Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 73403: [Win32SS] - Revert HAX : Fix validating region with null. See CORE-12169 and related issues.
by jimtabor＠svn.reactos.org 28 Nov '16

28 Nov '16

Author: jimtabor Date: Mon Nov 28 16:48:39 2016 New Revision: 73403 URL: http://svn.reactos.org/svn/reactos?rev=73403&view=rev Log: [Win32SS] - Revert HAX : Fix validating region with null. See CORE-12169 and related issues. Modified: trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/simplecall.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Mon Nov 28 16:48:39 2016 @@ -1158,33 +1158,13 @@ } // -// Hax around internal painting of windows. +// Internal painting of windows. // VOID FASTCALL IntPaintWindow( PWND Window ) { // Handle normal painting. co_IntPaintWindows( Window, RDW_NOCHILDREN, FALSE ); - - // Hack to prevent more spamming from misbehaving application. - // Handle it like a begin/end paint - if (Window->hrgnUpdate != NULL) - { - ERR("HAX hrgnUpdate not NULL! Dec Paint Count!\n"); - MsqDecPaintCountQueue(Window->head.pti); - IntGdiSetRegionOwner(Window->hrgnUpdate, GDI_OBJ_HMGR_POWNED); - GreDeleteObject(Window->hrgnUpdate); - Window->state &= ~WNDS_UPDATEDIRTY; - Window->hrgnUpdate = NULL; - } - else - { - if (!(Window->state & WNDS_INTERNALPAINT)) - { - ERR("HAX WNDS_INTERNALPAINT not set! Dec Paint Count!\n"); - MsqDecPaintCountQueue(Window->head.pti); - } - } } BOOL FASTCALL Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Mon Nov 28 16:48:39 2016 @@ -774,11 +774,8 @@ case TWOPARAM_ROUTINE_VALIDATERGN: { PREGION Rgn = REGION_LockRgn((HRGN)Param); - if (Rgn) - { - Ret = (DWORD)co_UserRedrawWindow( Window, NULL, Rgn, RDW_VALIDATE); - REGION_UnlockRgn(Rgn); - } + Ret = (DWORD)co_UserRedrawWindow( Window, NULL, Rgn, RDW_VALIDATE); + if (Rgn) REGION_UnlockRgn(Rgn); break; } }

1 0

[hbelusca] 73402: [SERVICES]: - Fix build. - Remove now deprecated code (since we use RPC for service commands since revision r13xxx).
by hbelusca＠svn.reactos.org 27 Nov '16

27 Nov '16

