Ros-diffs March 2017

ros-diffs@reactos.org

14 participants
251 discussions

[hbelusca] 74067: [WS2_32]: Fix the crash in ws2_32 reported in CORE-12852, that happens when opening e.g. Word 2010 for the first time (when it asks for registration): - Check whether WsNcLoadProv...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 5 00:24:08 2017 New Revision: 74067 URL: http://svn.reactos.org/svn/reactos?rev=74067&view=rev Log: [WS2_32]: Fix the crash in ws2_32 reported in CORE-12852, that happens when opening e.g. Word 2010 for the first time (when it asks for registration): - Check whether WsNcLoadProvider really succeeded in loading a provider in WsNcGetCatalogFromProviderId, and return appropriate error code. - In WsNqLookupServiceBegin, initialize CatalogEntry to NULL prior to calling WsNcGetCatalogFromProviderId, and check for success or failure of WsNqAddProvider (and fail in accordance). Modified: trunk/reactos/dll/win32/ws2_32/src/nscatalo.c trunk/reactos/dll/win32/ws2_32/src/nsquery.c Modified: trunk/reactos/dll/win32/ws2_32/src/nscatalo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/nscat… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/nscatalo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/nscatalo.c [iso-8859-1] Sun Mar 5 00:24:08 2017 @@ -497,6 +497,7 @@ IN LPGUID ProviderId, OUT PNSCATALOG_ENTRY *CatalogEntry) { + INT ErrorCode = WSAEINVAL; PLIST_ENTRY NextEntry; PNSCATALOG_ENTRY Entry; @@ -514,25 +515,24 @@ /* Check if this is the Catalog Entry ID we want */ if (IsEqualGUID(&Entry->ProviderId, ProviderId)) { - /* Check if it doesn't already have a provider */ + /* If it doesn't already have a provider, load the provider */ if (!Entry->Provider) + ErrorCode = WsNcLoadProvider(Catalog, Entry); + + /* If we succeeded, reference the entry and return it */ + if (Entry->Provider /* || ErrorCode == ERROR_SUCCESS */) { - /* Match, load the Provider */ - WsNcLoadProvider(Catalog, Entry); + InterlockedIncrement(&Entry->RefCount); + *CatalogEntry = Entry; + ErrorCode = ERROR_SUCCESS; + break; } - - /* Reference the entry and return it */ - InterlockedIncrement(&Entry->RefCount); - *CatalogEntry = Entry; - break; - } - } - - /* Release the catalog */ + } + } + + /* Release the lock and return */ WsNcUnlock(); - - /* Return */ - return ERROR_SUCCESS; + return ErrorCode; } BOOL Modified: trunk/reactos/dll/win32/ws2_32/src/nsquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/nsque… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/nsquery.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/nsquery.c [iso-8859-1] Sun Mar 5 00:24:08 2017 @@ -355,7 +355,7 @@ PLIST_ENTRY Entry; INT ErrorCode; DWORD ClassInfoSize; - PNSCATALOG_ENTRY CatalogEntry; + PNSCATALOG_ENTRY CatalogEntry = NULL; ENUM_CONTEXT EnumContext; BOOLEAN TryAgain; @@ -396,10 +396,13 @@ ErrorCode = SOCKET_ERROR; goto Exit; } - else - { - /* Add this provider */ - WsNqAddProvider(NsQuery, CatalogEntry->Provider); + /* We succeeded, add this provider */ + else if (!WsNqAddProvider(NsQuery, CatalogEntry->Provider)) + { + /* Fail */ + SetLastError(WSA_NOT_ENOUGH_MEMORY); + ErrorCode = SOCKET_ERROR; + goto Exit; } } else

7 years, 9 months

