Ros-diffs March 2020

ros-diffs@reactos.org

25 participants
156 discussions

[reactos] 01/01: [WINETESTS] */generated.c: Remove forced 0x0501 API versions

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d471558dbcb7e3ae3db0c… commit d471558dbcb7e3ae3db0c2c42b802f6224729910 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Mar 13 23:50:33 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 28 20:50:28 2020 +0100 [WINETESTS] */generated.c: Remove forced 0x0501 API versions This actually affects 2 modules only: * kernel32: this file is still commented out, these defines were going to be deactivated anyway. * rpcrt4: I don't know why it had these defines (still) activated. Anyway. Import https://source.winehq.org/git/wine.git/commit/aa384d36429110970aa72acbc5043… --- modules/rostests/winetests/gdi32/generated.c | 6 ------ modules/rostests/winetests/kernel32/generated.c | 4 ---- modules/rostests/winetests/ntdll/generated.c | 6 ------ modules/rostests/winetests/rpcrt4/generated.c | 4 ---- modules/rostests/winetests/shell32/generated.c | 6 ------ modules/rostests/winetests/shlwapi/generated.c | 6 ------ modules/rostests/winetests/urlmon/generated.c | 6 ------ modules/rostests/winetests/user32/generated.c | 6 ------ modules/rostests/winetests/wininet/generated.c | 6 ------ modules/rostests/winetests/winmm/generated.c | 4 ---- 10 files changed, 54 deletions(-) diff --git a/modules/rostests/winetests/gdi32/generated.c b/modules/rostests/winetests/gdi32/generated.c index 7a2bcfbfaff..fe3ecd937d3 100644 --- a/modules/rostests/winetests/gdi32/generated.c +++ b/modules/rostests/winetests/gdi32/generated.c @@ -5,12 +5,6 @@ * Unit tests for data structure packing */ -#ifndef __REACTOS__ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 -#endif - #define WINE_NOWINSOCK #include "windows.h" diff --git a/modules/rostests/winetests/kernel32/generated.c b/modules/rostests/winetests/kernel32/generated.c index 2f0126edb35..e465ca55ad3 100644 --- a/modules/rostests/winetests/kernel32/generated.c +++ b/modules/rostests/winetests/kernel32/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "windows.h" diff --git a/modules/rostests/winetests/ntdll/generated.c b/modules/rostests/winetests/ntdll/generated.c index d6a5c4286f8..d277e02073b 100644 --- a/modules/rostests/winetests/ntdll/generated.c +++ b/modules/rostests/winetests/ntdll/generated.c @@ -5,12 +5,6 @@ * Unit tests for data structure packing */ -#ifndef __REACTOS__ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 -#endif - #define WINE_NOWINSOCK #include "ntdll_test.h" diff --git a/modules/rostests/winetests/rpcrt4/generated.c b/modules/rostests/winetests/rpcrt4/generated.c index 7eb8faa0731..72672cd3a91 100644 --- a/modules/rostests/winetests/rpcrt4/generated.c +++ b/modules/rostests/winetests/rpcrt4/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/modules/rostests/winetests/shell32/generated.c b/modules/rostests/winetests/shell32/generated.c index d30857b9d21..55f4eab8942 100644 --- a/modules/rostests/winetests/shell32/generated.c +++ b/modules/rostests/winetests/shell32/generated.c @@ -5,12 +5,6 @@ * Unit tests for data structure packing */ -#ifndef __REACTOS__ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 -#endif - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/modules/rostests/winetests/shlwapi/generated.c b/modules/rostests/winetests/shlwapi/generated.c index e509e5c49b5..3a8e4269fc7 100644 --- a/modules/rostests/winetests/shlwapi/generated.c +++ b/modules/rostests/winetests/shlwapi/generated.c @@ -5,12 +5,6 @@ * Unit tests for data structure packing */ -#ifndef __REACTOS__ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 -#endif - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/modules/rostests/winetests/urlmon/generated.c b/modules/rostests/winetests/urlmon/generated.c index 75358140a1c..45fd5d84f30 100644 --- a/modules/rostests/winetests/urlmon/generated.c +++ b/modules/rostests/winetests/urlmon/generated.c @@ -5,12 +5,6 @@ * Unit tests for data structure packing */ -#ifndef __REACTOS__ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 -#endif - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/modules/rostests/winetests/user32/generated.c b/modules/rostests/winetests/user32/generated.c index 87dda5ec115..be1b698a2ce 100644 --- a/modules/rostests/winetests/user32/generated.c +++ b/modules/rostests/winetests/user32/generated.c @@ -5,12 +5,6 @@ * Unit tests for data structure packing */ -#ifndef __REACTOS__ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 -#endif - #define WINE_NOWINSOCK #include "windows.h" diff --git a/modules/rostests/winetests/wininet/generated.c b/modules/rostests/winetests/wininet/generated.c index 34369a8d536..f88834ab9dd 100644 --- a/modules/rostests/winetests/wininet/generated.c +++ b/modules/rostests/winetests/wininet/generated.c @@ -5,12 +5,6 @@ * Unit tests for data structure packing */ -#ifndef __REACTOS__ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 -#endif - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/modules/rostests/winetests/winmm/generated.c b/modules/rostests/winetests/winmm/generated.c index dd5e21ce489..8cb4d93fae4 100644 --- a/modules/rostests/winetests/winmm/generated.c +++ b/modules/rostests/winetests/winmm/generated.c @@ -7,10 +7,6 @@ #ifdef __REACTOS__ #define _WINE -#else -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 #endif #define WINE_NOWINSOCK

