Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[hbelusca] 65753: [SERVICES]: Do not use GetSystemMetrics to retrieve SafeBoot option value, but instead use directly the registry (as it is done just after...).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 20 03:12:23 2014 New Revision: 65753 URL: http://svn.reactos.org/svn/reactos?rev=65753&view=rev Log: [SERVICES]: Do not use GetSystemMetrics to retrieve SafeBoot option value, but instead use directly the registry (as it is done just after...). Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sat Dec 20 03:12:23 2014 @@ -1774,13 +1774,15 @@ VOID ScmAutoStartServices(VOID) { - DWORD dwError = ERROR_SUCCESS; + DWORD dwError; PLIST_ENTRY GroupEntry; PLIST_ENTRY ServiceEntry; PSERVICE_GROUP CurrentGroup; PSERVICE CurrentService; WCHAR szSafeBootServicePath[MAX_PATH]; + DWORD SafeBootEnabled; HKEY hKey; + DWORD dwKeySize; ULONG i; /* @@ -1789,6 +1791,30 @@ */ ASSERT(ScmInitialize); + /* + * Retrieve the SafeBoot parameter. + */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\SafeBoot\\Option", + 0, + KEY_READ, + &hKey); + if (dwError == ERROR_SUCCESS) + { + dwKeySize = sizeof(SafeBootEnabled); + dwError = RegQueryValueExW(hKey, + L"OptionValue", + 0, + NULL, + (LPBYTE)&SafeBootEnabled, + &dwKeySize); + RegCloseKey(hKey); + } + + /* Default to Normal boot if the value doesn't exist */ + if (dwError != ERROR_SUCCESS) + SafeBootEnabled = 0; + /* Acquire the service control critical section, to synchronize starts */ EnterCriticalSection(&ControlServiceCriticalSection); @@ -1802,7 +1828,7 @@ wcscpy(szSafeBootServicePath, L"SYSTEM\\CurrentControlSet\\Control\\SafeBoot"); - switch (GetSystemMetrics(SM_CLEANBOOT)) + switch (SafeBootEnabled) { /* NOTE: Assumes MINIMAL (1) and DSREPAIR (3) load same items */ case 1: @@ -1815,7 +1841,7 @@ break; } - if (GetSystemMetrics(SM_CLEANBOOT)) + if (SafeBootEnabled != 0) { /* If key does not exist then do not assume safe mode */ dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, @@ -2028,14 +2054,13 @@ &hKey); if (dwError == ERROR_SUCCESS) { - dwKeySize = sizeof(DWORD); + dwKeySize = sizeof(PipeTimeout); RegQueryValueExW(hKey, L"ServicesPipeTimeout", 0, NULL, (LPBYTE)&PipeTimeout, &dwKeySize); - RegCloseKey(hKey); } }

9 years, 9 months

[gadamopoulos] 65752: [UXTHEME] * Implement a few functions needed by windows themeui.dll

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Dec 19 14:21:18 2014 New Revision: 65752 URL: http://svn.reactos.org/svn/reactos?rev=65752&view=rev Log: [UXTHEME] * Implement a few functions needed by windows themeui.dll Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c trunk/reactos/dll/win32/uxtheme/uxtheme.spec Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] Fri Dec 19 14:21:18 2014 @@ -399,4 +399,44 @@ UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED); return ret; -} +} + +INT WINAPI ClassicSystemParametersInfoW(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni) +{ + if (gbThemeHooksActive) + { + return user32ApiHook.SystemParametersInfoW(uiAction, uiParam, pvParam, fWinIni); + } + + return SystemParametersInfoW(uiAction, uiParam, pvParam, fWinIni); +} + +INT WINAPI ClassicSystemParametersInfoA(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni) +{ + if (gbThemeHooksActive) + { + return user32ApiHook.SystemParametersInfoA(uiAction, uiParam, pvParam, fWinIni); + } + + return SystemParametersInfoA(uiAction, uiParam, pvParam, fWinIni); +} + +INT WINAPI ClassicGetSystemMetrics(int nIndex) +{ + if (gbThemeHooksActive) + { + return user32ApiHook.GetSystemMetrics(nIndex); + } + + return GetSystemMetrics(nIndex); +} + +BOOL WINAPI ClassicAdjustWindowRectEx(LPRECT lpRect, DWORD dwStyle, BOOL bMenu, DWORD dwExStyle) +{ + if (gbThemeHooksActive) + { + return user32ApiHook.AdjustWindowRectEx(lpRect, dwStyle, bMenu, dwExStyle); + } + + return AdjustWindowRectEx(lpRect, dwStyle, bMenu, dwExStyle); +} Modified: trunk/reactos/dll/win32/uxtheme/uxtheme.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxtheme.… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] Fri Dec 19 14:21:18 2014 @@ -40,10 +40,10 @@ 40 stdcall EnableThemeDialogTexture(ptr long) 41 stdcall EnableTheming(long) 42 stdcall GetCurrentThemeName(wstr long wstr long wstr long) -43 stub -noname ClassicGetSystemMetrics -44 stub -noname ClassicSystemParametersInfoA -45 stub -noname ClassicSystemParametersInfoW -46 stub -noname ClassicAdjustWindowRectEx +43 stdcall -noname ClassicGetSystemMetrics(long) +44 stdcall -noname ClassicSystemParametersInfoA(long long ptr long) +45 stdcall -noname ClassicSystemParametersInfoW(long long ptr long) +46 stdcall -noname ClassicAdjustWindowRectEx(ptr long long long) 47 stdcall DrawThemeBackgroundEx(ptr ptr long long ptr ptr) 48 stub -noname GetThemeParseErrorInfo 49 stdcall GetThemeAppProperties()

9 years, 9 months

