Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 66361: [SHELL32]: Partial sync: SHA-1: a08160680be1a3164e882fcc41504f115ba62f12 * shell32: Automatically expand CPL applet path string. (Hermès Bélusca-Maïto)
by hbelusca＠svn.reactos.org 20 Feb '15

20 Feb '15

Author: hbelusca Date: Fri Feb 20 02:05:46 2015 New Revision: 66361 URL: http://svn.reactos.org/svn/reactos?rev=66361&view=rev Log: [SHELL32]: Partial sync: SHA-1: a08160680be1a3164e882fcc41504f115ba62f12 * shell32: Automatically expand CPL applet path string. (Hermès Bélusca-Maïto) Modified: trunk/reactos/dll/win32/shell32/wine/control.c Modified: trunk/reactos/dll/win32/shell32/wine/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/con… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/control.c [iso-8859-1] Fri Feb 20 02:05:46 2015 @@ -49,6 +49,7 @@ FreeLibrary(applet->hModule); next = applet->next; + HeapFree(GetProcessHeap(), 0, applet->cmd); HeapFree(GetProcessHeap(), 0, applet); return next; } @@ -56,6 +57,7 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) { CPlApplet* applet; + DWORD len; unsigned i; CPLINFO info; NEWCPLINFOW newinfo; @@ -63,16 +65,32 @@ if (!(applet = (CPlApplet *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*applet)))) return applet; + len = ExpandEnvironmentStringsW(cmd, NULL, 0); + if (len > 0) + { + if (!(applet->cmd = HeapAlloc(GetProcessHeap(), 0, (len+1) * sizeof(WCHAR)))) + { + WARN("Cannot allocate memory for applet path\n"); + goto theError; + } + ExpandEnvironmentStringsW(cmd, applet->cmd, len+1); + } + else + { + WARN("Cannot expand applet path\n"); + goto theError; + } + applet->hWnd = hWnd; - if (!(applet->hModule = LoadLibraryW(cmd))) - { - WARN("Cannot load control panel applet %s\n", debugstr_w(cmd)); + if (!(applet->hModule = LoadLibraryW(applet->cmd))) + { + WARN("Cannot load control panel applet %s\n", debugstr_w(applet->cmd)); goto theError; } if (!(applet->proc = (APPLET_PROC)GetProcAddress(applet->hModule, "CPlApplet"))) { - WARN("Not a valid control panel applet %s\n", debugstr_w(cmd)); + WARN("Not a valid control panel applet %s\n", debugstr_w(applet->cmd)); goto theError; } if (!applet->proc(hWnd, CPL_INIT, 0L, 0L)) @@ -155,9 +173,9 @@ panel->hWnd = hWnd; } -#define XICON 32 +#define XICON 32 #define XSTEP 128 -#define YICON 32 +#define YICON 32 #define YSTEP 64 static BOOL Control_Localize(const CPanel* panel, int cx, int cy,

1 0

