Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 71962: [USER32] Add missing lprc check in SetRect().
by akhaldi＠svn.reactos.org 18 Jul '16

18 Jul '16

Author: akhaldi Date: Mon Jul 18 15:46:38 2016 New Revision: 71962 URL: http://svn.reactos.org/svn/reactos?rev=71962&view=rev Log: [USER32] Add missing lprc check in SetRect(). Modified: trunk/reactos/win32ss/user/user32/windows/rect.c Modified: trunk/reactos/win32ss/user/user32/windows/rect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/rect.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/rect.c [iso-8859-1] Mon Jul 18 15:46:38 2016 @@ -159,11 +159,15 @@ int xRight, int yBottom) { + if (!lprc) + return FALSE; + lprc->left = xLeft; lprc->top = yTop; lprc->right = xRight; lprc->bottom = yBottom; - return(TRUE); + + return TRUE; }

1 0

[akhaldi] 71961: [WS2_32_WINETEST] Sync with Wine Staging 1.9.14. Made possible thanks to Peter Hater's changes. CORE-11368 ROSTESTS-233
by akhaldi＠svn.reactos.org 18 Jul '16

18 Jul '16

Author: akhaldi Date: Mon Jul 18 10:44:58 2016 New Revision: 71961 URL: http://svn.reactos.org/svn/reactos?rev=71961&view=rev Log: [WS2_32_WINETEST] Sync with Wine Staging 1.9.14. Made possible thanks to Peter Hater's changes. CORE-11368 ROSTESTS-233 Added: trunk/rostests/winetests/ws2_32/ros_diff.patch (with props) Modified: trunk/rostests/winetests/ws2_32/sock.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/rostests/winetests/ws2_32/ros_diff.patch URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/ros_diff… Modified: trunk/rostests/winetests/ws2_32/sock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/sock.c?r…

1 0

[akhaldi] 71960: [SHELL32] Add AVI file 151. By Jared Smudde. CORE-11638
by akhaldi＠svn.reactos.org 18 Jul '16

18 Jul '16

Author: akhaldi Date: Mon Jul 18 10:27:56 2016 New Revision: 71960 URL: http://svn.reactos.org/svn/reactos?rev=71960&view=rev Log: [SHELL32] Add AVI file 151. By Jared Smudde. CORE-11638 Added: trunk/reactos/dll/win32/shell32/res/avis/151.avi (with props) Modified: trunk/reactos/dll/win32/shell32/avi_res.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/avi_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/avi_res.… ============================================================================== --- trunk/reactos/dll/win32/shell32/avi_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/avi_res.rc [iso-8859-1] Mon Jul 18 10:27:56 2016 @@ -1,3 +1,4 @@ +IDA_SHELL_SEARCHING_INDEX AVI "res/avis/151.avi" IDA_SHELL_COPY AVI "res/avis/160+161+167+168.avi" IDA_SHELL_COPY1 AVI "res/avis/160+161+167+168.avi" IDA_SHELL_COPY2 AVI "res/avis/160+161+167+168.avi" Added: trunk/reactos/dll/win32/shell32/res/avis/151.avi URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/avis… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/avis/151.avi ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Mon Jul 18 10:27:56 2016 @@ -573,18 +573,19 @@ * AVI resources * * windows shell32 has 14 of them: 150-152 and 160-170 - * FIXME: Add 150-152 + * FIXME: Add 150, 152 */ -#define IDA_SHELL_COPY 160 -#define IDA_SHELL_COPY1 161 -#define IDA_SHELL_COPY2 167 -#define IDA_SHELL_COPY3 168 -#define IDA_SHELL_RECYCLE 162 -#define IDA_SHELL_EMPTY_RECYCLE 163 -#define IDA_SHELL_DELETE 164 -#define IDA_SHELL_DELETE1 169 -#define IDA_SHELL_DOWNLOAD 170 +#define IDA_SHELL_SEARCHING_INDEX 151 +#define IDA_SHELL_COPY 160 +#define IDA_SHELL_COPY1 161 +#define IDA_SHELL_COPY2 167 +#define IDA_SHELL_COPY3 168 +#define IDA_SHELL_RECYCLE 162 +#define IDA_SHELL_EMPTY_RECYCLE 163 +#define IDA_SHELL_DELETE 164 +#define IDA_SHELL_DELETE1 169 +#define IDA_SHELL_DOWNLOAD 170 /* Desktop Browser commands */ #define FCIDM_DESKBROWSER_CLOSE 0xA004