[akhaldi] 65751: [UXTHEME] Remove some exports that do not exist in native. Reorder some exports. Add some missing exports. Mark OpenThemeDataEx as noname. CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 19 14:00:09 2014 New Revision: 65751 URL: http://svn.reactos.org/svn/reactos?rev=65751&view=rev Log: [UXTHEME] Remove some exports that do not exist in native. Reorder some exports. Add some missing exports. Mark OpenThemeDataEx as noname. CORE-8174 Modified: trunk/reactos/dll/win32/uxtheme/uxtheme.spec Modified: trunk/reactos/dll/win32/uxtheme/uxtheme.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxtheme.… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] Fri Dec 19 14:00:09 2014 @@ -1,13 +1,15 @@ -# Undocumented functions - Names derived from debug symbols -1 stdcall -noname QueryThemeServices() -2 stdcall -noname OpenThemeFile(wstr wstr wstr ptr long) -3 stdcall -noname CloseThemeFile(ptr) -4 stdcall -noname ApplyTheme(ptr ptr ptr) -7 stdcall -noname GetThemeDefaults(wstr wstr long wstr long) -8 stdcall -noname EnumThemes(wstr ptr ptr) -9 stdcall -noname EnumThemeColors(wstr wstr long ptr) +1 stdcall -noname QueryThemeServices() +2 stdcall -noname OpenThemeFile(wstr wstr wstr ptr long) +3 stdcall -noname CloseThemeFile(ptr) +4 stdcall -noname ApplyTheme(ptr ptr ptr) +5 stdcall CloseThemeData(ptr) +6 stdcall DrawThemeBackground(ptr ptr long long ptr ptr) +7 stdcall -noname GetThemeDefaults(wstr wstr long wstr long) +8 stdcall -noname EnumThemes(wstr ptr ptr) +9 stdcall -noname EnumThemeColors(wstr wstr long ptr) 10 stdcall -noname EnumThemeSizes(wstr wstr long ptr) 11 stdcall -noname ParseThemeIniFile(wstr wstr ptr ptr) +12 stdcall DrawThemeEdge(ptr ptr long long ptr long long ptr) 13 stdcall -noname DrawNCPreview(ptr long ptr wstr wstr wstr ptr ptr) 14 stub -noname RegisterDefaultTheme 15 stub -noname DumpLoadedThemeToTextFile @@ -32,67 +34,62 @@ 34 stdcall -noname ThemeHooksInstall() 35 stdcall -noname ThemeHooksRemove() 36 stub -noname RefreshThemeForTS +37 stdcall DrawThemeIcon(ptr ptr long long ptr ptr long) +38 stdcall DrawThemeParentBackground(ptr ptr ptr) +39 stdcall DrawThemeText(ptr ptr long long wstr long long long ptr) +40 stdcall EnableThemeDialogTexture(ptr long) +41 stdcall EnableTheming(long) +42 stdcall GetCurrentThemeName(wstr long wstr long wstr long) 43 stub -noname ClassicGetSystemMetrics 44 stub -noname ClassicSystemParametersInfoA 45 stub -noname ClassicSystemParametersInfoW 46 stub -noname ClassicAdjustWindowRectEx +47 stdcall DrawThemeBackgroundEx(ptr ptr long long ptr ptr) 48 stub -noname GetThemeParseErrorInfo +49 stdcall GetThemeAppProperties() +50 stdcall GetThemeBackgroundContentRect(ptr ptr long long ptr ptr) +51 stdcall GetThemeBackgroundExtent(ptr ptr long long ptr ptr) +52 stdcall GetThemeBackgroundRegion(ptr ptr long long ptr ptr) +53 stdcall GetThemeBool(ptr long long long ptr) +54 stdcall GetThemeColor(ptr long long long ptr) +55 stdcall GetThemeDocumentationProperty(wstr wstr wstr long) +56 stdcall GetThemeEnumValue(ptr long long long ptr) +57 stdcall GetThemeFilename(ptr long long long wstr long) +58 stdcall GetThemeFont(ptr ptr long long long ptr) +59 stdcall GetThemeInt(ptr long long long ptr) 60 stub -noname CreateThemeDataFromObjects -61 stdcall OpenThemeDataEx(ptr wstr long) +61 stdcall -noname OpenThemeDataEx(ptr wstr long) 62 stub -noname ServerClearStockObjects 63 stub -noname MarkSelection - -# Standard functions -@ stdcall BeginBufferedPaint(ptr ptr long ptr ptr) -@ stdcall BufferedPaintInit() -@ stdcall BufferedPaintUnInit() -@ stdcall CloseThemeData(ptr) -@ stdcall DrawThemeBackground(ptr ptr long long ptr ptr) -@ stdcall DrawThemeBackgroundEx(ptr ptr long long ptr ptr) -@ stdcall DrawThemeEdge(ptr ptr long long ptr long long ptr) -@ stdcall DrawThemeIcon(ptr ptr long long ptr ptr long) -@ stdcall DrawThemeParentBackground(ptr ptr ptr) -@ stdcall DrawThemeText(ptr ptr long long wstr long long long ptr) -@ stdcall EnableThemeDialogTexture(ptr long) -@ stdcall EnableTheming(long) -@ stdcall EndBufferedPaint(ptr long) -@ stdcall GetCurrentThemeName(wstr long wstr long wstr long) -@ stdcall GetThemeAppProperties() -@ stdcall GetThemeBackgroundContentRect(ptr ptr long long ptr ptr) -@ stdcall GetThemeBackgroundExtent(ptr ptr long long ptr ptr) -@ stdcall GetThemeBackgroundRegion(ptr ptr long long ptr ptr) -@ stdcall GetThemeBool(ptr long long long ptr) -@ stdcall GetThemeColor(ptr long long long ptr) -@ stdcall GetThemeDocumentationProperty(wstr wstr wstr long) -@ stdcall GetThemeEnumValue(ptr long long long ptr) -@ stdcall GetThemeFilename(ptr long long long wstr long) -@ stdcall GetThemeFont(ptr ptr long long long ptr) -@ stdcall GetThemeInt(ptr long long long ptr) -@ stdcall GetThemeIntList(ptr long long long ptr) -@ stdcall GetThemeMargins(ptr ptr long long long ptr ptr) -@ stdcall GetThemeMetric(ptr ptr long long long ptr) -@ stdcall GetThemePartSize(ptr ptr long long ptr long ptr) -@ stdcall GetThemePosition(ptr long long long ptr) -@ stdcall GetThemePropertyOrigin(ptr long long long ptr) -@ stdcall GetThemeRect(ptr long long long ptr) -@ stdcall GetThemeString(ptr long long long wstr long) -@ stdcall GetThemeSysBool(ptr long) -@ stdcall GetThemeSysColor(ptr long) -@ stdcall GetThemeSysColorBrush(ptr long) -@ stdcall GetThemeSysFont(ptr long ptr) -@ stdcall GetThemeSysInt(ptr long ptr) -@ stdcall GetThemeSysSize(ptr long) -@ stdcall GetThemeSysString(ptr long wstr long) -@ stdcall GetThemeTextExtent(ptr ptr long long wstr long long ptr ptr) -@ stdcall GetThemeTextMetrics(ptr ptr long long ptr) -@ stdcall GetWindowTheme(ptr) -@ stdcall HitTestThemeBackground(ptr long long long long ptr long double ptr) -@ stdcall IsAppThemed() -@ stdcall IsThemeActive() -@ stdcall IsThemeBackgroundPartiallyTransparent(ptr long long) -@ stdcall IsThemeDialogTextureEnabled(ptr) -@ stdcall IsThemePartDefined(ptr long long) -@ stdcall OpenThemeData(ptr wstr) -@ stdcall SetThemeAppProperties(long) -@ stdcall SetWindowTheme(ptr wstr wstr) -@ stdcall ThemeInitApiHook(long ptr) +#64 ProcessLoadTheme_RunDLLW +#65 SetSystemVisualStyle +#66 ServiceClearStockObjects +67 stdcall GetThemeIntList(ptr long long long ptr) +68 stdcall GetThemeMargins(ptr ptr long long long ptr ptr) +69 stdcall GetThemeMetric(ptr ptr long long long ptr) +70 stdcall GetThemePartSize(ptr ptr long long ptr long ptr) +71 stdcall GetThemePosition(ptr long long long ptr) +72 stdcall GetThemePropertyOrigin(ptr long long long ptr) +#73 IsThemeActiveByPolicy +74 stdcall GetThemeRect(ptr long long long ptr) +75 stdcall GetThemeString(ptr long long long wstr long) +76 stdcall GetThemeSysBool(ptr long) +77 stdcall GetThemeSysColor(ptr long) +78 stdcall GetThemeSysColorBrush(ptr long) +79 stdcall GetThemeSysFont(ptr long ptr) +80 stdcall GetThemeSysInt(ptr long ptr) +81 stdcall GetThemeSysSize(ptr long) +82 stdcall GetThemeSysString(ptr long wstr long) +83 stdcall GetThemeTextExtent(ptr ptr long long wstr long long ptr ptr) +84 stdcall GetThemeTextMetrics(ptr ptr long long ptr) +85 stdcall GetWindowTheme(ptr) +86 stdcall HitTestThemeBackground(ptr long long long long ptr long double ptr) +87 stdcall IsAppThemed() +88 stdcall IsThemeActive() +89 stdcall IsThemeBackgroundPartiallyTransparent(ptr long long) +90 stdcall IsThemeDialogTextureEnabled(ptr) +91 stdcall IsThemePartDefined(ptr long long) +92 stdcall OpenThemeData(ptr wstr) +93 stdcall SetThemeAppProperties(long) +94 stdcall SetWindowTheme(ptr wstr wstr) +95 stdcall ThemeInitApiHook(long ptr)

9 years, 9 months