[hbelusca] 66360: [FREELDR]: Code formatting; support drive numbers that can be also specified in particular in hexadecimal: 0x??? or in octal: 0??? (first character starts with '0' so it's OK).
by hbelusca＠svn.reactos.org 19 Feb '15

19 Feb '15

Author: hbelusca Date: Thu Feb 19 21:06:38 2015 New Revision: 66360 URL: http://svn.reactos.org/svn/reactos?rev=66360&view=rev Log: [FREELDR]: Code formatting; support drive numbers that can be also specified in particular in hexadecimal: 0x??? or in octal: 0??? (first character starts with '0' so it's OK). Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c [iso-8859-1] Thu Feb 19 21:06:38 2015 @@ -114,11 +114,12 @@ BOOLEAN DriveMapIsValidDriveString(PCSTR DriveString) { - ULONG Index; + ULONG Index; // Now verify that the user has given us appropriate strings if ((strlen(DriveString) < 3) || - ((DriveString[0] != 'f') && (DriveString[0] != 'F') && (DriveString[0] != 'h') && (DriveString[0] != 'H')) || + ((DriveString[0] != 'f') && (DriveString[0] != 'F') && + (DriveString[0] != 'h') && (DriveString[0] != 'H')) || ((DriveString[1] != 'd') && (DriveString[1] != 'D'))) { return FALSE; @@ -126,13 +127,14 @@ // Now verify that the user has given us appropriate numbers // Make sure that only numeric characters were given - for (Index=2; Index<strlen(DriveString); Index++) + for (Index = 2; Index < strlen(DriveString); Index++) { if (DriveString[Index] < '0' || DriveString[Index] > '9') { return FALSE; } } + // Now make sure that they are not outrageous values (i.e. hd90874) if ((atoi(&DriveString[2]) < 0) || (atoi(&DriveString[2]) > 0xff)) { @@ -145,13 +147,15 @@ UCHAR DriveMapGetBiosDriveNumber(PCSTR DeviceName) { - UCHAR BiosDriveNumber = 0; + UCHAR BiosDriveNumber = 0; + + TRACE("DriveMapGetBiosDriveNumber(%s)\n", DeviceName); // If they passed in a number string then just // convert it to decimal and return it if (DeviceName[0] >= '0' && DeviceName[0] <= '9') { - return atoi(DeviceName); + return (UCHAR)strtoul(DeviceName, NULL, 0); } // Convert the drive number string into a number @@ -171,8 +175,8 @@ #ifndef _MSC_VER VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap) { - ULONG* RealModeIVT = (ULONG*)0x00000000; - USHORT* BiosLowMemorySize = (USHORT*)0x00000413; + ULONG* RealModeIVT = (ULONG*)0x00000000; + USHORT* BiosLowMemorySize = (USHORT*)0x00000413; if (!DriveMapInstalled) { @@ -207,8 +211,8 @@ VOID DriveMapRemoveInt13Handler(VOID) { - ULONG* RealModeIVT = (ULONG*)0x00000000; - USHORT* BiosLowMemorySize = (USHORT*)0x00000413; + ULONG* RealModeIVT = (ULONG*)0x00000000; + USHORT* BiosLowMemorySize = (USHORT*)0x00000413; if (DriveMapInstalled) {

1 0

[hbelusca] 66359: [WINSRV]: Initialize Context.QueryResult to a meaningful value by default. Spotted by Thomas. CORE-9229 #resolve
by hbelusca＠svn.reactos.org 19 Feb '15

19 Feb '15

Author: hbelusca Date: Thu Feb 19 20:38:03 2015 New Revision: 66359 URL: http://svn.reactos.org/svn/reactos?rev=66359&view=rev Log: [WINSRV]: Initialize Context.QueryResult to a meaningful value by default. Spotted by Thomas. CORE-9229 #resolve Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] Thu Feb 19 20:38:03 2015 @@ -535,6 +535,7 @@ NOTIFY_CONTEXT Context; Context.ShutdownSettings = ShutdownSettings; + Context.QueryResult = QUERY_RESULT_CONTINUE; // We continue shutdown by default. /* Lock the process */ CsrLockProcessByClientId(CsrProcess->ClientId.UniqueProcess, &Process);

1 0

[pschweitzer] 66358: [KERNEL32] OK, Thomas had to convince me that MAX_USHORT + MAX_USHORT + 0x400 + 0x6 cannot overflow an ULONG. So remove useless check. By Thomas :-)
by pschweitzer＠svn.reactos.org 19 Feb '15

19 Feb '15

Author: pschweitzer Date: Thu Feb 19 19:15:46 2015 New Revision: 66358 URL: http://svn.reactos.org/svn/reactos?rev=66358&view=rev Log: [KERNEL32] OK, Thomas had to convince me that MAX_USHORT + MAX_USHORT + 0x400 + 0x6 cannot overflow an ULONG. So remove useless check. By Thomas :-) Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] Thu Feb 19 19:15:46 2015 @@ -93,12 +93,6 @@ /* Reserve enough to read previous string + to append our with required null chars */ BufferLength = NewPath->Length + ExistingPath->Length + STRING_LENGTH + 3 * sizeof(UNICODE_NULL); - /* Check we didn't overflow */ - if (BufferLength < STRING_LENGTH) - { - NtClose(KeyHandle); - return STATUS_BUFFER_TOO_SMALL; - } while (TRUE) { @@ -123,6 +117,7 @@ StringLength = DataSize; RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); BufferLength = ExistingPath->Length + StringLength + NewPath->Length + 3 * sizeof(UNICODE_NULL); + /* Check we didn't overflow */ if (BufferLength < StringLength) { NtClose(KeyHandle);

1 0

[pschweitzer] 66357: [KERNEL32] Remove trailing spaces. Patch by Thomas
by pschweitzer＠svn.reactos.org 19 Feb '15

19 Feb '15

Author: pschweitzer Date: Thu Feb 19 19:10:07 2015 New Revision: 66357 URL: http://svn.reactos.org/svn/reactos?rev=66357&view=rev Log: [KERNEL32] Remove trailing spaces. Patch by Thomas Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] Thu Feb 19 19:10:07 2015 @@ -304,7 +304,7 @@ NULL); /* Attempt to open source file */ Status = NtOpenFile(&SourceHandle, - FILE_READ_ATTRIBUTES | DELETE | SYNCHRONIZE, + FILE_READ_ATTRIBUTES | DELETE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, @@ -474,7 +474,7 @@ if (Status != STATUS_NOT_SAME_DEVICE || !(dwFlags & MOVEFILE_COPY_ALLOWED)) { /* ReactOS hack! To be removed once all FSD have proper renaming support - * Just leave status to error and leave + * Just leave status to error and leave */ if (Status == STATUS_NOT_IMPLEMENTED) {