1 0

[jimtabor] 71959: [User32] - Fix log out shutdown dialog window input. See CORE-11633 #resolve
by jimtabor＠svn.reactos.org 18 Jul '16

18 Jul '16

Author: jimtabor Date: Mon Jul 18 02:35:46 2016 New Revision: 71959 URL: http://svn.reactos.org/svn/reactos?rev=71959&view=rev Log: [User32] - Fix log out shutdown dialog window input. See CORE-11633 #resolve Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] Mon Jul 18 02:35:46 2016 @@ -532,7 +532,7 @@ if (!(GetWindowLongPtrW( hwnd, GWL_STYLE ) & DS_NOIDLEMSG)) { /* No message present -> send ENTERIDLE and wait */ - if (owner) SendMessageW( owner, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd ); + SendMessageW( owner, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd ); } GetMessageW( &msg, 0, 0, 0 ); } @@ -919,25 +919,42 @@ if (modal_owner && owner) { - HWND parent; + HWND parent = NULL; /* * Owner needs to be top level window. We need to duplicate the logic from server, * because we need to disable it before creating dialog window. Note that we do that * even if dialog has WS_CHILD, but only for modal dialogs, which matched what * Windows does. */ - while ((GetWindowLongW( owner, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) - { - parent = GetParent( owner ); - if (!parent || parent == GetDesktopWindow()) break; - owner = parent; + + ////// Wine'ie babies need to fix your code!!!! CORE-11633 + if ((GetWindowLongW( owner, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) + { + parent = owner; + while ((GetWindowLongW( parent, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) + { + parent = GetParent( owner ); + if (!parent || parent == GetDesktopWindow()) + { + parent = NULL; + break; + } + } + } + else + parent = GetAncestor( owner, GA_ROOT ); + + if (parent) + { + owner = parent; + + if (IsWindowEnabled( owner )) + { + disabled_owner = owner; + EnableWindow( disabled_owner, FALSE ); + } } *modal_owner = owner; - if (IsWindowEnabled( owner )) - { - disabled_owner = owner; - EnableWindow( disabled_owner, FALSE ); - } } if (unicode) @@ -1052,7 +1069,6 @@ } return hwnd; } - //if (modal && ownerEnabled) DIALOG_EnableOwner(owner); if (disabled_owner) EnableWindow( disabled_owner, TRUE ); IntNotifyWinEvent(EVENT_SYSTEM_DIALOGEND, hwnd, OBJID_WINDOW, CHILDID_SELF, 0); if( IsWindow(hwnd) ) @@ -2036,6 +2052,7 @@ } else owner = GetWindow( hwnd, GW_OWNER ); + if (owner) EnableWindow( owner, TRUE );

1 0

[hbelusca] 71958: [EVENTVWR] Commit "Part 1" of my Improvements for the Event Log Viewer. See CORE-11637 description for more details (too long to stay there).
by hbelusca＠svn.reactos.org 17 Jul '16

17 Jul '16

Author: hbelusca Date: Sun Jul 17 23:06:03 2016 New Revision: 71958 URL: http://svn.reactos.org/svn/reactos?rev=71958&view=rev Log: [EVENTVWR] Commit "Part 1" of my Improvements for the Event Log Viewer. See CORE-11637 description for more details (too long to stay there). Added: trunk/reactos/base/applications/mscutils/eventvwr/res/COPYING (with props) trunk/reactos/base/applications/mscutils/eventvwr/res/key.ico (with props) trunk/reactos/base/applications/mscutils/eventvwr/res/lock.ico (with props) Modified: trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc trunk/reactos/base/applications/mscutils/eventvwr/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/eventvwr/res/COPYING URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/eventvwr/res/key.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/eventvwr/res/lock.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…

1 0

[tthompson] 71957: [NTFS] Address some minor issues with attrib.c: Fix gcc build. Fix formatting.
by tthompson＠svn.reactos.org 17 Jul '16

17 Jul '16