[hbelusca] 74066: [WS2_32] - Let require explicit semicolons when using the Ws***(Un)Lock macros (and thus remove the semicolon from their definition).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Mar 4 23:55:30 2017 New Revision: 74066 URL: http://svn.reactos.org/svn/reactos?rev=74066&view=rev Log: [WS2_32] - Let require explicit semicolons when using the Ws***(Un)Lock macros (and thus remove the semicolon from their definition). Modified: trunk/reactos/dll/win32/ws2_32/src/async.c trunk/reactos/dll/win32/ws2_32/src/dcatalog.c trunk/reactos/dll/win32/ws2_32/src/dprocess.c trunk/reactos/dll/win32/ws2_32/src/nscatalo.c trunk/reactos/dll/win32/ws2_32/src/nsquery.c trunk/reactos/dll/win32/ws2_32/src/rasdial.c trunk/reactos/dll/win32/ws2_32/src/rnr.c trunk/reactos/dll/win32/ws2_32/src/startup.c Modified: trunk/reactos/dll/win32/ws2_32/src/async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/async… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/async.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/async.c [iso-8859-1] Sat Mar 4 23:55:30 2017 @@ -21,8 +21,8 @@ HANDLE WsAsyncCancelledTaskHandle; HINSTANCE WsAsyncDllHandle; -#define WsAsyncLock() EnterCriticalSection(&WsAsyncCritSect); -#define WsAsyncUnlock() LeaveCriticalSection(&WsAsyncCritSect); +#define WsAsyncLock() EnterCriticalSection(&WsAsyncCritSect) +#define WsAsyncUnlock() LeaveCriticalSection(&WsAsyncCritSect) /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32/src/dcatalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/dcata… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/dcatalog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/dcatalog.c [iso-8859-1] Sat Mar 4 23:55:30 2017 @@ -15,8 +15,8 @@ /* DATA **********************************************************************/ -#define WsTcLock() EnterCriticalSection(&Catalog->Lock); -#define WsTcUnlock() LeaveCriticalSection(&Catalog->Lock); +#define WsTcLock() EnterCriticalSection(&Catalog->Lock) +#define WsTcUnlock() LeaveCriticalSection(&Catalog->Lock) /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32/src/dprocess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/dproc… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/dprocess.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/dprocess.c [iso-8859-1] Sat Mar 4 23:55:30 2017 @@ -14,8 +14,8 @@ PWSPROCESS CurrentWsProcess; -#define WsProcLock() EnterCriticalSection(&Process->ThreadLock); -#define WsProcUnlock() LeaveCriticalSection(&Process->ThreadLock); +#define WsProcLock() EnterCriticalSection(&Process->ThreadLock) +#define WsProcUnlock() LeaveCriticalSection(&Process->ThreadLock) /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32/src/nscatalo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/nscat… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/nscatalo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/nscatalo.c [iso-8859-1] Sat Mar 4 23:55:30 2017 @@ -15,8 +15,8 @@ /* DATA **********************************************************************/ -#define WsNcLock() EnterCriticalSection(&Catalog->Lock); -#define WsNcUnlock() LeaveCriticalSection(&Catalog->Lock); +#define WsNcLock() EnterCriticalSection(&Catalog->Lock) +#define WsNcUnlock() LeaveCriticalSection(&Catalog->Lock) /* FUNCTIONS *****************************************************************/ @@ -370,7 +370,7 @@ GoOn = Callback(Context, CatalogEntry); } - /* Release lock */ + /* Release the lock */ WsNcUnlock(); } @@ -413,7 +413,7 @@ } } - /* Release the lock */ + /* Release the lock and return */ WsNcUnlock(); return ErrorCode; } Modified: trunk/reactos/dll/win32/ws2_32/src/nsquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/nsque… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/nsquery.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/nsquery.c [iso-8859-1] Sat Mar 4 23:55:30 2017 @@ -12,8 +12,8 @@ /* DATA **********************************************************************/ -#define WsNqLock() EnterCriticalSection(&NsQuery->Lock); -#define WsNqUnlock() LeaveCriticalSection(&NsQuery->Lock); +#define WsNqLock() EnterCriticalSection(&NsQuery->Lock) +#define WsNqUnlock() LeaveCriticalSection(&NsQuery->Lock) /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32/src/rasdial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/rasdi… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/rasdial.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/rasdial.c [iso-8859-1] Sat Mar 4 23:55:30 2017 @@ -37,8 +37,8 @@ PWS_ATTEMPT_AUTODIAL_NAME lpfnWSAttemptAutodialName; PWS_NOTE_SUCCESSFUL_HOSTENT_LOOKUP lpfnWSNoteSuccessfulHostentLookup; -#define WsRasLock() EnterCriticalSection(&WsRasHelperLock); -#define WsRasUnlock() LeaveCriticalSection(&WsRasHelperLock); +#define WsRasLock() EnterCriticalSection(&WsRasHelperLock) +#define WsRasUnlock() LeaveCriticalSection(&WsRasHelperLock) /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32/src/rnr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/rnr.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/rnr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/rnr.c [iso-8859-1] Sat Mar 4 23:55:30 2017 @@ -34,6 +34,7 @@ PTCATALOG_ENTRY CatalogEntry; LPWSTR UnicodeString; DWORD Length = *lpdwAddressStringLength; + DPRINT("WSAAddressToStringA: %p\n", lpsaAddress); /* Enter prolog */ @@ -136,6 +137,7 @@ DWORD CatalogEntryId; PTCATALOG Catalog; PTCATALOG_ENTRY CatalogEntry; + DPRINT("WSAAddressToStringW: %p\n", lpsaAddress); /* Enter prolog */ @@ -203,6 +205,7 @@ PWSTHREAD Thread; INT ErrorCode; PNSQUERY Query = hLookup; + DPRINT("WSALookupServiceEnd: %lx\n", hLookup); /* Enter prolog */ @@ -246,6 +249,7 @@ INT ErrorCode; LPWSAQUERYSETW UnicodeQuerySet = NULL; DWORD UnicodeQuerySetSize = 0; + DPRINT("WSALookupServiceBeginA: %p\n", lpqsRestrictions); /* Verify pointer */ @@ -317,6 +321,7 @@ PWSTHREAD Thread; INT ErrorCode; PNSQUERY Query; + DPRINT("WSALookupServiceBeginW: %p\n", lpqsRestrictions); /* Enter prolog */ @@ -387,6 +392,7 @@ PWSTHREAD Thread; INT ErrorCode; PNSQUERY Query = hLookup; + DPRINT("WSALookupServiceNextW: %lx\n", hLookup); /* Enter prolog */ @@ -440,6 +446,7 @@ LPWSAQUERYSETW UnicodeQuerySet; DWORD UnicodeQuerySetSize; INT ErrorCode; + DPRINT("WSALookupServiceNextA: %lx\n", hLookup); /* Verify pointers */ @@ -734,6 +741,7 @@ PWSPROCESS WsProcess; PNSCATALOG Catalog; NSPROVIDER_ENUM_CONTEXT Context; + DPRINT("WSAEnumNameSpaceProvidersInternal: %lx\n", lpnspBuffer); if (!lpdwBufferLength) @@ -829,6 +837,7 @@ PTCATALOG_ENTRY CatalogEntry; LPWSTR UnicodeString; DWORD Length = (DWORD)strlen(AddressString) + 1; + DPRINT("WSAStringToAddressA: %s\n", AddressString); /* Enter prolog */ @@ -920,6 +929,7 @@ DWORD CatalogEntryId; PTCATALOG Catalog; PTCATALOG_ENTRY CatalogEntry; + DPRINT("WSAStringToAddressW: %S\n", AddressString); /* Enter prolog */ Modified: trunk/reactos/dll/win32/ws2_32/src/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/start… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/startup.c [iso-8859-1] Sat Mar 4 23:55:30 2017 @@ -18,8 +18,8 @@ PWS_SOCK_POST_ROUTINE WsSockPostRoutine = NULL; CRITICAL_SECTION WsStartupLock; -#define WsStartupLock() EnterCriticalSection(&WsStartupLock); -#define WsStartupUnlock() LeaveCriticalSection(&WsStartupLock); +#define WsStartupLock() EnterCriticalSection(&WsStartupLock) +#define WsStartupUnlock() LeaveCriticalSection(&WsStartupLock) /* FUNCTIONS *****************************************************************/