[akhaldi] 65750: [SHLWAPI_WINETEST] Addendum to r65749. CORE-7556

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 19 13:22:15 2014 New Revision: 65750 URL: http://svn.reactos.org/svn/reactos?rev=65750&view=rev Log: [SHLWAPI_WINETEST] Addendum to r65749. CORE-7556 Modified: trunk/rostests/winetests/shlwapi/string.c Modified: trunk/rostests/winetests/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/string.… ============================================================================== --- trunk/rostests/winetests/shlwapi/string.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/string.c [iso-8859-1] Fri Dec 19 13:22:15 2014 @@ -53,6 +53,7 @@ static DWORD (WINAPI *pSHUnicodeToUnicode)(LPCWSTR,LPWSTR,int); static LPSTR (WINAPI *pStrCatBuffA)(LPSTR,LPCSTR,INT); static LPWSTR (WINAPI *pStrCatBuffW)(LPWSTR,LPCWSTR,INT); +static DWORD (WINAPI *pStrCatChainW)(LPWSTR,DWORD,DWORD,LPCWSTR); static LPSTR (WINAPI *pStrCpyNXA)(LPSTR,LPCSTR,int); static LPWSTR (WINAPI *pStrCpyNXW)(LPWSTR,LPCWSTR,int); static LPSTR (WINAPI *pStrFormatByteSize64A)(LONGLONG,LPSTR,UINT); @@ -1486,6 +1487,125 @@ } } +static void test_StrCatChainW(void) +{ + static const WCHAR deadbeefW[] = {'D','e','A','d','B','e','E','f',0}; + static const WCHAR deadW[] = {'D','e','A','d',0}; + static const WCHAR beefW[] = {'B','e','E','f',0}; + + WCHAR buf[32 + 1]; + DWORD ret; + + if (!pStrCatChainW) + { + win_skip("StrCatChainW is not available\n"); + return; + } + + /* Test with NULL buffer */ + ret = pStrCatChainW(NULL, 0, 0, beefW); + ok(ret == 0, "Expected StrCatChainW to return 0, got %u\n", ret); + + /* Test with empty buffer */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 0, 0, beefW); + ok(ret == 0, "Expected StrCatChainW to return 0, got %u\n", ret); + ok(buf[0] == 0x1111, "Expected buf[0] = 0x1111, got %x\n", buf[0]); + + memcpy(buf, deadbeefW, sizeof(deadbeefW)); + ret = pStrCatChainW(buf, 0, -1, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + + /* Append data to existing string with offset = -1 */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 32, 0, deadW); + ok(ret == 4, "Expected StrCatChainW to return 4, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + ret = pStrCatChainW(buf, 32, -1, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + + /* Append data at a fixed offset */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 32, 0, deadW); + ok(ret == 4, "Expected StrCatChainW to return 4, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + ret = pStrCatChainW(buf, 32, 4, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + + /* Buffer exactly sufficient for string + terminating null */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 5, 0, deadW); + ok(ret == 4, "Expected StrCatChainW to return 4, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + /* Buffer too small, string will be truncated */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 4, 0, deadW); + if (ret == 4) + { + /* Windows 2000 and XP uses a slightly different implementation + * for StrCatChainW, which doesn't ensure that strings are null- + * terminated. Skip test if we detect such an implementation. */ + win_skip("Windows2000/XP behaviour detected for StrCatChainW, skipping tests\n"); + return; + } + ok(ret == 3, "Expected StrCatChainW to return 3, got %u\n", ret); + ok(!memcmp(buf, deadW, 3 * sizeof(WCHAR)), "Buffer contains wrong data\n"); + ok(!buf[3], "String is not nullterminated\n"); + ok(buf[4] == 0x1111, "Expected buf[4] = 0x1111, got %x\n", buf[4]); + + /* Overwrite part of an existing string */ + ret = pStrCatChainW(buf, 4, 1, beefW); + ok(ret == 3, "Expected StrCatChainW to return 3, got %u\n", ret); + ok(buf[0] == 'D', "Expected buf[0] = 'D', got %x\n", buf[0]); + ok(buf[1] == 'B', "Expected buf[1] = 'B', got %x\n", buf[1]); + ok(buf[2] == 'e', "Expected buf[2] = 'e', got %x\n", buf[2]); + ok(!buf[3], "String is not nullterminated\n"); + ok(buf[4] == 0x1111, "Expected buf[4] = 0x1111, got %x\n", buf[4]); + + /* Test appending to full buffer */ + memset(buf, 0x11, sizeof(buf)); + memcpy(buf, deadbeefW, sizeof(deadbeefW)); + memcpy(buf + 9, deadW, sizeof(deadW)); + ret = pStrCatChainW(buf, 9, 8, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + ok(!memcmp(buf + 9, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + /* Offset points at the end of the buffer */ + ret = pStrCatChainW(buf, 9, 9, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + ok(!memcmp(buf + 9, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + /* Offset points outside of the buffer */ + ret = pStrCatChainW(buf, 9, 10, beefW); + ok(ret == 10, "Expected StrCatChainW to return 10, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + ok(!memcmp(buf + 9, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + /* The same but without nullterminated string */ + memcpy(buf, deadbeefW, sizeof(deadbeefW)); + ret = pStrCatChainW(buf, 5, -1, deadW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + + ret = pStrCatChainW(buf, 5, 5, deadW); + ok(ret == 4, "Expected StrCatChainW to return 4, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + ok(buf[5] == 'e', "Expected buf[5] = 'e', got %x\n", buf[5]); + + ret = pStrCatChainW(buf, 5, 6, deadW); + ok(ret == 6, "Expected StrCatChainW to return 6, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + ok(buf[5] == 'e', "Expected buf[5] = 'e', got %x\n", buf[5]); +} + START_TEST(string) { HMODULE hShlwapi; @@ -1505,6 +1625,7 @@ pSHUnicodeToUnicode = (void *)GetProcAddress(hShlwapi, (LPSTR)346); pStrCatBuffA = (void *)GetProcAddress(hShlwapi, "StrCatBuffA"); pStrCatBuffW = (void *)GetProcAddress(hShlwapi, "StrCatBuffW"); + pStrCatChainW = (void *)GetProcAddress(hShlwapi, "StrCatChainW"); pStrCpyNXA = (void *)GetProcAddress(hShlwapi, (LPSTR)399); pStrCpyNXW = (void *)GetProcAddress(hShlwapi, (LPSTR)400); pStrChrNW = (void *)GetProcAddress(hShlwapi, "StrChrNW"); @@ -1570,6 +1691,7 @@ test_StrStrIW(); test_StrStrNW(); test_StrStrNIW(); + test_StrCatChainW(); CoUninitialize(); }

9 years, 9 months

[akhaldi] 65749: [SHLWAPI] Import Wine commit 4b33a33 by Sebastian Lackner: Add implementation for StrCatChainW. Based on a patch by Huw Campbell. CORE-7556

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 19 13:20:42 2014 New Revision: 65749 URL: http://svn.reactos.org/svn/reactos?rev=65749&view=rev Log: [SHLWAPI] Import Wine commit 4b33a33 by Sebastian Lackner: Add implementation for StrCatChainW. Based on a patch by Huw Campbell. CORE-7556 Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec trunk/reactos/dll/win32/shlwapi/string.c Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] Fri Dec 19 13:20:42 2014 @@ -767,7 +767,7 @@ 767 stdcall StrCSpnW(wstr wstr) 768 stdcall StrCatBuffA(str str long) 769 stdcall StrCatBuffW(wstr wstr long) -#770 StrCatChainW +770 stdcall StrCatChainW (ptr long long wstr) 771 stdcall StrCatW(ptr wstr) 772 stdcall StrChrA(str long) 773 stdcall StrChrIA(str long) Modified: trunk/reactos/dll/win32/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/string.c… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/string.c [iso-8859-1] Fri Dec 19 13:20:42 2014 @@ -435,6 +435,47 @@ if (lpszStr && lpszSrc) strcatW(lpszStr, lpszSrc); return lpszStr; +} + +/************************************************************************* + * StrCatChainW [SHLWAPI.@] + * + * Concatenates two unicode strings. + * + * PARAMS + * lpszStr [O] Initial string + * cchMax [I] Length of destination buffer + * ichAt [I] Offset from the destination buffer to begin concatenation + * lpszCat [I] String to concatenate + * + * RETURNS + * The offset from the beginning of pszDst to the terminating NULL. + */ +DWORD WINAPI StrCatChainW(LPWSTR lpszStr, DWORD cchMax, DWORD ichAt, LPCWSTR lpszCat) +{ + TRACE("(%s,%u,%d,%s)\n", debugstr_w(lpszStr), cchMax, ichAt, debugstr_w(lpszCat)); + + if (ichAt == -1) + ichAt = strlenW(lpszStr); + + if (!cchMax) + return ichAt; + + if (ichAt == cchMax) + ichAt--; + + if (lpszCat && ichAt < cchMax) + { + lpszStr += ichAt; + while (ichAt < cchMax - 1 && *lpszCat) + { + *lpszStr++ = *lpszCat++; + ichAt++; + } + *lpszStr = 0; + } + + return ichAt; } /*************************************************************************

9 years, 9 months