Author: hbelusca Date: Sun Nov 27 20:44:09 2016 New Revision: 73402 URL: http://svn.reactos.org/svn/reactos?rev=73402&view=rev Log: [SERVICES]: - Fix build. - Remove now deprecated code (since we use RPC for service commands since revision r13xxx). Modified: trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/services.c Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Sun Nov 27 20:44:09 2016 @@ -659,7 +659,7 @@ break; } - dwError = ScmDeleteServiceKey(hSubKey, pszName); + dwError = ScmDeleteRegKey(hSubKey, pszName); if (dwError != ERROR_SUCCESS) goto done; } Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.c [iso-8859-1] Sun Nov 27 20:44:09 2016 @@ -21,9 +21,6 @@ /* GLOBALS ******************************************************************/ -#define PIPE_BUFSIZE 1024 -#define PIPE_TIMEOUT 1000 - /* Defined in include/reactos/services/services.h */ // #define SCM_START_EVENT L"SvcctrlStartEvent_A3752DX" #define SCM_AUTOSTARTCOMPLETE_EVENT L"SC_AutoStartComplete" @@ -105,182 +102,6 @@ } -BOOL -ScmNamedPipeHandleRequest(PVOID Request, - DWORD RequestSize, - PVOID Reply, - LPDWORD ReplySize) -{ - DbgPrint("SCM READ: %p\n", Request); - - *ReplySize = 0; - return FALSE; -} - - -DWORD WINAPI -ScmNamedPipeThread(LPVOID Context) -{ - CHAR chRequest[PIPE_BUFSIZE]; - CHAR chReply[PIPE_BUFSIZE]; - DWORD cbReplyBytes; - DWORD cbBytesRead; - DWORD cbWritten; - BOOL bSuccess; - HANDLE hPipe; - - hPipe = (HANDLE)Context; - - DPRINT("ScmNamedPipeThread(%p) - Accepting SCM commands through named pipe\n", hPipe); - - for (;;) - { - bSuccess = ReadFile(hPipe, - &chRequest, - PIPE_BUFSIZE, - &cbBytesRead, - NULL); - if (!bSuccess || cbBytesRead == 0) - { - break; - } - - if (ScmNamedPipeHandleRequest(&chRequest, cbBytesRead, &chReply, &cbReplyBytes)) - { - bSuccess = WriteFile(hPipe, - &chReply, - cbReplyBytes, - &cbWritten, - NULL); - if (!bSuccess || cbReplyBytes != cbWritten) - { - break; - } - } - } - - DPRINT("ScmNamedPipeThread(%p) - Disconnecting named pipe connection\n", hPipe); - - FlushFileBuffers(hPipe); - DisconnectNamedPipe(hPipe); - CloseHandle(hPipe); - - DPRINT("ScmNamedPipeThread(%p) - Done.\n", hPipe); - - return ERROR_SUCCESS; -} - - -BOOL -ScmCreateNamedPipe(VOID) -{ - DWORD dwThreadId; - BOOL bConnected; - HANDLE hThread; - HANDLE hPipe; - - DPRINT("ScmCreateNamedPipe() - CreateNamedPipe(\"\\\\.\\pipe\\Ntsvcs\")\n"); - - hPipe = CreateNamedPipeW(L"\\\\.\\pipe\\Ntsvcs", - PIPE_ACCESS_DUPLEX, - PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, - PIPE_UNLIMITED_INSTANCES, - PIPE_BUFSIZE, - PIPE_BUFSIZE, - PIPE_TIMEOUT, - NULL); - if (hPipe == INVALID_HANDLE_VALUE) - { - DPRINT("CreateNamedPipe() failed (%lu)\n", GetLastError()); - return FALSE; - } - - DPRINT("CreateNamedPipe() - calling ConnectNamedPipe(%p)\n", hPipe); - bConnected = ConnectNamedPipe(hPipe, - NULL) ? TRUE : (GetLastError() == ERROR_PIPE_CONNECTED); - DPRINT("CreateNamedPipe() - ConnectNamedPipe() returned %d\n", bConnected); - - if (bConnected) - { - DPRINT("Pipe connected\n"); - hThread = CreateThread(NULL, - 0, - ScmNamedPipeThread, - (LPVOID)hPipe, - 0, - &dwThreadId); - if (!hThread) - { - DPRINT("Could not create thread (%lu)\n", GetLastError()); - DisconnectNamedPipe(hPipe); - CloseHandle(hPipe); - DPRINT("CreateNamedPipe() - returning FALSE\n"); - return FALSE; - } - - CloseHandle(hThread); - } - else - { - DPRINT("Pipe not connected\n"); - CloseHandle(hPipe); - DPRINT("CreateNamedPipe() - returning FALSE\n"); - return FALSE; - } - DPRINT("CreateNamedPipe() - returning TRUE\n"); - return TRUE; -} - - -DWORD WINAPI -ScmNamedPipeListenerThread(LPVOID Context) -{ -// HANDLE hPipe; - DPRINT("ScmNamedPipeListenerThread(%p) - aka SCM.\n", Context); - -// hPipe = (HANDLE)Context; - for (;;) - { - DPRINT("SCM: Waiting for new connection on named pipe...\n"); - /* Create named pipe */ - if (!ScmCreateNamedPipe()) - { - DPRINT1("\nSCM: Failed to create named pipe\n"); - break; - //ExitThread(0); - } - DPRINT("\nSCM: named pipe session created.\n"); - Sleep(10); - } - DPRINT("\n\nWARNING: ScmNamedPipeListenerThread(%p) - Aborted.\n\n", Context); - return ERROR_SUCCESS; -} - - -BOOL -StartScmNamedPipeThreadListener(VOID) -{ - DWORD dwThreadId; - HANDLE hThread; - - hThread = CreateThread(NULL, - 0, - ScmNamedPipeListenerThread, - NULL, /*(LPVOID)hPipe,*/ - 0, - &dwThreadId); - if (!hThread) - { - DPRINT1("SERVICES: Could not create thread (Status %lx)\n", GetLastError()); - return FALSE; - } - - CloseHandle(hThread); - - return TRUE; -} - - BOOL WINAPI ShutdownHandlerRoutine(DWORD dwCtrlType) {

1 0

[hbelusca] 73401: [SERVICES] - The new ScmDeleteServiceKey (r73400) and the already existing ScmDeleteRegKey are the same functions: remove the old ScmDeleteRegKey and use ScmDeleteServiceKey inste...
by hbelusca＠svn.reactos.org 27 Nov '16

27 Nov '16