7 years, 9 months

[gadamopoulos] 74065: [UXTHEME]: Handle WM_NCACTIVATE only when the window has a themed caption (it's not like windows with classic borders and no caption need to be redrawn to reflect that they ge...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Mar 4 22:33:21 2017 New Revision: 74065 URL: http://svn.reactos.org/svn/reactos?rev=74065&view=rev Log: [UXTHEME]: Handle WM_NCACTIVATE only when the window has a themed caption (it's not like windows with classic borders and no caption need to be redrawn to reflect that they get or lose the active state). Fixes the classic border drawn on deactivation in the taskbar. Found by Sylvain Deverre. CORE-12887 Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Sat Mar 4 22:33:21 2017 @@ -1087,6 +1087,10 @@ // case WM_NCUAHDRAWFRAME: case WM_NCACTIVATE: + + if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) != WS_CAPTION) + return TRUE; + ThemeHandleNCPaint(hWnd, (HRGN)1); return TRUE; case WM_NCMOUSEMOVE:

7 years, 9 months

[mjansen] 74064: [NTDLL] Implement some basic shim engine integration. CORE-10368

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Mar 4 20:34:36 2017 New Revision: 74064 URL: http://svn.reactos.org/svn/reactos?rev=74064&view=rev Log: [NTDLL] Implement some basic shim engine integration. CORE-10368 Modified: trunk/reactos/dll/ntdll/include/ntdllp.h trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/dll/ntdll/ldr/ldrinit.c trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/include/ntdllp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] Sat Mar 4 20:34:36 2017 @@ -47,6 +47,13 @@ extern UNICODE_STRING LdrpKnownDllPath; extern PLDR_DATA_TABLE_ENTRY LdrpGetModuleHandleCache, LdrpLoadedDllHandleCache; extern ULONG RtlpDphGlobalFlags; +extern BOOLEAN g_ShimsEnabled; +extern PVOID g_pShimEngineModule; +extern PVOID g_pfnSE_DllLoaded; +extern PVOID g_pfnSE_DllUnloaded; +extern PVOID g_pfnSE_InstallBeforeInit; +extern PVOID g_pfnSE_InstallAfterInit; +extern PVOID g_pfnSE_ProcessDying; /* ldrinit.c */ NTSTATUS NTAPI LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL); @@ -139,6 +146,18 @@ VOID NTAPI LdrpFreeUnicodeString(PUNICODE_STRING String); +VOID NTAPI +LdrpGetShimEngineInterface(); + +VOID +NTAPI +LdrpLoadShimEngine(IN PWSTR ImageName, + IN PUNICODE_STRING ProcessImage, + IN PVOID pShimData); + +VOID NTAPI +LdrpUnloadShimEngine(); + /* FIXME: Cleanup this mess */ typedef NTSTATUS (NTAPI *PEPFUNC)(PPEB); Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Sat Mar 4 20:34:36 2017 @@ -1404,7 +1404,12 @@ LdrEntry->EntryPoint); } - /* FIXME: Call Shim Engine and notify */ + /* Call Shim Engine and notify */ + if (g_ShimsEnabled) + { + VOID (NTAPI* SE_DllUnloaded)(PVOID) = RtlDecodeSystemPointer(g_pfnSE_DllUnloaded); + SE_DllUnloaded(LdrEntry); + } /* Unlink it */ CurrentEntry = LdrEntry; Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Sat Mar 4 20:34:36 2017 @@ -901,10 +901,12 @@ if (LdrpShutdownInProgress) return STATUS_SUCCESS; /* Tell the Shim Engine */ - //if (ShimsEnabled) - //{ - /* FIXME */ - //} + if (g_ShimsEnabled) + { + VOID(NTAPI *SE_ProcessDying)(); + SE_ProcessDying = RtlDecodeSystemPointer(g_pfnSE_ProcessDying); + SE_ProcessDying(); + } /* Tell the world */ if (ShowSnaps) @@ -2110,8 +2112,7 @@ { /* Load the Shim Engine */ Peb->AppCompatInfo = NULL; - //LdrpLoadShimEngine(OldShimData, ImagePathName, OldShimData); - DPRINT1("We do not support shims yet\n"); + LdrpLoadShimEngine(OldShimData, &ImagePathName, OldShimData); } else { @@ -2134,7 +2135,13 @@ return Status; } - /* FIXME: Unload the Shim Engine if it was loaded */ + /* Notify Shim Engine */ + if (g_ShimsEnabled) + { + VOID(NTAPI *SE_InstallAfterInit)(PUNICODE_STRING, PVOID); + SE_InstallAfterInit = RtlDecodeSystemPointer(g_pfnSE_InstallAfterInit); + SE_InstallAfterInit(&ImagePathName, OldShimData); + } /* Check if we have a user-defined Post Process Routine */ if (NT_SUCCESS(Status) && Peb->PostProcessInitRoutine) Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Sat Mar 4 20:34:36 2017 @@ -17,7 +17,14 @@ /* GLOBALS *******************************************************************/ PLDR_DATA_TABLE_ENTRY LdrpLoadedDllHandleCache, LdrpGetModuleHandleCache; + BOOLEAN g_ShimsEnabled; +PVOID g_pShimEngineModule; +PVOID g_pfnSE_DllLoaded; +PVOID g_pfnSE_DllUnloaded; +PVOID g_pfnSE_InstallBeforeInit; +PVOID g_pfnSE_InstallAfterInit; +PVOID g_pfnSE_ProcessDying; /* FUNCTIONS *****************************************************************/ @@ -2548,12 +2555,11 @@ /* If we have to run the entrypoint, make sure the DB is ready */ if (CallInit && LdrpLdrDatabaseIsSetup) { - /* FIXME: Notify Shim Engine */ + /* Notify Shim Engine */ if (g_ShimsEnabled) { - /* Call it */ - //ShimLoadCallback = RtlDecodeSystemPointer(g_pfnSE_DllLoaded); - //ShimLoadCallback(LdrEntry); + VOID (NTAPI* SE_DllLoaded)(PLDR_DATA_TABLE_ENTRY) = RtlDecodeSystemPointer(g_pfnSE_DllLoaded); + SE_DllLoaded(LdrEntry); } /* Run the init routine */ @@ -2654,4 +2660,72 @@ return ModulesCount; } +PVOID LdrpGetShimEngineFunction(PCSZ FunctionName) +{ + ANSI_STRING Function; + NTSTATUS Status; + PVOID Address; + RtlInitAnsiString(&Function, FunctionName); + Status = LdrGetProcedureAddress(g_pShimEngineModule, &Function, 0, &Address); + return NT_SUCCESS(Status) ? Address : NULL; +} + +VOID +NTAPI +LdrpGetShimEngineInterface() +{ + PVOID SE_DllLoaded = LdrpGetShimEngineFunction("SE_DllLoaded"); + PVOID SE_DllUnloaded = LdrpGetShimEngineFunction("SE_DllUnloaded"); + PVOID SE_InstallBeforeInit = LdrpGetShimEngineFunction("SE_InstallBeforeInit"); + PVOID SE_InstallAfterInit = LdrpGetShimEngineFunction("SE_InstallAfterInit"); + PVOID SE_ProcessDying = LdrpGetShimEngineFunction("SE_ProcessDying"); + + if (SE_DllLoaded && SE_DllUnloaded && SE_InstallBeforeInit && SE_InstallAfterInit && SE_ProcessDying) + { + g_pfnSE_DllLoaded = RtlEncodeSystemPointer(SE_DllLoaded); + g_pfnSE_DllUnloaded = RtlEncodeSystemPointer(SE_DllUnloaded); + g_pfnSE_InstallBeforeInit = RtlEncodeSystemPointer(SE_InstallBeforeInit); + g_pfnSE_InstallAfterInit = RtlEncodeSystemPointer(SE_InstallAfterInit); + g_pfnSE_ProcessDying = RtlEncodeSystemPointer(SE_ProcessDying); + g_ShimsEnabled = TRUE; + } + else + { + LdrpUnloadShimEngine(); + } +} + + +VOID +NTAPI +LdrpLoadShimEngine(IN PWSTR ImageName, IN PUNICODE_STRING ProcessImage, IN PVOID pShimData) +{ + UNICODE_STRING ShimLibraryName; + PVOID ShimLibrary; + NTSTATUS Status; + RtlInitUnicodeString(&ShimLibraryName, ImageName); + Status = LdrpLoadDll(FALSE, NULL, NULL, &ShimLibraryName, &ShimLibrary, TRUE); + if (NT_SUCCESS(Status)) + { + g_pShimEngineModule = ShimLibrary; + LdrpGetShimEngineInterface(); + if (g_ShimsEnabled) + { + VOID(NTAPI *SE_InstallBeforeInit)(PUNICODE_STRING, PVOID); + SE_InstallBeforeInit = RtlDecodeSystemPointer(g_pfnSE_InstallBeforeInit); + SE_InstallBeforeInit(ProcessImage, pShimData); + } + } +} + +VOID +NTAPI +LdrpUnloadShimEngine() +{ + /* Make sure we do not call into the shim engine anymore */ + g_ShimsEnabled = FALSE; + LdrUnloadDll(g_pShimEngineModule); + g_pShimEngineModule = NULL; +} + /* EOF */