4 years, 9 months

[reactos] 02/02: [SHELL32_WINETEST] shlexec.c: Remove forced 0x0501 API versions

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d3d2b1bef984d0604d76… commit 8d3d2b1bef984d0604d760345ded1c2a1c9322ff Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Mar 12 17:07:47 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 28 20:46:44 2020 +0100 [SHELL32_WINETEST] shlexec.c: Remove forced 0x0501 API versions No impact, as already deactivated. Import https://source.winehq.org/git/wine.git/commit/8fc0b7d525ae5e85b5a796eaf6572… --- modules/rostests/winetests/shell32/shlexec.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/rostests/winetests/shell32/shlexec.c b/modules/rostests/winetests/shell32/shlexec.c index af4b8e33850..72a8c6dd129 100644 --- a/modules/rostests/winetests/shell32/shlexec.c +++ b/modules/rostests/winetests/shell32/shlexec.c @@ -30,13 +30,6 @@ * we could check */ -/* Needed to get SEE_MASK_NOZONECHECKS with the PSDK */ -#ifndef __REACTOS__ -#define NTDDI_WINXPSP1 0x05010100 -#define NTDDI_VERSION NTDDI_WINXPSP1 -#define _WIN32_WINNT 0x0501 -#endif - #include <stdio.h> #include <assert.h>

4 years, 9 months

[reactos] 01/02: [RPCRT4_WINETEST] ndr_marshall.c: Remove forced 0x0500 API versions

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d943b788ab62c8b42eb9… commit 9d943b788ab62c8b42eb95d74decbfcfc84c02f9 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Mar 12 17:07:47 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 28 20:46:44 2020 +0100 [RPCRT4_WINETEST] ndr_marshall.c: Remove forced 0x0500 API versions Import https://source.winehq.org/git/wine.git/commit/57f08ba5259e56ae681bab1e61f86… --- modules/rostests/winetests/rpcrt4/ndr_marshall.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/rostests/winetests/rpcrt4/ndr_marshall.c b/modules/rostests/winetests/rpcrt4/ndr_marshall.c index e4a4c6a7271..b206c37b233 100644 --- a/modules/rostests/winetests/rpcrt4/ndr_marshall.c +++ b/modules/rostests/winetests/rpcrt4/ndr_marshall.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x0500 -#define NTDDI_WIN2K 0x05000000 -#define NTDDI_VERSION NTDDI_WIN2K /* for some MIDL_STUB_MESSAGE fields */ #define COBJMACROS #include <stdarg.h>

4 years, 9 months