Author: tthompson Date: Sun Jul 17 14:04:01 2016 New Revision: 71957 URL: http://svn.reactos.org/svn/reactos?rev=71957&view=rev Log: [NTFS] Address some minor issues with attrib.c: Fix gcc build. Fix formatting. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Sun Jul 17 14:04:01 2016 @@ -89,7 +89,7 @@ // Allocate some memory for the RunBuffer PUCHAR RunBuffer; - int RunBufferOffset = 0; + ULONG RunBufferOffset = 0; if (!AttrContext->Record.IsNonResident) return STATUS_INVALID_PARAMETER; @@ -108,7 +108,7 @@ // Add newly-assigned clusters to mcb _SEH2_TRY{ if (!FsRtlAddLargeMcbEntry(&DataRunsMCB, - NextVBN, + NextVBN, NextAssignedCluster, RunLength)) { @@ -217,8 +217,6 @@ LONGLONG DataRunOffset; ULONGLONG DataRunLength; LONGLONG DataRunStartLCN; - ULONGLONG NextCluster; - ULONGLONG LastLCN = 0; // Initialize the MCB, potentially catch an exception @@ -237,8 +235,6 @@ // Normal data run. DataRunStartLCN = LastLCN + DataRunOffset; LastLCN = DataRunStartLCN; - NextCluster = LastLCN + DataRunLength; - _SEH2_TRY{ if (!FsRtlAddLargeMcbEntry(DataRunsMCB, @@ -295,14 +291,14 @@ ULONG RunBufferOffset = 0; LONGLONG DataRunOffset; ULONGLONG LastLCN = 0; - LONGLONG Vbn, Lbn, Count; + int i; DPRINT("\t[Vbn, Lbn, Count]\n"); // convert each mcb entry to a data run - for (int i = 0; FsRtlGetNextLargeMcbEntry(DataRunsMCB, i, &Vbn, &Lbn, &Count); i++) + for (i = 0; FsRtlGetNextLargeMcbEntry(DataRunsMCB, i, &Vbn, &Lbn, &Count); i++) { UCHAR DataRunOffsetSize = 0; UCHAR DataRunLengthSize = 0;

1 0

[mjansen] 71956: [EXPLORER] Fix the Explore all users/open all users menu items. Patch by Jared Smudde. CORE-11146 #resolve #comment Thanks!
by mjansen＠svn.reactos.org 16 Jul '16

16 Jul '16

Author: mjansen Date: Sat Jul 16 17:49:27 2016 New Revision: 71956 URL: http://svn.reactos.org/svn/reactos?rev=71956&view=rev Log: [EXPLORER] Fix the Explore all users/open all users menu items. Patch by Jared Smudde. CORE-11146 #resolve #comment Thanks! Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Sat Jul 16 17:49:27 2016 @@ -1704,9 +1704,9 @@ { ShellExecute(hWndOwner, lpOperation, + szDir, NULL, NULL, - szDir, SW_SHOWNORMAL); } }

1 0

[ekohl] 71955: Ooops! These were not meant to be committed!
by ekohl＠svn.reactos.org 16 Jul '16

16 Jul '16

Author: ekohl Date: Sat Jul 16 17:41:44 2016 New Revision: 71955 URL: http://svn.reactos.org/svn/reactos?rev=71955&view=rev Log: Ooops! These were not meant to be committed! Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sat Jul 16 17:41:44 2016 @@ -202,9 +202,9 @@ PWSTR ptr; DWORD dwError = ERROR_SUCCESS; - DPRINT1("ScmLogonService()\n"); - - DPRINT1("Service %S\n", pService->lpServiceName); + DPRINT("ScmLogonService()\n"); + + DPRINT("Service %S\n", pService->lpServiceName); if (ScmIsLocalSystemAccount(pImage->pszAccountName)) return ERROR_SUCCESS; @@ -228,10 +228,10 @@ // pDomainName = computer name } - DPRINT1("Domain: %S User: %S\n", pDomainName, pUserName); + DPRINT("Domain: %S User: %S\n", pDomainName, pUserName); /* FIXME */ -#if 1 +#if 0 if (!LogonUserW(pUserName, pDomainName, L"", // lpszPassword,

1 0

[ekohl] 71954: [SERVICES] Check for NULL pointers before derreferecing them in ScmIsSameServiceAccount(). Patch by Victor Martinez Calvo. CORE-11599 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 16 Jul '16

16 Jul '16