7 years, 9 months

[mjansen] 74063: [NTDLL] Fix RtlDecodeSystemPointer for usage inside ntdll. CORE-10368

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Mar 4 20:32:12 2017 New Revision: 74063 URL: http://svn.reactos.org/svn/reactos?rev=74063&view=rev Log: [NTDLL] Fix RtlDecodeSystemPointer for usage inside ntdll. CORE-10368 Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/sdk/lib/rtl/process.c Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sat Mar 4 20:32:12 2017 @@ -540,7 +540,7 @@ 539 stdcall RtlDeactivateActivationContext(long long) # RtlDebugPrintTimes 541 stdcall RtlDecodePointer(ptr) -542 stdcall RtlDecodeSystemPointer(ptr) RtlEncodeSystemPointer +542 stdcall RtlDecodeSystemPointer(ptr) 543 stdcall RtlDecompressBuffer(long ptr long ptr long ptr) 544 stdcall RtlDecompressFragment(long ptr long ptr long long ptr ptr) 545 stdcall RtlDefaultNpAcl(ptr) Modified: trunk/reactos/sdk/lib/rtl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/process.c?rev=… ============================================================================== --- trunk/reactos/sdk/lib/rtl/process.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/process.c [iso-8859-1] Sat Mar 4 20:32:12 2017 @@ -433,6 +433,16 @@ /* * @implemented + */ +PVOID +NTAPI +RtlDecodeSystemPointer(IN PVOID Pointer) +{ + return RtlEncodeSystemPointer(Pointer); +} + +/* + * @implemented * * NOTES: * Implementation based on the documentation from:

7 years, 9 months

[mjansen] 74062: [APPHELP] Fix a possible read past the buffer in SdbpIsPathOnRemovableMedia.

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Mar 4 20:29:46 2017 New Revision: 74062 URL: http://svn.reactos.org/svn/reactos?rev=74062&view=rev Log: [APPHELP] Fix a possible read past the buffer in SdbpIsPathOnRemovableMedia. Modified: trunk/reactos/dll/appcompat/apphelp/layer.c Modified: trunk/reactos/dll/appcompat/apphelp/layer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/laye… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/layer.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/layer.c [iso-8859-1] Sat Mar 4 20:29:46 2017 @@ -109,7 +109,7 @@ { WCHAR tmp[] = { 'A',':','\\',0 }; ULONG type; - if (!Path) + if (!Path || Path[0] == UNICODE_NULL) { SHIM_ERR("Invalid argument\n"); return FALSE;

7 years, 9 months

[mjansen] 74061: [APPHELP_APITEST] Check which parts of apphelp accept NT paths

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Mar 4 20:27:39 2017 New Revision: 74061 URL: http://svn.reactos.org/svn/reactos?rev=74061&view=rev Log: [APPHELP_APITEST] Check which parts of apphelp accept NT paths Modified: trunk/rostests/apitests/apphelp/db.cpp trunk/rostests/apitests/apphelp/layerapi.c Modified: trunk/rostests/apitests/apphelp/db.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/db.cpp?r… ============================================================================== --- trunk/rostests/apitests/apphelp/db.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/db.cpp [iso-8859-1] Sat Mar 4 20:27:39 2017 @@ -1148,6 +1148,7 @@ TAGID tagid; TAGREF trApphelp; DWORD expect_flags = 0, adwExeFlags_0, exe_count; + UNICODE_STRING exenameNT; memset(&query, 0xab, sizeof(query)); @@ -1289,6 +1290,16 @@ ret = pSdbTagRefToTagID(hsdb, 0, &pdb, &tagid); ok(pdb != NULL && pdb != (PDB)0x12345678, "Expected pdb to be set to a valid pdb, was: %p\n", pdb); ok(tagid == 0, "Expected tagid to be set to 0, was: 0x%x\n", tagid); + + + + if (RtlDosPathNameToNtPathName_U(exenameW, &exenameNT, NULL, NULL)) + { + ret = pSdbGetMatchingExe(hsdb, exenameNT.Buffer, NULL, NULL, 0, (SDBQUERYRESULT*)&query); + ok(ret, "SdbGetMatchingExe should not fail for %d.\n", cur); + + RtlFreeUnicodeString(&exenameNT); + } if (test_exedata[cur].extra_file) DeleteFileA(testfile); Modified: trunk/rostests/apitests/apphelp/layerapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/layerapi… ============================================================================== --- trunk/rostests/apitests/apphelp/layerapi.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/layerapi.c [iso-8859-1] Sat Mar 4 20:27:39 2017 @@ -141,6 +141,21 @@ } WideCharToMultiByte(CP_ACP, 0, buffer, -1, resultBuffer, sizeof(resultBuffer), NULL, NULL); winetest_ok(!strcmp(stringResult, resultBuffer), "Expected the result to be '%s', was '%s'\n", stringResult, resultBuffer); + + if (result) + { + UNICODE_STRING pathNT; + + if (RtlDosPathNameToNtPathName_U(pathW, &pathNT, NULL, NULL)) + { + memset(buffer, 0, sizeof(buffer)); + dwBufSize = sizeof(buffer); + winetest_ok(pSdbGetPermLayerKeys(pathNT.Buffer, buffer, &dwBufSize, type) == FALSE, "Expected pSdbGetPermLayerKeys to fail for NT path\n"); + + RtlFreeUnicodeString(&pathNT); + } + } + }

