Ros-diffs April 2022

ros-diffs@reactos.org

22 participants
157 discussions

[reactos] 09/14: [SECUR32] Do not declare global variables in a header

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98aabbcf9ff19c8d33300… commit 98aabbcf9ff19c8d33300ff966a45dc0163d4655 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Apr 26 03:03:28 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Apr 26 03:38:38 2022 +0300 [SECUR32] Do not declare global variables in a header --- dll/win32/secur32/wine/ntlm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/secur32/wine/ntlm.h b/dll/win32/secur32/wine/ntlm.h index 0006ad573aa..3338be52226 100644 --- a/dll/win32/secur32/wine/ntlm.h +++ b/dll/win32/secur32/wine/ntlm.h @@ -110,7 +110,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle) DECLSPEC_HIDDE SECURITY_STATUS SEC_ENTRY ntlm_MakeSignature(PCtxtHandle, ULONG, PSecBufferDesc, ULONG) DECLSPEC_HIDDEN; SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle, PSecBufferDesc, ULONG, PULONG) DECLSPEC_HIDDEN; -SecPkgInfoW *ntlm_package_infoW DECLSPEC_HIDDEN; -SecPkgInfoA *ntlm_package_infoA DECLSPEC_HIDDEN; +extern SecPkgInfoW *ntlm_package_infoW DECLSPEC_HIDDEN; +extern SecPkgInfoA *ntlm_package_infoA DECLSPEC_HIDDEN; #endif /* __WINE_NTLM_H__ */

2 years, 8 months

[reactos] 08/14: [WINED3D] Do not declare global variables in a header

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2c667c616580c2ffd516… commit d2c667c616580c2ffd516486b4212bf05ccff249 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Apr 26 02:50:33 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Apr 26 03:38:37 2022 +0300 [WINED3D] Do not declare global variables in a header --- dll/directx/wine/wined3d/state.c | 3 +++ dll/directx/wine/wined3d/wined3d_gl.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dll/directx/wine/wined3d/state.c b/dll/directx/wine/wined3d/state.c index 2f506c36d16..890af9c2ee0 100644 --- a/dll/directx/wine/wined3d/state.c +++ b/dll/directx/wine/wined3d/state.c @@ -38,6 +38,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_shader); +void (WINE_GLAPI *glDisableWINE)(GLenum cap); +void (WINE_GLAPI *glEnableWINE)(GLenum cap); + ULONG CDECL wined3d_blend_state_incref(struct wined3d_blend_state *state) { ULONG refcount = InterlockedIncrement(&state->refcount); diff --git a/dll/directx/wine/wined3d/wined3d_gl.h b/dll/directx/wine/wined3d/wined3d_gl.h index 87283c850e1..f9fd9c307fa 100644 --- a/dll/directx/wine/wined3d/wined3d_gl.h +++ b/dll/directx/wine/wined3d/wined3d_gl.h @@ -28,8 +28,8 @@ #define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837 /* not in the gl spec */ -void (WINE_GLAPI *glDisableWINE)(GLenum cap) DECLSPEC_HIDDEN; -void (WINE_GLAPI *glEnableWINE)(GLenum cap) DECLSPEC_HIDDEN; +extern void (WINE_GLAPI *glDisableWINE)(GLenum cap) DECLSPEC_HIDDEN; +extern void (WINE_GLAPI *glEnableWINE)(GLenum cap) DECLSPEC_HIDDEN; /* OpenGL extensions. */ enum wined3d_gl_extension

2 years, 8 months

[reactos] 07/14: [HALX86] Do not define unnamed enums

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4295b007aea0b4ed74476… commit 4295b007aea0b4ed74476d3faef8235a5747acc2 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Apr 26 02:38:30 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Apr 26 03:38:37 2022 +0300 [HALX86] Do not define unnamed enums --- hal/halx86/apic/apicp.h | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/hal/halx86/apic/apicp.h b/hal/halx86/apic/apicp.h index a532fdcad8d..245ab197f59 100644 --- a/hal/halx86/apic/apicp.h +++ b/hal/halx86/apic/apicp.h @@ -170,7 +170,7 @@ typedef enum _APIC_RRS } APIC_RRS; /* Timer Constants */ -enum _TIMER_DV +typedef enum _TIMER_DV { TIMER_DV_DivideBy2 = 0, TIMER_DV_DivideBy4 = 1, @@ -277,20 +277,14 @@ typedef union _LVT_REGISTER } LVT_REGISTER; /* IOAPIC offsets */ -enum -{ - IOAPIC_IOREGSEL = 0x00, - IOAPIC_IOWIN = 0x10 -}; +#define IOAPIC_IOREGSEL 0x00 +#define IOAPIC_IOWIN 0x10 /* IOAPIC Constants */ -enum -{ - IOAPIC_ID = 0x00, - IOAPIC_VER = 0x01, - IOAPIC_ARB = 0x02, - IOAPIC_REDTBL = 0x10 -}; +#define IOAPIC_ID 0x00 +#define IOAPIC_VER 0x01 +#define IOAPIC_ARB 0x02 +#define IOAPIC_REDTBL 0x10 typedef union _IOAPIC_REDIRECTION_REGISTER {

2 years, 8 months

[reactos] 06/14: [DBGHELP_APITEST][SDK_APITEST] Fix initializing global variables

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=522e9f6dd34d2934b3280… commit 522e9f6dd34d2934b328041580844b0f4e03969f Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Apr 26 02:37:07 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Apr 26 03:38:37 2022 +0300 [DBGHELP_APITEST][SDK_APITEST] Fix initializing global variables --- modules/rostests/apitests/dbghelp/pdb.c | 9 +++++---- modules/rostests/apitests/sdk/delayimp.cpp | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/rostests/apitests/dbghelp/pdb.c b/modules/rostests/apitests/dbghelp/pdb.c index 68aab4942bb..e36a1b8fee5 100644 --- a/modules/rostests/apitests/dbghelp/pdb.c +++ b/modules/rostests/apitests/dbghelp/pdb.c @@ -15,6 +15,8 @@ #include "wine/test.h" +extern PfnDliHook __pfnDliFailureHook2; + #define ok_ulonglong(expression, result) \ do { \ ULONG64 _value = (expression); \ @@ -217,10 +219,6 @@ FARPROC WINAPI DliFailHook(unsigned dliNotify, PDelayLoadInfo pdli) return NULL; } -/* Register the failure hook using the magic name '__pfnDliFailureHook2'. */ -PfnDliHook __pfnDliFailureHook2 = DliFailHook; - - /* Maybe our dbghelp.dll is too old? */ static BOOL supports_pdb(HANDLE hProc, DWORD64 BaseAddress) { @@ -582,6 +580,9 @@ START_TEST(pdb) init_dbghelp_version(); + /* Register the failure hook using the magic name '__pfnDliFailureHook2'. */ + __pfnDliFailureHook2 = DliFailHook; + if (init_sym(FALSE)) { SetLastError(ERROR_SUCCESS); diff --git a/modules/rostests/apitests/sdk/delayimp.cpp b/modules/rostests/apitests/sdk/delayimp.cpp index 7073f001932..bad395e4f4e 100644 --- a/modules/rostests/apitests/sdk/delayimp.cpp +++ b/modules/rostests/apitests/sdk/delayimp.cpp @@ -369,7 +369,7 @@ LONG ExceptionFilter(IN PEXCEPTION_POINTERS ExceptionInfo, ULONG ExceptionCode) so that we can check that both fallback and registration work*/ extern "C" { - PfnDliHook __pfnDliNotifyHook2 = DliHook; + extern PfnDliHook __pfnDliNotifyHook2; //PfnDliHook __pfnDliFailureHook2 = DliFailHook; } @@ -401,6 +401,7 @@ unsigned g_imagehlp[] = { dliStartProcessing, dliNotePreLoadLibrary, dliFailLoad //#define DELAYLOAD_SUPPORTS_UNLOADING START_TEST(delayimp) { + __pfnDliNotifyHook2 = DliHook; /* Verify that both scenario's work */ ok(__pfnDliNotifyHook2 == DliHook, "Expected __pfnDliNotifyHook2 to be DliHook(%p), but was: %p\n", DliHook, __pfnDliNotifyHook2);

