diff --git a/reactos/base/applications/imagesoft/about.c b/reactos/base/applications/imagesoft/about.c index 145d750c675..dcfd8eb69c9 100644 --- a/reactos/base/applications/imagesoft/about.c +++ b/reactos/base/applications/imagesoft/about.c @@ -1,8 +1,5 @@ #include -#ifdef _MSC_VER -#pragma warning(disable : 4100) -#endif INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { diff --git a/reactos/base/applications/imagesoft/imageprop.c b/reactos/base/applications/imagesoft/imageprop.c index 36875096205..812bdfdf944 100644 --- a/reactos/base/applications/imagesoft/imageprop.c +++ b/reactos/base/applications/imagesoft/imageprop.c @@ -3,9 +3,6 @@ static PIMAGE_PROP ImageProp; static HWND hImageType, hUnitType, hHeightUnit, hWidthUnit, hResUnit; -#ifdef _MSC_VER -#pragma warning(disable : 4100) -#endif INT_PTR CALLBACK ImagePropDialogProc(HWND hDlg, UINT message, diff --git a/reactos/base/applications/imagesoft/misc.c b/reactos/base/applications/imagesoft/misc.c index 148a09d0542..a5f034b15bf 100644 --- a/reactos/base/applications/imagesoft/misc.c +++ b/reactos/base/applications/imagesoft/misc.c @@ -183,8 +183,12 @@ GetNumFromEdit(IN HWND hDlg, IN UINT Res) { LONG num = 0; + LPTSTR buf; INT len = GetWindowTextLength(GetDlgItem(hDlg, Res)); - TCHAR buf[len+1]; + + buf = HeapAlloc(ProcessHeap, + 0, + len); if(len > 0) { @@ -195,5 +199,9 @@ GetNumFromEdit(IN HWND hDlg, num = _ttol(buf); } + HeapFree(ProcessHeap, + 0, + buf); + return num; } diff --git a/reactos/base/applications/imagesoft/precomp.h b/reactos/base/applications/imagesoft/precomp.h index 23eb6e992ff..60a9b0c7676 100644 --- a/reactos/base/applications/imagesoft/precomp.h +++ b/reactos/base/applications/imagesoft/precomp.h @@ -24,6 +24,10 @@ ULONG DbgPrint(PCH Format,...); #define MAX_KEY_LENGTH 256 #define NUM_BUTTONS 14 +#ifdef _MSC_VER +#pragma warning(disable : 4100) +#endif + /* generic definitions and forward declarations */ struct _MAIN_WND_INFO; struct _EDIT_WND_INFO; diff --git a/reactos/base/applications/regedit/res/folder.ico b/reactos/base/applications/regedit/res/folder.ico index ec688354cb3..452da3a40ca 100644 Binary files a/reactos/base/applications/regedit/res/folder.ico and b/reactos/base/applications/regedit/res/folder.ico differ diff --git a/reactos/base/applications/regedit/res/folderopen.ico b/reactos/base/applications/regedit/res/folderopen.ico index a1bd9873e2a..1ca5dfa59c5 100644 Binary files a/reactos/base/applications/regedit/res/folderopen.ico and b/reactos/base/applications/regedit/res/folderopen.ico differ diff --git a/reactos/base/setup/usetup/bootsup.c b/reactos/base/setup/usetup/bootsup.c index 22ce2164c57..fa739fc22c7 100644 --- a/reactos/base/setup/usetup/bootsup.c +++ b/reactos/base/setup/usetup/bootsup.c @@ -245,7 +245,7 @@ CreateFreeLoaderIniForDos(PWCHAR IniPath, NULL, INSERT_LAST, L"Options", - L"/DEBUGPORT=SCREEN /NOGUIBOOT"); + L"/DEBUGPORT=COM1 /NOGUIBOOT"); /* Create "DOS" section */ IniSection = IniCacheAppendSection(IniCache, @@ -356,7 +356,7 @@ CreateFreeLoaderIniForReactos(PWCHAR IniPath, NULL, INSERT_LAST, L"Options", - L"/DEBUGPORT=SCREEN /NOGUIBOOT"); + L"/DEBUGPORT=COM1 /NOGUIBOOT"); /* Save the ini file */ IniCacheSave(IniCache, IniPath); diff --git a/reactos/base/shell/explorer/res/action.ico b/reactos/base/shell/explorer/res/action.ico index 233a1379187..e26b494b0a1 100644 Binary files a/reactos/base/shell/explorer/res/action.ico and b/reactos/base/shell/explorer/res/action.ico differ diff --git a/reactos/base/shell/explorer/res/computer.ico b/reactos/base/shell/explorer/res/computer.ico index d62870d0837..a86e03b3d2b 100644 Binary files a/reactos/base/shell/explorer/res/computer.ico and b/reactos/base/shell/explorer/res/computer.ico differ diff --git a/reactos/base/shell/explorer/res/config.ico b/reactos/base/shell/explorer/res/config.ico index 0a131f10923..6ac41378e4d 100644 Binary files a/reactos/base/shell/explorer/res/config.ico and b/reactos/base/shell/explorer/res/config.ico differ diff --git a/reactos/base/shell/explorer/res/documents.ico b/reactos/base/shell/explorer/res/documents.ico index 2902e4b7cdc..4567a2a759a 100644 Binary files a/reactos/base/shell/explorer/res/documents.ico and b/reactos/base/shell/explorer/res/documents.ico differ diff --git a/reactos/base/shell/explorer/res/explorer.ico b/reactos/base/shell/explorer/res/explorer.ico index 09e4a52d122..be314eea3cd 100644 Binary files a/reactos/base/shell/explorer/res/explorer.ico and b/reactos/base/shell/explorer/res/explorer.ico differ diff --git a/reactos/base/shell/explorer/res/folder.ico b/reactos/base/shell/explorer/res/folder.ico index 11ac83d299a..406f3208c88 100644 Binary files a/reactos/base/shell/explorer/res/folder.ico and b/reactos/base/shell/explorer/res/folder.ico differ diff --git a/reactos/base/shell/explorer/res/info.ico b/reactos/base/shell/explorer/res/info.ico index 1a3f64276b1..84913edab61 100644 Binary files a/reactos/base/shell/explorer/res/info.ico and b/reactos/base/shell/explorer/res/info.ico differ diff --git a/reactos/base/shell/explorer/res/logoff.ico b/reactos/base/shell/explorer/res/logoff.ico index dbaefab3b5c..8a379ffb3a6 100644 Binary files a/reactos/base/shell/explorer/res/logoff.ico and b/reactos/base/shell/explorer/res/logoff.ico differ diff --git a/reactos/base/shell/explorer/res/logov.bmp b/reactos/base/shell/explorer/res/logov.bmp index 0d251b664b2..767f9d69063 100644 Binary files a/reactos/base/shell/explorer/res/logov.bmp and b/reactos/base/shell/explorer/res/logov.bmp differ diff --git a/reactos/base/shell/explorer/res/network.ico b/reactos/base/shell/explorer/res/network.ico index 3965e61f86f..579163c0dc4 100644 Binary files a/reactos/base/shell/explorer/res/network.ico and b/reactos/base/shell/explorer/res/network.ico differ diff --git a/reactos/base/shell/explorer/res/reactos.ico b/reactos/base/shell/explorer/res/reactos.ico index 16cebc5698d..492e388a939 100644 Binary files a/reactos/base/shell/explorer/res/reactos.ico and b/reactos/base/shell/explorer/res/reactos.ico differ diff --git a/reactos/base/shell/explorer/res/recent-documents.ico b/reactos/base/shell/explorer/res/recent-documents.ico index 26d1b253fc4..8ebc83b19ac 100644 Binary files a/reactos/base/shell/explorer/res/recent-documents.ico and b/reactos/base/shell/explorer/res/recent-documents.ico differ diff --git a/reactos/base/shell/explorer/res/search.ico b/reactos/base/shell/explorer/res/search.ico index 36ff3f5a609..4283483b8e9 100644 Binary files a/reactos/base/shell/explorer/res/search.ico and b/reactos/base/shell/explorer/res/search.ico differ diff --git a/reactos/base/shell/explorer/res/shutdown.ico b/reactos/base/shell/explorer/res/shutdown.ico index b6831c1a01a..86fa8bc53b6 100644 Binary files a/reactos/base/shell/explorer/res/shutdown.ico and b/reactos/base/shell/explorer/res/shutdown.ico differ diff --git a/reactos/base/shell/explorer/res/startmenu.ico b/reactos/base/shell/explorer/res/startmenu.ico index 52411bf87e9..492e388a939 100644 Binary files a/reactos/base/shell/explorer/res/startmenu.ico and b/reactos/base/shell/explorer/res/startmenu.ico differ