7 years, 9 months

[ekohl] 74060: [NTOS:CM] CmpSecurityMethod: - Lock and unlock the Hive and the KCB. - Fail, if we try to access a key that has been marked for deletion.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Mar 4 19:48:27 2017 New Revision: 74060 URL: http://svn.reactos.org/svn/reactos?rev=74060&view=rev Log: [NTOS:CM] CmpSecurityMethod: - Lock and unlock the Hive and the KCB. - Fail, if we try to access a key that has been marked for deletion. Modified: trunk/reactos/ntoskrnl/config/cmse.c Modified: trunk/reactos/ntoskrnl/config/cmse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmse.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmse.c [iso-8859-1] Sat Mar 4 19:48:27 2017 @@ -138,7 +138,7 @@ } NTSTATUS -CmpQuerySecurityDescriptor(IN PCM_KEY_BODY KeyBody, +CmpQuerySecurityDescriptor(IN PCM_KEY_CONTROL_BLOCK Kcb, IN SECURITY_INFORMATION SecurityInformation, OUT PSECURITY_DESCRIPTOR SecurityDescriptor, IN OUT PULONG BufferLength) @@ -153,7 +153,9 @@ ULONG Group = 0; ULONG Dacl = 0; - DBG_UNREFERENCED_PARAMETER(KeyBody); + DBG_UNREFERENCED_PARAMETER(Kcb); + + DPRINT("CmpQuerySecurityDescriptor()\n"); if (SecurityInformation == 0) { @@ -233,6 +235,17 @@ ASSERT(Status == STATUS_SUCCESS); return Status; +} + +NTSTATUS +CmpSetSecurityDescriptor(IN PCM_KEY_CONTROL_BLOCK Kcb, + IN PSECURITY_INFORMATION SecurityInformation, + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN POOL_TYPE PoolType, + IN PGENERIC_MAPPING GenericMapping) +{ + DPRINT("CmpSetSecurityDescriptor()\n"); + return STATUS_SUCCESS; } NTSTATUS @@ -246,23 +259,57 @@ IN POOL_TYPE PoolType, IN PGENERIC_MAPPING GenericMapping) { + PCM_KEY_CONTROL_BLOCK Kcb; + NTSTATUS Status = STATUS_SUCCESS; + DBG_UNREFERENCED_PARAMETER(OldSecurityDescriptor); DBG_UNREFERENCED_PARAMETER(GenericMapping); + + Kcb = ((PCM_KEY_BODY)ObjectBody)->KeyControlBlock; + + /* Acquire hive lock */ + CmpLockRegistry(); + + /* Acquire the KCB lock */ + if (OperationCode == QuerySecurityDescriptor) + { + CmpAcquireKcbLockShared(Kcb); + } + else + { + CmpAcquireKcbLockExclusive(Kcb); + } + + /* Don't touch deleted keys */ + if (Kcb->Delete) + { + /* Unlock the KCB */ + CmpReleaseKcbLock(Kcb); + + /* Unlock the HIVE */ + CmpUnlockRegistry(); + return STATUS_KEY_DELETED; + } switch (OperationCode) { case SetSecurityDescriptor: DPRINT("Set security descriptor\n"); ASSERT((PoolType == PagedPool) || (PoolType == NonPagedPool)); - /* HACK */ + Status = CmpSetSecurityDescriptor(Kcb, + SecurityInformation, + SecurityDescriptor, + PoolType, + GenericMapping); break; case QuerySecurityDescriptor: DPRINT("Query security descriptor\n"); - return CmpQuerySecurityDescriptor(ObjectBody, - *SecurityInformation, - SecurityDescriptor, - BufferLength); + Status = CmpQuerySecurityDescriptor(Kcb, + *SecurityInformation, + SecurityDescriptor, + BufferLength); + break; case DeleteSecurityDescriptor: DPRINT("Delete security descriptor\n"); @@ -278,6 +325,11 @@ KeBugCheckEx(SECURITY_SYSTEM, 0, STATUS_INVALID_PARAMETER, 0, 0); } - /* HACK */ - return STATUS_SUCCESS; + /* Unlock the KCB */ + CmpReleaseKcbLock(Kcb); + + /* Unlock the hive */ + CmpUnlockRegistry(); + + return Status; }