Author: hbelusca Date: Sun Nov 27 20:39:10 2016 New Revision: 73401 URL: http://svn.reactos.org/svn/reactos?rev=73401&view=rev Log: [SERVICES] - The new ScmDeleteServiceKey (r73400) and the already existing ScmDeleteRegKey are the same functions: remove the old ScmDeleteRegKey and use ScmDeleteServiceKey instead AND rename ScmDeleteServiceKey to ScmDeleteRegKey (as it can be used generically within services.exe). - Call RegDeleteKeyW for the subkey after we have closed its opened handle. Modified: trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Sun Nov 27 20:39:10 2016 @@ -617,22 +617,22 @@ DWORD -ScmDeleteServiceKey( - _In_ HKEY hServicesKey, - _In_ PCWSTR pszServiceName) +ScmDeleteRegKey( + _In_ HKEY hKey, + _In_ PCWSTR pszSubKey) { DWORD dwMaxSubkeyLen, dwMaxValueLen; DWORD dwMaxLen, dwSize; PWSTR pszName = NULL; - HKEY hServiceKey; + HKEY hSubKey; DWORD dwError; - dwError = RegOpenKeyExW(hServicesKey, pszServiceName, 0, KEY_READ, &hServiceKey); + dwError = RegOpenKeyExW(hKey, pszSubKey, 0, KEY_READ, &hSubKey); if (dwError != ERROR_SUCCESS) return dwError; /* Get maximum length of key and value names */ - dwError = RegQueryInfoKeyW(hServiceKey, NULL, NULL, NULL, NULL, + dwError = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, NULL, &dwMaxSubkeyLen, NULL, NULL, &dwMaxValueLen, NULL, NULL, NULL); if (dwError != ERROR_SUCCESS) goto done; @@ -653,22 +653,26 @@ while (TRUE) { dwSize = dwMaxLen; - if (RegEnumKeyExW(hServiceKey, 0, pszName, &dwSize, - NULL, NULL, NULL, NULL)) + if (RegEnumKeyExW(hSubKey, 0, pszName, &dwSize, + NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + { break; - - dwError = ScmDeleteServiceKey(hServiceKey, pszName); + } + + dwError = ScmDeleteServiceKey(hSubKey, pszName); if (dwError != ERROR_SUCCESS) goto done; } - - dwError = RegDeleteKeyW(hServicesKey, pszServiceName); done: if (pszName != NULL) HeapFree(GetProcessHeap(), 0, pszName); - RegCloseKey(hServiceKey); + RegCloseKey(hSubKey); + + /* Finally delete the key */ + if (dwError == ERROR_SUCCESS) + dwError = RegDeleteKeyW(hKey, pszSubKey); return dwError; } 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] Sun Nov 27 20:39:10 2016 @@ -735,55 +735,6 @@ } return dwError; -} - - -DWORD -ScmDeleteRegKey(HKEY hKey, LPCWSTR lpszSubKey) -{ - DWORD dwRet, dwMaxSubkeyLen = 0, dwSize; - WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; - HKEY hSubKey = 0; - - dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); - if (!dwRet) - { - /* Find the maximum subkey length so that we can allocate a buffer */ - dwRet = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, NULL, - &dwMaxSubkeyLen, NULL, NULL, NULL, NULL, NULL, NULL); - if (!dwRet) - { - dwMaxSubkeyLen++; - if (dwMaxSubkeyLen > sizeof(szNameBuf) / sizeof(WCHAR)) - { - /* Name too big: alloc a buffer for it */ - lpszName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwMaxSubkeyLen * sizeof(WCHAR)); - } - - if (!lpszName) - dwRet = ERROR_NOT_ENOUGH_MEMORY; - else - { - while (dwRet == ERROR_SUCCESS) - { - dwSize = dwMaxSubkeyLen; - dwRet = RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL, NULL, NULL, NULL); - if (dwRet == ERROR_SUCCESS || dwRet == ERROR_MORE_DATA) - dwRet = ScmDeleteRegKey(hSubKey, lpszName); - } - if (dwRet == ERROR_NO_MORE_ITEMS) - dwRet = ERROR_SUCCESS; - - if (lpszName != szNameBuf) - HeapFree(GetProcessHeap(), 0, lpszName); /* Free buffer if allocated */ - } - } - - RegCloseKey(hSubKey); - if (!dwRet) - dwRet = RegDeleteKeyW(hKey, lpszSubKey); - } - return dwRet; } Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Nov 27 20:39:10 2016 @@ -1026,8 +1026,8 @@ it is now safe to delete the service */ /* Delete the Service Key */ - dwError = ScmDeleteServiceKey(hServicesKey, - lpService->lpServiceName); + dwError = ScmDeleteRegKey(hServicesKey, + lpService->lpServiceName); RegCloseKey(hServicesKey); Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Sun Nov 27 20:39:10 2016 @@ -143,9 +143,9 @@ _Out_ PSECURITY_DESCRIPTOR *ppSecurityDescriptor); DWORD -ScmDeleteServiceKey( - _In_ HKEY hServicesKey, - _In_ PCWSTR pszServiceName); +ScmDeleteRegKey( + _In_ HKEY hKey, + _In_ PCWSTR pszSubKey); /* controlset.c */

1 0

[ekohl] 73400: [SERVICES] Delete service registry keys recursively.
by ekohl＠svn.reactos.org 27 Nov '16

27 Nov '16