Author: ekohl Date: Sat Jul 16 17:39:37 2016 New Revision: 71954 URL: http://svn.reactos.org/svn/reactos?rev=71954&view=rev Log: [SERVICES] Check for NULL pointers before derreferecing them in ScmIsSameServiceAccount(). Patch by Victor Martinez Calvo. CORE-11599 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sat Jul 16 17:39:37 2016 @@ -162,10 +162,16 @@ IN PWSTR pszAccountName1, IN PWSTR pszAccountName2) { - if ((pszAccountName1 == NULL && pszAccountName2 == NULL) || - (pszAccountName1 == NULL && wcscmp(pszAccountName2, L"LocalSystem") == 0) || - (pszAccountName2 == NULL && wcscmp(pszAccountName1, L"LocalSystem") == 0) || - (wcscmp(pszAccountName1, pszAccountName2) == 0)) + if (pszAccountName1 == NULL && pszAccountName2 == NULL) + return TRUE; + + if (pszAccountName1 == NULL && pszAccountName2 && wcscmp(pszAccountName2, L"LocalSystem") == 0) + return TRUE; + + if (pszAccountName2 == NULL && pszAccountName1 && wcscmp(pszAccountName1, L"LocalSystem") == 0) + return TRUE; + + if (pszAccountName1 && pszAccountName2 && wcscmp(pszAccountName1, pszAccountName2) == 0) return TRUE; return FALSE; @@ -196,9 +202,9 @@ PWSTR ptr; DWORD dwError = ERROR_SUCCESS; - DPRINT("ScmLogonService()\n"); - - DPRINT("Service %S\n", pService->lpServiceName); + DPRINT1("ScmLogonService()\n"); + + DPRINT1("Service %S\n", pService->lpServiceName); if (ScmIsLocalSystemAccount(pImage->pszAccountName)) return ERROR_SUCCESS; @@ -222,10 +228,10 @@ // pDomainName = computer name } - DPRINT("Domain: %S User: %S\n", pDomainName, pUserName); + DPRINT1("Domain: %S User: %S\n", pDomainName, pUserName); /* FIXME */ -#if 0 +#if 1 if (!LogonUserW(pUserName, pDomainName, L"", // lpszPassword,

1 0

[ekohl] 71953: [ADVAPI32] Remove unneeded NULL checks at CreateServiceA/W and ChangeServiceConfigW/A(). Patch by Victor Martinez Calvo. CORE-11610 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 16 Jul '16

16 Jul '16

Author: ekohl Date: Sat Jul 16 16:18:17 2016 New Revision: 71953 URL: http://svn.reactos.org/svn/reactos?rev=71953&view=rev Log: [ADVAPI32] Remove unneeded NULL checks at CreateServiceA/W and ChangeServiceConfigW/A(). Patch by Victor Martinez Calvo. CORE-11610 #resolve #comment Thanks a lot! Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sat Jul 16 16:18:17 2016 @@ -326,7 +326,7 @@ /* FIXME: Encrypt the password */ lpEncryptedPassword = (LPBYTE)lpPasswordW; - dwPasswordLength = (DWORD)(lpPasswordW ? (wcslen(lpPasswordW) + 1) * sizeof(WCHAR) : 0); + dwPasswordLength = (wcslen(lpPasswordW) + 1) * sizeof(WCHAR); } RpcTryExcept @@ -407,9 +407,12 @@ dwDependenciesLength *= sizeof(WCHAR); } - /* FIXME: Encrypt the password */ - lpEncryptedPassword = (LPBYTE)lpPassword; - dwPasswordLength = (lpPassword ? (wcslen(lpPassword) + 1) * sizeof(WCHAR) : 0); + if (lpPassword != NULL) + { + /* FIXME: Encrypt the password */ + lpEncryptedPassword = (LPBYTE)lpPassword; + dwPasswordLength = (wcslen(lpPassword) + 1) * sizeof(WCHAR); + } RpcTryExcept { @@ -619,7 +622,7 @@ /* FIXME: Encrypt the password */ lpEncryptedPassword = (LPBYTE)lpPasswordW; - dwPasswordLength = (DWORD)(lpPasswordW ? (wcslen(lpPasswordW) + 1) * sizeof(WCHAR) : 0); + dwPasswordLength = (wcslen(lpPasswordW) + 1) * sizeof(WCHAR); } RpcTryExcept @@ -714,9 +717,12 @@ dwDependenciesLength *= sizeof(WCHAR); } - /* FIXME: Encrypt the password */ - lpEncryptedPassword = (LPBYTE)lpPassword; - dwPasswordLength = (DWORD)(lpPassword ? (wcslen(lpPassword) + 1) * sizeof(WCHAR) : 0); + if (lpPassword != NULL) + { + /* FIXME: Encrypt the password */ + lpEncryptedPassword = (LPBYTE)lpPassword; + dwPasswordLength = (wcslen(lpPassword) + 1) * sizeof(WCHAR); + } RpcTryExcept {

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