[PATCH 0/3] MR10873: Remove unused global variables from 16-bit modules.
Fixes -Wunused-but-set-global warnings. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10873
From: Jacek Caban <jacek@codeweavers.com> Fixes -Wunused-but-set-global warnings. --- dlls/keyboard.drv16/keyboard.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/keyboard.drv16/keyboard.c b/dlls/keyboard.drv16/keyboard.c index 8ba782c092c..add44e1611b 100644 --- a/dlls/keyboard.drv16/keyboard.c +++ b/dlls/keyboard.drv16/keyboard.c @@ -48,9 +48,6 @@ typedef struct _KBINFO } KBINFO, *LPKBINFO; #pragma pack(pop) -static FARPROC16 DefKeybEventProc; -static LPBYTE pKeyStateTable; - /*********************************************************************** * Inquire (KEYBOARD.1) */ @@ -70,9 +67,6 @@ WORD WINAPI Inquire16(LPKBINFO kbInfo) */ VOID WINAPI Enable16( FARPROC16 proc, LPBYTE lpKeyState ) { - DefKeybEventProc = proc; - pKeyStateTable = lpKeyState; - memset( lpKeyState, 0, 256 ); /* all states to false */ } @@ -81,8 +75,6 @@ VOID WINAPI Enable16( FARPROC16 proc, LPBYTE lpKeyState ) */ VOID WINAPI Disable16(VOID) { - DefKeybEventProc = NULL; - pKeyStateTable = NULL; } /**************************************************************************** -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10873
From: Jacek Caban <jacek@codeweavers.com> Fixes -Wunused-but-set-global warning. --- dlls/mouse.drv16/mouse.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/mouse.drv16/mouse.c b/dlls/mouse.drv16/mouse.c index f2d4ae90967..9474514cf58 100644 --- a/dlls/mouse.drv16/mouse.c +++ b/dlls/mouse.drv16/mouse.c @@ -42,8 +42,6 @@ typedef struct _MOUSEINFO } MOUSEINFO, *LPMOUSEINFO; #pragma pack(pop) -static FARPROC16 DefMouseEventProc; - /*********************************************************************** * Inquire (MOUSE.1) */ @@ -67,7 +65,6 @@ WORD WINAPI Inquire16(LPMOUSEINFO mouseInfo) */ VOID WINAPI Enable16( FARPROC16 proc ) { - DefMouseEventProc = proc; } /*********************************************************************** @@ -75,5 +72,4 @@ VOID WINAPI Enable16( FARPROC16 proc ) */ VOID WINAPI Disable16(void) { - DefMouseEventProc = 0; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10873
From: Jacek Caban <jacek@codeweavers.com> Fixes -Wunused-but-set-global warnings. --- dlls/win87em.dll16/win87em.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/win87em.dll16/win87em.c b/dlls/win87em.dll16/win87em.c index aaaf3c9d839..126c94f94e0 100644 --- a/dlls/win87em.dll16/win87em.c +++ b/dlls/win87em.dll16/win87em.c @@ -46,23 +46,17 @@ struct Win87EmInfoStruct /* FIXME: Still rather skeletal implementation only */ static BOOL Installed = TRUE; /* 8087 is installed */ -static WORD RefCount = 0; static WORD CtrlWord_1 = 0; -static WORD CtrlWord_2 = 0; static WORD CtrlWord_Internal = 0; static WORD StatusWord_1 = 0x000b; static WORD StatusWord_2 = 0; -static WORD StatusWord_3 = 0; -static WORD StackTop = 175; -static WORD StackBottom = 0; -static WORD Inthandler02hVar = 1; static void WIN87_ClearCtrlWord( CONTEXT *context ) { context->Eax &= ~0xffff; /* set AX to 0 */ if (Installed) __asm__("fclex"); - StatusWord_3 = StatusWord_2 = 0; + StatusWord_2 = 0; } static void WIN87_SetCtrlWord( CONTEXT *context ) @@ -73,7 +67,6 @@ static void WIN87_SetCtrlWord( CONTEXT *context ) CtrlWord_Internal = LOWORD(context->Eax); __asm__("wait;fldcw %0" : : "m" (CtrlWord_Internal)); } - CtrlWord_2 = LOWORD(context->Eax); } static void WIN87_Init( CONTEXT *context ) @@ -82,7 +75,6 @@ static void WIN87_Init( CONTEXT *context ) __asm__("fninit"); __asm__("fninit"); } - StackBottom = StackTop; context->Eax = (context->Eax & ~0xffff) | 0x1332; WIN87_SetCtrlWord(context); WIN87_ClearCtrlWord(context); @@ -100,8 +92,8 @@ void WINAPI __fpMath( CONTEXT *context ) switch(LOWORD(context->Ebx)) { case 0: /* install (increase instanceref) emulator, install NMI vector */ - RefCount++; #if 0 + RefCount++; if (Installed) InstallIntVecs02hAnd75h(); #endif @@ -117,8 +109,8 @@ void WINAPI __fpMath( CONTEXT *context ) * if zero. Every '0' call should have a matching '2' call. */ WIN87_Init(context); - RefCount--; #if 0 + RefCount--; if (!RefCount && Installed) RestoreInt02h(); #endif @@ -194,7 +186,6 @@ void WINAPI __fpMath( CONTEXT *context ) break; case 12: /* save AX in some internal state var */ - Inthandler02hVar = LOWORD(context->Eax); break; default: /* error. Say that loud and clear */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10873
participants (2)
-
Jacek Caban -
Jacek Caban (@jacek)