February 2022 - Wine-commits

Francois Gouget : ws2_32/tests: Remove the todo_wine on a test_recv() ok() call.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 98f2922d2e1ce640727c195ebbd2a7101264d092 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98f2922d2e1ce640727c195e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 17 16:29:58 2022 +0100 ws2_32/tests: Remove the todo_wine on a test_recv() ok() call. This test has been succeeding ever since the try_recv() call has been removed before the server call in sock_recv(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index d8a78947de4..befd9fc702e 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1460,7 +1460,7 @@ static void test_recv(void) memset(buffer, 0xcc, sizeof(buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); - todo_wine ok(ret == STATUS_PIPE_DISCONNECTED, "got %#x\n", ret); + ok(ret == STATUS_PIPE_DISCONNECTED, "got %#x\n", ret); ok(!io.Status, "got status %#x\n", io.Status); ok(!io.Information, "got information %#Ix\n", io.Information);

1 0

Alexandre Julliard : kernel32/tests: Add a few more tests for apisets.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 8796d34a803d6f4acc686c60a2fd132e250f04ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=8796d34a803d6f4acc686c60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 17 21:12:54 2022 +0100 kernel32/tests: Add a few more tests for apisets. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 76 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 8ec3a5433ee..91e1aba31e0 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -692,21 +692,95 @@ static void test_LoadLibraryEx_search_flags(void) } else { + LoadLibraryA( "ole32.dll" ); /* FIXME: make sure the dependencies are loaded */ mod = LoadLibraryA( apiset_dll ); if (mod) { + HMODULE shcore; + char buffer[MAX_PATH]; + FreeLibrary(mod); mod = LoadLibraryExA( apiset_dll, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); ok( !!mod, "Got NULL module, error %u.\n", GetLastError() ); ok( !!GetModuleHandleA( apiset_dll ), "Got NULL handle.\n" ); + shcore = GetModuleHandleA( "shcore.dll" ); + todo_wine + ok( mod == shcore, "wrong module %p/%p\n", mod, shcore ); + ret = FreeLibrary( mod ); + ok( ret, "FreeLibrary failed, error %u.\n", GetLastError() ); + shcore = GetModuleHandleA( "shcore.dll" ); + ok( !shcore, "shcore not unloaded\n" ); + + /* api set without .dll */ + strcpy( buffer, apiset_dll ); + buffer[strlen(buffer) - 4] = 0; + mod = LoadLibraryExA( buffer, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + ok( !!mod, "Got NULL module, error %u.\n", GetLastError() ); + ok( !!GetModuleHandleA( apiset_dll ), "Got NULL handle.\n" ); + shcore = GetModuleHandleA( "shcore.dll" ); + todo_wine + ok( mod == shcore, "wrong module %p/%p\n", mod, shcore ); ret = FreeLibrary( mod ); ok( ret, "FreeLibrary failed, error %u.\n", GetLastError() ); + shcore = GetModuleHandleA( "shcore.dll" ); + ok( !shcore, "shcore not unloaded\n" ); + + /* api set with different version */ + strcpy( buffer, apiset_dll ); + buffer[strlen(buffer) - 5] = '9'; + mod = LoadLibraryExA( buffer, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + todo_wine + ok( !!mod || broken(!mod) /* win8 */, "Got NULL module, error %u.\n", GetLastError() ); + if (mod) + { + ok( !!GetModuleHandleA( apiset_dll ), "Got NULL handle.\n" ); + shcore = GetModuleHandleA( "shcore.dll" ); + ok( mod == shcore, "wrong module %p/%p\n", mod, shcore ); + ret = FreeLibrary( mod ); + ok( ret, "FreeLibrary failed, error %u.\n", GetLastError() ); + } + shcore = GetModuleHandleA( "shcore.dll" ); + ok( !shcore, "shcore not unloaded\n" ); + + /* api set with full path */ + GetWindowsDirectoryA( buffer, MAX_PATH ); + strcat( buffer, "\\" ); + strcat( buffer, apiset_dll ); + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( buffer, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + ok( !mod, "Loaded %s\n", debugstr_a(buffer) ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + mod = LoadLibraryA( buffer ); + ok( !mod, "Loaded %s\n", debugstr_a(buffer) ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); } else { win_skip( "%s not found, skipping test.\n", apiset_dll ); } - } + + /* try a library with dependencies */ + mod = GetModuleHandleA( "rasapi32.dll" ); + ok( !mod, "rasapi32 already loaded\n" ); + mod = LoadLibraryA( "rasapi32.dll" ); + ok( !!mod, "rasapi32 not found %u\n", GetLastError() ); + FreeLibrary( mod ); + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "rasapi32.dll", NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + ok( !mod, "rasapi32 loaded\n" ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "ext-ms-win-ras-rasapi32-l1-1-0.dll", NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + ok( !mod, "rasapi32 loaded\n" ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + if (mod) FreeLibrary( mod ); + mod = LoadLibraryA( "ext-ms-win-ras-rasapi32-l1-1-0.dll" ); + ok( !!mod || broken(!mod) /* win7 */, "rasapi32 not found %u\n", GetLastError() ); + if (mod) FreeLibrary( mod ); + mod = GetModuleHandleA( "rasapi32.dll" ); + ok( !mod, "rasapi32 still loaded\n" ); + } done: for (i = 1; i <= 6; i++) {

1 0

Francois Gouget : xinput1_3: Fix the spelling of a WARN() message and helper.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 30ab3557e9542cc4a1e29a980f6d2aa39aa77994 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30ab3557e9542cc4a1e29a98… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 17 20:53:59 2022 +0100 xinput1_3: Fix the spelling of a WARN() message and helper. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index c8ce6622dcb..909ef9e7dfd 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -470,7 +470,7 @@ static void get_registry_keys(HKEY *defkey, HKEY *appkey) } } -static BOOL device_is_overriden(HANDLE device) +static BOOL device_is_overridden(HANDLE device) { WCHAR name[MAX_PATH], buffer[MAX_PATH]; DWORD size = sizeof(buffer); @@ -519,8 +519,8 @@ static BOOL try_add_device(const WCHAR *device_path) else if (caps.Usage != HID_USAGE_GENERIC_GAMEPAD && caps.Usage != HID_USAGE_GENERIC_JOYSTICK && caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); - else if (device_is_overriden(device)) - WARN("ignoring HID device, overriden for dinput\n"); + else if (device_is_overridden(device)) + WARN("ignoring HID device, overridden for dinput\n"); else if (!controller_init(&controllers[i], preparsed, &caps, device, device_path)) WARN("ignoring HID device, failed to initialize\n"); else

1 0

Eric Pouech : rasapi32: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: df977dd3bb7eb90bf2eabbca8550e905a7965bb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df977dd3bb7eb90bf2eabbca… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:37 2022 +0100 rasapi32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rasapi32/Makefile.in | 1 - dlls/rasapi32/rasapi.c | 52 +++++++++++++++++++++++------------------------ 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in index e1d31e8c405..ff7e71042f9 100644 --- a/dlls/rasapi32/Makefile.in +++ b/dlls/rasapi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rasapi32.dll IMPORTLIB = rasapi32 diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index f70f73caa2c..a7f3baf4953 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -30,13 +30,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(ras); DWORD WINAPI RasConnectionNotificationA(HRASCONN hrasconn, HANDLE hEvent, DWORD dwFlags) { - FIXME("(%p,%p,0x%08x),stub!\n",hrasconn,hEvent,dwFlags); + FIXME("(%p,%p,0x%08lx),stub!\n",hrasconn,hEvent,dwFlags); return 1; } DWORD WINAPI RasConnectionNotificationW(HRASCONN hrasconn, HANDLE hEvent, DWORD dwFlags) { - FIXME("(%p,%p,0x%08x),stub!\n",hrasconn,hEvent,dwFlags); + FIXME("(%p,%p,0x%08lx),stub!\n",hrasconn,hEvent,dwFlags); return 1; } @@ -54,14 +54,14 @@ DWORD WINAPI RasCreatePhonebookEntryW(HWND hwnd, LPCWSTR lpszPhonebook) DWORD WINAPI RasDeleteSubEntryA(LPCSTR lpszPhonebook, LPCSTR lpszEntry, DWORD dwSubEntryId) { - FIXME("(%s,%s,0x%08x),stub!\n",debugstr_a(lpszPhonebook), + FIXME("(%s,%s,0x%08lx),stub!\n",debugstr_a(lpszPhonebook), debugstr_a(lpszEntry),dwSubEntryId); return 0; } DWORD WINAPI RasDeleteSubEntryW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, DWORD dwSubEntryId) { - FIXME("(%s,%s,0x%08x),stub!\n",debugstr_w(lpszPhonebook), + FIXME("(%s,%s,0x%08lx),stub!\n",debugstr_w(lpszPhonebook), debugstr_w(lpszEntry),dwSubEntryId); return 0; } @@ -70,7 +70,7 @@ DWORD WINAPI RasDialA(LPRASDIALEXTENSIONS lpRasDialExtensions, LPCSTR lpszPhoneb LPRASDIALPARAMSA lpRasDialParams, DWORD dwNotifierType, LPVOID lpvNotifier, LPHRASCONN lphRasConn) { - FIXME("(%p,%s,%p,0x%08x,%p,%p),stub!\n",lpRasDialExtensions,debugstr_a(lpszPhonebook), + FIXME("(%p,%s,%p,0x%08lx,%p,%p),stub!\n",lpRasDialExtensions,debugstr_a(lpszPhonebook), lpRasDialParams,dwNotifierType,lpvNotifier,lphRasConn); return 1; } @@ -79,7 +79,7 @@ DWORD WINAPI RasDialW(LPRASDIALEXTENSIONS lpRasDialExtensions, LPCWSTR lpszPhone LPRASDIALPARAMSW lpRasDialParams, DWORD dwNotifierType, LPVOID lpvNotifier, LPHRASCONN lphRasConn) { - FIXME("(%p,%s,%p,0x%08x,%p,%p),stub!\n",lpRasDialExtensions,debugstr_w(lpszPhonebook), + FIXME("(%p,%s,%p,0x%08lx,%p,%p),stub!\n",lpRasDialExtensions,debugstr_w(lpszPhonebook), lpRasDialParams,dwNotifierType,lpvNotifier,lphRasConn); return 1; } @@ -300,7 +300,7 @@ DWORD WINAPI RasGetAutodialAddressW(LPCWSTR a, LPDWORD b, LPRASAUTODIALENTRYW c, */ DWORD WINAPI RasGetAutodialEnableA(DWORD a, LPBOOL b) { - FIXME("(%x,%p),stub!\n",a,b); + FIXME("(%lx,%p),stub!\n",a,b); return 0; } @@ -309,7 +309,7 @@ DWORD WINAPI RasGetAutodialEnableA(DWORD a, LPBOOL b) */ DWORD WINAPI RasGetAutodialEnableW(DWORD a, LPBOOL b) { - FIXME("(%x,%p),stub!\n",a,b); + FIXME("(%lx,%p),stub!\n",a,b); return 0; } @@ -318,7 +318,7 @@ DWORD WINAPI RasGetAutodialEnableW(DWORD a, LPBOOL b) */ DWORD WINAPI RasGetAutodialParamA(DWORD dwKey, LPVOID lpvValue, LPDWORD lpdwcbValue) { - FIXME("(%x,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue); + FIXME("(%lx,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue); return 0; } @@ -327,7 +327,7 @@ DWORD WINAPI RasGetAutodialParamA(DWORD dwKey, LPVOID lpvValue, LPDWORD lpdwcbVa */ DWORD WINAPI RasGetAutodialParamW(DWORD dwKey, LPVOID lpvValue, LPDWORD lpdwcbValue) { - FIXME("(%x,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue); + FIXME("(%lx,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue); return 0; } @@ -337,7 +337,7 @@ DWORD WINAPI RasGetAutodialParamW(DWORD dwKey, LPVOID lpvValue, LPDWORD lpdwcbVa DWORD WINAPI RasSetAutodialAddressA(LPCSTR a, DWORD b, LPRASAUTODIALENTRYA c, DWORD d, DWORD e) { - FIXME("(%s,%x,%p,%x,%x),stub!\n",debugstr_a(a),b,c,d,e); + FIXME("(%s,%lx,%p,%lx,%lx),stub!\n",debugstr_a(a),b,c,d,e); return 0; } @@ -347,7 +347,7 @@ DWORD WINAPI RasSetAutodialAddressA(LPCSTR a, DWORD b, LPRASAUTODIALENTRYA c, DWORD WINAPI RasSetAutodialAddressW(LPCWSTR a, DWORD b, LPRASAUTODIALENTRYW c, DWORD d, DWORD e) { - FIXME("(%s,%x,%p,%x,%x),stub!\n",debugstr_w(a),b,c,d,e); + FIXME("(%s,%lx,%p,%lx,%lx),stub!\n",debugstr_w(a),b,c,d,e); return 0; } @@ -356,7 +356,7 @@ DWORD WINAPI RasSetAutodialAddressW(LPCWSTR a, DWORD b, LPRASAUTODIALENTRYW c, */ DWORD WINAPI RasSetAutodialEnableA(DWORD dwDialingLocation, BOOL fEnabled) { - FIXME("(%x,%x),stub!\n",dwDialingLocation,fEnabled); + FIXME("(%lx,%x),stub!\n",dwDialingLocation,fEnabled); return 0; } @@ -365,7 +365,7 @@ DWORD WINAPI RasSetAutodialEnableA(DWORD dwDialingLocation, BOOL fEnabled) */ DWORD WINAPI RasSetAutodialEnableW(DWORD dwDialingLocation, BOOL fEnabled) { - FIXME("(%x,%x),stub!\n",dwDialingLocation,fEnabled); + FIXME("(%lx,%x),stub!\n",dwDialingLocation,fEnabled); return 0; } @@ -374,7 +374,7 @@ DWORD WINAPI RasSetAutodialEnableW(DWORD dwDialingLocation, BOOL fEnabled) */ DWORD WINAPI RasSetAutodialParamA(DWORD a, LPVOID b, DWORD c) { - FIXME("(%x,%p,%x),stub!\n",a,b,c); + FIXME("(%lx,%p,%lx),stub!\n",a,b,c); return 0; } @@ -383,7 +383,7 @@ DWORD WINAPI RasSetAutodialParamA(DWORD a, LPVOID b, DWORD c) */ DWORD WINAPI RasSetAutodialParamW(DWORD a, LPVOID b, DWORD c) { - FIXME("(%x,%p,%x),stub!\n",a,b,c); + FIXME("(%lx,%p,%lx),stub!\n",a,b,c); return 0; } @@ -394,12 +394,12 @@ DWORD WINAPI RasSetEntryPropertiesA(LPCSTR lpszPhonebook, LPCSTR lpszEntry, LPRASENTRYA lpRasEntry, DWORD dwEntryInfoSize, LPBYTE lpbDeviceInfo, DWORD dwDeviceInfoSize ) { - FIXME("(%s,%s,%p,%d,%p,%d), stub!\n", + FIXME("(%s,%s,%p,%ld,%p,%ld), stub!\n", debugstr_a(lpszPhonebook),debugstr_a(lpszEntry), lpRasEntry,dwEntryInfoSize,lpbDeviceInfo,dwDeviceInfoSize ); FIXME("Rasentry:\n"); - FIXME("\tdwfOptions %x\n",lpRasEntry->dwfOptions); + FIXME("\tdwfOptions %lx\n",lpRasEntry->dwfOptions); FIXME("\tszLocalPhoneNumber %s\n",debugstr_a(lpRasEntry->szLocalPhoneNumber)); return 0; } @@ -411,7 +411,7 @@ DWORD WINAPI RasSetEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, LPRASENTRYW lpRasEntry, DWORD dwEntryInfoSize, LPBYTE lpbDeviceInfo, DWORD dwDeviceInfoSize ) { - FIXME("(%s,%s,%p,%d,%p,%d), stub!\n", + FIXME("(%s,%s,%p,%ld,%p,%ld), stub!\n", debugstr_w(lpszPhonebook),debugstr_w(lpszEntry), lpRasEntry,dwEntryInfoSize,lpbDeviceInfo,dwDeviceInfoSize ); @@ -458,13 +458,13 @@ DWORD WINAPI RasGetEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, LP DWORD WINAPI RasGetErrorStringA(UINT uErrorValue, LPSTR lpszErrorString, DWORD cBufSize) { - FIXME("(0x%08x,%p,0x%08x), stub!\n", uErrorValue, lpszErrorString, cBufSize); + FIXME("(0x%08x,%p,0x%08lx), stub!\n", uErrorValue, lpszErrorString, cBufSize); return 1; } DWORD WINAPI RasGetErrorStringW(UINT uErrorValue, LPWSTR lpszErrorString, DWORD cBufSize) { - FIXME("(0x%08x,%p,0x%08x), stub!\n", uErrorValue, lpszErrorString, cBufSize); + FIXME("(0x%08x,%p,0x%08lx), stub!\n", uErrorValue, lpszErrorString, cBufSize); return 1; } @@ -510,13 +510,13 @@ DWORD WINAPI RasSetCredentialsW(const WCHAR *phonebook, const WCHAR *entry, RASC DWORD WINAPI RasSetCustomAuthDataA(const char *phonebook, const char *entry, BYTE *authdata, DWORD size) { - FIXME("(%s,%s,%p,0x%08x), stub!\n", debugstr_a(phonebook), debugstr_a(entry), authdata, size); + FIXME("(%s,%s,%p,0x%08lx), stub!\n", debugstr_a(phonebook), debugstr_a(entry), authdata, size); return 0; } DWORD WINAPI RasSetCustomAuthDataW(const WCHAR *phonebook, const WCHAR *entry, BYTE *authdata, DWORD size) { - FIXME("(%s,%s,%p,0x%08x), stub!\n", debugstr_w(phonebook), debugstr_w(entry), authdata, size); + FIXME("(%s,%s,%p,0x%08lx), stub!\n", debugstr_w(phonebook), debugstr_w(entry), authdata, size); return 0; } @@ -538,7 +538,7 @@ DWORD WINAPI RasSetSubEntryPropertiesA(LPCSTR lpszPhonebook, LPCSTR lpszEntry, D LPRASSUBENTRYA lpRasSubEntry, DWORD dwcbRasSubEntry, LPBYTE lpbDeviceConfig, DWORD dwcbDeviceConfig) { - FIXME("(%s,%s,0x%08x,%p,0x%08x,%p,0x%08x), stub!\n", debugstr_a(lpszPhonebook), + FIXME("(%s,%s,0x%08lx,%p,0x%08lx,%p,0x%08lx), stub!\n", debugstr_a(lpszPhonebook), debugstr_a(lpszEntry), dwSubEntry, lpRasSubEntry, dwcbRasSubEntry, lpbDeviceConfig, dwcbDeviceConfig); return 0; @@ -548,7 +548,7 @@ DWORD WINAPI RasSetSubEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, LPRASSUBENTRYW lpRasSubEntry, DWORD dwcbRasSubEntry, LPBYTE lpbDeviceConfig, DWORD dwcbDeviceConfig) { - FIXME("(%s,%s,0x%08x,%p,0x%08x,%p,0x%08x), stub!\n", debugstr_w(lpszPhonebook), + FIXME("(%s,%s,0x%08lx,%p,0x%08lx,%p,0x%08lx), stub!\n", debugstr_w(lpszPhonebook), debugstr_w(lpszEntry), dwSubEntry, lpRasSubEntry, dwcbRasSubEntry, lpbDeviceConfig, dwcbDeviceConfig); return 0; @@ -556,7 +556,7 @@ DWORD WINAPI RasSetSubEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, DWORD WINAPI RasGetLinkStatistics(HRASCONN connection, DWORD entry, RAS_STATS *statistics) { - FIXME("(%p,%u,%p), stub!\n", connection, entry, statistics); + FIXME("(%p,%lu,%p), stub!\n", connection, entry, statistics); return 0; }

1 0

Eric Pouech : rpcrt4: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: b67a843c1a25b3dcce653b14d213b904f883c009 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b67a843c1a25b3dcce653b14… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:49 2022 +0100 rpcrt4: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/Makefile.in | 2 +- dlls/rpcrt4/cproxy.c | 6 +- dlls/rpcrt4/cstub.c | 8 +-- dlls/rpcrt4/ndr_clientserver.c | 4 +- dlls/rpcrt4/ndr_contexthandle.c | 12 ++-- dlls/rpcrt4/ndr_es.c | 32 ++++----- dlls/rpcrt4/ndr_fullpointer.c | 8 +-- dlls/rpcrt4/ndr_marshall.c | 150 ++++++++++++++++++++-------------------- dlls/rpcrt4/ndr_ole.c | 8 +-- dlls/rpcrt4/ndr_stubless.c | 30 ++++---- dlls/rpcrt4/ndr_typelib.c | 6 +- dlls/rpcrt4/rpc_assoc.c | 2 +- dlls/rpcrt4/rpc_async.c | 2 +- dlls/rpcrt4/rpc_binding.c | 58 ++++++++-------- dlls/rpcrt4/rpc_epmap.c | 20 +++--- dlls/rpcrt4/rpc_message.c | 62 ++++++++--------- dlls/rpcrt4/rpc_server.c | 40 +++++------ dlls/rpcrt4/rpc_transport.c | 76 ++++++++++---------- dlls/rpcrt4/rpcrt4_main.c | 12 ++-- 19 files changed, 269 insertions(+), 269 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b67a843c1a25b3dcce65…

1 0

Eric Pouech : rsaenh: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 8a12a30503951fa002dc57126944235d81371d08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a12a30503951fa002dc5712… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:56 2022 +0100 rsaenh: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/Makefile.in | 1 - dlls/rsaenh/handle.c | 10 +++---- dlls/rsaenh/rsaenh.c | 72 ++++++++++++++++++++++++------------------------- 3 files changed, 41 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a12a30503951fa002dc…

1 0

Eric Pouech : rstrtmgr: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: f0849f7dbc70fa5be21bf9f52c64777c39df9bed URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0849f7dbc70fa5be21bf9f5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:12:03 2022 +0100 rstrtmgr: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rstrtmgr/Makefile.in | 1 - dlls/rstrtmgr/main.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/rstrtmgr/Makefile.in b/dlls/rstrtmgr/Makefile.in index 9770a4b3408..8e9610ee5c9 100644 --- a/dlls/rstrtmgr/Makefile.in +++ b/dlls/rstrtmgr/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rstrtmgr.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c index b9f29c7060c..238bcc20b1a 100644 --- a/dlls/rstrtmgr/main.c +++ b/dlls/rstrtmgr/main.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(rstrtmgr); DWORD WINAPI RmGetList(DWORD dwSessionHandle, UINT *pnProcInfoNeeded, UINT *pnProcInfo, RM_PROCESS_INFO *rgAffectedApps[], LPDWORD lpdwRebootReasons) { - FIXME("%d, %p, %p, %p, %p stub!\n", dwSessionHandle, pnProcInfoNeeded, pnProcInfo, rgAffectedApps, lpdwRebootReasons); + FIXME("%ld, %p, %p, %p, %p stub!\n", dwSessionHandle, pnProcInfoNeeded, pnProcInfo, rgAffectedApps, lpdwRebootReasons); if (pnProcInfoNeeded) *pnProcInfoNeeded = 0; if (pnProcInfo) @@ -51,7 +51,7 @@ DWORD WINAPI RmRegisterResources(DWORD dwSessionHandle, UINT nFiles, LPCWSTR rgs UINT nApplications, RM_UNIQUE_PROCESS *rgApplications, UINT nServices, LPCWSTR rgsServiceNames[]) { - FIXME("%d, %d, %p, %d, %p, %d, %p stub!\n", dwSessionHandle, nFiles, rgsFilenames, + FIXME("%ld, %d, %p, %d, %p, %d, %p stub!\n", dwSessionHandle, nFiles, rgsFilenames, nApplications, rgApplications, nServices, rgsServiceNames); return ERROR_SUCCESS; } @@ -63,7 +63,7 @@ DWORD WINAPI RmRegisterResources(DWORD dwSessionHandle, UINT nFiles, LPCWSTR rgs */ DWORD WINAPI RmStartSession(DWORD *sessionhandle, DWORD flags, WCHAR sessionkey[]) { - FIXME("%p, %d, %p stub!\n", sessionhandle, flags, sessionkey); + FIXME("%p, %ld, %p stub!\n", sessionhandle, flags, sessionkey); if (sessionhandle) *sessionhandle = 0xdeadbeef; return ERROR_SUCCESS; @@ -74,7 +74,7 @@ DWORD WINAPI RmStartSession(DWORD *sessionhandle, DWORD flags, WCHAR sessionkey[ */ DWORD WINAPI RmRestart(DWORD handle, DWORD flags, RM_WRITE_STATUS_CALLBACK status) { - FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); + FIXME("%lu, 0x%08lx, %p stub!\n", handle, flags, status); return ERROR_SUCCESS; } @@ -83,7 +83,7 @@ DWORD WINAPI RmRestart(DWORD handle, DWORD flags, RM_WRITE_STATUS_CALLBACK statu */ DWORD WINAPI RmEndSession(DWORD handle) { - FIXME("%u stub!\n", handle); + FIXME("%lu stub!\n", handle); return ERROR_SUCCESS; } @@ -92,7 +92,7 @@ DWORD WINAPI RmEndSession(DWORD handle) */ DWORD WINAPI RmShutdown(DWORD handle, ULONG flags, RM_WRITE_STATUS_CALLBACK status) { - FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); + FIXME("%lu, 0x%08lx, %p stub!\n", handle, flags, status); return ERROR_SUCCESS; } @@ -102,7 +102,7 @@ DWORD WINAPI RmShutdown(DWORD handle, ULONG flags, RM_WRITE_STATUS_CALLBACK stat DWORD WINAPI RmAddFilter(DWORD handle, LPCWSTR moduleName, RM_UNIQUE_PROCESS *process, LPCWSTR serviceShortName, RM_FILTER_ACTION filter) { - FIXME("%u, %s %p %s 0x%08x stub!\n", handle, debugstr_w(moduleName), process, + FIXME("%lu, %s %p %s 0x%08x stub!\n", handle, debugstr_w(moduleName), process, debugstr_w(serviceShortName), filter); return ERROR_SUCCESS; } @@ -113,7 +113,7 @@ DWORD WINAPI RmAddFilter(DWORD handle, LPCWSTR moduleName, RM_UNIQUE_PROCESS *pr DWORD WINAPI RmRemoveFilter(DWORD handle, LPCWSTR moduleName, RM_UNIQUE_PROCESS *process, LPCWSTR serviceShortName) { - FIXME("%u, %s %p %s stub!\n", handle, debugstr_w(moduleName), process, + FIXME("%lu, %s %p %s stub!\n", handle, debugstr_w(moduleName), process, debugstr_w(serviceShortName)); return ERROR_SUCCESS; }

1 0

Eric Pouech : rtutils: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 6714a290deeeca205c502e29a0aafe0f20aa3b83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6714a290deeeca205c502e29… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:12:09 2022 +0100 rtutils: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtutils/Makefile.in | 1 - dlls/rtutils/tracing.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/rtutils/Makefile.in b/dlls/rtutils/Makefile.in index ac39ee054aa..d55efc11cfb 100644 --- a/dlls/rtutils/Makefile.in +++ b/dlls/rtutils/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rtutils.dll IMPORTLIB = rtutils diff --git a/dlls/rtutils/tracing.c b/dlls/rtutils/tracing.c index 96d1dfb4a02..576acbd7647 100644 --- a/dlls/rtutils/tracing.c +++ b/dlls/rtutils/tracing.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(rtutils); */ DWORD WINAPI TraceRegisterExW(LPCWSTR name, DWORD flags) { - FIXME("(%s, %x): stub\n", debugstr_w(name), flags); + FIXME("(%s, %lx): stub\n", debugstr_w(name), flags); return INVALID_TRACEID; }

1 0

Eric Pouech : sane.ds: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 6b6e863c525cb8d1728d132f3f9f49b4db157ca0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b6e863c525cb8d1728d132f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:12:15 2022 +0100 sane.ds: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sane.ds/Makefile.in | 1 - dlls/sane.ds/capability.c | 12 ++++++------ dlls/sane.ds/ds_ctrl.c | 2 +- dlls/sane.ds/sane_main.c | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index 9c4931a0b54..59ceeda3fac 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sane.ds UNIXLIB = sane.so IMPORTS = comctl32 user32 gdi32 diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 8c0922ca176..15ca4ea740a 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -198,7 +198,7 @@ static TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action if (twCC == TWCC_SUCCESS) { activeDS.capXferMech = (TW_UINT16) val; - FIXME("Partial Stub: XFERMECH set to %d, but ignored\n", val); + FIXME("Partial Stub: XFERMECH set to %ld, but ignored\n", val); } break; @@ -242,7 +242,7 @@ static TW_UINT16 SANE_CAPXferCount (pTW_CAPABILITY pCapability, TW_UINT16 action case MSG_SET: twCC = msg_set(pCapability, &val); if (twCC == TWCC_SUCCESS) - FIXME("Partial Stub: XFERCOUNT set to %d, but ignored\n", val); + FIXME("Partial Stub: XFERCOUNT set to %ld, but ignored\n", val); break; case MSG_GETDEFAULT: @@ -326,7 +326,7 @@ static TW_UINT16 SANE_ICAPPixelType (pTW_CAPABILITY pCapability, TW_UINT16 actio twCC = msg_set(pCapability, &val); if (twCC == TWCC_SUCCESS) { - TRACE("Setting pixeltype to %d\n", val); + TRACE("Setting pixeltype to %ld\n", val); if (! pixeltype_to_sane_mode(val, mode, sizeof(mode))) return TWCC_BADVALUE; @@ -493,7 +493,7 @@ static TW_UINT16 SANE_ICAPCompression (pTW_CAPABILITY pCapability, TW_UINT16 act case MSG_SET: twCC = msg_set(pCapability, &val); if (twCC == TWCC_SUCCESS) - FIXME("Partial Stub: COMPRESSION set to %d, but ignored\n", val); + FIXME("Partial Stub: COMPRESSION set to %ld, but ignored\n", val); break; case MSG_GETDEFAULT: @@ -659,7 +659,7 @@ static TW_UINT16 SANE_ICAPPixelFlavor (pTW_CAPABILITY pCapability, TW_UINT16 act twCC = msg_set(pCapability, &val); if (twCC == TWCC_SUCCESS) { - FIXME("Stub: PIXELFLAVOR set to %d, but ignored\n", val); + FIXME("Stub: PIXELFLAVOR set to %ld, but ignored\n", val); } break; @@ -822,7 +822,7 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 if (supported_sizes[i].size == val) return set_width_height(supported_sizes[i].x, supported_sizes[i].y); - ERR("Unsupported size %d\n", val); + ERR("Unsupported size %ld\n", val); twCC = TWCC_BADCAP; break; diff --git a/dlls/sane.ds/ds_ctrl.c b/dlls/sane.ds/ds_ctrl.c index 915f085a481..79c268a36ae 100644 --- a/dlls/sane.ds/ds_ctrl.c +++ b/dlls/sane.ds/ds_ctrl.c @@ -176,7 +176,7 @@ TW_UINT16 SANE_ProcessEvent (pTW_IDENTITY pOrigin, pTW_EVENT pEvent = (pTW_EVENT) pData; MSG *pMsg = pEvent->pEvent; - TRACE("DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT msg 0x%x, wParam 0x%lx\n", pMsg->message, pMsg->wParam); + TRACE("DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT msg 0x%x, wParam 0x%Ix\n", pMsg->message, pMsg->wParam); activeDS.twCC = TWCC_SUCCESS; pEvent->TWMessage = MSG_NULL; /* no message to the application */ diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 48972bd4b8c..832c333ae57 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -34,7 +34,7 @@ unixlib_handle_t sane_handle = 0; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { @@ -333,7 +333,7 @@ DS_Entry ( pTW_IDENTITY pOrigin, { TW_UINT16 twRC = TWRC_SUCCESS; /* Return Code */ - TRACE("(DG=%d DAT=%d MSG=%d)\n", DG, DAT, MSG); + TRACE("(DG=%ld DAT=%d MSG=%d)\n", DG, DAT, MSG); switch (DG) {

1 0

Eric Pouech : sapi: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 341d9a4c59a44b318c3b013ccfa89d006908200a URL: https://source.winehq.org/git/wine.git/?a=commit;h=341d9a4c59a44b318c3b013c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:12:21 2022 +0100 sapi: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/Makefile.in | 1 - dlls/sapi/automation.c | 26 +++++++++++++------------- dlls/sapi/resource.c | 4 ++-- dlls/sapi/stream.c | 18 +++++++++--------- dlls/sapi/token.c | 20 ++++++++++---------- dlls/sapi/tts.c | 48 ++++++++++++++++++++++++------------------------ 6 files changed, 58 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=341d9a4c59a44b318c3b…

1 0