[reactos] 03/03: [ADVAPI32] wine/crypt.*: Misc fixes

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5542dd50d64ba0712fa3d… commit 5542dd50d64ba0712fa3ddca3497b8ac5bcd2949 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Mar 25 07:54:36 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 28 20:43:04 2020 +0100 [ADVAPI32] wine/crypt.*: Misc fixes Import https://source.winehq.org/git/wine.git/commit/62df03af96822bda36aef398d00bf… https://source.winehq.org/git/wine.git/commit/8b9e3dae4fb875d6a445bd5182bb6… https://source.winehq.org/git/wine.git/commit/2df16753f0008099e119f39469bad… And use explicit '#ifndef __REACTOS__'. --- dll/win32/advapi32/wine/crypt.c | 13 ++++++------- dll/win32/advapi32/wine/crypt.h | 12 +++++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dll/win32/advapi32/wine/crypt.c b/dll/win32/advapi32/wine/crypt.c index a7e130c86c9..27e70585731 100644 --- a/dll/win32/advapi32/wine/crypt.c +++ b/dll/win32/advapi32/wine/crypt.c @@ -604,7 +604,7 @@ BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer, * PARAMS * hProv [I] Handle to the CSP whose reference is being incremented. * pdwReserved [IN] Reserved for future use and must be NULL. - * dwFlags [I] Reserved for future use and must be NULL. + * dwFlags [I] Reserved for future use and must be 0. * * RETURNS * Success: TRUE @@ -628,7 +628,7 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl return FALSE; } - pProv->refcount++; + InterlockedIncrement(&pProv->refcount); return TRUE; } @@ -654,7 +654,7 @@ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) if (!pProv) { - SetLastError(NTE_BAD_UID); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -664,8 +664,7 @@ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) return FALSE; } - pProv->refcount--; - if (pProv->refcount <= 0) + if (InterlockedDecrement(&pProv->refcount) == 0) { ret = pProv->pFuncs->pCPReleaseContext(pProv->hPrivate, dwFlags); pProv->dwMagic = 0; @@ -728,7 +727,7 @@ BOOL WINAPI CryptGenRandom (HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer) * hProv [I] Handle of a CSP. * Algid [I] Identifies the hash algorithm to use. * hKey [I] Key for the hash (if required). - * dwFlags [I] Reserved for future use and must be NULL. + * dwFlags [I] Reserved for future use and must be 0. * phHash [O] Address of the future handle to the new hash object. * * RETURNS @@ -963,7 +962,7 @@ BOOL WINAPI CryptDestroyKey (HCRYPTKEY hKey) * * PARAMS * hHash [I] Handle to the hash to be copied. - * pdwReserved [I] Reserved for future use and must be zero. + * pdwReserved [I] Reserved for future use and must be NULL. * dwFlags [I] Reserved for future use and must be zero. * phHash [O] Address of the handle to receive the copy. * diff --git a/dll/win32/advapi32/wine/crypt.h b/dll/win32/advapi32/wine/crypt.h index 75cf937fda2..0b101bb0b01 100644 --- a/dll/win32/advapi32/wine/crypt.h +++ b/dll/win32/advapi32/wine/crypt.h @@ -21,11 +21,13 @@ #ifndef __WINE_CRYPT_H #define __WINE_CRYPT_H -//#include <stdarg.h> +#ifndef __REACTOS__ +#include <stdarg.h> -//#include "windef.h" -//#include "winbase.h" -//#include "wincrypt.h" +#include "windef.h" +#include "winbase.h" +#include "wincrypt.h" +#endif typedef struct tagPROVFUNCS { @@ -63,7 +65,7 @@ typedef struct tagPROVFUNCS typedef struct tagCRYPTPROV { DWORD dwMagic; - UINT refcount; + LONG refcount; HMODULE hModule; PPROVFUNCS pFuncs; HCRYPTPROV hPrivate; /*CSP's handle - Should not be given to application under any circumstances!*/

4 years, 9 months

[reactos] 02/03: [ADVAPI32][PSDK] CryptReleaseContext(): dwFlags parameter is DWORD, only

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ae8083378546fc7d907e… commit 8ae8083378546fc7d907e489aeebddbe3c8d9399 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Mar 12 17:14:06 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 28 20:43:03 2020 +0100 [ADVAPI32][PSDK] CryptReleaseContext(): dwFlags parameter is DWORD, only Import https://source.winehq.org/git/wine.git/commit/9cc8b501eea8dc3bd589ab3e5df3b… --- dll/win32/advapi32/wine/crypt.c | 8 ++------ sdk/include/psdk/wincrypt.h | 4 ---- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dll/win32/advapi32/wine/crypt.c b/dll/win32/advapi32/wine/crypt.c index 25cf65e8371..a7e130c86c9 100644 --- a/dll/win32/advapi32/wine/crypt.c +++ b/dll/win32/advapi32/wine/crypt.c @@ -639,22 +639,18 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl * * PARAMS * hProv [I] Handle of a CSP. - * dwFlags [I] Reserved for future use and must be NULL. + * dwFlags [I] Reserved for future use and must be 0. * * RETURNS * Success: TRUE * Failure: FALSE */ -#ifdef __REACTOS__ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) -#else -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) -#endif { PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE; - TRACE("(0x%lx, %08lx)\n", hProv, dwFlags); + TRACE("(0x%lx, %08x)\n", hProv, dwFlags); if (!pProv) { diff --git a/sdk/include/psdk/wincrypt.h b/sdk/include/psdk/wincrypt.h index f0c2f5f2535..930a07de1dc 100644 --- a/sdk/include/psdk/wincrypt.h +++ b/sdk/include/psdk/wincrypt.h @@ -4395,11 +4395,7 @@ CryptImportKey( _In_ DWORD dwFlags, _Out_ HCRYPTKEY *phKey); -#if (NTDDI_VERSION >= NTDDI_WINXP) WINADVAPI BOOL WINAPI CryptReleaseContext(_In_ HCRYPTPROV, _In_ DWORD); -#else -WINADVAPI BOOL WINAPI CryptReleaseContext(_In_ HCRYPTPROV, _In_ ULONG_PTR); -#endif WINADVAPI BOOL