[tkreuzer] 65748: [WIN32K] Handle coordinate translation in NtGdiOffsetClipRgn

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Dec 19 12:53:50 2014 New Revision: 65748 URL: http://svn.reactos.org/svn/reactos?rev=65748&view=rev Log: [WIN32K] Handle coordinate translation in NtGdiOffsetClipRgn Modified: trunk/reactos/win32ss/gdi/gdi32/objects/region.c trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/region.c [iso-8859-1] Fri Dec 19 12:53:50 2014 @@ -984,6 +984,11 @@ int nXOffset, int nYOffset) { + if (hdc == NULL) + { + SetLastError(ERROR_INVALID_HANDLE); + return ERROR; + } #if 0 // Handle something other than a normal dc object. if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/cliprgn.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] Fri Dec 19 12:53:50 2014 @@ -350,41 +350,59 @@ return iComplexity; } -int APIENTRY NtGdiOffsetClipRgn(HDC hDC, - int XOffset, - int YOffset) -{ - INT Result; - DC *dc; - - if(!(dc = DC_LockDc(hDC))) - { - EngSetLastError(ERROR_INVALID_HANDLE); +INT +APIENTRY +NtGdiOffsetClipRgn( + _In_ HDC hdc, + _In_ INT xOffset, + _In_ INT yOffset) +{ + INT iComplexity; + PDC pdc; + POINTL apt[2]; + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (pdc == NULL) + { return ERROR; } - if(dc->dclevel.prgnClip != NULL) - { - if (!REGION_bOffsetRgn(dc->dclevel.prgnClip, - XOffset, - YOffset)) - { - Result = ERROR; + /* Check if we have a clip region */ + if (pdc->dclevel.prgnClip != NULL) + { + /* Convert coordinates into device space. Note that we need to convert + 2 coordinates to account for rotation / shear / offset */ + apt[0].x = 0; + apt[0].y = 0; + apt[1].x = xOffset; + apt[1].y = yOffset; + IntLPtoDP(pdc, &apt, 2); + + /* Offset the clip region */ + if (!REGION_bOffsetRgn(pdc->dclevel.prgnClip, + apt[1].x - apt[0].x, + apt[1].y - apt[0].y)) + { + iComplexity = ERROR; } else { - Result = REGION_Complexity(dc->dclevel.prgnClip); - } - - dc->fs |= DC_FLAG_DIRTY_RAO; + iComplexity = REGION_Complexity(pdc->dclevel.prgnClip); + } + + /* Mark the RAO region as dirty */ + pdc->fs |= DC_FLAG_DIRTY_RAO; } else { - Result = NULLREGION; - } - - DC_UnlockDc(dc); - return Result; + /* NULL means no clipping, i.e. the "whole" region */ + iComplexity = SIMPLEREGION; + } + + /* Unlock the DC and return the complexity */ + DC_UnlockDc(pdc); + return iComplexity; } BOOL APIENTRY NtGdiPtVisible(HDC hDC, @@ -472,6 +490,7 @@ { if ( pDC->dclevel.prgnClip ) { + // preferably REGION_IntersectRegion Ret = IntGdiCombineRgn(pDC->dclevel.prgnMeta, pDC->dclevel.prgnMeta, pDC->dclevel.prgnClip, RGN_AND); if (Ret != ERROR) {

9 years, 9 months

[tkreuzer] 65747: [WIN32K] Dump object event log, when trying to dereference an object with 0 references.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Dec 19 11:12:40 2014 New Revision: 65747 URL: http://svn.reactos.org/svn/reactos?rev=65747&view=rev Log: [WIN32K] Dump object event log, when trying to dereference an object with 0 references. Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Fri Dec 19 11:12:40 2014 @@ -559,6 +559,10 @@ if (ulIndex) { /* Decrement reference count */ + if ((gpaulRefCount[ulIndex] & REF_MASK_COUNT) == 0) + { + DBG_DUMP_EVENT_LIST(&pobj->slhLog); + } ASSERT((gpaulRefCount[ulIndex] & REF_MASK_COUNT) > 0); cRefs = InterlockedDecrement((LONG*)&gpaulRefCount[ulIndex]); DBG_LOGEVENT(&pobj->slhLog, EVENT_DEREFERENCE, cRefs);

9 years, 9 months