Author: ekohl Date: Sun Nov 27 20:12:39 2016 New Revision: 73400 URL: http://svn.reactos.org/svn/reactos?rev=73400&view=rev Log: [SERVICES] Delete service registry keys recursively. Modified: trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Sun Nov 27 20:12:39 2016 @@ -615,4 +615,62 @@ return dwError; } + +DWORD +ScmDeleteServiceKey( + _In_ HKEY hServicesKey, + _In_ PCWSTR pszServiceName) +{ + DWORD dwMaxSubkeyLen, dwMaxValueLen; + DWORD dwMaxLen, dwSize; + PWSTR pszName = NULL; + HKEY hServiceKey; + DWORD dwError; + + dwError = RegOpenKeyExW(hServicesKey, pszServiceName, 0, KEY_READ, &hServiceKey); + if (dwError != ERROR_SUCCESS) + return dwError; + + /* Get maximum length of key and value names */ + dwError = RegQueryInfoKeyW(hServiceKey, NULL, NULL, NULL, NULL, + &dwMaxSubkeyLen, NULL, NULL, &dwMaxValueLen, NULL, NULL, NULL); + if (dwError != ERROR_SUCCESS) + goto done; + + dwMaxSubkeyLen++; + dwMaxValueLen++; + dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen); + + /* Allocate the name buffer */ + pszName = HeapAlloc(GetProcessHeap(), 0, dwMaxLen * sizeof(WCHAR)); + if (pszName == NULL) + { + dwError = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } + + /* Recursively delete all the subkeys */ + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumKeyExW(hServiceKey, 0, pszName, &dwSize, + NULL, NULL, NULL, NULL)) + break; + + dwError = ScmDeleteServiceKey(hServiceKey, pszName); + if (dwError != ERROR_SUCCESS) + goto done; + } + + dwError = RegDeleteKeyW(hServicesKey, pszServiceName); + +done: + if (pszName != NULL) + HeapFree(GetProcessHeap(), 0, pszName); + + RegCloseKey(hServiceKey); + + return dwError; +} + /* EOF */ Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Nov 27 20:12:39 2016 @@ -1026,8 +1026,8 @@ it is now safe to delete the service */ /* Delete the Service Key */ - dwError = RegDeleteKeyW(hServicesKey, - lpService->lpServiceName); + dwError = ScmDeleteServiceKey(hServicesKey, + lpService->lpServiceName); RegCloseKey(hServicesKey); @@ -1443,7 +1443,7 @@ { PSERVICE_HANDLE hSvc; PSERVICE lpService; - ULONG DesiredAccess = 0; + ACCESS_MASK DesiredAccess = 0; HANDLE hToken = NULL; HKEY hServiceKey = NULL; BOOL bDatabaseLocked = FALSE; Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Sun Nov 27 20:12:39 2016 @@ -142,6 +142,10 @@ _In_ HKEY hServiceKey, _Out_ PSECURITY_DESCRIPTOR *ppSecurityDescriptor); +DWORD +ScmDeleteServiceKey( + _In_ HKEY hServicesKey, + _In_ PCWSTR pszServiceName); /* controlset.c */

1 0

[pschweitzer] 73399: [NTOSKRNL] Don't leak FO reference on failure. Fixes kmtest:NtCreateSection unloading. Dedicated to Thomas. CORE-11819 CORE-12475
by pschweitzer＠svn.reactos.org 27 Nov '16

27 Nov '16

Author: pschweitzer Date: Sun Nov 27 20:11:30 2016 New Revision: 73399 URL: http://svn.reactos.org/svn/reactos?rev=73399&view=rev Log: [NTOSKRNL] Don't leak FO reference on failure. Fixes kmtest:NtCreateSection unloading. Dedicated to Thomas. CORE-11819 CORE-12475 Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Nov 27 20:11:30 2016 @@ -5077,6 +5077,8 @@ if (!NT_SUCCESS(Status) && Status != STATUS_END_OF_FILE) { DPRINT1("CC failure: %lx\n", Status); + if (FileObject) + ObDereferenceObject(FileObject); return Status; } // Caching is initialized...

1 0

[mjansen] 73398: [APPHELP][APPHELP_APITEST] Stub ApphelpCheckShellObject + add tests, based on the work of Mislav Blažević. CORE-12476
by mjansen＠svn.reactos.org 27 Nov '16

27 Nov '16