7 years, 9 months

[tfaber] 74059: [USER32] - Fix overflow check in SetScrollRange. CID 731535 CORE-12763 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Mar 4 19:02:30 2017 New Revision: 74059 URL: http://svn.reactos.org/svn/reactos?rev=74059&view=rev Log: [USER32] - Fix overflow check in SetScrollRange. CID 731535 CORE-12763 #resolve Modified: trunk/reactos/win32ss/user/user32/controls/scrollbar.c Modified: trunk/reactos/win32ss/user/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/scrollbar.c [iso-8859-1] Sat Mar 4 19:02:30 2017 @@ -1701,7 +1701,7 @@ pWnd = ValidateHwnd(hWnd); if ( !pWnd ) return FALSE; - if ((nMaxPos - nMinPos) > MAXLONG) + if (((LONGLONG)nMaxPos - nMinPos) > MAXLONG) { SetLastError(ERROR_INVALID_SCROLLBAR_RANGE); return FALSE;

7 years, 9 months

[tfaber] 74058: [USER32_APITEST] - Add a test for SetScrollRange CORE-12763

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Mar 4 18:34:35 2017 New Revision: 74058 URL: http://svn.reactos.org/svn/reactos?rev=74058&view=rev Log: [USER32_APITEST] - Add a test for SetScrollRange CORE-12763 Added: trunk/rostests/apitests/user32/SetScrollRange.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Sat Mar 4 18:34:35 2017 @@ -32,6 +32,7 @@ SetParent.c SetProp.c SetScrollInfo.c + SetScrollRange.c SystemParametersInfo.c TrackMouseEvent.c WndProc.c Added: trunk/rostests/apitests/user32/SetScrollRange.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetScroll… ============================================================================== --- trunk/rostests/apitests/user32/SetScrollRange.c (added) +++ trunk/rostests/apitests/user32/SetScrollRange.c [iso-8859-1] Sat Mar 4 18:34:35 2017 @@ -0,0 +1,66 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for SetScrollRange + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#include <wingdi.h> +#include <winuser.h> + +START_TEST(SetScrollRange) +{ + struct + { + INT nMin; + INT nMax; + BOOL result; + } tests[] = + { + { 0, 0, TRUE }, + { 0, INT_MAX, TRUE }, + { -1, INT_MAX, FALSE }, + { INT_MIN, INT_MAX, FALSE }, + { INT_MIN, 0, FALSE }, + { INT_MIN, -1, TRUE }, + }; + unsigned i; + HWND hScroll; + BOOL success; + DWORD error; + INT newMin, newMax; + + hScroll = CreateWindowExW(0, L"SCROLLBAR", NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hScroll != NULL, "CreateWindowEx failed with %lu\n", GetLastError()); + if (!hScroll) + { + skip("No scroll bar\n"); + return; + } + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + (void)SetScrollRange(hScroll, SB_CTL, 123, 456, FALSE); + SetLastError(0xdeaff00d); + success = SetScrollRange(hScroll, SB_CTL, tests[i].nMin, tests[i].nMax, FALSE); + error = GetLastError(); + (void)GetScrollRange(hScroll, SB_CTL, &newMin, &newMax); + if (tests[i].result) + { + ok(success == TRUE, "SetScrollRange(%d, %d) failed with %d %lu\n", tests[i].nMin, tests[i].nMax, success, error); + ok(newMin == tests[i].nMin, "nMin was changed to %d\n", tests[i].nMin); + ok(newMax == tests[i].nMax, "nMax was changed to %d\n", tests[i].nMax); + } + else + { + ok(success == FALSE, "SetScrollRange(%d, %d) succeeded with %d\n", tests[i].nMin, tests[i].nMax, success); + ok(error == ERROR_INVALID_SCROLLBAR_RANGE, "Error %lu\n", error); + ok(newMin == 123, "nMin was changed to %d\n", newMin); + ok(newMax == 456, "nMax was changed to %d\n", newMax); + } + } + + DestroyWindow(hScroll); +} Propchange: trunk/rostests/apitests/user32/SetScrollRange.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Sat Mar 4 18:34:35 2017 @@ -34,6 +34,7 @@ extern void func_SetParent(void); extern void func_SetProp(void); extern void func_SetScrollInfo(void); +extern void func_SetScrollRange(void); extern void func_SystemParametersInfo(void); extern void func_TrackMouseEvent(void); extern void func_WndProc(void); @@ -72,6 +73,7 @@ { "SetParent", func_SetParent }, { "SetProp", func_SetProp }, { "SetScrollInfo", func_SetScrollInfo }, + { "SetScrollRange", func_SetScrollRange }, { "SystemParametersInfo", func_SystemParametersInfo }, { "TrackMouseEvent", func_TrackMouseEvent }, { "WndProc", func_WndProc },

7 years, 9 months

← Newer
1
...
17
18
19
20
21
22
23
...
26
Older →

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 March 2017