[PATCH 0/2] MR11041: ddraw: Remove unused variables.

[Jacek Caban (＠jacek)]

Fixes -Wunused-but-set-global warnings.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11041

[PATCH 1/2] ddraw/tests: Remove unused variable.

[Jacek Caban]

From: Jacek Caban <[e-mail]>

Fixes -Wunused-but-set-global warning.
---
 dlls/ddraw/tests/dsurface.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c
index e65160034f6..ea040ccba4a 100644
--- a/dlls/ddraw/tests/dsurface.c
+++ b/dlls/ddraw/tests/dsurface.c
@@ -29,8 +29,6 @@
 #include "d3d.h"
 #include "unknwn.h"
 
-static HRESULT (WINAPI *pDirectDrawCreateEx)(GUID *, void **, REFIID, IUnknown *);
-
 static IDirectDraw *lpDD;
 static DDCAPS ddcaps;
 
@@ -2466,9 +2464,6 @@ START_TEST(dsurface)
     HRESULT ret;
     IDirectDraw4 *dd4;
 
-    HMODULE ddraw_mod = GetModuleHandleA("ddraw.dll");
-    pDirectDrawCreateEx = (void *) GetProcAddress(ddraw_mod, "DirectDrawCreateEx");
-
     if (!CreateDirectDraw())
         return;
 
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/11041

[PATCH 2/2] ddraw: Remove unused variable.

[Jacek Caban]

From: Jacek Caban <[e-mail]>

Fixes -Wunused-but-set-global warning.
---
 dlls/ddraw/main.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index faf6e13c8f2..8f2402554fe 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -32,8 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 static struct list global_ddraw_list = LIST_INIT(global_ddraw_list);
 
-static HINSTANCE instance;
-
 /* value of ForceRefreshRate */
 DWORD force_refresh_rate = 0;
 
@@ -874,7 +872,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
                 (const WCHAR *)&ddraw_self, &ddraw_self))
             ERR("Failed to get own module handle.\n");
 
-        instance = inst;
         DisableThreadLibraryCalls(inst);
         break;
     }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/11041

[PATCH 0/2] MR11041: ddraw: Remove unused variables. - approved

[Elizabeth Figura (＠zfigura)]

This merge request was approved by Elizabeth Figura.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11041