Author: mjansen Date: Sun Nov 27 18:33:21 2016 New Revision: 73398 URL: http://svn.reactos.org/svn/reactos?rev=73398&view=rev Log: [APPHELP][APPHELP_APITEST] Stub ApphelpCheckShellObject + add tests, based on the work of Mislav Blažević. CORE-12476 Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.c trunk/reactos/dll/appcompat/apphelp/apphelp.h trunk/reactos/dll/appcompat/apphelp/apphelp.spec trunk/rostests/apitests/apphelp/apphelp.c Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.c [iso-8859-1] Sun Nov 27 18:33:21 2016 @@ -82,10 +82,23 @@ BOOL WINAPI ApphelpCheckInstallShieldPackage(void* ptr, LPCWSTR path) { - SHIM_WARN("stub: ptr=%p path='%S'\r\n", ptr, path); + SHIM_WARN("stub: ptr=%p, path='%S'\r\n", ptr, path); return TRUE; } + +BOOL WINAPI ApphelpCheckShellObject(REFCLSID ObjectCLSID, BOOL bShimIfNecessary, ULONGLONG *pullFlags) +{ + WCHAR GuidString[100]; + if (!ObjectCLSID || !SdbGUIDToString(ObjectCLSID, GuidString, 100)) + GuidString[0] = L'\0'; + SHIM_WARN("stub: ObjectCLSID='%S', bShimIfNecessary=%d, pullFlags=%p)\n", GuidString, bShimIfNecessary, pullFlags); + + if (pullFlags) + *pullFlags = 0; + + return TRUE; +} /** * Outputs diagnostic info. Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] Sun Nov 27 18:33:21 2016 @@ -85,6 +85,7 @@ PWSTR SdbpStrDup(LPCWSTR string); HSDB WINAPI SdbInitDatabase(DWORD, LPCWSTR); void WINAPI SdbReleaseDatabase(HSDB); +BOOL WINAPI SdbGUIDToString(CONST GUID *Guid, PWSTR GuidString, SIZE_T Length); PDB WINAPI SdbOpenDatabase(LPCWSTR path, PATH_TYPE type); void WINAPI SdbCloseDatabase(PDB); Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] Sun Nov 27 18:33:21 2016 @@ -4,7 +4,7 @@ @ stub ApphelpCheckMsiPackage @ stub ApphelpCheckRunApp @ stub ApphelpCheckRunAppEx -@ stub ApphelpCheckShellObject +@ stdcall ApphelpCheckShellObject(ptr long ptr) @ stub ApphelpCreateAppcompatData @ stub ApphelpFixMsiPackage @ stub ApphelpFixMsiPackageExe Modified: trunk/rostests/apitests/apphelp/apphelp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/apphelp.… ============================================================================== --- trunk/rostests/apitests/apphelp/apphelp.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/apphelp.c [iso-8859-1] Sun Nov 27 18:33:21 2016 @@ -33,6 +33,8 @@ #include <winerror.h> #include <stdio.h> #include <initguid.h> +#include <shlguid.h> +#include <shobjidl.h> #include "wine/test.h" @@ -101,6 +103,7 @@ } ATTRINFO, *PATTRINFO; static HMODULE hdll; +static BOOL (WINAPI *pApphelpCheckShellObject)(REFCLSID, BOOL, ULONGLONG *); static LPCWSTR (WINAPI *pSdbTagToString)(TAG); static BOOL (WINAPI *pSdbGUIDToString)(CONST GUID *, PCWSTR, SIZE_T); static BOOL (WINAPI *pSdbIsNullGUID)(CONST GUID *); @@ -114,7 +117,65 @@ DEFINE_GUID(GUID_DATABASE_DRIVERS,0xf9ab2228,0x3312,0x4a73,0xb6,0xf9,0x93,0x6d,0x70,0xe1,0x12,0xef); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + +DEFINE_GUID(test_Microsoft_Browser_Architecture, 0xa5e46e3a, 0x8849, 0x11d1, 0x9d, 0x8c, 0x00, 0xc0, 0x4f, 0xc9, 0x9d, 0x61); DEFINE_GUID(test_UserAssist, 0xdd313e04, 0xfeff, 0x11d1, 0x8e, 0xcd, 0x00, 0x00, 0xf8, 0x7a, 0x47, 0x0c); +DEFINE_GUID(CLSID_InternetSecurityManager, 0x7b8a2d94, 0x0ac9, 0x11d1, 0x89, 0x6c, 0x00, 0xc0, 0x4f, 0xB6, 0xbf, 0xc4); + +static const CLSID * objects[] = { + &GUID_NULL, + /* used by IE */ + &test_Microsoft_Browser_Architecture, + &CLSID_MenuBand, + &CLSID_ShellLink, + &CLSID_ShellWindows, + &CLSID_InternetSecurityManager, + &test_UserAssist, + (const CLSID *)NULL +}; + +static void test_ApphelpCheckShellObject(void) +{ + ULONGLONG flags; + BOOL res; + int i; + + if (!pApphelpCheckShellObject) + { + win_skip("ApphelpCheckShellObject not available\n"); + return; + } + + for (i = 0; objects[i]; i++) + { + flags = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pApphelpCheckShellObject(objects[i], FALSE, &flags); + ok(res && (flags == 0), "%s 0: got %d and 0x%x%08x with 0x%x (expected TRUE and 0)\n", + wine_dbgstr_guid(objects[i]), res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); + + flags = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pApphelpCheckShellObject(objects[i], TRUE, &flags); + ok(res && (flags == 0), "%s 1: got %d and 0x%x%08x with 0x%x (expected TRUE and 0)\n", + wine_dbgstr_guid(objects[i]), res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); + + } + + /* NULL as pointer to flags is checked */ + SetLastError(0xdeadbeef); + res = pApphelpCheckShellObject(&GUID_NULL, FALSE, NULL); + ok(res, "%s 0: got %d with 0x%x (expected != FALSE)\n", wine_dbgstr_guid(&GUID_NULL), res, GetLastError()); + + /* NULL as CLSID* crash on Windows */ + if (0) + { + flags = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pApphelpCheckShellObject(NULL, FALSE, &flags); + trace("NULL as CLSID*: got %d and 0x%x%08x with 0x%x\n", res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); + } +} static void test_SdbTagToString(void) { @@ -834,6 +895,8 @@ //SetEnvironmentVariable("SHIM_DEBUG_LEVEL", "4"); //SetEnvironmentVariable("DEBUGCHANNEL", "+apphelp"); hdll = LoadLibraryA("apphelp.dll"); + + pApphelpCheckShellObject = (void *) GetProcAddress(hdll, "ApphelpCheckShellObject"); pSdbTagToString = (void *) GetProcAddress(hdll, "SdbTagToString"); pSdbGUIDToString = (void *) GetProcAddress(hdll, "SdbGUIDToString"); pSdbIsNullGUID = (void *) GetProcAddress(hdll, "SdbIsNullGUID"); @@ -841,6 +904,7 @@ pSdbGetFileAttributes = (void *) GetProcAddress(hdll, "SdbGetFileAttributes"); pSdbFreeFileAttributes = (void *) GetProcAddress(hdll, "SdbFreeFileAttributes"); + test_ApphelpCheckShellObject(); test_GuidFunctions(); test_ApplicationAttributes(); test_SdbTagToString();