1 0

[pschweitzer] 66356: [KERNEL32] Fix heap buffer overflow in case PendingFileRenameOperations already exists. Spotted by Thomas
by pschweitzer＠svn.reactos.org 19 Feb '15

19 Feb '15

Author: pschweitzer Date: Thu Feb 19 19:05:56 2015 New Revision: 66356 URL: http://svn.reactos.org/svn/reactos?rev=66356&view=rev Log: [KERNEL32] Fix heap buffer overflow in case PendingFileRenameOperations already exists. Spotted by Thomas Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] Thu Feb 19 19:05:56 2015 @@ -92,7 +92,7 @@ } /* Reserve enough to read previous string + to append our with required null chars */ - BufferLength = NewPath->Length + ExistingPath->Length + STRING_LENGTH + 3 * sizeof(WCHAR); + BufferLength = NewPath->Length + ExistingPath->Length + STRING_LENGTH + 3 * sizeof(UNICODE_NULL); /* Check we didn't overflow */ if (BufferLength < STRING_LENGTH) { @@ -122,7 +122,7 @@ /* If buffer was too small, then, reallocate one which is big enough */ StringLength = DataSize; RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - BufferLength = ExistingPath->Length + StringLength + NewPath->Length + 3 * sizeof(WCHAR); + BufferLength = ExistingPath->Length + StringLength + NewPath->Length + 3 * sizeof(UNICODE_NULL); if (BufferLength < StringLength) { NtClose(KeyHandle); @@ -148,9 +148,11 @@ { PKEY_VALUE_PARTIAL_INFORMATION PartialInfo = (PKEY_VALUE_PARTIAL_INFORMATION)Buffer; - /* Get data, our buffer begin and then where we should append data (+ null char) */ + /* Get data, our buffer begin and then where we should append data + * (- null char, this is REG_MULTI_SZ, it already includes double termination, we keep only one) + */ BufferBegin = PartialInfo->Data; - BufferWrite = (PWSTR)((ULONG_PTR)PartialInfo->Data + PartialInfo->DataLength + sizeof(WCHAR)); + BufferWrite = (PWSTR)((ULONG_PTR)PartialInfo->Data + PartialInfo->DataLength - sizeof(UNICODE_NULL)); } /* First copy existing */

1 0

[pschweitzer] 66355: [KERNEL32] Fixx 64bits build. Spotted by Thomas
by pschweitzer＠svn.reactos.org 19 Feb '15

19 Feb '15

Author: pschweitzer Date: Thu Feb 19 18:42:37 2015 New Revision: 66355 URL: http://svn.reactos.org/svn/reactos?rev=66355&view=rev Log: [KERNEL32] Fixx 64bits build. Spotted by Thomas Modified: trunk/reactos/dll/win32/kernel32/client/except.c Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Thu Feb 19 18:42:37 2015 @@ -370,7 +370,7 @@ { DPRINT1("Delphi Exception at address: %p\n", ExceptionRecord.ExceptionInformation[0]); DPRINT1("Exception-Object: %p\n", ExceptionRecord.ExceptionInformation[1]); - DPRINT1("Exception text: %x\n", ExceptionRecord.ExceptionInformation[2]); + DPRINT1("Exception text: %lx\n", ExceptionRecord.ExceptionInformation[2]); } /* Trace the wine special error and show the modulename and functionname */

1 0

[pschweitzer] 66354: [KERNEL32] Don't pretend that ExceptionRecord.ExceptionInformation[2] is a pointer to a string in case of Delphi exception. This can lead to invalid pointer dereference in DbgP...
by pschweitzer＠svn.reactos.org 19 Feb '15

19 Feb '15

Author: pschweitzer Date: Thu Feb 19 18:36:32 2015 New Revision: 66354 URL: http://svn.reactos.org/svn/reactos?rev=66354&view=rev Log: [KERNEL32] Don't pretend that ExceptionRecord.ExceptionInformation[2] is a pointer to a string in case of Delphi exception. This can lead to invalid pointer dereference in DbgPrint then. For instance: (../../dll/win32/kernel32/client/except.c:371) Delphi Exception at address: 50075885 (../../dll/win32/kernel32/client/except.c:372) Exception-Object: 00E885A8 (../../dll/win32/kernel32/client/except.c:373) Exception text: 2 Modified: trunk/reactos/dll/win32/kernel32/client/except.c Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Thu Feb 19 18:36:32 2015 @@ -370,7 +370,7 @@ { DPRINT1("Delphi Exception at address: %p\n", ExceptionRecord.ExceptionInformation[0]); DPRINT1("Exception-Object: %p\n", ExceptionRecord.ExceptionInformation[1]); - DPRINT1("Exception text: %s\n", ExceptionRecord.ExceptionInformation[2]); + DPRINT1("Exception text: %x\n", ExceptionRecord.ExceptionInformation[2]); } /* Trace the wine special error and show the modulename and functionname */