2 years, 8 months

[reactos] 05/14: [WS2_32_APITEST] Convert global variables to static ones

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=590e36479cd3943355302… commit 590e36479cd394335530269b7cebe858847e0e81 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Apr 26 02:30:23 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Apr 26 03:38:37 2022 +0300 [WS2_32_APITEST] Convert global variables to static ones --- modules/rostests/apitests/ws2_32/bind.c | 2 +- modules/rostests/apitests/ws2_32/getaddrinfo.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/ws2_32/bind.c b/modules/rostests/apitests/ws2_32/bind.c index bf9069d1697..2ff5524db1e 100644 --- a/modules/rostests/apitests/ws2_32/bind.c +++ b/modules/rostests/apitests/ws2_32/bind.c @@ -7,7 +7,7 @@ #include "ws2_32.h" -CHAR LocalAddress[sizeof("255.255.255.255")]; +static CHAR LocalAddress[sizeof("255.255.255.255")]; #define PORT 58888 static diff --git a/modules/rostests/apitests/ws2_32/getaddrinfo.c b/modules/rostests/apitests/ws2_32/getaddrinfo.c index c06ca268c16..3fd915da9ad 100644 --- a/modules/rostests/apitests/ws2_32/getaddrinfo.c +++ b/modules/rostests/apitests/ws2_32/getaddrinfo.c @@ -27,7 +27,7 @@ ok_dec(((SOCKADDR_IN *)(sockaddr))->sin_zero[_i], 0); \ } while (0) -CHAR LocalAddress[sizeof("255.255.255.255")]; +static CHAR LocalAddress[sizeof("255.255.255.255")]; static VOID

2 years, 8 months

[reactos] 04/14: [LIBTIRPC] Do not declare global variables in a header

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5632aa5d82e244f16edec… commit 5632aa5d82e244f16edec2b5991f2ea952bd2094 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Mar 24 02:46:53 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Apr 26 03:38:36 2022 +0300 [LIBTIRPC] Do not declare global variables in a header --- dll/3rdparty/libtirpc/src/rpc_com.h | 5 ++--- dll/3rdparty/libtirpc/src/rpc_commondata.c | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dll/3rdparty/libtirpc/src/rpc_com.h b/dll/3rdparty/libtirpc/src/rpc_com.h index 0658438379a..a69d7f0c3d3 100644 --- a/dll/3rdparty/libtirpc/src/rpc_com.h +++ b/dll/3rdparty/libtirpc/src/rpc_com.h @@ -92,9 +92,8 @@ bool_t __xdrrec_getrec(XDR *, enum xprt_stat *, bool_t); void __xprt_unregister_unlocked(SVCXPRT *); void __xprt_set_raddr(SVCXPRT *, const struct sockaddr_storage *); - -SVCXPRT **__svc_xports; -int __svc_maxrec; +extern SVCXPRT **__svc_xports; +extern int __svc_maxrec; __END_DECLS diff --git a/dll/3rdparty/libtirpc/src/rpc_commondata.c b/dll/3rdparty/libtirpc/src/rpc_commondata.c index ec8d3fb0a48..3b2a9e51631 100644 --- a/dll/3rdparty/libtirpc/src/rpc_commondata.c +++ b/dll/3rdparty/libtirpc/src/rpc_commondata.c @@ -37,3 +37,6 @@ struct opaque_auth _null_auth; fd_set svc_fdset; int svc_maxfd = -1; + +SVCXPRT **__svc_xports; +int __svc_maxrec;

2 years, 8 months

[reactos] 03/14: [COMPILER_APITEST] Convert global variables to static ones

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e5d80df69c5f094af45f… commit 6e5d80df69c5f094af45fda2e4d42569a7ab247f Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Apr 26 02:33:43 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Apr 26 03:38:36 2022 +0300 [COMPILER_APITEST] Convert global variables to static ones --- modules/rostests/apitests/compiler/pseh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/compiler/pseh.c b/modules/rostests/apitests/compiler/pseh.c index 7090394f7cb..1b3577fd90d 100644 --- a/modules/rostests/apitests/compiler/pseh.c +++ b/modules/rostests/apitests/compiler/pseh.c @@ -1069,7 +1069,7 @@ DEFINE_TEST(test_yield_5) return test_yield_5_helper() == return_positive() && test_yield_5_ret == return_positive(); } -int test_yield_6_ret; +static int test_yield_6_ret; static int test_yield_6_helper(void)

2 years, 8 months