1 0

[ekohl] 73397: [SERVICES] RQueryServiceStatusEx and REnumServicesStatusExW: This way it make a lot more sense!
by ekohl＠svn.reactos.org 27 Nov '16

27 Nov '16

Author: ekohl Date: Sun Nov 27 15:49:05 2016 New Revision: 73397 URL: http://svn.reactos.org/svn/reactos?rev=73397&view=rev Log: [SERVICES] RQueryServiceStatusEx and REnumServicesStatusExW: This way it make a lot more sense! Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Nov 27 15:49:05 2016 @@ -5872,7 +5872,7 @@ sizeof(SERVICE_STATUS)); /* Copy the service process ID */ - if ((lpService->Status.dwCurrentState == SERVICE_STOPPED) || (lpService->lpImage != NULL)) + if ((lpService->Status.dwCurrentState == SERVICE_STOPPED) || (lpService->lpImage == NULL)) lpStatus->dwProcessId = 0; else lpStatus->dwProcessId = lpService->lpImage->dwProcessId; @@ -6283,7 +6283,7 @@ sizeof(SERVICE_STATUS)); /* Copy the service process ID */ - if ((CurrentService->Status.dwCurrentState == SERVICE_STOPPED) ||(CurrentService->lpImage != NULL)) + if ((CurrentService->Status.dwCurrentState == SERVICE_STOPPED) ||(CurrentService->lpImage == NULL)) lpStatusPtr->ServiceStatusProcess.dwProcessId = 0; else lpStatusPtr->ServiceStatusProcess.dwProcessId = CurrentService->lpImage->dwProcessId;

1 0

[ekohl] 73396: [SERVICES] REnumServicesStatusExW/W and RQueryServiceStatusEx should not return a non-zero process ID for a stopped service.
by ekohl＠svn.reactos.org 27 Nov '16

27 Nov '16

Author: ekohl Date: Sun Nov 27 15:24:49 2016 New Revision: 73396 URL: http://svn.reactos.org/svn/reactos?rev=73396&view=rev Log: [SERVICES] REnumServicesStatusExW/W and RQueryServiceStatusEx should not return a non-zero process ID for a stopped service. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Nov 27 15:24:49 2016 @@ -5871,7 +5871,12 @@ &lpService->Status, sizeof(SERVICE_STATUS)); - lpStatus->dwProcessId = (lpService->lpImage != NULL) ? lpService->lpImage->dwProcessId : 0; /* FIXME */ + /* Copy the service process ID */ + if ((lpService->Status.dwCurrentState == SERVICE_STOPPED) || (lpService->lpImage != NULL)) + lpStatus->dwProcessId = 0; + else + lpStatus->dwProcessId = lpService->lpImage->dwProcessId; + lpStatus->dwServiceFlags = 0; /* FIXME */ /* Unlock the service database */ @@ -5996,7 +6001,9 @@ &lpStatusPtrIncrW->ServiceStatusProcess, sizeof(SERVICE_STATUS)); - lpStatusPtrA->ServiceStatusProcess.dwProcessId = lpStatusPtrIncrW->ServiceStatusProcess.dwProcessId; /* FIXME */ + /* Copy the service process ID */ + lpStatusPtrA->ServiceStatusProcess.dwProcessId = lpStatusPtrIncrW->ServiceStatusProcess.dwProcessId; + lpStatusPtrA->ServiceStatusProcess.dwServiceFlags = 0; /* FIXME */ lpStatusPtrIncrW++; @@ -6274,8 +6281,13 @@ memcpy(&lpStatusPtr->ServiceStatusProcess, &CurrentService->Status, sizeof(SERVICE_STATUS)); - lpStatusPtr->ServiceStatusProcess.dwProcessId = - (CurrentService->lpImage != NULL) ? CurrentService->lpImage->dwProcessId : 0; /* FIXME */ + + /* Copy the service process ID */ + if ((CurrentService->Status.dwCurrentState == SERVICE_STOPPED) ||(CurrentService->lpImage != NULL)) + lpStatusPtr->ServiceStatusProcess.dwProcessId = 0; + else + lpStatusPtr->ServiceStatusProcess.dwProcessId = CurrentService->lpImage->dwProcessId; + lpStatusPtr->ServiceStatusProcess.dwServiceFlags = 0; /* FIXME */ lpStatusPtr++;