[tkreuzer] 65746: [WIN32K] Rename RGNOBJAPI_Lock to REGION_LockRgn and remove the 2nd argument, rename RGNOBJAPI_Unlock to REGION_UnlockRgn, remove the old inline lock/unlock functions. Do proper l...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Dec 19 10:34:52 2014 New Revision: 65746 URL: http://svn.reactos.org/svn/reactos?rev=65746&view=rev Log: [WIN32K] Rename RGNOBJAPI_Lock to REGION_LockRgn and remove the 2nd argument, rename RGNOBJAPI_Unlock to REGION_UnlockRgn, remove the old inline lock/unlock functions. Do proper locking using GDIOBJ_bLockMultipleObjects in NtGdiEqualRgn. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/path.c trunk/reactos/win32ss/gdi/ntgdi/region.c trunk/reactos/win32ss/gdi/ntgdi/region.h trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/ntuser/vis.c trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Fri Dec 19 10:34:52 2014 @@ -1130,7 +1130,7 @@ } /* Lock the region */ - prgn = RGNOBJAPI_Lock(hrgn, NULL); + prgn = REGION_LockRgn(hrgn); if (prgn == NULL) { ERR("Failed to lock hrgn %p\n", hrgn); @@ -1143,7 +1143,7 @@ if (pbrFill == NULL) { ERR("Failed to lock hbrush %p\n", hbrush); - RGNOBJAPI_Unlock(prgn); + REGION_UnlockRgn(prgn); DC_UnlockDc(pdc); return FALSE; } @@ -1157,7 +1157,7 @@ /* Cleanup locks */ BRUSH_ShareUnlockBrush(pbrFill); - RGNOBJAPI_Unlock(prgn); + REGION_UnlockRgn(prgn); DC_UnlockDc(pdc); return bResult; @@ -1197,7 +1197,7 @@ ULONG i; PRECTL rc; - RgnData = RGNOBJAPI_Lock(hRgn, NULL); + RgnData = REGION_LockRgn(hRgn); if (RgnData == NULL) { EngSetLastError(ERROR_INVALID_HANDLE); @@ -1210,13 +1210,13 @@ if (!NtGdiPatBlt(hDC, rc->left, rc->top, rc->right - rc->left, rc->bottom - rc->top, DSTINVERT)) { - RGNOBJAPI_Unlock(RgnData); + REGION_UnlockRgn(RgnData); return FALSE; } rc++; } - RGNOBJAPI_Unlock(RgnData); + REGION_UnlockRgn(RgnData); return TRUE; } Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] Fri Dec 19 10:34:52 2014 @@ -2723,7 +2723,7 @@ if (PATH_PathToRegion(pPath, pdcattr->jFillMode, Rgn)) { PATH_EmptyPath(pPath); - RGNOBJAPI_Unlock(Rgn); + REGION_UnlockRgn(Rgn); } else { Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Fri Dec 19 10:34:52 2014 @@ -534,7 +534,7 @@ { PREGION Data; - Data = RGNOBJAPI_Lock(hRgn, NULL); + Data = REGION_LockRgn(hRgn); if (Data == NULL) { DbgPrint("IntDumpRegion called with invalid region!\n"); @@ -549,7 +549,7 @@ Data->rdh.rcBound.bottom, Data->rdh.iType); - RGNOBJAPI_Unlock(Data); + REGION_UnlockRgn(Data); } #endif /* Not NDEBUG */ @@ -1768,7 +1768,7 @@ trb = REGION_AllocRgnWithHandle(srb->rdh.nCount + 1); if (trb == NULL) { - RGNOBJAPI_Unlock(tra); + REGION_UnlockRgn(tra); GreDeleteObject(htra); return; } @@ -1777,8 +1777,8 @@ REGION_SubtractRegion(tra, sra, srb); REGION_SubtractRegion(trb, srb, sra); REGION_UnionRegion(dr, tra, trb); - RGNOBJAPI_Unlock(tra); - RGNOBJAPI_Unlock(trb); + REGION_UnlockRgn(tra); + REGION_UnlockRgn(trb); GreDeleteObject(htra); GreDeleteObject(htrb); @@ -2016,7 +2016,7 @@ } /* Lock the source region */ - prgnSrc = RGNOBJAPI_Lock(hrgn, NULL); + prgnSrc = REGION_LockRgn(hrgn); if (prgnSrc == NULL) { REGION_Delete(prgnFrame); @@ -2026,7 +2026,7 @@ if (REGION_bMakeFrameRegion(prgnFrame, prgnSrc, cx, cy)) { hrgnFrame = prgnFrame->BaseObject.hHmgr; - RGNOBJAPI_Unlock(prgnFrame); + REGION_UnlockRgn(prgnFrame); } else { @@ -2034,7 +2034,7 @@ hrgnFrame = NULL; } - RGNOBJAPI_Unlock(prgnSrc); + REGION_UnlockRgn(prgnSrc); return hrgnFrame; } @@ -2319,28 +2319,23 @@ PREGION FASTCALL -RGNOBJAPI_Lock( - HRGN hRgn, - PRGN_ATTR *ppRgn_Attr) -{ - PREGION pRgn; - - pRgn = REGION_LockRgn(hRgn); - if (pRgn == NULL) +REGION_LockRgn( + _In_ HRGN hrgn) +{ + PREGION prgn; + + prgn = GDIOBJ_LockObject(hrgn, GDIObjType_RGN_TYPE); + if (prgn == NULL) return NULL; - REGION_vSyncRegion(pRgn); - - if (ppRgn_Attr) - *ppRgn_Attr = pRgn->prgnattr; - - return pRgn; + REGION_vSyncRegion(prgn); + return prgn; } VOID FASTCALL -RGNOBJAPI_Unlock( - PREGION prgn) +REGION_UnlockRgn( + _In_ PREGION prgn) { PRGN_ATTR prgnattr; @@ -2360,7 +2355,7 @@ prgnattr->AttrFlags |= ATTR_RGN_VALID; } - REGION_UnlockRgn(prgn); + GDIOBJ_vUnlockObject(&prgn->BaseObject); } /* @@ -2431,12 +2426,13 @@ PRGN_ATTR prgnattr; PPROCESSINFO ppi; - prgn = RGNOBJAPI_Lock(hRgn, &prgnattr); + prgn = REGION_LockRgn(hRgn); if (prgn == NULL) { return FALSE; } + prgnattr = prgn->prgnattr; if (prgnattr != &prgn->rgnattr) { GDIOBJ_vSetObjectAttr(&prgn->BaseObject, NULL); @@ -2445,7 +2441,7 @@ GdiPoolFree(ppi->pPoolRgnAttr, prgnattr); } - RGNOBJAPI_Unlock(prgn); + REGION_UnlockRgn(prgn); return GreSetObjectOwner(hRgn, OwnerMask); } @@ -2532,14 +2528,14 @@ PREGION Rgn; DWORD ret; - Rgn = RGNOBJAPI_Lock(hRgn, NULL); + Rgn = REGION_LockRgn(hRgn); if (Rgn == NULL) { return ERROR; } ret = REGION_GetRgnBox(Rgn, pRect); - RGNOBJAPI_Unlock(Rgn); + REGION_UnlockRgn(Rgn); return ret; } @@ -3434,7 +3430,7 @@ { /* Success, get the handle and unlock the region */ hrgn = prgn->BaseObject.hHmgr; - RGNOBJAPI_Unlock(prgn); + REGION_UnlockRgn(prgn); } else { @@ -3455,14 +3451,14 @@ PREGION Rgn; BOOL Ret; - Rgn = RGNOBJAPI_Lock(hRgn, NULL); + Rgn = REGION_LockRgn(hRgn); if (Rgn == NULL) { return ERROR; } Ret = REGION_RectInRegion(Rgn, rc); - RGNOBJAPI_Unlock(Rgn); + REGION_UnlockRgn(Rgn); return Ret; } @@ -3493,7 +3489,7 @@ (hrgnSrc1 == NULL) || ((iMode != RGN_COPY) && (hrgnSrc2 == NULL))) { - DPRINT1("NtGdiCombineRgn: %p, %p, %p, %d\n", + DPRINT1("NtGdiCombineRgn invalid parameters: %p, %p, %p, %d\n", hrgnDst, hrgnSrc1, hrgnSrc2, iMode); return ERROR; } @@ -3504,7 +3500,7 @@ ahrgn[2] = iMode != RGN_COPY ? hrgnSrc2 : NULL; if (!GDIOBJ_bLockMultipleObjects(3, (HGDIOBJ*)ahrgn, (PVOID*)aprgn, GDIObjType_RGN_TYPE)) { - DPRINT1("NtGdiCombineRgn: %p, %p, %p, %d\n", + DPRINT1("NtGdiCombineRgn failed to lock regions: %p, %p, %p, %d\n", hrgnDst, hrgnSrc1, hrgnSrc2, iMode); return ERROR; } @@ -3520,10 +3516,10 @@ iResult = IntGdiCombineRgn(aprgn[0], aprgn[1], aprgn[2], iMode); /* Unlock and return */ - RGNOBJAPI_Unlock(aprgn[0]); - RGNOBJAPI_Unlock(aprgn[1]); + REGION_UnlockRgn(aprgn[0]); + REGION_UnlockRgn(aprgn[1]); if (aprgn[2] != NULL) - RGNOBJAPI_Unlock(aprgn[2]); + REGION_UnlockRgn(aprgn[2]); return iResult; } @@ -3565,7 +3561,7 @@ hRgn = pRgn->BaseObject.hHmgr; REGION_SetRectRgn(pRgn, LeftRect, TopRect, RightRect, BottomRect); - RGNOBJAPI_Unlock(pRgn); + REGION_UnlockRgn(pRgn); DPRINT("Returning %p.\n", hRgn); @@ -3692,7 +3688,7 @@ REGION_UnionRectWithRgn(obj, &rect); } - RGNOBJAPI_Unlock(obj); + REGION_UnlockRgn(obj); return hrgn; } @@ -3702,23 +3698,46 @@ HRGN hSrcRgn1, HRGN hSrcRgn2) { + HRGN ahrgn[2]; + PREGION aprgn[2]; PREGION rgn1, rgn2; PRECTL tRect1, tRect2; ULONG i; BOOL bRet = FALSE; - /// FIXME: need to use GDIOBJ_LockMultipleObjects - - rgn1 = RGNOBJAPI_Lock(hSrcRgn1, NULL); - if (rgn1 == NULL) - return ERROR; - - rgn2 = RGNOBJAPI_Lock(hSrcRgn2, NULL); - if (rgn2 == NULL) - { - RGNOBJAPI_Unlock(rgn1); - return ERROR; - } + /* Check if we got 2 regions */ + if ((hSrcRgn1 == NULL) || (hSrcRgn2 == NULL)) + { + return FALSE; + } + + /* Check if these are the same regions */ + if (hSrcRgn1 == hSrcRgn2) + { + /* Make sure this region is valid */ + if ((GDI_HANDLE_GET_TYPE(hSrcRgn1) == GDILoObjType_LO_REGION_TYPE) && + GreIsHandleValid(hSrcRgn1)) + { + return TRUE; + } + return FALSE; + } + + /* Lock both regions */ + ahrgn[0] = hSrcRgn1; + ahrgn[1] = hSrcRgn2; + if (!GDIOBJ_bLockMultipleObjects(2, (HGDIOBJ*)ahrgn, (PVOID*)aprgn, GDIObjType_RGN_TYPE)) + { + DPRINT1("NtGdiEqualRgn failed to lock regions: %p, %p\n", + hSrcRgn1, hSrcRgn2); + return FALSE; + } + + REGION_vSyncRegion(aprgn[0]); + REGION_vSyncRegion(aprgn[1]); + + rgn1 = aprgn[0]; + rgn2 = aprgn[1]; if (rgn1->rdh.nCount != rgn2->rdh.nCount) goto exit; @@ -3753,8 +3772,8 @@ bRet = TRUE; exit: - RGNOBJAPI_Unlock(rgn1); - RGNOBJAPI_Unlock(rgn2); + REGION_UnlockRgn(rgn1); + REGION_UnlockRgn(rgn2); return bRet; } @@ -3854,12 +3873,12 @@ if (!NT_SUCCESS(Status)) { EngSetLastError(ERROR_INVALID_PARAMETER); - RGNOBJAPI_Unlock(Region); + REGION_UnlockRgn(Region); GreDeleteObject(hRgn); return NULL; } - RGNOBJAPI_Unlock(Region); + REGION_UnlockRgn(Region); return hRgn; } @@ -3875,14 +3894,14 @@ DWORD ret; NTSTATUS Status = STATUS_SUCCESS; - Rgn = RGNOBJAPI_Lock(hRgn, NULL); + Rgn = REGION_LockRgn(hRgn); if (Rgn == NULL) { return ERROR; } ret = REGION_GetRgnBox(Rgn, &SafeRect); - RGNOBJAPI_Unlock(Rgn); + REGION_UnlockRgn(Rgn); if (ret == ERROR) { return ret; @@ -3918,7 +3937,7 @@ DPRINT("NtGdiOffsetRgn: hRgn %p Xoffs %d Yoffs %d rgn %p\n", hRgn, XOffset, YOffset, rgn ); - rgn = RGNOBJAPI_Lock(hRgn, NULL); + rgn = REGION_LockRgn(hRgn); if (rgn == NULL) { DPRINT("NtGdiOffsetRgn: hRgn error\n"); @@ -3934,7 +3953,7 @@ ret = REGION_Complexity(rgn); } - RGNOBJAPI_Unlock(rgn); + REGION_UnlockRgn(rgn); return ret; } @@ -3948,13 +3967,13 @@ PREGION prgn; BOOL ret; - prgn = RGNOBJAPI_Lock(hRgn, NULL); + prgn = REGION_LockRgn(hRgn); if (prgn == NULL) return FALSE; ret = REGION_PtInRegion(prgn, X, Y); - RGNOBJAPI_Unlock(prgn); + REGION_UnlockRgn(prgn); return ret; } @@ -3999,7 +4018,7 @@ { PREGION rgn; - rgn = RGNOBJAPI_Lock(hRgn, NULL); + rgn = REGION_LockRgn(hRgn); if (rgn == NULL) { return 0; // Per documentation @@ -4007,7 +4026,7 @@ REGION_SetRectRgn(rgn, LeftRect, TopRect, RightRect, BottomRect); - RGNOBJAPI_Unlock(rgn); + REGION_UnlockRgn(rgn); return TRUE; } @@ -4033,7 +4052,7 @@ PREGION prgn; /* Lock the region */ - prgn = RGNOBJAPI_Lock(hrgn, NULL); + prgn = REGION_LockRgn(hrgn); if (prgn == NULL) { EngSetLastError(ERROR_INVALID_HANDLE); @@ -4074,7 +4093,7 @@ } /* Unlock the region and return the size */ - RGNOBJAPI_Unlock(prgn); + REGION_UnlockRgn(prgn); return cjSize; } Modified: trunk/reactos/win32ss/gdi/ntgdi/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.h [iso-8859-1] Fri Dec 19 10:34:52 2014 @@ -39,6 +39,16 @@ VOID FASTCALL REGION_Delete(PREGION); INT APIENTRY IntGdiGetRgnBox(HRGN, RECTL*); +PREGION +FASTCALL +REGION_LockRgn( + _In_ HRGN hrgn); + +VOID +FASTCALL +REGION_UnlockRgn( + _In_ PREGION prgn); + BOOL FASTCALL REGION_bXformRgn( @@ -73,8 +83,6 @@ INT FASTCALL IntGdiCombineRgn(PREGION, PREGION, PREGION, INT); INT FASTCALL REGION_Complexity(PREGION); -PREGION FASTCALL RGNOBJAPI_Lock(HRGN,PRGN_ATTR *); -VOID FASTCALL RGNOBJAPI_Unlock(PREGION); PREGION FASTCALL IntSysCreateRectpRgn(INT,INT,INT,INT); BOOL FASTCALL IntGdiSetRegionOwner(HRGN,DWORD); @@ -92,19 +100,5 @@ FASTCALL IntSysCreateRectpRgn(INT LeftRect, INT TopRect, INT RightRect, INT BottomRect); -FORCEINLINE -PREGION -REGION_LockRgn(HRGN hrgn) -{ - return GDIOBJ_LockObject(hrgn, GDIObjType_RGN_TYPE); -} - -FORCEINLINE -VOID -REGION_UnlockRgn(PREGION prgn) -{ - GDIOBJ_vUnlockObject(&prgn->BaseObject); -} - // FIXME: move this BOOL FASTCALL IntGdiPaintRgn(PDC, PREGION ); 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] Fri Dec 19 10:34:52 2014 @@ -314,15 +314,15 @@ { if (Wnd->hrgnUpdate) { - PREGION RgnUpdate = RGNOBJAPI_Lock(Wnd->hrgnUpdate, NULL); + PREGION RgnUpdate = REGION_LockRgn(Wnd->hrgnUpdate); if (RgnUpdate) { if (!IntValidateParent(Wnd, RgnUpdate, Recurse)) { - RGNOBJAPI_Unlock(RgnUpdate); + REGION_UnlockRgn(RgnUpdate); return; } - RGNOBJAPI_Unlock(RgnUpdate); + REGION_UnlockRgn(RgnUpdate); } } @@ -457,7 +457,7 @@ } else { - PREGION RgnClip = RGNOBJAPI_Lock(Wnd->hrgnClip, NULL); + PREGION RgnClip = REGION_LockRgn(Wnd->hrgnClip); if (RgnClip) { REGION_bOffsetRgn(Rgn, @@ -467,7 +467,7 @@ REGION_bOffsetRgn(Rgn, Wnd->rcWindow.left, Wnd->rcWindow.top); - RGNOBJAPI_Unlock(RgnClip); + REGION_UnlockRgn(RgnClip); } } @@ -514,11 +514,11 @@ IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_PUBLIC); } - RgnUpdate = RGNOBJAPI_Lock(Wnd->hrgnUpdate, NULL); + RgnUpdate = REGION_LockRgn(Wnd->hrgnUpdate); if (RgnUpdate) { RgnType = IntGdiCombineRgn(RgnUpdate, RgnUpdate, Rgn, RGN_OR); - RGNOBJAPI_Unlock(RgnUpdate); + REGION_UnlockRgn(RgnUpdate); if (RgnType == NULLREGION) { IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_POWNED); @@ -547,12 +547,12 @@ if (Wnd->hrgnUpdate != NULL) { - PREGION RgnUpdate = RGNOBJAPI_Lock(Wnd->hrgnUpdate, NULL); + PREGION RgnUpdate = REGION_LockRgn(Wnd->hrgnUpdate); if (RgnUpdate) { RgnType = IntGdiCombineRgn(RgnUpdate, RgnUpdate, Rgn, RGN_DIFF); - RGNOBJAPI_Unlock(RgnUpdate); + REGION_UnlockRgn(RgnUpdate); if(RgnType == NULLREGION) { @@ -1221,7 +1221,7 @@ return NULLREGION; } - UpdateRgn = RGNOBJAPI_Lock(Window->hrgnUpdate, NULL); + UpdateRgn = REGION_LockRgn(Window->hrgnUpdate); if (!UpdateRgn) return ERROR; @@ -1230,7 +1230,7 @@ REGION_SetRectRgn(Rgn, Rect.left, Rect.top, Rect.right, Rect.bottom); RegionType = IntGdiCombineRgn(Rgn, Rgn, UpdateRgn, RGN_AND); REGION_bOffsetRgn(Rgn, -Window->rcClient.left, -Window->rcClient.top); - RGNOBJAPI_Unlock(UpdateRgn); + REGION_UnlockRgn(UpdateRgn); if (bErase && RegionType != NULLREGION && RegionType != ERROR) { @@ -1278,14 +1278,14 @@ CLEANUP: if (Rgn && (_ret_ != ERROR)) { - PREGION TheRgn = RGNOBJAPI_Lock(hRgn, NULL); + PREGION TheRgn = REGION_LockRgn(hRgn); if (!TheRgn) { EngSetLastError(ERROR_INVALID_HANDLE); _ret_ = ERROR; } IntGdiCombineRgn(TheRgn, Rgn, NULL, RGN_COPY); - RGNOBJAPI_Unlock(TheRgn); + REGION_UnlockRgn(TheRgn); } if (Rgn) @@ -1336,10 +1336,10 @@ } else { - RgnData = RGNOBJAPI_Lock(Window->hrgnUpdate, NULL); + RgnData = REGION_LockRgn(Window->hrgnUpdate); ASSERT(RgnData != NULL); RegionType = REGION_GetRgnBox(RgnData, &Rect); - RGNOBJAPI_Unlock(RgnData); + REGION_UnlockRgn(RgnData); if (RegionType != ERROR && RegionType != NULLREGION) RECTL_bIntersectRect(&Rect, &Rect, &Window->rcClient); @@ -1453,14 +1453,14 @@ RETURN(FALSE); } - RgnTemp = RGNOBJAPI_Lock(hrgnUpdate, NULL); + RgnTemp = REGION_LockRgn(hrgnUpdate); if (!RgnTemp) { EngSetLastError(ERROR_INVALID_HANDLE); RETURN(FALSE); } IntGdiCombineRgn(RgnUpdate, RgnTemp, NULL, RGN_COPY); - RGNOBJAPI_Unlock(RgnTemp); + REGION_UnlockRgn(RgnTemp); } UserRefObjectCo(Wnd, &Ref); @@ -1549,7 +1549,7 @@ if (hrgnUpdate) { NT_ASSERT(RgnUpdate == NULL); - RgnUpdate = RGNOBJAPI_Lock(hrgnUpdate, NULL); + RgnUpdate = REGION_LockRgn(hrgnUpdate); if (!RgnUpdate) { DC_UnlockDc(pDC); @@ -1592,7 +1592,7 @@ if (hrgnUpdate) { - RGNOBJAPI_Unlock(RgnUpdate); + REGION_UnlockRgn(RgnUpdate); } else if (!RgnUpdate) { @@ -1786,14 +1786,14 @@ if (hrgnUpdate) { - RgnTemp = RGNOBJAPI_Lock(hrgnUpdate, NULL); + RgnTemp = REGION_LockRgn(hrgnUpdate); if (!RgnTemp) { EngSetLastError(ERROR_INVALID_HANDLE); RETURN(ERROR); } IntGdiCombineRgn(RgnUpdate, RgnTemp, NULL, RGN_COPY); - RGNOBJAPI_Unlock(RgnTemp); + REGION_UnlockRgn(RgnTemp); } /* ScrollWindow uses the window DC, ScrollWindowEx doesn't */ @@ -1941,14 +1941,14 @@ if (hrgnUpdate && (_ret_ != ERROR)) { /* Give everything back to the caller */ - RgnTemp = RGNOBJAPI_Lock(hrgnUpdate, NULL); + RgnTemp = REGION_LockRgn(hrgnUpdate); /* The handle should still be valid */ ASSERT(RgnTemp); if (RgnWinupd) IntGdiCombineRgn(RgnTemp, RgnUpdate, RgnWinupd, RGN_OR); else IntGdiCombineRgn(RgnTemp, RgnUpdate, NULL, RGN_COPY); - RGNOBJAPI_Unlock(RgnTemp); + REGION_UnlockRgn(RgnTemp); } if (RgnWinupd) 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] Fri Dec 19 10:34:52 2014 @@ -169,8 +169,8 @@ if (count == 0) count = 8; psmwp = (PSMWP) UserCreateObject( gHandleTable, - NULL, - NULL, + NULL, + NULL, (PHANDLE)&hDwp, TYPE_SETWINDOWPOS, sizeof(SMWP)); @@ -780,11 +780,11 @@ { case TWOPARAM_ROUTINE_VALIDATERGN: { - PREGION Rgn = RGNOBJAPI_Lock((HRGN)Param, NULL); + PREGION Rgn = REGION_LockRgn((HRGN)Param); if (Rgn) { Ret = (DWORD)co_UserRedrawWindow( Window, NULL, Rgn, RDW_VALIDATE); - RGNOBJAPI_Unlock(Rgn); + REGION_UnlockRgn(Rgn); } break; } Modified: trunk/reactos/win32ss/user/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/vis.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/vis.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/vis.c [iso-8859-1] Fri Dec 19 10:34:52 2014 @@ -78,13 +78,13 @@ /* Combine it with the window region if available */ if (CurrentSibling->hrgnClip && !(CurrentSibling->style & WS_MINIMIZE)) { - PREGION SiblingClipRgn = RGNOBJAPI_Lock(CurrentSibling->hrgnClip, NULL); + PREGION SiblingClipRgn = REGION_LockRgn(CurrentSibling->hrgnClip); if (SiblingClipRgn) { REGION_bOffsetRgn(ClipRgn, -CurrentSibling->rcWindow.left, -CurrentSibling->rcWindow.top); IntGdiCombineRgn(ClipRgn, ClipRgn, SiblingClipRgn, RGN_AND); REGION_bOffsetRgn(ClipRgn, CurrentSibling->rcWindow.left, CurrentSibling->rcWindow.top); - RGNOBJAPI_Unlock(SiblingClipRgn); + REGION_UnlockRgn(SiblingClipRgn); } } IntGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_DIFF); @@ -110,13 +110,13 @@ /* Combine it with the window region if available */ if (CurrentWindow->hrgnClip && !(CurrentWindow->style & WS_MINIMIZE)) { - PREGION CurrentRgnClip = RGNOBJAPI_Lock(CurrentWindow->hrgnClip, NULL); + PREGION CurrentRgnClip = REGION_LockRgn(CurrentWindow->hrgnClip); if (CurrentRgnClip) { REGION_bOffsetRgn(ClipRgn, -CurrentWindow->rcWindow.left, -CurrentWindow->rcWindow.top); IntGdiCombineRgn(ClipRgn, ClipRgn, CurrentRgnClip, RGN_AND); REGION_bOffsetRgn(ClipRgn, CurrentWindow->rcWindow.left, CurrentWindow->rcWindow.top); - RGNOBJAPI_Unlock(CurrentRgnClip); + REGION_UnlockRgn(CurrentRgnClip); } } IntGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_DIFF); @@ -128,13 +128,13 @@ if (Wnd->hrgnClip && !(Wnd->style & WS_MINIMIZE)) { - PREGION WndRgnClip = RGNOBJAPI_Lock(Wnd->hrgnClip, NULL); + PREGION WndRgnClip = REGION_LockRgn(Wnd->hrgnClip); if (WndRgnClip) { REGION_bOffsetRgn(VisRgn, -Wnd->rcWindow.left, -Wnd->rcWindow.top); IntGdiCombineRgn(VisRgn, VisRgn, WndRgnClip, RGN_AND); REGION_bOffsetRgn(VisRgn, Wnd->rcWindow.left, Wnd->rcWindow.top); - RGNOBJAPI_Unlock(WndRgnClip); + REGION_UnlockRgn(WndRgnClip); } } Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Fri Dec 19 10:34:52 2014 @@ -345,7 +345,7 @@ Fixes wine win.c:test_SetParent last ShowWindow test after popup dies. Check for previous active window to bring to top. */ - if (Wnd) + if (Wnd) { WndTo = Wnd->head.pti->MessageQueue->spwndActivePrev; if (can_activate_window( WndTo )) goto done; @@ -1902,13 +1902,13 @@ /* No use in copying bits which are in the update region. */ if (Window->hrgnUpdate != NULL) { - PREGION RgnUpdate = RGNOBJAPI_Lock(Window->hrgnUpdate, NULL); + PREGION RgnUpdate = REGION_LockRgn(Window->hrgnUpdate); if (RgnUpdate) { REGION_bOffsetRgn(CopyRgn, NewWindowRect.left, NewWindowRect.top); IntGdiCombineRgn(CopyRgn, CopyRgn, RgnUpdate, RGN_DIFF); REGION_bOffsetRgn(CopyRgn, -NewWindowRect.left, -NewWindowRect.top); - RGNOBJAPI_Unlock(RgnUpdate); + REGION_UnlockRgn(RgnUpdate); } } @@ -1927,7 +1927,7 @@ OldWindowRect.top != NewWindowRect.top) { HRGN DcRgn = NtGdiCreateRectRgn(0, 0, 0, 0); - PREGION DcRgnObj = RGNOBJAPI_Lock(DcRgn, NULL); + PREGION DcRgnObj = REGION_LockRgn(DcRgn); /* * Small trick here: there is no function to bitblt a region. So @@ -1940,7 +1940,7 @@ */ IntGdiCombineRgn(DcRgnObj, CopyRgn, NULL, RGN_COPY); REGION_bOffsetRgn(DcRgnObj, NewWindowRect.left, NewWindowRect.top); - RGNOBJAPI_Unlock(DcRgnObj); + REGION_UnlockRgn(DcRgnObj); Dc = UserGetDCEx( Window, DcRgn, DCX_WINDOW|DCX_CACHE|DCX_INTERSECTRGN|DCX_CLIPSIBLINGS|DCX_KEEPCLIPRGN);