4 years, 9 months

[reactos] 01/03: [ADVAPI32] wine: Remove remnant ros_diff.patch

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df224cb7104378ef7f61f… commit df224cb7104378ef7f61fbdce22db2f7d56dd396 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Mar 12 17:07:47 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 28 20:43:03 2020 +0100 [ADVAPI32] wine: Remove remnant ros_diff.patch Added on 4234345b03677c2b01d0f313108e24d684e4d2ed (r48090), merged on d4a89f6ccaf19953acf0d218e9e0f985c5d6004b. CORE-14434 --- dll/win32/advapi32/wine/ros_diff.patch | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dll/win32/advapi32/wine/ros_diff.patch b/dll/win32/advapi32/wine/ros_diff.patch deleted file mode 100644 index a6c0c08c138..00000000000 --- a/dll/win32/advapi32/wine/ros_diff.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: crypt.c -=================================================================== ---- crypt.c (Revision 48087) -+++ crypt.c (Arbeitskopie) -@@ -618,7 +618,7 @@ - * Success: TRUE - * Failure: FALSE - */ --BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) -+BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) - { - PCRYPTPROV pProv = (PCRYPTPROV)hProv; - BOOL ret = TRUE;

4 years, 9 months

[reactos] 01/01: [WORDPAD] Restore code commas in no-NO.rc

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16f47d5e6f4d54b4166b8… commit 16f47d5e6f4d54b4166b89844286da5f9d68bb09 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Mar 27 17:15:27 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 28 20:40:34 2020 +0100 [WORDPAD] Restore code commas in no-NO.rc ".../no-NO.rc:81: syntax error" --- base/applications/wordpad/lang/no-NO.rc | 46 ++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/base/applications/wordpad/lang/no-NO.rc b/base/applications/wordpad/lang/no-NO.rc index af4c0dc5b0a..a764d952616 100644 --- a/base/applications/wordpad/lang/no-NO.rc +++ b/base/applications/wordpad/lang/no-NO.rc @@ -78,9 +78,9 @@ BEGIN POPUP "F&ormat" BEGIN MENUITEM "&Skrift...", ID_FONTSETTINGS - MENUITEM "&Punktmerking" ID_BULLET - MENUITEM "&Avsnitt..." ID_PARAFORMAT - MENUITEM "&Tabulatorer..." ID_TABSTOPS + MENUITEM "&Punktmerking", ID_BULLET + MENUITEM "&Avsnitt...", ID_PARAFORMAT + MENUITEM "&Tabulatorer...", ID_TABSTOPS POPUP "&Bakgrunn" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 @@ -89,7 +89,7 @@ BEGIN END POPUP "&Hjelp" BEGIN - MENUITEM "&Om Wine Wordpad" ID_ABOUT + MENUITEM "&Om Wine Wordpad", ID_ABOUT END END @@ -101,8 +101,8 @@ BEGIN MENUITEM "&Kopier", ID_EDIT_COPY MENUITEM "&Lim inn", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Punktmerking" ID_BULLET - MENUITEM "&Avsnitt..." ID_PARAFORMAT + MENUITEM "&Punktmerking", ID_BULLET + MENUITEM "&Avsnitt...", ID_PARAFORMAT END END @@ -110,23 +110,23 @@ IDM_COLOR_POPUP MENU BEGIN POPUP "" BEGIN - MENUITEM "Svart", ID_COLOR_BLACK - MENUITEM "Rødbrun", ID_COLOR_MAROON - MENUITEM "Grønn", ID_COLOR_GREEN - MENUITEM "Oliven" ID_COLOR_OLIVE - MENUITEM "Marineblå" ID_COLOR_NAVY - MENUITEM "Purpur" ID_COLOR_PURPLE - MENUITEM "Blågrønn" ID_COLOR_TEAL - MENUITEM "Grå" ID_COLOR_GRAY - MENUITEM "Sølv" ID_COLOR_SILVER - MENUITEM "Rød" ID_COLOR_RED - MENUITEM "Lime-grønn" ID_COLOR_LIME - MENUITEM "Gul" ID_COLOR_YELLOW - MENUITEM "Blå" ID_COLOR_BLUE - MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Turkis" ID_COLOR_AQUA - MENUITEM "Hvit" ID_COLOR_WHITE - MENUITEM "Automatisk" ID_COLOR_AUTOMATIC + MENUITEM "Svart", ID_COLOR_BLACK + MENUITEM "Rødbrun", ID_COLOR_MAROON + MENUITEM "Grønn", ID_COLOR_GREEN + MENUITEM "Oliven", ID_COLOR_OLIVE + MENUITEM "Marineblå", ID_COLOR_NAVY + MENUITEM "Purpur", ID_COLOR_PURPLE + MENUITEM "Blågrønn", ID_COLOR_TEAL + MENUITEM "Grå", ID_COLOR_GRAY + MENUITEM "Sølv", ID_COLOR_SILVER + MENUITEM "Rød", ID_COLOR_RED + MENUITEM "Lime-grønn", ID_COLOR_LIME + MENUITEM "Gul", ID_COLOR_YELLOW + MENUITEM "Blå", ID_COLOR_BLUE + MENUITEM "Fuchsia", ID_COLOR_FUCHSIA + MENUITEM "Turkis", ID_COLOR_AQUA + MENUITEM "Hvit", ID_COLOR_WHITE + MENUITEM "Automatisk", ID_COLOR_AUTOMATIC END END

4 years, 9 months

[reactos] 01/01: [KMTEST] Delete special-purpose driver services on unload. ROSTESTS-263

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f027384e481678e9ec64b… commit f027384e481678e9ec64b9d6525d3123e53f5de4 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Mar 28 20:31:31 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 28 20:33:43 2020 +0100 [KMTEST] Delete special-purpose driver services on unload. ROSTESTS-263 Based on a patch by Serge Gautherie. --- modules/rostests/kmtests/kmtest/support.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/rostests/kmtests/kmtest/support.c b/modules/rostests/kmtests/kmtest/support.c index 13bd66b323d..0f0ad64ce45 100644 --- a/modules/rostests/kmtests/kmtest/support.c +++ b/modules/rostests/kmtests/kmtest/support.c @@ -2,8 +2,9 @@ * PROJECT: ReactOS kernel-mode tests * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) * PURPOSE: Kernel-Mode Test Suite user-mode support routines - * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> + * COPYRIGHT: Copyright 2011-2020 Thomas Faber <thomas.faber(a)reactos.org> * Copyright 2013 Nikolay Borisov <nib9(a)aber.ac.uk> + * Copyright 2018 Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> */ #include <kmt_test.h> @@ -149,19 +150,25 @@ KmtLoadDriver( /** * @name KmtUnloadDriver * - * Unload special-purpose driver (stop the service) + * Unload special-purpose driver (stop and delete the service) */ VOID KmtUnloadDriver(VOID) { - DWORD Error = ERROR_SUCCESS; + DWORD Error; Error = KmtStopService(TestServiceName, &TestServiceHandle); if (Error) { - // TODO - __debugbreak(); + fprintf(stderr, "Failed to stop %ls service with error 0x%lx\n", TestServiceName, Error); + } + + Error = KmtDeleteService(TestServiceName, &TestServiceHandle); + + if (Error) + { + fprintf(stderr, "Failed to delete %ls service with error 0x%lx\n", TestServiceName, Error); } }