1 0

[tfaber] 66353: [EXPLORER] - Fix uninitialized variable use in CTaskSwitchWnd::OnContextMenu
by tfaber＠svn.reactos.org 19 Feb '15

19 Feb '15

Author: tfaber Date: Thu Feb 19 16:30:37 2015 New Revision: 66353 URL: http://svn.reactos.org/svn/reactos?rev=66353&view=rev Log: [EXPLORER] - Fix uninitialized variable use in CTaskSwitchWnd::OnContextMenu Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tasksw… ============================================================================== --- trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] Thu Feb 19 16:30:37 2015 @@ -378,11 +378,11 @@ SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR) &hIcon); if (hIcon) return hIcon; - + hIcon = (HICON) GetClassLongPtr(hwnd, GCL_HICONSM); if (hIcon) return hIcon; - + hIcon = (HICON) GetClassLongPtr(hwnd, GCL_HICON); return hIcon; @@ -1279,7 +1279,7 @@ } LRESULT OnThemeChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) - { + { return OnThemeChanged(); } @@ -1353,7 +1353,7 @@ return Ret; } - + LRESULT HandleShellHookMsg(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { BOOL Ret = FALSE; @@ -1526,7 +1526,7 @@ HMENU hmenu = GetSystemMenu(TaskItem->hWnd, FALSE); - if (hmenu) + if (hmenu) { POINT pt; int cmd; @@ -1756,11 +1756,12 @@ LRESULT OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - LRESULT Ret; + LRESULT Ret = 0; + INT_PTR iBtn = -1; + if (m_TaskBar.m_hWnd != NULL) { POINT pt; - INT_PTR iBtn; pt.x = GET_X_LPARAM(lParam); pt.y = GET_Y_LPARAM(lParam); @@ -1772,13 +1773,10 @@ { HandleButtonRightClick(iBtn); } - else - goto ForwardContextMenuMsg; - } - else - { - ForwardContextMenuMsg: - /* Forward message */ + } + if (iBtn < 0) + { + /* Not on a taskbar button, so forward message to tray */ Ret = SendMessage(m_Tray->GetHWND(), uMsg, wParam, lParam); } return Ret;

1 0

[tfaber] 66352: [PSDK] - Fix packing for system restore point API types (STATEMGRSTATUS in particular). Fixes VC++ 2012 redist installer. CORE-8010 #resolve
by tfaber＠svn.reactos.org 19 Feb '15

19 Feb '15

Author: tfaber Date: Thu Feb 19 15:42:33 2015 New Revision: 66352 URL: http://svn.reactos.org/svn/reactos?rev=66352&view=rev Log: [PSDK] - Fix packing for system restore point API types (STATEMGRSTATUS in particular). Fixes VC++ 2012 redist installer. CORE-8010 #resolve Modified: trunk/reactos/include/psdk/srrestoreptapi.h Modified: trunk/reactos/include/psdk/srrestoreptapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/srrestoreptap… ============================================================================== --- trunk/reactos/include/psdk/srrestoreptapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/srrestoreptapi.h [iso-8859-1] Thu Feb 19 15:42:33 2015 @@ -39,6 +39,8 @@ /* Types */ +#pragma pack(push, 1) + typedef struct _RESTOREPTINFOA { DWORD dwEventType; DWORD dwRestorePtType; @@ -47,10 +49,10 @@ } RESTOREPOINTINFOA, *PRESTOREPOINTINFOA; typedef struct _RESTOREPTINFOW { - DWORD dwEventType; - DWORD dwRestorePtType; - INT64 llSequenceNumber; - WCHAR szDescription[MAX_DESC_W]; + DWORD dwEventType; + DWORD dwRestorePtType; + INT64 llSequenceNumber; + WCHAR szDescription[MAX_DESC_W]; } RESTOREPOINTINFOW, *PRESTOREPOINTINFOW; typedef struct _SMGRSTATUS { @@ -58,12 +60,14 @@ INT64 llSequenceNumber; } STATEMGRSTATUS, *PSTATEMGRSTATUS; +#pragma pack(pop) + /* Functions */ BOOL WINAPI SRSetRestorePointA(PRESTOREPOINTINFOA, PSTATEMGRSTATUS); BOOL WINAPI SRSetRestorePointW(PRESTOREPOINTINFOW, PSTATEMGRSTATUS); DWORD WINAPI SRRemoveRestorePoint(DWORD); - + #ifdef __cplusplus } #endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs