From fd46865a502036b9e4414e7ec4950faf551b1f14 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Tue, 2 Dec 2008 20:35:40 +0000 Subject: QAR-1040 maint-viewer-11 + OpenAL combo mergeme svn merge -c104451 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448 --- indra/win_updater/updater.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'indra/win_updater') diff --git a/indra/win_updater/updater.cpp b/indra/win_updater/updater.cpp index 4bd07ead96..1355486db5 100644 --- a/indra/win_updater/updater.cpp +++ b/indra/win_updater/updater.cpp @@ -33,10 +33,14 @@ // Usage: updater -url // -#include "linden_common.h" +// We use dangerous fopen, strtok, mbstowcs, sprintf +// which generates warnings on VC2005. +// *TODO: Switch to fopen_s, strtok_s, etc. +#define _CRT_SECURE_NO_DEPRECATE #include #include +#include #define BUFSIZE 8192 @@ -44,7 +48,7 @@ int gTotalBytesRead = 0; DWORD gTotalBytes = -1; HWND gWindow = NULL; WCHAR gProgress[256]; -char* gUpdateURL; +char* gUpdateURL = NULL; #if _DEBUG FILE* logfile = 0; @@ -352,7 +356,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho int parse_args_result = parse_args(argc, argv); WNDCLASSEX wndclassex = { 0 }; - DEVMODE dev_mode = { 0 }; + //DEVMODE dev_mode = { 0 }; char update_exec_path[MAX_PATH]; /* Flawfinder: ignore */ const int WINDOW_WIDTH = 250; @@ -371,7 +375,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho RegisterClassEx(&wndclassex); // Get the size of the screen - EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dev_mode); + //EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dev_mode); gWindow = CreateWindowEx(NULL, win_class_name, L"Second Life Updater", -- cgit v1.2.3