[PATCH 0/3] MR11260: ws2_32,qcap,http: Fix -Wunused-but-set-global warnings.
From: Jacek Caban <jacek@codeweavers.com> Fixes -Wunused-but-set-global warnings. --- dlls/http.sys/http.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 260e022f20a..56cdbe996ff 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -42,7 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(http); DECLARE_CRITICAL_SECTION(http_cs); static HANDLE request_thread, request_event; -static BOOL thread_stop; static HTTP_REQUEST_ID req_id_counter; @@ -1195,7 +1194,6 @@ static void WINAPI unload(DRIVER_OBJECT *driver) struct request_queue *queue, *queue_next; struct connection *conn, *conn_next; - thread_stop = TRUE; SetEvent(request_event); WaitForSingleObject(request_thread, INFINITE); CloseHandle(request_thread); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11260
From: Jacek Caban <jacek@codeweavers.com> Fixes -Wunused-but-set-global warnings. --- dlls/qcap/tests/audiorecord.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index 11397531064..55eb6ab6a49 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -225,7 +225,6 @@ static ULONG WINAPI property_bag_Release(IPropertyBag *iface) ok(0, "Unexpected call.\n"); return 1; } -static int ppb_id; static unsigned int ppb_got_read; static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, const WCHAR *name, VARIANT *var, IErrorLog *log) @@ -270,7 +269,6 @@ static void test_property_bag(IMoniker *mon) VariantInit(&var); hr = IPropertyBag_Read(devenum_bag, L"WaveInId", &var, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); - ppb_id = V_I4(&var); hr = CoCreateInstance(&CLSID_AudioRecord, NULL, CLSCTX_INPROC_SERVER, &IID_IPersistPropertyBag, (void **)&ppb); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11260
From: Jacek Caban <jacek@codeweavers.com> Fixes -Wunused-but-set-global warnings. --- dlls/ws2_32/tests/protocol.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 0e87ee04ce5..76339c0a146 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -44,7 +44,6 @@ static int (WINAPI *pGetAddrInfoExW)(const WCHAR *name, const WCHAR *servname, D static int (WINAPI *pGetAddrInfoExOverlappedResult)(OVERLAPPED *overlapped); static int (WINAPI *pGetHostNameW)(WCHAR *name, int len); static const char *(WINAPI *p_inet_ntop)(int family, void *addr, char *string, ULONG size); -static const WCHAR *(WINAPI *pInetNtopW)(int family, void *addr, WCHAR *string, ULONG size); static int (WINAPI *p_inet_pton)(int family, const char *string, void *addr); static int (WINAPI *pInetPtonW)(int family, WCHAR *string, void *addr); static int (WINAPI *pWSCGetApplicationCategory)(LPCWSTR path, DWORD path_len, LPCWSTR extra, DWORD extra_len, DWORD *category, INT *err); @@ -3173,7 +3172,6 @@ START_TEST( protocol ) pGetAddrInfoExW = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "GetAddrInfoExW"); pGetHostNameW = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "GetHostNameW"); p_inet_ntop = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "inet_ntop"); - pInetNtopW = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "InetNtopW"); p_inet_pton = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "inet_pton"); pInetPtonW = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "InetPtonW"); pWSCGetApplicationCategory = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "WSCGetApplicationCategory"); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11260
The http.sys part doesn't look right to me; rather it seems that it should have been actually used in request_thread_proc(). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/11260#note_144318
participants (3)
-
Elizabeth Figura (＠zfigura) -
Jacek Caban
-
Jacek Caban (＠jacek)