1 0

[pschweitzer] 73395: [KMTESTS:MM] Test FCB header fields: FileSize, ValidDataLength CORE-11819 CORE-12475
by pschweitzer＠svn.reactos.org 27 Nov '16

27 Nov '16

Author: pschweitzer Date: Sun Nov 27 13:39:01 2016 New Revision: 73395 URL: http://svn.reactos.org/svn/reactos?rev=73395&view=rev Log: [KMTESTS:MM] Test FCB header fields: FileSize, ValidDataLength CORE-11819 CORE-12475 Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/NtCreateS… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c [iso-8859-1] Sun Nov 27 13:39:01 2016 @@ -473,16 +473,29 @@ } else { + ULONG TestSize = 0; + ok(EOFInfo != NULL, "Null pointer!\n"); ok(Fcb != NULL, "Null pointer!\n"); ok_bool_false(IoStack->Parameters.SetFile.AdvanceOnly, "AdvanceOnly set!\n"); ok(EOFInfo->EndOfFile.QuadPart > Fcb->Header.AllocationSize.QuadPart, "New size smaller\n"); + if (Fcb->Header.AllocationSize.QuadPart != 0) + { + TestSize = 512; + } + Fcb->Header.AllocationSize.QuadPart = EOFInfo->EndOfFile.QuadPart; + ok_eq_ulong(Fcb->Header.FileSize.QuadPart, TestSize); + ok_eq_ulong(Fcb->Header.ValidDataLength.QuadPart, TestSize); + if (CcIsFileCached(IoStack->FileObject)) { CcSetFileSizes(IoStack->FileObject, (PCC_FILE_SIZES)(&(Fcb->Header.AllocationSize))); } + + ok_eq_ulong(Fcb->Header.FileSize.QuadPart, TestSize); + ok_eq_ulong(Fcb->Header.ValidDataLength.QuadPart, TestSize); Status = STATUS_SUCCESS; }

1 0

[ekohl] 73394: [SETUPAPI] Partial implementation of CMP_RegisterNotification and CMP_UnregisterNotification. [UMPNPMGR] Partial implementation of PNP_RegisterNotification and PNP_UnregisterNotifica...
by ekohl＠svn.reactos.org 27 Nov '16

27 Nov '16

