Ros-diffs November 2016

ros-diffs@reactos.org

15 participants
317 discussions

[ekohl] 73400: [SERVICES] Delete service registry keys recursively.

by ekohl＠svn.reactos.org

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 */

7 years, 10 months

[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

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...

7 years, 10 months

[mjansen] 73398: [APPHELP][APPHELP_APITEST] Stub ApphelpCheckShellObject + add tests, based on the work of Mislav Blažević. CORE-12476

by mjansen＠svn.reactos.org

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();

7 years, 10 months

[ekohl] 73397: [SERVICES] RQueryServiceStatusEx and REnumServicesStatusExW: This way it make a lot more sense!

by ekohl＠svn.reactos.org

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;

7 years, 10 months

[ekohl] 73396: [SERVICES] REnumServicesStatusExW/W and RQueryServiceStatusEx should not return a non-zero process ID for a stopped service.

by ekohl＠svn.reactos.org

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++;

7 years, 10 months

[pschweitzer] 73395: [KMTESTS:MM] Test FCB header fields: FileSize, ValidDataLength CORE-11819 CORE-12475

by pschweitzer＠svn.reactos.org

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; }

7 years, 10 months

[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

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")

7 years, 10 months

[pschweitzer] 73393: [KMTESTS:MM] Playing with EOF shouldn't make you forget EOL! Addendum to r73392

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Nov 27 10:56:40 2016 New Revision: 73393 URL: http://svn.reactos.org/svn/reactos?rev=73393&view=rev Log: [KMTESTS:MM] Playing with EOF shouldn't make you forget EOL! Addendum to r73392 Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/NtCreateS… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c [iso-8859-1] Sun Nov 27 10:56:40 2016 @@ -53,7 +53,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); KmtStartSeh(); - ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x", ((PCHAR)Buffer)[0]); + ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x\n", ((PCHAR)Buffer)[0]); memset(Buffer, 0xBA, 512); KmtEndSeh(STATUS_SUCCESS); @@ -79,7 +79,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); KmtStartSeh(); - ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x", ((PCHAR)Buffer)[0]); + ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x\n", ((PCHAR)Buffer)[0]); memset(Buffer, 0xBA, 4096); KmtEndSeh(STATUS_SUCCESS); @@ -105,7 +105,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); KmtStartSeh(); - ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x", ((PCHAR)Buffer)[0]); + ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x\n", ((PCHAR)Buffer)[0]); memset(Buffer, 0xBA, 512); KmtEndSeh(STATUS_SUCCESS); @@ -131,7 +131,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); KmtStartSeh(); - ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x", ((PCHAR)Buffer)[0]); + ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x\n", ((PCHAR)Buffer)[0]); memset(Buffer, 0xBA, 4096); KmtEndSeh(STATUS_SUCCESS); @@ -169,7 +169,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); KmtStartSeh(); - ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x", ((PCHAR)Buffer)[0]); + ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x\n", ((PCHAR)Buffer)[0]); memset(Buffer, 0xBA, 512); KmtEndSeh(STATUS_SUCCESS); @@ -195,7 +195,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); KmtStartSeh(); - ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x", ((PCHAR)Buffer)[0]); + ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x\n", ((PCHAR)Buffer)[0]); memset(Buffer, 0xBA, 4096); KmtEndSeh(STATUS_SUCCESS); @@ -221,7 +221,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); KmtStartSeh(); - ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x", ((PCHAR)Buffer)[0]); + ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x\n", ((PCHAR)Buffer)[0]); memset(Buffer, 0xBA, 512); KmtEndSeh(STATUS_SUCCESS); @@ -247,7 +247,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); KmtStartSeh(); - ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x", ((PCHAR)Buffer)[0]); + ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x\n", ((PCHAR)Buffer)[0]); memset(Buffer, 0xBA, 4096); KmtEndSeh(STATUS_SUCCESS);

7 years, 10 months

[pschweitzer] 73392: [KMTESTS:MM] Check the first byte is really null, in spite of the hack writing. CORE-11819 CORE-12475

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Nov 27 10:49:33 2016 New Revision: 73392 URL: http://svn.reactos.org/svn/reactos?rev=73392&view=rev Log: [KMTESTS:MM] Check the first byte is really null, in spite of the hack writing. CORE-11819 CORE-12475 Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.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 10:49:33 2016 @@ -404,7 +404,8 @@ { Fcb = IoStack->FileObject->FsContext; ok(Fcb != NULL, "Null pointer!\n"); - if (IoStack->FileObject->PrivateCacheMap != NULL) + if (IoStack->FileObject->SectionObjectPointer != NULL && + IoStack->FileObject->SectionObjectPointer->SharedCacheMap != NULL) { CcFlushCache(&Fcb->SectionObjectPointers, NULL, 0, NULL); CcPurgeCacheSection(&Fcb->SectionObjectPointers, NULL, 0, FALSE); Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/NtCreateS… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c [iso-8859-1] Sun Nov 27 10:49:33 2016 @@ -53,6 +53,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); KmtStartSeh(); + ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x", ((PCHAR)Buffer)[0]); memset(Buffer, 0xBA, 512); KmtEndSeh(STATUS_SUCCESS); @@ -78,6 +79,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); KmtStartSeh(); + ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x", ((PCHAR)Buffer)[0]); memset(Buffer, 0xBA, 4096); KmtEndSeh(STATUS_SUCCESS); @@ -103,6 +105,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); KmtStartSeh(); + ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x", ((PCHAR)Buffer)[0]); memset(Buffer, 0xBA, 512); KmtEndSeh(STATUS_SUCCESS); @@ -128,6 +131,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); KmtStartSeh(); + ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x", ((PCHAR)Buffer)[0]); memset(Buffer, 0xBA, 4096); KmtEndSeh(STATUS_SUCCESS); @@ -165,6 +169,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); KmtStartSeh(); + ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x", ((PCHAR)Buffer)[0]); memset(Buffer, 0xBA, 512); KmtEndSeh(STATUS_SUCCESS); @@ -190,6 +195,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); KmtStartSeh(); + ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x", ((PCHAR)Buffer)[0]); memset(Buffer, 0xBA, 4096); KmtEndSeh(STATUS_SUCCESS); @@ -215,6 +221,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); KmtStartSeh(); + ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x", ((PCHAR)Buffer)[0]); memset(Buffer, 0xBA, 512); KmtEndSeh(STATUS_SUCCESS); @@ -240,6 +247,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); KmtStartSeh(); + ok(((PCHAR)Buffer)[0] == 0, "First byte is not null! %x", ((PCHAR)Buffer)[0]); memset(Buffer, 0xBA, 4096); KmtEndSeh(STATUS_SUCCESS);

7 years, 10 months

[pschweitzer] 73391: [NTOSKRNL] Don't write random byte. Force a value so that it can be easily recognized. CORE-11819 CORE-12475

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Nov 27 10:27:43 2016 New Revision: 73391 URL: http://svn.reactos.org/svn/reactos?rev=73391&view=rev Log: [NTOSKRNL] Don't write random byte. Force a value so that it can be easily recognized. 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 10:27:43 2016 @@ -5086,6 +5086,7 @@ if (Status == STATUS_END_OF_FILE && !(AllocationAttributes & SEC_IMAGE) && FileObject != NULL && (FileObject->SectionObjectPointer == NULL || FileObject->SectionObjectPointer->SharedCacheMap == NULL)) { + Buffer = 0xdb; Status = ZwWriteFile(FileHandle, NULL, NULL,

7 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2016