[reactos] 02/14: [COMPILER_APITEST] Remove unused variable from MS SEH tests

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4571c96534b9bc72f790f… commit 4571c96534b9bc72f790f739a3c1bfff4afa2233 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Mar 24 02:33:51 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Apr 26 03:38:36 2022 +0300 [COMPILER_APITEST] Remove unused variable from MS SEH tests --- modules/rostests/apitests/compiler/ms/seh/seh0001.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0002.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0003.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0004.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0005.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0006.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0007.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0008.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0009.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0010.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0011.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0012.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0013.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0014.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0015.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0016.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0017.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0018.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0019.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0020.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0021.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0022.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0023.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0024.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0025.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0026.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0027.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0028.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0029.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0030.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0031.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0032.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0033.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0034.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0035.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0036.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0037.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0038.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0039.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0040.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0041.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0042.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0043.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0044.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0045.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0046.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0047.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0048.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0049.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0050.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0051.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0052.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0053.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0054.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0055.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0056.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0057.c | 1 - modules/rostests/apitests/compiler/ms/seh/seh0058.c | 1 - 58 files changed, 58 deletions(-) diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0001.c b/modules/rostests/apitests/compiler/ms/seh/seh0001.c index c041b05c44a..6b8cb85e55c 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0001.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0001.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0001.c"; -int perfect; int main() { long Counter; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0002.c b/modules/rostests/apitests/compiler/ms/seh/seh0002.c index b078aa6ffea..ceff322d67b 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0002.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0002.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0002.c"; -int perfect; int main() { diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0003.c b/modules/rostests/apitests/compiler/ms/seh/seh0003.c index d453b71db27..00a96fe78bd 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0003.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0003.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0003.c"; -int perfect; int main() { LONG Counter; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0004.c b/modules/rostests/apitests/compiler/ms/seh/seh0004.c index 77b81898452..0aedd536990 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0004.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0004.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0004.c"; -int perfect; int main() { diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0005.c b/modules/rostests/apitests/compiler/ms/seh/seh0005.c index 627d8fdb7b7..6572bb10974 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0005.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0005.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0005.c"; -int perfect; int main() { PLONG BadAddress; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0006.c b/modules/rostests/apitests/compiler/ms/seh/seh0006.c index 7163cb59a03..5b4aee0acbf 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0006.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0006.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0006.c"; -int perfect; int main() { LONG Counter; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0007.c b/modules/rostests/apitests/compiler/ms/seh/seh0007.c index fcf402e0236..6f890caa475 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0007.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0007.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0007.c"; -int perfect; int main() { PLONG BadAddress; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0008.c b/modules/rostests/apitests/compiler/ms/seh/seh0008.c index d0d105d2279..ddf1cc658a2 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0008.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0008.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0008.c"; -int perfect; void rtlRaiseStatus(DWORD Status) { RaiseException(Status, 0, /*no flags*/ 0, 0); diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0009.c b/modules/rostests/apitests/compiler/ms/seh/seh0009.c index 53c6f4472d1..1e310741e8a 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0009.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0009.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0009.c"; -int perfect; void AccessViolation(PLONG BlackHole, PLONG BadAddress) { *BlackHole += *BadAddress; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0010.c b/modules/rostests/apitests/compiler/ms/seh/seh0010.c index 35ccae033ba..0ad8f306290 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0010.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0010.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0010.c"; -int perfect; void rtlRaiseExcpt(DWORD Status) { RaiseException(Status, 0, /*no flags*/ 0, 0); diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0011.c b/modules/rostests/apitests/compiler/ms/seh/seh0011.c index 0572234efa3..24874381ad8 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0011.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0011.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0011.c"; -int perfect; void AccessViolation(PLONG BlackHole, PLONG BadAddress) { *BlackHole += *BadAddress; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0012.c b/modules/rostests/apitests/compiler/ms/seh/seh0012.c index d85c16f79ec..e029df2697d 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0012.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0012.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0012.c"; -int perfect; void rtlRaiseException(DWORD Status) { RaiseException(Status, 0, /*no flags*/ 0, 0); diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0013.c b/modules/rostests/apitests/compiler/ms/seh/seh0013.c index d3a6c04c8a8..f8b34944d05 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0013.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0013.c @@ -7,7 +7,6 @@ #include "seh.h" char test[] = "SEH0013.c"; -int perfect; void rtlRaiseException(DWORD Status) { RaiseException(Status, 0, /*no flags*/ 0, 0); diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0014.c b/modules/rostests/apitests/compiler/ms/seh/seh0014.c index e8864a43263..41822709880 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0014.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0014.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0014.c"; -int perfect; void rtlRaiseExceptin(DWORD Status) { RaiseException(Status, 0, /*no flags*/ 0, 0); diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0015.c b/modules/rostests/apitests/compiler/ms/seh/seh0015.c index 8a11e044918..57c0eab06a4 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0015.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0015.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0015.c"; -int perfect; int main() { LONG Counter; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0016.c b/modules/rostests/apitests/compiler/ms/seh/seh0016.c index c56f406963e..007f9d66b22 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0016.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0016.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0016.c"; -int perfect; void rtlRaiseExceptin(DWORD Status) { RaiseException(Status, 0, /*no flags*/ 0, 0); diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0017.c b/modules/rostests/apitests/compiler/ms/seh/seh0017.c index d600dda5f01..f7a71e88482 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0017.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0017.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0017.c"; -int perfect; int main() { diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0018.c b/modules/rostests/apitests/compiler/ms/seh/seh0018.c index 607598ed213..b0df995e112 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0018.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0018.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0018.c"; -int perfect; void rtlRaiseException(DWORD Status) { RaiseException(Status, 0, /*no flags*/ 0, 0); diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0019.c b/modules/rostests/apitests/compiler/ms/seh/seh0019.c index 88654a4eb3c..0139091880f 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0019.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0019.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0019.c"; -int perfect; void fret(PLONG Counter) { try { diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0020.c b/modules/rostests/apitests/compiler/ms/seh/seh0020.c index 2644a83b163..317512c1f16 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0020.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0020.c @@ -7,7 +7,6 @@ #include "seh.h" char test[] = "SEH0020.c"; -int perfect; int main() { jmp_buf JumpBuffer; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0021.c b/modules/rostests/apitests/compiler/ms/seh/seh0021.c index 2cd5673b523..4bb81b8f058 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0021.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0021.c @@ -7,7 +7,6 @@ #include "seh.h" char test[] = "SEH0021.c"; -int perfect; int main() { jmp_buf JumpBuffer; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0022.c b/modules/rostests/apitests/compiler/ms/seh/seh0022.c index 04fd727ca94..04dab71cc16 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0022.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0022.c @@ -7,7 +7,6 @@ #include "seh.h" char test[] = "SEH0022.c"; -int perfect; int main() { jmp_buf JumpBuffer; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0023.c b/modules/rostests/apitests/compiler/ms/seh/seh0023.c index 40294bac20f..b188df96109 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0023.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0023.c @@ -7,7 +7,6 @@ #include "seh.h" char test[] = "SEH0023.c"; -int perfect; int main() { jmp_buf JumpBuffer; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0024.c b/modules/rostests/apitests/compiler/ms/seh/seh0024.c index 152d13cdf30..c9543d1f2a4 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0024.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0024.c @@ -17,7 +17,6 @@ #include "seh.h" char test[] = "SEH0024.c"; -int perfect; int main() { jmp_buf JumpBuffer; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0025.c b/modules/rostests/apitests/compiler/ms/seh/seh0025.c index 5d1cc8ce372..1748d2f9cd2 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0025.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0025.c @@ -7,7 +7,6 @@ #include "seh.h" char test[] = "SEH0025.c"; -int perfect; void dojump(jmp_buf JumpBuffer, PLONG Counter) { try { diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0026.c b/modules/rostests/apitests/compiler/ms/seh/seh0026.c index d1a6ef11539..35d215a7e2d 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0026.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0026.c @@ -8,7 +8,6 @@ #include "seh.h" char test[] = "SEH0026.c"; -int perfect; void dojump(jmp_buf JumpBuffer, PLONG Counter) { try { diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0027.c b/modules/rostests/apitests/compiler/ms/seh/seh0027.c index 26e79830a74..d78bfe88b83 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0027.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0027.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0027.c"; -int perfect; void rtlRaiseStatus(DWORD Status) { RaiseException(Status, 0, /*no flags*/ 0, 0); diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0028.c b/modules/rostests/apitests/compiler/ms/seh/seh0028.c index a59918a27b2..5e428cce80f 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0028.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0028.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0028.c"; -int perfect; void addtwo(long First, long Second, long *Place) { RaiseException(EXCEPTION_INT_OVERFLOW, 0, /*no flags*/ 0, 0); diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0029.c b/modules/rostests/apitests/compiler/ms/seh/seh0029.c index 927a70eb750..43a14327536 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0029.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0029.c @@ -10,7 +10,6 @@ #define finish() char test[] = "SEH0029.c"; -int perfect; void AccessViolation(PLONG BlackHole, PLONG BadAddress) { *BlackHole += *BadAddress; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0030.c b/modules/rostests/apitests/compiler/ms/seh/seh0030.c index 8fff3ab0e48..9c49b95e32c 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0030.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0030.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0030.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0031.c b/modules/rostests/apitests/compiler/ms/seh/seh0031.c index 24269a955e0..b244dbbee62 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0031.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0031.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0031.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0032.c b/modules/rostests/apitests/compiler/ms/seh/seh0032.c index 365ac24984d..8eee604c306 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0032.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0032.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0032.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0033.c b/modules/rostests/apitests/compiler/ms/seh/seh0033.c index 61561503b53..36c15117a30 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0033.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0033.c @@ -10,7 +10,6 @@ #define finish() char test[] = "SEH0033.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0034.c b/modules/rostests/apitests/compiler/ms/seh/seh0034.c index 5bedbc29faf..77d2de400b6 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0034.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0034.c @@ -10,7 +10,6 @@ #define finish() char test[] = "SEH0034.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0035.c b/modules/rostests/apitests/compiler/ms/seh/seh0035.c index 5490efe1363..eb70e6b230b 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0035.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0035.c @@ -10,7 +10,6 @@ #define finish() char test[] = "SEH0035.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0036.c b/modules/rostests/apitests/compiler/ms/seh/seh0036.c index 8bf471a8181..19b56f30a10 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0036.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0036.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0036.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0037.c b/modules/rostests/apitests/compiler/ms/seh/seh0037.c index ea4a60341f6..6175e111e8a 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0037.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0037.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0037.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0038.c b/modules/rostests/apitests/compiler/ms/seh/seh0038.c index 9c4a79b197b..8b0c92c6c69 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0038.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0038.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0038.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0039.c b/modules/rostests/apitests/compiler/ms/seh/seh0039.c index f230c808b27..92358cbb534 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0039.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0039.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0039.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0040.c b/modules/rostests/apitests/compiler/ms/seh/seh0040.c index 39d28875d82..c612add1823 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0040.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0040.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0040.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0041.c b/modules/rostests/apitests/compiler/ms/seh/seh0041.c index 25809fcbd68..519d76b6155 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0041.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0041.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0041.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0042.c b/modules/rostests/apitests/compiler/ms/seh/seh0042.c index 654f2f5df31..ebb7dbcb727 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0042.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0042.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0042.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0043.c b/modules/rostests/apitests/compiler/ms/seh/seh0043.c index c7a2c07566c..c268bcfc124 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0043.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0043.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0043.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0044.c b/modules/rostests/apitests/compiler/ms/seh/seh0044.c index 23313dbd631..91cb56a4acd 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0044.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0044.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0044.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0045.c b/modules/rostests/apitests/compiler/ms/seh/seh0045.c index 5a8a7a0f430..1159a9440e4 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0045.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0045.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0045.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0046.c b/modules/rostests/apitests/compiler/ms/seh/seh0046.c index 76d0494a667..f88cfb377d6 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0046.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0046.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0046.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0047.c b/modules/rostests/apitests/compiler/ms/seh/seh0047.c index 10f8422734a..5e946e7f70e 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0047.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0047.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0047.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0048.c b/modules/rostests/apitests/compiler/ms/seh/seh0048.c index 5b95ef1b421..89e57243010 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0048.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0048.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0048.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0049.c b/modules/rostests/apitests/compiler/ms/seh/seh0049.c index 5fc9a57366e..e9fbbc033d7 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0049.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0049.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0049.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0050.c b/modules/rostests/apitests/compiler/ms/seh/seh0050.c index 321f745575d..8381bb6e1f0 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0050.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0050.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0050.c"; -int perfect; int main() { ULONG Index1; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0051.c b/modules/rostests/apitests/compiler/ms/seh/seh0051.c index 0f21d7542e5..af82a5608bf 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0051.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0051.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0051.c"; -int perfect; LONG Echo(LONG Value) { return Value; } diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0052.c b/modules/rostests/apitests/compiler/ms/seh/seh0052.c index a364b0a95c7..fe1095bea7b 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0052.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0052.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "seh0052.c"; -int perfect; LONG Echo(LONG Value) { return Value; } diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0053.c b/modules/rostests/apitests/compiler/ms/seh/seh0053.c index 7b0732d97c4..03310e72f52 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0053.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0053.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "seh0053.c"; -int perfect; #define BLUE 0 #define RED 1 diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0054.c b/modules/rostests/apitests/compiler/ms/seh/seh0054.c index bcb4e0eba7a..231a38e42f8 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0054.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0054.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "seh0054.c"; -int perfect; LONG Echo(LONG Value) { return Value; } diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0055.c b/modules/rostests/apitests/compiler/ms/seh/seh0055.c index af5545a71a1..b92deed031a 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0055.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0055.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "seh0055.c"; -int perfect; LONG Echo(LONG Value) { return Value; } diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0056.c b/modules/rostests/apitests/compiler/ms/seh/seh0056.c index 7e461305231..8494e93c4df 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0056.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0056.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0056.c"; -int perfect; int main() { LONG Counter; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0057.c b/modules/rostests/apitests/compiler/ms/seh/seh0057.c index 87f1b215a23..3f736a733fa 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0057.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0057.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "seh0057.c"; -int perfect; int main() { LONG Counter; diff --git a/modules/rostests/apitests/compiler/ms/seh/seh0058.c b/modules/rostests/apitests/compiler/ms/seh/seh0058.c index d32488a3a85..988873daf72 100644 --- a/modules/rostests/apitests/compiler/ms/seh/seh0058.c +++ b/modules/rostests/apitests/compiler/ms/seh/seh0058.c @@ -6,7 +6,6 @@ #include "seh.h" char test[] = "SEH0058.c"; -int perfect; int main() { LONG Counter;

2 years, 8 months

[reactos] 01/14: [USER32_APITEST] Convert global variables to static ones

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97f075a2ab213dd845292… commit 97f075a2ab213dd84529209c2176cb05bac8f40e Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Mar 24 02:24:35 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Apr 26 03:38:29 2022 +0300 [USER32_APITEST] Convert global variables to static ones --- .../rostests/apitests/user32/AttachThreadInput.c | 7 +- modules/rostests/apitests/user32/CreateDialog.c | 2 +- modules/rostests/apitests/user32/CreateWindowEx.c | 36 ++--- modules/rostests/apitests/user32/DeferWindowPos.c | 2 +- modules/rostests/apitests/user32/EmptyClipboard.c | 6 +- modules/rostests/apitests/user32/GetKeyState.c | 2 +- .../rostests/apitests/user32/InitializeLpkHooks.c | 16 +-- modules/rostests/apitests/user32/SetActiveWindow.c | 6 +- modules/rostests/apitests/user32/SetCursorPos.c | 28 ++-- .../apitests/user32/SystemParametersInfo.c | 8 +- modules/rostests/apitests/user32/TrackMouseEvent.c | 156 +++++++++++---------- modules/rostests/apitests/user32/desktop.c | 2 +- 12 files changed, 142 insertions(+), 129 deletions(-) diff --git a/modules/rostests/apitests/user32/AttachThreadInput.c b/modules/rostests/apitests/user32/AttachThreadInput.c index 80b69df498f..0249678f0f3 100644 --- a/modules/rostests/apitests/user32/AttachThreadInput.c +++ b/modules/rostests/apitests/user32/AttachThreadInput.c @@ -19,10 +19,9 @@ typedef struct { MSG_CACHE cache; } THREAD_DATA; -DWORD tidMouseMove; -THREAD_DATA data[6]; -HHOOK hMouseHookLL = NULL; -HHOOK hKbdHookLL = NULL; +static THREAD_DATA data[6]; +static HHOOK hMouseHookLL = NULL; +static HHOOK hKbdHookLL = NULL; #define EXPECT_FOREGROUND(expected) ok(GetForegroundWindow() == expected, \ diff --git a/modules/rostests/apitests/user32/CreateDialog.c b/modules/rostests/apitests/user32/CreateDialog.c index e8517fd496c..d198d212beb 100644 --- a/modules/rostests/apitests/user32/CreateDialog.c +++ b/modules/rostests/apitests/user32/CreateDialog.c @@ -31,7 +31,7 @@ typedef struct tagMsgInfo msgList[TEST_MAX_MSG]; } tagMsgList; -tagMsgList msglist; +static tagMsgList msglist; /* the expected message-list */ const tagMsgList t1msgList = diff --git a/modules/rostests/apitests/user32/CreateWindowEx.c b/modules/rostests/apitests/user32/CreateWindowEx.c index c048f903469..f50a335aed3 100644 --- a/modules/rostests/apitests/user32/CreateWindowEx.c +++ b/modules/rostests/apitests/user32/CreateWindowEx.c @@ -65,9 +65,9 @@ static void Test_Params(void) ok(dwError == ERROR_INVALID_WINDOW_HANDLE, "error = %lu\n", dwError); } -HWND g_TestWindow = NULL; -HWND g_ChildWindow = NULL; -HWND g_hwndMDIClient = NULL; +static HWND g_TestWindow = NULL; +static HWND g_ChildWindow = NULL; +static HWND g_hwndMDIClient = NULL; static int get_iwnd(HWND hWnd) { @@ -83,16 +83,16 @@ static int get_iwnd(HWND hWnd) return 0; } -DWORD g_FaultLine = 0; -DWORD g_NcExpectStyle = 0; -DWORD g_NcExpectExStyle = 0; -DWORD g_ExpectStyle = 0; -DWORD g_ExpectExStyle = 0; +static DWORD g_FaultLine = 0; +static DWORD g_NcExpectStyle = 0; +static DWORD g_NcExpectExStyle = 0; +static DWORD g_ExpectStyle = 0; +static DWORD g_ExpectExStyle = 0; -DWORD g_ChildNcExpectStyle = 0; -DWORD g_ChildNcExpectExStyle = 0; -DWORD g_ChildExpectStyle = 0; -DWORD g_ChildExpectExStyle = 0; +static DWORD g_ChildNcExpectStyle = 0; +static DWORD g_ChildNcExpectExStyle = 0; +static DWORD g_ChildExpectStyle = 0; +static DWORD g_ChildExpectExStyle = 0; #undef ok_hex_ #define ok_hex_(expression, result) \ @@ -170,7 +170,7 @@ static LRESULT CALLBACK MSGTestProc(HWND hWnd, UINT message, WPARAM wParam, LPAR return lRet; } -MSG_ENTRY create_chain[] = +static MSG_ENTRY create_chain[] = { { 1, WM_GETMINMAXINFO, SENT }, { 1, WM_GETMINMAXINFO, SENT_RET }, @@ -183,7 +183,7 @@ MSG_ENTRY create_chain[] = { 0, 0 } }; -MSG_ENTRY create_chain_modify[] = +static MSG_ENTRY create_chain_modify[] = { { 1, WM_GETMINMAXINFO, SENT }, { 1, WM_GETMINMAXINFO, SENT_RET }, @@ -212,7 +212,7 @@ MSG_ENTRY create_chain_modify[] = { 0, 0 } }; -MSG_ENTRY create_chain_modify_below8_nonsrv[] = +static MSG_ENTRY create_chain_modify_below8_nonsrv[] = { { 1, WM_GETMINMAXINFO, SENT }, { 1, WM_GETMINMAXINFO, SENT_RET }, @@ -884,7 +884,7 @@ static LRESULT CALLBACK MSGChildProcMDI2(HWND hWnd, UINT message, WPARAM wParam, } -MSG_ENTRY child_create_chain_MDI[] = +static MSG_ENTRY child_create_chain_MDI[] = { { 1, WM_GETMINMAXINFO, SENT }, { 1, WM_GETMINMAXINFO, SENT_RET }, @@ -949,7 +949,7 @@ MSG_ENTRY child_create_chain_MDI[] = { 0, 0 }, }; -MSG_ENTRY child_create_chain_MDI_below8[] = +static MSG_ENTRY child_create_chain_MDI_below8[] = { { 1, WM_GETMINMAXINFO, SENT }, { 1, WM_GETMINMAXINFO, SENT_RET }, @@ -1014,7 +1014,7 @@ MSG_ENTRY child_create_chain_MDI_below8[] = { 0, 0 }, }; -MSG_ENTRY child_create_chain_MDI_below8_nonsrv[] = +static MSG_ENTRY child_create_chain_MDI_below8_nonsrv[] = { { 1, WM_GETMINMAXINFO, SENT }, { 1, WM_GETMINMAXINFO, SENT_RET }, diff --git a/modules/rostests/apitests/user32/DeferWindowPos.c b/modules/rostests/apitests/user32/DeferWindowPos.c index c8d4676d6f9..735f02cb76c 100644 --- a/modules/rostests/apitests/user32/DeferWindowPos.c +++ b/modules/rostests/apitests/user32/DeferWindowPos.c @@ -7,7 +7,7 @@ #include "precomp.h" -HWND hWnd1, hWnd2, hWnd3, hWnd4; +static HWND hWnd1, hWnd2, hWnd3, hWnd4; /* FIXME: test for HWND_TOP, etc...*/ static int get_iwnd(HWND hWnd) diff --git a/modules/rostests/apitests/user32/EmptyClipboard.c b/modules/rostests/apitests/user32/EmptyClipboard.c index 0536736902f..23bf085710a 100644 --- a/modules/rostests/apitests/user32/EmptyClipboard.c +++ b/modules/rostests/apitests/user32/EmptyClipboard.c @@ -7,9 +7,9 @@ #include "precomp.h" -HWND hWnd1, hWnd2; +static HWND hWnd1, hWnd2; -CRITICAL_SECTION CritSect; +static CRITICAL_SECTION CritSect; /* FIXME: test for HWND_TOP, etc...*/ static int get_iwnd(HWND hWnd) @@ -94,7 +94,7 @@ static DWORD WINAPI ClipThread(PVOID Parameter) return 0; } -MSG_ENTRY EmptyClipboard_chain[]={ +static MSG_ENTRY EmptyClipboard_chain[]={ {1,WM_DESTROYCLIPBOARD, MARKER, 0}, {1,WM_DESTROYCLIPBOARD, SENT}, {1,WM_DESTROYCLIPBOARD, MARKER, 1}, diff --git a/modules/rostests/apitests/user32/GetKeyState.c b/modules/rostests/apitests/user32/GetKeyState.c index 5f3a8ade23d..0c463bd74b1 100644 --- a/modules/rostests/apitests/user32/GetKeyState.c +++ b/modules/rostests/apitests/user32/GetKeyState.c @@ -7,7 +7,7 @@ #include "precomp.h" -HHOOK hKbdHook, hKbdLLHook; +static HHOOK hKbdHook, hKbdLLHook; LRESULT CALLBACK KeyboardProc(int code, WPARAM wParam, LPARAM lParam) { diff --git a/modules/rostests/apitests/user32/InitializeLpkHooks.c b/modules/rostests/apitests/user32/InitializeLpkHooks.c index d2fe1961a95..558856dd1cd 100644 --- a/modules/rostests/apitests/user32/InitializeLpkHooks.c +++ b/modules/rostests/apitests/user32/InitializeLpkHooks.c @@ -26,14 +26,14 @@ typedef struct _LPK_LPEDITCONTROL_LIST } LPK_LPEDITCONTROL_LIST, *PLPK_LPEDITCONTROL_LIST; -DWORD (APIENTRY *fpLpkTabbedTextOut) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID); -DWORD (APIENTRY *fpLpkPSMTextOut) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID); -DWORD (APIENTRY *fpLpkDrawTextEx) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID); -PLPK_LPEDITCONTROL_LIST (APIENTRY *fpLpkEditControl) (); - -int Count_myLpkTabbedTextOut = 0; -int Count_myLpkPSMTextOut = 0; -int Count_myLpkDrawTextEx = 0; +static DWORD (APIENTRY *fpLpkTabbedTextOut) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID); +static DWORD (APIENTRY *fpLpkPSMTextOut) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID); +static DWORD (APIENTRY *fpLpkDrawTextEx) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID); +static PLPK_LPEDITCONTROL_LIST (APIENTRY *fpLpkEditControl) (); + +static int Count_myLpkTabbedTextOut = 0; +static int Count_myLpkPSMTextOut = 0; +static int Count_myLpkDrawTextEx = 0; DWORD WINAPI myLpkTabbedTextOut (LPVOID x1,LPVOID x2,LPVOID x3, LPVOID x4, LPVOID x5, LPVOID x6, LPVOID x7, LPVOID x8, LPVOID x9, LPVOID x10, LPVOID x11, LPVOID x12) diff --git a/modules/rostests/apitests/user32/SetActiveWindow.c b/modules/rostests/apitests/user32/SetActiveWindow.c index 0d698d46a29..b68f157e17b 100644 --- a/modules/rostests/apitests/user32/SetActiveWindow.c +++ b/modules/rostests/apitests/user32/SetActiveWindow.c @@ -7,7 +7,7 @@ #include "precomp.h" -HWND hWnd1, hWnd2; +static HWND hWnd1, hWnd2; /* FIXME: test for HWND_TOP, etc...*/ static int get_iwnd(HWND hWnd) @@ -92,7 +92,7 @@ static void destroy_test_window() UnregisterClassW(L"testClass", 0); } -MSG_ENTRY activate2to1_chain[]={ +static MSG_ENTRY activate2to1_chain[]={ {2,WM_NCACTIVATE}, {2,WM_ACTIVATE}, {1,WM_WINDOWPOSCHANGING, SENT,0, SWP_NOSIZE|SWP_NOMOVE}, @@ -103,7 +103,7 @@ MSG_ENTRY activate2to1_chain[]={ {1,WM_SETFOCUS}, {0,0}}; -MSG_ENTRY activate1to2_chain[]={ +static MSG_ENTRY activate1to2_chain[]={ {1,WM_NCACTIVATE}, {1,WM_ACTIVATE}, {2,WM_WINDOWPOSCHANGING, SENT,0, SWP_NOSIZE|SWP_NOMOVE}, diff --git a/modules/rostests/apitests/user32/SetCursorPos.c b/modules/rostests/apitests/user32/SetCursorPos.c index 05d73afc7b6..6a3185c1b1d 100644 --- a/modules/rostests/apitests/user32/SetCursorPos.c +++ b/modules/rostests/apitests/user32/SetCursorPos.c @@ -7,7 +7,7 @@ #include "precomp.h" -HHOOK hMouseHookLL, hMouseHook; +static HHOOK hMouseHookLL, hMouseHook; struct _test_info { @@ -16,18 +16,20 @@ struct _test_info int mouse_move_called; }; -struct _test_info info[] = { {0,0,0}, /* SetCursorPos without a window */ - {1,1,0}, /* mouse_event without a window */ - {0,1,1}, /* SetCursorPos with a window */ - {1,1,1}, /* mouse_event with a window */ - {0,1,1}, /* multiple SetCursorPos with a window with coalescing */ - {0,2,2}, /* multiple SetCursorPos with a window without coalescing */ - {2,1,1}, /* multiple mouse_event with a window with coalescing */ - {2,2,2}, /* multiple mouse_event with a window without coalescing */ - }; - -struct _test_info results[8]; -int test_no = 0; +static struct _test_info info[] = +{ + {0,0,0}, /* SetCursorPos without a window */ + {1,1,0}, /* mouse_event without a window */ + {0,1,1}, /* SetCursorPos with a window */ + {1,1,1}, /* mouse_event with a window */ + {0,1,1}, /* multiple SetCursorPos with a window with coalescing */ + {0,2,2}, /* multiple SetCursorPos with a window without coalescing */ + {2,1,1}, /* multiple mouse_event with a window with coalescing */ + {2,2,2}, /* multiple mouse_event with a window without coalescing */ +}; + +static struct _test_info results[8]; +static int test_no = 0; LRESULT CALLBACK MouseLLHookProc(int nCode, WPARAM wParam, LPARAM lParam) diff --git a/modules/rostests/apitests/user32/SystemParametersInfo.c b/modules/rostests/apitests/user32/SystemParametersInfo.c index 469d0a687ef..0df971e677b 100644 --- a/modules/rostests/apitests/user32/SystemParametersInfo.c +++ b/modules/rostests/apitests/user32/SystemParametersInfo.c @@ -7,7 +7,7 @@ #include "precomp.h" -HWND hWnd1, hWnd2; +static HWND hWnd1, hWnd2; static BOOL g_bReadyForDisplayChange = FALSE; static HANDLE g_hSemDisplayChange; @@ -66,7 +66,7 @@ static void FlushMessages() } } -MSG_ENTRY NcMetricsChange_chain[]={ +static MSG_ENTRY NcMetricsChange_chain[]={ {2,WM_WINDOWPOSCHANGING, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW}, {2,WM_GETMINMAXINFO}, {2,WM_NCCALCSIZE}, @@ -77,7 +77,7 @@ MSG_ENTRY NcMetricsChange_chain[]={ {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOSIZE}, {0,0}}; -MSG_ENTRY NcMetricsChange1_chain[]={ +static MSG_ENTRY NcMetricsChange1_chain[]={ {2,WM_WINDOWPOSCHANGING, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW}, {2,WM_GETMINMAXINFO}, {2,WM_NCCALCSIZE}, @@ -90,7 +90,7 @@ MSG_ENTRY NcMetricsChange1_chain[]={ {1,WM_SETTINGCHANGE}, {0,0}}; -MSG_ENTRY CaptionHeight_chain[]={ +static MSG_ENTRY CaptionHeight_chain[]={ {2,WM_WINDOWPOSCHANGING, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW}, {2,WM_GETMINMAXINFO}, {2,WM_NCCALCSIZE}, diff --git a/modules/rostests/apitests/user32/TrackMouseEvent.c b/modules/rostests/apitests/user32/TrackMouseEvent.c index 61cef302c05..6c81d594f28 100644 --- a/modules/rostests/apitests/user32/TrackMouseEvent.c +++ b/modules/rostests/apitests/user32/TrackMouseEvent.c @@ -7,9 +7,9 @@ #include "precomp.h" -HWND hWnd1, hWnd2, hWnd3; -HHOOK hMouseHookLL, hMouseHook; -int ignore_timer = 0, ignore_mouse = 0, ignore_mousell = 0; +static HWND hWnd1, hWnd2, hWnd3; +static HHOOK hMouseHookLL, hMouseHook; +static int ignore_timer = 0, ignore_mouse = 0, ignore_mousell = 0; static int get_iwnd(HWND hWnd) { @@ -164,97 +164,109 @@ DWORD TmeQuery(HWND hwnd) y*(65535/GetSystemMetrics(SM_CYVIRTUALSCREEN)) , 0,0); /* the mouse moves over hwnd2 */ -MSG_ENTRY mousemove2_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, - {2, WM_NCHITTEST}, - {2, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, - {2, WM_SETCURSOR}, - {1, WM_SETCURSOR}, - {2, WM_MOUSEMOVE, POST}, - {0,0}}; +static MSG_ENTRY mousemove2_chain[]={ + {0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {2, WM_NCHITTEST}, + {2, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, + {2, WM_SETCURSOR}, + {1, WM_SETCURSOR}, + {2, WM_MOUSEMOVE, POST}, + {0,0}}; /* the mouse hovers hwnd2 */ -MSG_ENTRY mousehover2_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, - {2, WM_NCHITTEST}, - {2, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, - {2, WM_SETCURSOR}, - {1, WM_SETCURSOR}, - {2, WM_MOUSEMOVE, POST}, - {2, WM_SYSTIMER, POST, ID_TME_TIMER}, - {2, WM_MOUSEHOVER, POST}, - {0,0}}; +static MSG_ENTRY mousehover2_chain[]={ + {0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {2, WM_NCHITTEST}, + {2, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, + {2, WM_SETCURSOR}, + {1, WM_SETCURSOR}, + {2, WM_MOUSEMOVE, POST}, + {2, WM_SYSTIMER, POST, ID_TME_TIMER}, + {2, WM_MOUSEHOVER, POST}, + {0,0}}; /* the mouse leaves hwnd2 and moves to hwnd1 */ -MSG_ENTRY mouseleave2to1_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, - {1, WM_NCHITTEST}, - {1, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, - {1, WM_SETCURSOR}, - {1, WM_MOUSEMOVE, POST}, - {2, WM_MOUSELEAVE, POST}, - {0,0}}; +static MSG_ENTRY mouseleave2to1_chain[]={ + {0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {1, WM_NCHITTEST}, + {1, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, + {1, WM_SETCURSOR}, + {1, WM_MOUSEMOVE, POST}, + {2, WM_MOUSELEAVE, POST}, + {0,0}}; /* the mouse leaves hwnd2 and moves to hwnd3 */ -MSG_ENTRY mouseleave2to3_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, - {3, WM_NCHITTEST}, - {3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, - {3, WM_SETCURSOR}, - {1, WM_SETCURSOR}, - {3, WM_MOUSEMOVE, POST}, - {2, WM_MOUSELEAVE, POST}, - {0,0}}; +static MSG_ENTRY mouseleave2to3_chain[]={ + {0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {3, WM_NCHITTEST}, + {3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, + {3, WM_SETCURSOR}, + {1, WM_SETCURSOR}, + {3, WM_MOUSEMOVE, POST}, + {2, WM_MOUSELEAVE, POST}, + {0,0}}; /* the mouse hovers hwnd3 */ -MSG_ENTRY mousehover3_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, - {3, WM_NCHITTEST}, - {3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, - {3, WM_SETCURSOR}, - {1, WM_SETCURSOR}, - {3, WM_MOUSEMOVE, POST}, - {3, WM_SYSTIMER, POST, ID_TME_TIMER}, - {3, WM_MOUSEHOVER, POST}, - {0,0}}; +static MSG_ENTRY mousehover3_chain[]={ + {0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {3, WM_NCHITTEST}, + {3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, + {3, WM_SETCURSOR}, + {1, WM_SETCURSOR}, + {3, WM_MOUSEMOVE, POST}, + {3, WM_SYSTIMER, POST, ID_TME_TIMER}, + {3, WM_MOUSEHOVER, POST}, + {0,0}}; /* the mouse hovers hwnd3 without moving */ -MSG_ENTRY mousehover3_nomove_chain[]={{3, WM_SYSTIMER, POST, ID_TME_TIMER}, - {3, WM_MOUSEHOVER, POST}, - {0,0}}; +static MSG_ENTRY mousehover3_nomove_chain[]={ + {3, WM_SYSTIMER, POST, ID_TME_TIMER}, + {3, WM_MOUSEHOVER, POST}, + {0,0}}; /* the mouse hovers hwnd3 and the timer is not dispatched */ -MSG_ENTRY mousehover3_droptimer_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, - {3, WM_NCHITTEST}, - {3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, - {3, WM_SETCURSOR}, - {1, WM_SETCURSOR}, - {3, WM_MOUSEMOVE, POST}, - {3, WM_SYSTIMER, POST, ID_TME_TIMER}, - {0,0}}; +static MSG_ENTRY mousehover3_droptimer_chain[]={ + {0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {3, WM_NCHITTEST}, + {3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, + {3, WM_SETCURSOR}, + {1, WM_SETCURSOR}, + {3, WM_MOUSEMOVE, POST}, + {3, WM_SYSTIMER, POST, ID_TME_TIMER}, + {0,0}}; /* the mouse hovers hwnd3 and mouse message is dropped by WH_MOUSE */ -MSG_ENTRY mousehover3_dropmouse_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, - {3, WM_NCHITTEST}, - {3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, - {3, WM_SYSTIMER, POST, ID_TME_TIMER}, - {3, WM_MOUSEHOVER, POST}, - {0,0}}; +static MSG_ENTRY mousehover3_dropmouse_chain[]={ + {0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {3, WM_NCHITTEST}, + {3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, + {3, WM_SYSTIMER, POST, ID_TME_TIMER}, + {3, WM_MOUSEHOVER, POST}, + {0,0}}; /* the mouse hovers hwnd3 and mouse message is dropped by WH_MOUSE_LL */ -MSG_ENTRY mousehover3_dropmousell_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, - {3, WM_SYSTIMER, POST, ID_TME_TIMER}, - {3, WM_MOUSEHOVER, POST}, - {0,0}}; +static MSG_ENTRY mousehover3_dropmousell_chain[]={ + {0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {3, WM_SYSTIMER, POST, ID_TME_TIMER}, + {3, WM_MOUSEHOVER, POST}, + {0,0}}; /* the mouse leaves hwnd3 and moves to hwnd2 and mouse message is dropped by WH_MOUSE */ -MSG_ENTRY mouseleave3to2_dropmouse_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, - {2, WM_NCHITTEST}, - {2, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, - {0,0}}; +static MSG_ENTRY mouseleave3to2_dropmouse_chain[]={ + {0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {2, WM_NCHITTEST}, + {2, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, + {0,0}}; /* the mouse leaves hwnd3 and moves to hwnd2 and mouse message is dropped by WH_MOUSE_LL */ -MSG_ENTRY mouseleave3to2_dropmousell_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, - {0,0}}; +static MSG_ENTRY mouseleave3to2_dropmousell_chain[]={ + {0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {0,0}}; /* after WH_MOUSE drops WM_MOUSEMOVE, WM_MOUSELEAVE is still in the queue */ -MSG_ENTRY mouseleave3_remainging_chain[]={{3, WM_MOUSELEAVE, POST}, - {0,0}}; +static MSG_ENTRY mouseleave3_remainging_chain[]={ + {3, WM_MOUSELEAVE, POST}, + {0,0}}; void Test_TrackMouseEvent() { diff --git a/modules/rostests/apitests/user32/desktop.c b/modules/rostests/apitests/user32/desktop.c index 05f0c133019..bdd0785c99f 100644 --- a/modules/rostests/apitests/user32/desktop.c +++ b/modules/rostests/apitests/user32/desktop.c @@ -15,7 +15,7 @@ struct test_info { WCHAR* ExpectedDesktp; }; -struct test_info TestResults[] = +static struct test_info TestResults[] = { {L"WinSta0",L"Default"}, {L"WinSta0",L"Default"},

2 years, 8 months

[reactos] 01/01: [BATT] Add the composite battery installer

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9c4b6aa65769f7aa6756… commit b9c4b6aa65769f7aa67567b19bbdbdeeba4d132c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Apr 25 23:33:25 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Apr 25 23:33:51 2022 +0200 [BATT] Add the composite battery installer --- dll/win32/batt/CMakeLists.txt | 2 +- dll/win32/batt/batt.c | 209 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 191 insertions(+), 20 deletions(-) diff --git a/dll/win32/batt/CMakeLists.txt b/dll/win32/batt/CMakeLists.txt index cf775185b37..ac11165ce96 100644 --- a/dll/win32/batt/CMakeLists.txt +++ b/dll/win32/batt/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(batt MODULE ${CMAKE_CURRENT_BINARY_DIR}/batt.def) set_module_type(batt win32dll UNICODE) -add_importlibs(batt msvcrt kernel32 ntdll) +add_importlibs(batt setupapi msvcrt kernel32 ntdll) add_cd_file(TARGET batt DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/batt/batt.c b/dll/win32/batt/batt.c index 03695e319be..59def5430a7 100644 --- a/dll/win32/batt/batt.c +++ b/dll/win32/batt/batt.c @@ -15,27 +15,192 @@ #include <winuser.h> #include <setupapi.h> +#include <initguid.h> +#include <devguid.h> + #define NDEBUG #include <debug.h> +static +DWORD +InstallCompositeBattery( + _In_ HDEVINFO DeviceInfoSet, + _In_opt_ PSP_DEVINFO_DATA DeviceInfoData, + _In_ PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +{ + WCHAR szDeviceId[32]; + SP_DRVINFO_DATA DriverInfoData; + HDEVINFO NewDeviceInfoSet = INVALID_HANDLE_VALUE; + PSP_DEVINFO_DATA NewDeviceInfoData = NULL; + BOOL bDeviceRegistered = FALSE, bHaveDriverInfoList = FALSE; + DWORD dwError = ERROR_SUCCESS; -BOOL + DPRINT("InstallCompositeBattery(%p %p %p)\n", + DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + + NewDeviceInfoSet = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_SYSTEM, + DeviceInstallParams->hwndParent); + if (NewDeviceInfoSet == INVALID_HANDLE_VALUE) + { + DPRINT1("SetupDiCreateDeviceInfoList() failed (Error %lu)\n", GetLastError()); + return GetLastError(); + } + + NewDeviceInfoData = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SP_DEVINFO_DATA)); + if (NewDeviceInfoData == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + NewDeviceInfoData->cbSize = sizeof(SP_DEVINFO_DATA); + if (!SetupDiCreateDeviceInfoW(NewDeviceInfoSet, + L"Root\\COMPOSITE_BATTERY\\0000", + &GUID_DEVCLASS_SYSTEM, + NULL, + DeviceInstallParams->hwndParent, + 0, + NewDeviceInfoData)) + { + dwError = GetLastError(); + if (dwError == ERROR_DEVINST_ALREADY_EXISTS) + { + dwError = ERROR_SUCCESS; + goto done; + } + + DPRINT1("SetupDiCreateDeviceInfoW() failed (Error %lu 0x%08lx)\n", dwError, dwError); + goto done; + } + + if (!SetupDiRegisterDeviceInfo(NewDeviceInfoSet, + NewDeviceInfoData, + 0, + NULL, + NULL, + NULL)) + { + dwError = GetLastError(); + DPRINT1("SetupDiRegisterDeviceInfo() failed (Error %lu 0x%08lx)\n", dwError, dwError); + goto done; + } + + bDeviceRegistered = TRUE; + + ZeroMemory(szDeviceId, sizeof(szDeviceId)); + wcscpy(szDeviceId, L"COMPOSITE_BATTERY"); + + if (!SetupDiSetDeviceRegistryPropertyW(NewDeviceInfoSet, + NewDeviceInfoData, + SPDRP_HARDWAREID, + (PBYTE)szDeviceId, + (wcslen(szDeviceId) + 2) * sizeof(WCHAR))) + { + dwError = GetLastError(); + DPRINT1("SetupDiSetDeviceRegistryPropertyW() failed (Error %lu 0x%08lx)\n", dwError, dwError); + goto done; + } + + if (!SetupDiBuildDriverInfoList(NewDeviceInfoSet, + NewDeviceInfoData, + SPDIT_COMPATDRIVER)) + { + dwError = GetLastError(); + DPRINT1("SetupDiBuildDriverInfoList() failed (Error %lu 0x%08lx)\n", dwError, dwError); + goto done; + } + + bHaveDriverInfoList = TRUE; + + DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA); + if (!SetupDiEnumDriverInfo(NewDeviceInfoSet, + NewDeviceInfoData, + SPDIT_COMPATDRIVER, + 0, + &DriverInfoData)) + { + dwError = GetLastError(); + DPRINT1("SetupDiEnumDriverInfo() failed (Error %lu 0x%08lx)\n", dwError, dwError); + goto done; + } + + if (!SetupDiSetSelectedDriver(NewDeviceInfoSet, + NewDeviceInfoData, + &DriverInfoData)) + { + dwError = GetLastError(); + DPRINT1("SetupDiSetSelectedDriver() failed (Error %lu 0x%08lx)\n", dwError, dwError); + goto done; + } + + if (!SetupDiInstallDevice(NewDeviceInfoSet, + NewDeviceInfoData)) + { + dwError = GetLastError(); + DPRINT1("SetupDiInstallDevice() failed (Error %lu 0x%08lx)\n", dwError, dwError); + goto done; + } + + dwError = ERROR_SUCCESS; + +done: + if (bHaveDriverInfoList) + SetupDiDestroyDriverInfoList(NewDeviceInfoSet, + NewDeviceInfoData, + SPDIT_COMPATDRIVER); + + if (bDeviceRegistered) + SetupDiDeleteDeviceInfo(NewDeviceInfoSet, + NewDeviceInfoData); + + if (NewDeviceInfoData != NULL) + HeapFree(GetProcessHeap(), 0, NewDeviceInfoData); + + if (NewDeviceInfoSet != INVALID_HANDLE_VALUE) + SetupDiDestroyDeviceInfoList(NewDeviceInfoSet); + + return dwError; +} + + +DWORD WINAPI -DllMain(HINSTANCE hinstDll, - DWORD dwReason, - LPVOID reserved) +BatteryClassInstall( + _In_ DI_FUNCTION InstallFunction, + _In_ HDEVINFO DeviceInfoSet, + _In_opt_ PSP_DEVINFO_DATA DeviceInfoData) { - switch (dwReason) + SP_DEVINSTALL_PARAMS_W DeviceInstallParams; + DWORD dwError; + + DPRINT("BatteryClassInstall(%u %p %p)\n", + InstallFunction, DeviceInfoSet, DeviceInfoData); + + if (InstallFunction != DIF_INSTALLDEVICE) + return ERROR_DI_DO_DEFAULT; + + DeviceInstallParams.cbSize = sizeof(DeviceInstallParams); + if (!SetupDiGetDeviceInstallParamsW(DeviceInfoSet, + DeviceInfoData, + &DeviceInstallParams)) { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDll); - break; + DPRINT1("SetupDiGetDeviceInstallParamsW() failed (Error %lu)\n", GetLastError()); + return GetLastError(); + } - case DLL_PROCESS_DETACH: - break; + /* Install the composite battery device */ + dwError = InstallCompositeBattery(DeviceInfoSet, + DeviceInfoData, + &DeviceInstallParams); + if (dwError == ERROR_SUCCESS) + { + /* Install the battery device */ + dwError = ERROR_DI_DO_DEFAULT; } - return TRUE; + return dwError; } @@ -55,18 +220,24 @@ BatteryClassCoInstaller(IN DI_FUNCTION InstallFunction, } -DWORD +BOOL WINAPI -BatteryClassInstall(IN DI_FUNCTION InstallFunction, - IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +DllMain( + _In_ HINSTANCE hinstDll, + _In_ DWORD dwReason, + _In_ LPVOID reserved) { - switch (InstallFunction) + switch (dwReason) { - default: - DPRINT("Install function %u ignored\n", InstallFunction); - return ERROR_DI_DO_DEFAULT; + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDll); + break; + + case DLL_PROCESS_DETACH: + break; } + + return TRUE; } /* EOF */

2 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2022