Author: ekohl Date: Sun Nov 27 11:14:25 2016 New Revision: 73394 URL: http://svn.reactos.org/svn/reactos?rev=73394&view=rev Log: [SETUPAPI] Partial implementation of CMP_RegisterNotification and CMP_UnregisterNotification. [UMPNPMGR] Partial implementation of PNP_RegisterNotification and PNP_UnregisterNotification. CORE-12217 #comment This should fix one of the issues. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/sdk/include/reactos/idl/pnp.idl Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sun Nov 27 11:14:25 2016 @@ -2857,10 +2857,28 @@ DWORD WINAPI PNP_RegisterNotification( - handle_t hBinding) -{ - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + handle_t hBinding, + DWORD ulFlags, + DWORD *pulNotify) +{ +#if 0 + PNOTIFY_DATA pNotifyData; +#endif + + DPRINT1("PNP_RegisterNotification(%p 0x%lx %p)\n", + hBinding, ulFlags, pulNotify); + +#if 0 + pNotifyData = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NOTIFY_DATA)); + if (pNotifyData == NULL) + return CR_OUT_OF_MEMORY; + + *pulNotify = (DWORD)pNotifyData; +#endif + + *pulNotify = 1; + + return CR_SUCCESS; } @@ -2868,10 +2886,18 @@ DWORD WINAPI PNP_UnregisterNotification( - handle_t hBinding) -{ - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + handle_t hBinding, + DWORD ulNotify) +{ + DPRINT1("PNP_UnregisterNotification(%p 0x%lx)\n", + hBinding, ulNotify); + +#if 0 + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +#endif + + return CR_SUCCESS; } Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Sun Nov 27 11:14:25 2016 @@ -21,6 +21,7 @@ #include "setupapi_private.h" +#include <dbt.h> #include <pnp_c.h> #include "rpc_private.h" @@ -59,6 +60,15 @@ #define LOG_CONF_MAGIC 0x464E434C /* "LCNF" */ +typedef struct _NOTIFY_DATA +{ + ULONG ulMagic; + ULONG ulNotifyData; +} NOTIFY_DATA, *PNOTIFY_DATA; + +#define NOTIFY_MAGIC 0x44556677 + + static BOOL GuidToString(LPGUID Guid, LPWSTR String) { LPWSTR lpString; @@ -121,14 +131,76 @@ */ CONFIGRET WINAPI -CMP_RegisterNotification(IN HANDLE hRecipient, - IN LPVOID lpvNotificationFilter, - IN DWORD dwFlags, - OUT PULONG pluhDevNotify) -{ - FIXME("Stub %p %p %lu %p\n", hRecipient, lpvNotificationFilter, dwFlags, pluhDevNotify); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return CR_FAILURE; +CMP_RegisterNotification( + IN HANDLE hRecipient, + IN LPVOID lpvNotificationFilter, + IN DWORD dwFlags, + OUT PHDEVNOTIFY phDevNotify) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + PNOTIFY_DATA pNotifyData = NULL; + CONFIGRET ret = CR_SUCCESS; + + TRACE("CMP_RegisterNotification(%p %p %lu %p)\n", hRecipient, lpvNotificationFilter, dwFlags, phDevNotify); + + if ((hRecipient == NULL) || + (lpvNotificationFilter == NULL) || + (phDevNotify == NULL)) + return CR_INVALID_POINTER; + + if (dwFlags & ~0x7) + return CR_INVALID_FLAG; + + if (((PDEV_BROADCAST_HDR)lpvNotificationFilter)->dbch_size < sizeof(DEV_BROADCAST_HDR)) + return CR_INVALID_DATA; + + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + + pNotifyData = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(NOTIFY_DATA)); + if (pNotifyData == NULL) + return CR_OUT_OF_MEMORY; + + pNotifyData->ulMagic = NOTIFY_MAGIC; + +/* + if (dwFlags & DEVICE_NOTIFY_SERVICE_HANDLE == DEVICE_NOTYFY_WINDOW_HANDLE) + { + + } + else if (dwFlags & DEVICE_NOTIFY_SERVICE_HANDLE == DEVICE_NOTYFY_SERVICE_HANDLE) + { + + } +*/ + + RpcTryExcept + { + ret = PNP_RegisterNotification(BindingHandle, + dwFlags, + &pNotifyData->ulNotifyData); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + if (ret == CR_SUCCESS) + { + *phDevNotify = (HDEVNOTIFY)pNotifyData; + } + else + { + if (pNotifyData != NULL) + HeapFree(GetProcessHeap(), 0, pNotifyData); + + *phDevNotify = (HDEVNOTIFY)NULL; + } + + return ret; } @@ -144,7 +216,7 @@ BOOL bAdmin; DWORD i; - TRACE("%lu\n", dwMagic); + TRACE("CMP_Report_LogOn(%lu %lu)\n", dwMagic, dwProcessId); if (dwMagic != CMP_MAGIC) return CR_INVALID_DATA; @@ -183,10 +255,39 @@ */ CONFIGRET WINAPI -CMP_UnregisterNotification(IN HDEVNOTIFY handle) -{ - FIXME("Stub %p\n", handle); - return CR_SUCCESS; +CMP_UnregisterNotification( + IN HDEVNOTIFY hDevNotify) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + PNOTIFY_DATA pNotifyData; + CONFIGRET ret = CR_SUCCESS; + + TRACE("CMP_UnregisterNotification(%p)\n", hDevNotify); + + pNotifyData = (PNOTIFY_DATA)hDevNotify; + + if ((pNotifyData == NULL) || + (pNotifyData->ulMagic != NOTIFY_MAGIC)) + return CR_INVALID_POINTER; + + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + + RpcTryExcept + { + ret = PNP_UnregisterNotification(BindingHandle, + pNotifyData->ulNotifyData); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + if (ret == CR_SUCCESS) + HeapFree(GetProcessHeap(), 0, pNotifyData); + + return ret; } Modified: trunk/reactos/sdk/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/idl/pn… ============================================================================== --- trunk/reactos/sdk/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/idl/pnp.idl [iso-8859-1] Sun Nov 27 11:14:25 2016 @@ -874,13 +874,16 @@ DWORD __stdcall PNP_RegisterNotification( - [in] handle_t hBinding); + [in] handle_t hBinding, + [in] DWORD ulFlags, + [out] DWORD *pulNotifyData); /* Function 60 */ DWORD __stdcall PNP_UnregisterNotification( - [in] handle_t hBinding); + [in] handle_t hBinding, + [in] DWORD ulNotifyData); cpp_quote("#if _WIN32_WINNT >= 0x0501")

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