4 years, 9 months

[reactos] 01/01: [Win32SS] Form Sanity to Hook Callbacks

by jimtabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=915a5764a98be6f8a0347… commit 915a5764a98be6f8a03471d68a55e4b1a5899f66 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Sat Mar 28 14:18:14 2020 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Sat Mar 28 14:18:14 2020 -0500 [Win32SS] Form Sanity to Hook Callbacks Fix WH_CALLWNDPROC/RET data to user hook calls. See CORE-13019 and CORE-13907. --- win32ss/include/callback.h | 15 ++++++++++ win32ss/user/ntuser/callback.c | 60 +++++++++++++++++++++++--------------- win32ss/user/user32/windows/hook.c | 30 ++++++++++--------- 3 files changed, 69 insertions(+), 36 deletions(-) diff --git a/win32ss/include/callback.h b/win32ss/include/callback.h index 5b6f49ce3a2..7eef1d6c278 100644 --- a/win32ss/include/callback.h +++ b/win32ss/include/callback.h @@ -61,6 +61,7 @@ typedef struct _HOOKPROC_CALLBACK_ARGUMENTS ULONG_PTR offPfn; BOOLEAN Ansi; LRESULT Result; + UINT lParamSize; WCHAR ModuleName[512]; } HOOKPROC_CALLBACK_ARGUMENTS, *PHOOKPROC_CALLBACK_ARGUMENTS; @@ -72,6 +73,20 @@ typedef struct _HOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS /* WCHAR szClass[] */ } HOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS, *PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS; +typedef struct tagCWP_Struct +{ + HOOKPROC_CALLBACK_ARGUMENTS hpca; + CWPSTRUCT cwps; + PBYTE Extra[4]; +} CWP_Struct, *PCWP_Struct; + +typedef struct tagCWPR_Struct +{ + HOOKPROC_CALLBACK_ARGUMENTS hpca; + CWPRETSTRUCT cwprs; + PBYTE Extra[4]; +} CWPR_Struct, *PCWPR_Struct; + typedef struct _EVENTPROC_CALLBACK_ARGUMENTS { HWINEVENTHOOK hook; diff --git a/win32ss/user/ntuser/callback.c b/win32ss/user/ntuser/callback.c index 42d50002d33..1497d72a892 100644 --- a/win32ss/user/ntuser/callback.c +++ b/win32ss/user/ntuser/callback.c @@ -509,6 +509,8 @@ co_IntLoadDefaultCursors(VOID) return TRUE; } +static INT iTheId = -2; // Set it out of range. + LRESULT APIENTRY co_IntCallHookProc(INT HookId, INT Code, @@ -535,6 +537,8 @@ co_IntCallHookProc(INT HookId, PMSG pMsg = NULL; BOOL Hit = FALSE; UINT lParamSize = 0; + CWPSTRUCT* pCWP = NULL; + CWPRETSTRUCT* pCWPR = NULL; ASSERT(Proc); /* Do not allow the desktop thread to do callback to user mode */ @@ -593,27 +597,27 @@ co_IntCallHookProc(INT HookId, goto Fault_Exit; } break; - case WH_KEYBOARD_LL: + case WH_KEYBOARD_LL: ArgumentLength += sizeof(KBDLLHOOKSTRUCT); break; - case WH_MOUSE_LL: + case WH_MOUSE_LL: ArgumentLength += sizeof(MSLLHOOKSTRUCT); break; - case WH_MOUSE: + case WH_MOUSE: ArgumentLength += sizeof(MOUSEHOOKSTRUCT); break; case WH_CALLWNDPROC: { - CWPSTRUCT* pCWP = (CWPSTRUCT*) lParam; - ArgumentLength += sizeof(CWPSTRUCT); + pCWP = (CWPSTRUCT*) lParam; + ArgumentLength = sizeof(CWP_Struct); lParamSize = lParamMemorySize(pCWP->message, pCWP->wParam, pCWP->lParam); ArgumentLength += lParamSize; break; } case WH_CALLWNDPROCRET: { - CWPRETSTRUCT* pCWPR = (CWPRETSTRUCT*) lParam; - ArgumentLength += sizeof(CWPRETSTRUCT); + pCWPR = (CWPRETSTRUCT*) lParam; + ArgumentLength = sizeof(CWPR_Struct); lParamSize = lParamMemorySize(pCWPR->message, pCWPR->wParam, pCWPR->lParam); ArgumentLength += lParamSize; break; @@ -647,6 +651,7 @@ co_IntCallHookProc(INT HookId, Common->Mod = Mod; Common->offPfn = offPfn; Common->Ansi = Ansi; + Common->lParamSize = lParamSize; RtlZeroMemory(&Common->ModuleName, sizeof(Common->ModuleName)); if (ModuleName->Buffer && ModuleName->Length) { @@ -697,25 +702,27 @@ co_IntCallHookProc(INT HookId, Common->lParam = (LPARAM) (Extra - (PCHAR) Common); break; case WH_CALLWNDPROC: + { + PCWP_Struct pcwps = (PCWP_Struct)Common; + RtlCopyMemory( &pcwps->cwps, pCWP, sizeof(CWPSTRUCT)); /* For CALLWNDPROC and CALLWNDPROCRET, we must be wary of the fact that * lParam could be a pointer to a buffer. This buffer must be exported * to user space too */ - RtlCopyMemory(Extra, (PVOID) lParam, sizeof(CWPSTRUCT)); - Common->lParam = (LPARAM) (Extra - (PCHAR) Common); - if(lParamSize) + if ( lParamSize ) { - RtlCopyMemory(Extra + sizeof(CWPSTRUCT), (PVOID)((CWPSTRUCT*)lParam)->lParam, lParamSize); - ((CWPSTRUCT*)Extra)->lParam = (LPARAM)lParamSize; + RtlCopyMemory( &pcwps->Extra, (PVOID)pCWP->lParam, lParamSize ); } + } break; case WH_CALLWNDPROCRET: - RtlCopyMemory(Extra, (PVOID) lParam, sizeof(CWPRETSTRUCT)); - Common->lParam = (LPARAM) (Extra - (PCHAR) Common); - if(lParamSize) + { + PCWPR_Struct pcwprs = (PCWPR_Struct)Common; + RtlCopyMemory( &pcwprs->cwprs, pCWPR, sizeof(CWPRETSTRUCT)); + if ( lParamSize ) { - RtlCopyMemory(Extra + sizeof(CWPRETSTRUCT), (PVOID)((CWPRETSTRUCT*)lParam)->lParam, lParamSize); - ((CWPRETSTRUCT*)Extra)->lParam = (LPARAM)lParamSize; + RtlCopyMemory( &pcwprs->Extra, (PVOID)pCWPR->lParam, lParamSize ); } + } break; case WH_MSGFILTER: case WH_SYSMSGFILTER: @@ -745,7 +752,11 @@ co_IntCallHookProc(INT HookId, if (!NT_SUCCESS(Status)) { - ERR("Failure to make Callback! Status 0x%x\n",Status); + if ( iTheId != HookId ) // Hook ID can change. + { + ERR("Failure to make Callback %d! Status 0x%x\n",HookId,Status); + iTheId = HookId; + } goto Fault_Exit; } @@ -1216,12 +1227,13 @@ APIENTRY co_UserCBClientPrinterThunk( PVOID pkt, INT InSize, PVOID pvOutData, INT OutSize ) { NTSTATUS Status; + PVOID ResultPointer; - Status = KeUserModeCallback(USER32_CALLBACK_UMPD, - pkt, - InSize, - pvOutData, - (PULONG)&OutSize); + Status = KeUserModeCallback( USER32_CALLBACK_UMPD, + pkt, + InSize, + &ResultPointer, + (PULONG)&OutSize ); if (!NT_SUCCESS(Status)) @@ -1230,6 +1242,8 @@ co_UserCBClientPrinterThunk( PVOID pkt, INT InSize, PVOID pvOutData, INT OutSize return 1; } + if (OutSize) RtlMoveMemory( pvOutData, ResultPointer, OutSize ); + return 0; } diff --git a/win32ss/user/user32/windows/hook.c b/win32ss/user/user32/windows/hook.c index e0cb8e4a041..f525bf1cc5a 100644 --- a/win32ss/user/user32/windows/hook.c +++ b/win32ss/user/user32/windows/hook.c @@ -699,35 +699,39 @@ User32CallHookProcFromKernel(PVOID Arguments, ULONG ArgumentLength) _SEH2_END; break; case WH_CALLWNDPROC: -// ERR("WH_CALLWNDPROC: Code %d, wParam %d\n",Common->Code,Common->wParam); - pCWP = HeapAlloc(GetProcessHeap(), 0, ArgumentLength - sizeof(HOOKPROC_CALLBACK_ARGUMENTS)); - RtlCopyMemory(pCWP, (PCHAR) Common + Common->lParam, sizeof(CWPSTRUCT)); + { + PCWP_Struct pcwps = (PCWP_Struct)Common; + CWPSTRUCT *pCWPT = &pcwps->cwps; + pCWP = HeapAlloc(GetProcessHeap(), 0, Common->lParamSize + sizeof(CWPSTRUCT)); + RtlCopyMemory(pCWP, pCWPT, sizeof(CWPSTRUCT)); +// ERR("WH_CALLWNDPROC: Code %d, wParam %d msg %d\n",Common->Code,Common->wParam,pCWP->message); /* If more memory is reserved, then lParam is a pointer. * Size of the buffer is stocked in the lParam member, and its content * is at the end of the argument buffer */ - if(ArgumentLength > (sizeof(CWPSTRUCT) + sizeof(HOOKPROC_CALLBACK_ARGUMENTS))) + if ( Common->lParamSize ) { - RtlCopyMemory((PCHAR)pCWP + sizeof(CWPSTRUCT), - (PCHAR)Common + Common->lParam + sizeof(CWPSTRUCT), - pCWP->lParam); pCWP->lParam = (LPARAM)((PCHAR)pCWP + sizeof(CWPSTRUCT)); + RtlCopyMemory( (PCHAR)pCWP + sizeof(CWPSTRUCT), &pcwps->Extra, Common->lParamSize ); } Result = Proc(Common->Code, Common->wParam, (LPARAM) pCWP); HeapFree(GetProcessHeap(), 0, pCWP); + } break; case WH_CALLWNDPROCRET: /* Almost the same as WH_CALLWNDPROC */ - pCWPR = HeapAlloc(GetProcessHeap(), 0, ArgumentLength - sizeof(HOOKPROC_CALLBACK_ARGUMENTS)); - RtlCopyMemory(pCWPR, (PCHAR) Common + Common->lParam, sizeof(CWPRETSTRUCT)); - if(ArgumentLength > (sizeof(CWPRETSTRUCT) + sizeof(HOOKPROC_CALLBACK_ARGUMENTS))) + { + PCWPR_Struct pcwprs = (PCWPR_Struct)Common; + CWPRETSTRUCT *pCWPRT = &pcwprs->cwprs; + pCWPR = HeapAlloc(GetProcessHeap(), 0, Common->lParamSize + sizeof(CWPRETSTRUCT)); + RtlCopyMemory(pCWPR, pCWPRT, sizeof(CWPSTRUCT)); + if ( Common->lParamSize ) { - RtlCopyMemory((PCHAR)pCWPR + sizeof(CWPRETSTRUCT), - (PCHAR)Common + Common->lParam + sizeof(CWPRETSTRUCT), - pCWPR->lParam); pCWPR->lParam = (LPARAM)((PCHAR)pCWPR + sizeof(CWPRETSTRUCT)); + RtlCopyMemory( (PCHAR)pCWPR + sizeof(CWPRETSTRUCT), &pcwprs->Extra, Common->lParamSize ); } Result = Proc(Common->Code, Common->wParam, (LPARAM) pCWPR); HeapFree(GetProcessHeap(), 0, pCWPR); + } break; case WH_MSGFILTER: /* All SEH support */ case WH_SYSMSGFILTER:

4 years, 9 months

[reactos] 01/01: [User32] Fix null return.

by jimtabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8add40e893c4bbbb7221… commit d8add40e893c4bbbb72211cae3e351445e53a3f4 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Sat Mar 28 14:03:15 2020 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Sat Mar 28 14:03:15 2020 -0500 [User32] Fix null return. See CORE-16769. --- win32ss/user/user32/windows/window.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index 40f051d3b6d..60c9feb47f5 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -159,16 +159,18 @@ RtlGetExpWinVer( HMODULE hModule ) if ( hModule && !((ULONG_PTR)hModule >> 16)) { pinth = RtlImageNtHeader( hModule ); - - dwMajorVersion = pinth->OptionalHeader.MajorSubsystemVersion; - - if ( dwMajorVersion == 1 ) - { - dwMajorVersion = 3; - } - else + if ( pinth ) { - dwMinorVersion = pinth->OptionalHeader.MinorSubsystemVersion; + dwMajorVersion = pinth->OptionalHeader.MajorSubsystemVersion; + + if ( dwMajorVersion == 1 ) + { + dwMajorVersion = 3; + } + else + { + dwMinorVersion = pinth->OptionalHeader.MinorSubsystemVersion; + } } } return MAKELONG(MAKEWORD(dwMinorVersion, dwMajorVersion), 0);

4 years, 9 months

← Newer
1
2
3
4
5
6
7
...
16
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 2020