9 years, 9 months

[tkreuzer] 65745: [WIN32K] Make sure to respect GDI object lock order in (Nt)UserScrollDC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Dec 19 09:26:50 2014 New Revision: 65745 URL: http://svn.reactos.org/svn/reactos?rev=65745&view=rev Log: [WIN32K] Make sure to respect GDI object lock order in (Nt)UserScrollDC Modified: trunk/reactos/win32ss/user/ntuser/painting.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] Fri Dec 19 09:26:50 2014 @@ -1490,6 +1490,7 @@ INT dy, const RECTL *prcScroll, const RECTL *prcClip, + HRGN hrgnUpdate, PREGION RgnUpdate, RECTL *prcUpdate) { @@ -1535,15 +1536,26 @@ /* Calculate the region that was invalidated by moving or could not be copied, because it was not visible */ - if (RgnUpdate || prcUpdate) + if (RgnUpdate || hrgnUpdate || prcUpdate) { PREGION RgnOwn, RgnTmp; pDC = DC_LockDc(hDC); if (!pDC) { - return FALSE; - } + return ERROR; + } + + if (hrgnUpdate) + { + NT_ASSERT(RgnUpdate == NULL); + RgnUpdate = RGNOBJAPI_Lock(hrgnUpdate, NULL); + if (!RgnUpdate) + { + DC_UnlockDc(pDC); + return ERROR; + } + } /* Begin with the shifted and then clipped scroll rect */ rcDst = rcScroll; @@ -1578,7 +1590,11 @@ REGION_GetRgnBox(RgnOwn, prcUpdate); } - if (!RgnUpdate) + if (hrgnUpdate) + { + RGNOBJAPI_Unlock(RgnUpdate); + } + else if (!RgnUpdate) { REGION_Delete(RgnOwn); } @@ -1609,7 +1625,6 @@ RECTL rcScroll, rcClip, rcUpdate; NTSTATUS Status = STATUS_SUCCESS; DWORD Result; - PREGION RgnUpdate = NULL; TRACE("Enter NtUserScrollDC\n"); UserEnterExclusive(); @@ -1640,13 +1655,6 @@ { SetLastNtError(Status); RETURN(FALSE); - } - - if (hrgnUpdate) - { - RgnUpdate = RGNOBJAPI_Lock(hrgnUpdate, NULL); - if (!RgnUpdate) - RETURN(FALSE); } Result = UserScrollDC( hDC, @@ -1654,7 +1662,8 @@ dy, prcUnsafeScroll? &rcScroll : 0, prcUnsafeClip? &rcClip : 0, - RgnUpdate, + hrgnUpdate, + NULL, prcUnsafeUpdate? &rcUpdate : NULL); if(Result == ERROR) { @@ -1684,8 +1693,6 @@ RETURN(TRUE); CLEANUP: - if (RgnUpdate) - RGNOBJAPI_Unlock(RgnUpdate); TRACE("Leave NtUserScrollDC, ret=%lu\n",_ret_); UserLeave(); END_CLEANUP; @@ -1824,6 +1831,7 @@ dy, &rcScroll, &rcClip, + NULL, RgnUpdate, prcUnsafeUpdate? &rcUpdate : NULL);

9 years, 9 months

[jimtabor] 65744: [Win32k] - Crash is due to receiving an APC for the current sending thread. Prematurely freeing the data block and while the receiving thread did not have a chance to process it. ...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Dec 18 23:45:11 2014 New Revision: 65744 URL: http://svn.reactos.org/svn/reactos?rev=65744&view=rev Log: [Win32k] - Crash is due to receiving an APC for the current sending thread. Prematurely freeing the data block and while the receiving thread did not have a chance to process it. Interception and calling back to user mode will allow thread to go away. What about the memory block, is it still allocated? A cleaver Hack can fix this, but still the application crashed leaving issues and trash laying about. See CORE-8779. Reference: http://msdn.microsoft.com/en-us/library/windows/hardware/ff565592(v=vs.85).… "Yes, for thread termination. No, for user APCs." Modified: trunk/reactos/win32ss/include/callback.h trunk/reactos/win32ss/user/ntuser/callback.c trunk/reactos/win32ss/user/ntuser/callback.h trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/user32/misc/dllmain.c Modified: trunk/reactos/win32ss/include/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/callback.h… ============================================================================== --- trunk/reactos/win32ss/include/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/callback.h [iso-8859-1] Thu Dec 18 23:45:11 2014 @@ -13,7 +13,8 @@ #define USER32_CALLBACK_GETCHARSETINFO (9) #define USER32_CALLBACK_COPYIMAGE (10) #define USER32_CALLBACK_SETWNDICONS (11) -#define USER32_CALLBACK_MAXIMUM (11) +#define USER32_CALLBACK_DELIVERUSERAPC (12) +#define USER32_CALLBACK_MAXIMUM (12) typedef struct _WINDOWPROC_CALLBACK_ARGUMENTS { @@ -138,4 +139,6 @@ User32CallClientLoadLibraryFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI User32CallGetCharsetInfo(PVOID Arguments, ULONG ArgumentLength); +NTSTATUS WINAPI +User32DeliverUserAPC(PVOID Arguments, ULONG ArgumentLength); #endif /* __INCLUDE_USER32_CALLBACK_H */ Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Thu Dec 18 23:45:11 2014 @@ -1100,4 +1100,24 @@ return TRUE; } +VOID FASTCALL +co_IntDeliverUserAPC(VOID) +{ + NTSTATUS Status; + UserLeaveCo(); + + Status = KeUserModeCallback(USER32_CALLBACK_DELIVERUSERAPC, + 0, + 0, + NULL, + NULL); + + + UserEnterCo(); + + if (!NT_SUCCESS(Status)) + { + ERR("Delivering User APC callback failed!\n"); + } +} /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.h [iso-8859-1] Thu Dec 18 23:45:11 2014 @@ -71,3 +71,4 @@ HANDLE FASTCALL co_IntCopyImage(HANDLE,UINT,INT,INT,UINT); BOOL FASTCALL co_IntSetWndIcons(VOID); +VOID FASTCALL co_IntDeliverUserAPC(VOID); Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Thu Dec 18 23:45:11 2014 @@ -1132,17 +1132,22 @@ /* We can't access the Message anymore since it could have already been deleted! */ - if(Block) - { + if (Block) + { + PVOID WaitObjects[2]; + + WaitObjects[0] = &CompletionEvent; // Wait 0 + WaitObjects[1] = ptirec->pEThread; // Wait 1 + UserLeaveCo(); /* Don't process messages sent to the thread */ - WaitStatus = KeWaitForSingleObject(&CompletionEvent, UserRequest, UserMode, - FALSE, (uTimeout ? &Timeout : NULL)); + WaitStatus = KeWaitForMultipleObjects(2, WaitObjects, WaitAny, UserRequest, + UserMode, FALSE, (uTimeout ? &Timeout : NULL), NULL); UserEnterCo(); - if(WaitStatus == STATUS_TIMEOUT) + if (WaitStatus == STATUS_TIMEOUT || WaitStatus == STATUS_USER_APC) { /* Look up if the message has not yet dispatched, if so make sure it can't pass a result and it must not set the completion event anymore */ @@ -1182,7 +1187,27 @@ Entry = Entry->Flink; } - TRACE("MsqSendMessage (blocked) timed out 1\n"); + TRACE("MsqSendMessage (blocked) timed out 1 Status %p\n",WaitStatus); + + } + // Receiving thread passed on and left us hanging with issues still pending. + if ( WaitStatus == STATUS_WAIT_1 ) + { + ERR("Bk Receiving Thread woken up dead!\n"); + Entry = pti->DispatchingMessagesHead.Flink; + while (Entry != &pti->DispatchingMessagesHead) + { + if ((PUSER_SENT_MESSAGE) CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, DispatchingListEntry) + == Message) + { + Message->CompletionEvent = NULL; + Message->Result = NULL; + RemoveEntryList(&Message->DispatchingListEntry); + Message->DispatchingListEntry.Flink = NULL; + break; + } + Entry = Entry->Flink; + } } while (co_MsqDispatchOneSentMessage(pti)) ; @@ -1204,7 +1229,7 @@ UserEnterCo(); - if(WaitStatus == STATUS_TIMEOUT) + if (WaitStatus == STATUS_TIMEOUT || WaitStatus == STATUS_USER_APC) { /* Look up if the message has not yet been dispatched, if so make sure it can't pass a result and it must not set the completion event anymore */ @@ -1244,13 +1269,14 @@ Entry = Entry->Flink; } - TRACE("MsqSendMessage timed out 2\n"); + TRACE("MsqSendMessage timed out 2 Status %p\n",WaitStatus); + break; } // Receiving thread passed on and left us hanging with issues still pending. if ( WaitStatus == STATUS_WAIT_2 ) { - ERR("Receiving Thread woken up dead!\n"); + ERR("NB Receiving Thread woken up dead!\n"); Entry = pti->DispatchingMessagesHead.Flink; while (Entry != &pti->DispatchingMessagesHead) { @@ -1272,8 +1298,21 @@ while (NT_SUCCESS(WaitStatus) && WaitStatus == STATUS_WAIT_1); } - if(WaitStatus != STATUS_TIMEOUT) - if (uResult) *uResult = (STATUS_WAIT_0 == WaitStatus ? Result : -1); + if ( WaitStatus == STATUS_USER_APC ) + { + // The current thread is dying! + TRACE("User APC\n"); + co_IntDeliverUserAPC(); + ERR("User APC Returned\n"); // Should not see this message. + } + + if (WaitStatus != STATUS_TIMEOUT) + { + if (uResult) + { + *uResult = (STATUS_WAIT_0 == WaitStatus ? Result : -1); + } + } return WaitStatus; } @@ -1972,6 +2011,11 @@ FALSE, NULL ); UserEnterCo(); + if ( ret == STATUS_USER_APC ) + { + TRACE("MWFNW User APC\n"); + co_IntDeliverUserAPC(); + } return ret; } Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Thu Dec 18 23:45:11 2014 @@ -200,6 +200,7 @@ User32CallGetCharsetInfo, User32CallCopyImageFromKernel, User32CallSetWndIconsFromKernel, + User32DeliverUserAPC, }; /* @@ -468,3 +469,10 @@ ERR("hIconSmWindows %p hIconWindows %p \n",hIconSmWindows,hIconWindows); return ZwCallbackReturn(Arguments, ArgumentLength, STATUS_SUCCESS); } + +NTSTATUS +WINAPI +User32DeliverUserAPC(PVOID Arguments, ULONG ArgumentLength) +{ + return ZwCallbackReturn(0, 0, STATUS_SUCCESS); +}

9 years, 9 months

← Newer
1
...
15
16
17
18
19
20
21
...
39
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 December 2014