February 2022 - Wine-Commits

Eric Pouech : user32/tests: Don't outdent todo_wine*.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: ccf6204cf70071aa9215402f2e6b3f65aa359a86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccf6204cf70071aa9215402f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 08:08:20 2022 +0100 user32/tests: Don't outdent todo_wine*. This prevents -Wmisleading-indentation warnings (Mingw GCC11). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/scroll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 57bf759879c..40eb13943fc 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -358,7 +358,7 @@ static void scrollbar_test_default( DWORD style) if( !(style & WS_VSCROLL)) { if (bThemeActive || style != WS_HSCROLL) -todo_wine + todo_wine ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_VSCROLL), "unexpected style change %08x/%08x\n", winstyle, style); else @@ -394,7 +394,7 @@ todo_wine if( !(style & WS_HSCROLL)) { if (bThemeActive || style != WS_VSCROLL) -todo_wine + todo_wine ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_HSCROLL), "unexpected style change %08x/%08x\n", winstyle, style); else

1 0

Eric Pouech : bcrypt/tests: Don't outdent todo_wine*.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 5cf4d0b6c9f2fc2578e28434af515dfecc4f5c50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cf4d0b6c9f2fc2578e28434… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 08:07:51 2022 +0100 bcrypt/tests: Don't outdent todo_wine*. This prevents -Wmisleading-indentation warnings (Mingw GCC11). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 46793018742..e7619897cfd 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -81,7 +81,7 @@ static void test_BCryptGetFipsAlgorithmMode(void) else { expected = FALSE; -todo_wine + todo_wine ok(0, "Neither XP or Vista key is present\n"); } RegCloseKey(hkey);

1 0

Eric Pouech : wevtapi: Enable compilation with long types.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 5c22bc551c8f0956abc5a1d824e0925f5044e70b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c22bc551c8f0956abc5a1d8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:59:37 2022 +0100 wevtapi: 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/wevtapi/Makefile.in | 1 - dlls/wevtapi/main.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wevtapi/Makefile.in b/dlls/wevtapi/Makefile.in index b99c0527ab6..4b300799051 100644 --- a/dlls/wevtapi/Makefile.in +++ b/dlls/wevtapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wevtapi.dll IMPORTLIB = wevtapi diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 3a2fd242284..f0db41ebf88 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -32,13 +32,13 @@ static const WCHAR log_pathW[] = L"C:\\windows\\temp\\evt.log"; EVT_HANDLE WINAPI EvtOpenSession(EVT_LOGIN_CLASS login_class, void *login, DWORD timeout, DWORD flags) { - FIXME("(%u %p %u %u) stub\n", login_class, login, timeout, flags); + FIXME("(%u %p %lu %lu) stub\n", login_class, login, timeout, flags); return NULL; } EVT_HANDLE WINAPI EvtOpenLog(EVT_HANDLE session, const WCHAR *path, DWORD flags) { - FIXME("(%p %s %u) stub\n", session, debugstr_w(path), flags); + FIXME("(%p %s %lu) stub\n", session, debugstr_w(path), flags); return NULL; } @@ -49,7 +49,7 @@ BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, PEVT_VARIANT PropertyValueBuffer, DWORD *PropertyValueBufferUsed) { - FIXME("(%p %i %u %u %p %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValueBufferSize, + FIXME("(%p %i %lu %lu %p %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValueBufferSize, PropertyValueBuffer, PropertyValueBufferUsed); switch (PropertyId) @@ -81,7 +81,7 @@ BOOL WINAPI EvtSetChannelConfigProperty(EVT_HANDLE ChannelConfig, DWORD Flags, PEVT_VARIANT PropertyValue) { - FIXME("(%p %i %u %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValue); + FIXME("(%p %i %lu %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValue); return TRUE; } @@ -89,38 +89,38 @@ EVT_HANDLE WINAPI EvtSubscribe(EVT_HANDLE Session, HANDLE SignalEvent, LPCWSTR C LPCWSTR Query, EVT_HANDLE Bookmark, PVOID context, EVT_SUBSCRIBE_CALLBACK Callback, DWORD Flags) { - FIXME("(%p %p %s %s %p %p %p %u) stub\n", Session, SignalEvent, debugstr_w(ChannelPath), + FIXME("(%p %p %s %s %p %p %p %lu) stub\n", Session, SignalEvent, debugstr_w(ChannelPath), debugstr_w(Query), Bookmark, context, Callback, Flags); return NULL; } EVT_HANDLE WINAPI EvtOpenChannelEnum(EVT_HANDLE session, DWORD flags) { - FIXME("(%p %u) stub\n", session, flags); + FIXME("(%p %lu) stub\n", session, flags); return NULL; } BOOL WINAPI EvtNextChannelPath(EVT_HANDLE channel_enum, DWORD buffer_len, WCHAR *buffer, DWORD *used) { - FIXME("(%p %u %p %p) stub\n", channel_enum, buffer_len, buffer, used); + FIXME("(%p %lu %p %p) stub\n", channel_enum, buffer_len, buffer, used); return FALSE; } EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, DWORD Flags) { - FIXME("(%p %s %u) stub\n", Session, debugstr_w(ChannelPath), Flags); + FIXME("(%p %s %lu) stub\n", Session, debugstr_w(ChannelPath), Flags); return (EVT_HANDLE)0xdeadbeef; } EVT_HANDLE WINAPI EvtQuery(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, DWORD flags) { - FIXME("(%p %s %s %u) stub\n", session, debugstr_w(path), debugstr_w(query), flags); + FIXME("(%p %s %s %lu) stub\n", session, debugstr_w(path), debugstr_w(query), flags); return NULL; } BOOL WINAPI EvtSaveChannelConfig(EVT_HANDLE channel, DWORD flags) { - FIXME("(%p,%08x) stub\n", channel, flags); + FIXME("(%p,%08lx) stub\n", channel, flags); return TRUE; } @@ -132,14 +132,14 @@ BOOL WINAPI EvtClose(EVT_HANDLE handle) BOOL WINAPI EvtNext(EVT_HANDLE result_set, DWORD size, EVT_HANDLE *array, DWORD timeout, DWORD flags, DWORD *ret_count) { - FIXME("(%p %u %p %u %#x %p) stub!\n", result_set, size, array, timeout, flags, ret_count); + FIXME("(%p %lu %p %lu %#lx %p) stub!\n", result_set, size, array, timeout, flags, ret_count); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } BOOL WINAPI EvtExportLog(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, const WCHAR *file, DWORD flags) { - FIXME("(%p %s %s %s %#x) stub!\n", session, debugstr_w(path), debugstr_w(query), debugstr_w(file), flags); + FIXME("(%p %s %s %s %#lx) stub!\n", session, debugstr_w(path), debugstr_w(query), debugstr_w(file), flags); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; }

1 0

Eric Pouech : kernel32/tests: Don't outdent todo_wine*.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 912cdec76d6d9334a9fb3ba48f554e3231d79e51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=912cdec76d6d9334a9fb3ba4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 08:07:33 2022 +0100 kernel32/tests: Don't outdent todo_wine*. This prevents -Wmisleading-indentation warnings (Mingw GCC11). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 12 ++++++------ dlls/kernel32/tests/process.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index f8e49491a7d..f16a092a4df 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4098,14 +4098,14 @@ static void test_CreateFile(void) ok(hfile == INVALID_HANDLE_VALUE, "CreateFile should fail\n"); if (i == 0 || i == 5) { -/* FIXME: remove once Wine is fixed */ -todo_wine_if (i == 5) + /* FIXME: remove once Wine is fixed */ + todo_wine_if (i == 5) ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); } else { -/* FIXME: remove once Wine is fixed */ -todo_wine_if (i == 1) + /* FIXME: remove once Wine is fixed */ + todo_wine_if (i == 1) ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); } @@ -4116,8 +4116,8 @@ todo_wine_if (i == 1) ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); else { -/* FIXME: remove once Wine is fixed */ -todo_wine_if (i == 1) + /* FIXME: remove once Wine is fixed */ + todo_wine_if (i == 1) ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); } } diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index a558597a404..a4af5bb57ff 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3833,7 +3833,7 @@ static void test_process_info(HANDLE hproc) ok(status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, "for info %u, got %08x (ret_len %u)\n", i, status, ret_len); else -todo_wine + todo_wine ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break;

1 0

Eric Pouech : comctl32/tests: Don't outdent todo_wine*.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 06d399fcb00e07e5c92e17b1252ca030ee01780d URL: https://source.winehq.org/git/wine.git/?a=commit;h=06d399fcb00e07e5c92e17b1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 08:07:21 2022 +0100 comctl32/tests: Don't outdent todo_wine*. This prevents -Wmisleading-indentation warnings (Mingw GCC11). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/static.c | 4 ++-- dlls/comctl32/tests/toolbar.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 9bd22408985..0038cadd7d2 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -165,7 +165,7 @@ static void test_image(HBITMAP image, BOOL is_dib, BOOL is_premult, BOOL is_alph ok(bm.bmBits != NULL, "bmBits is NULL\n"); memcpy(bits, bm.bmBits, 4); if (is_premult) -todo_wine + todo_wine ok(bits[0] == 0x05 && bits[1] == 0x09 && bits[2] == 0x0e && bits[3] == 0x44, "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); else if (is_alpha) @@ -195,7 +195,7 @@ todo_wine DeleteDC(hdc); if (is_premult) -todo_wine + todo_wine ok(bits[0] == 0x05 && bits[1] == 0x09 && bits[2] == 0x0e && bits[3] == 0x44, "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); else if (is_alpha) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index cfe4f16f430..dcd95ffa4d8 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2728,7 +2728,7 @@ static void test_BTNS_SEP(void) memset(&button, 0, sizeof(button)); ret = SendMessageA(hwnd, TB_GETBUTTON, 0, (LPARAM)&button); ok(ret == 1, "Unexpected return value.\n"); -todo_wine + todo_wine ok(button.iBitmap == 8, "Unexpected iBitmap value %d.\n", button.iBitmap); rebuild_toolbar(&hwnd); @@ -2789,7 +2789,7 @@ todo_wine memset(&button, 0, sizeof(button)); ret = SendMessageA(hwnd, TB_GETBUTTON, 0, (LPARAM)&button); ok(ret == 1, "Unexpected return value.\n"); -todo_wine + todo_wine ok(button.iBitmap == 8, "Unexpected iBitmap value %d.\n", button.iBitmap); DestroyWindow(hwnd);

1 0

Eric Pouech : wer: Enable compilation with long types.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: fef66ec03eeef7d21c2c6c34573f2ecac1285e61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fef66ec03eeef7d21c2c6c34… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:59:31 2022 +0100 wer: 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/wer/Makefile.in | 1 - dlls/wer/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wer/Makefile.in b/dlls/wer/Makefile.in index ac3d79bd59d..a422a934bc0 100644 --- a/dlls/wer/Makefile.in +++ b/dlls/wer/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wer.dll IMPORTLIB = wer IMPORTS = advapi32 diff --git a/dlls/wer/main.c b/dlls/wer/main.c index e54e6d6e0c9..44c6718f310 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -155,7 +155,7 @@ HRESULT WINAPI WerReportAddDump(HREPORT hReportHandle, HANDLE hProcess, HANDLE h WER_DUMP_TYPE dumpType, PWER_EXCEPTION_INFORMATION pExceptionParam, PWER_DUMP_CUSTOM_OPTIONS pDumpCustomOptions, DWORD dwFlags) { - FIXME("(%p, %p, %p, %d, %p, %p, %u) :stub\n", hReportHandle, hProcess, hThread, dumpType, + FIXME("(%p, %p, %p, %d, %p, %p, %lu) :stub\n", hReportHandle, hProcess, hThread, dumpType, pExceptionParam, pDumpCustomOptions, dwFlags); return E_NOTIMPL; @@ -179,7 +179,7 @@ HRESULT WINAPI WerReportAddDump(HREPORT hReportHandle, HANDLE hProcess, HANDLE h */ HRESULT WINAPI WerReportAddFile(HREPORT hreport, PCWSTR path, WER_FILE_TYPE type, DWORD flags) { - FIXME("(%p, %s, %d, 0x%x) :stub\n", hreport, debugstr_w(path), type, flags); + FIXME("(%p, %s, %d, 0x%lx) :stub\n", hreport, debugstr_w(path), type, flags); return S_OK; } @@ -299,7 +299,7 @@ HRESULT WINAPI WerReportCreate(PCWSTR eventtype, WER_REPORT_TYPE reporttype, PWE */ HRESULT WINAPI WerReportSetParameter(HREPORT hreport, DWORD id, PCWSTR name, PCWSTR value) { - FIXME("(%p, %d, %s, %s) :stub\n", hreport, id, debugstr_w(name), debugstr_w(value)); + FIXME("(%p, %ld, %s, %s) :stub\n", hreport, id, debugstr_w(name), debugstr_w(value)); return S_OK; } @@ -323,7 +323,7 @@ HRESULT WINAPI WerReportSetParameter(HREPORT hreport, DWORD id, PCWSTR name, PCW */ HRESULT WINAPI WerReportSubmit(HREPORT hreport, WER_CONSENT consent, DWORD flags, PWER_SUBMIT_RESULT presult) { - FIXME("(%p, %d, 0x%x, %p) :stub\n", hreport, consent, flags, presult); + FIXME("(%p, %d, 0x%lx, %p) :stub\n", hreport, consent, flags, presult); if(!presult) return E_INVALIDARG;

1 0

Eric Pouech : vtdapi.vxd: Enable compilation with long types.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 3c4b6653ba4d3347b0d1f51343a78ce0128cac3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c4b6653ba4d3347b0d1f513… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:59:13 2022 +0100 vtdapi.vxd: 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/vtdapi.vxd/Makefile.in | 1 - dlls/vtdapi.vxd/vtdapi.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/vtdapi.vxd/Makefile.in b/dlls/vtdapi.vxd/Makefile.in index 043b4f7d2e3..685495e70e9 100644 --- a/dlls/vtdapi.vxd/Makefile.in +++ b/dlls/vtdapi.vxd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vtdapi.vxd C_SRCS = \ diff --git a/dlls/vtdapi.vxd/vtdapi.c b/dlls/vtdapi.vxd/vtdapi.c index 7abc00a83f5..43e75f5ce17 100644 --- a/dlls/vtdapi.vxd/vtdapi.c +++ b/dlls/vtdapi.vxd/vtdapi.c @@ -42,7 +42,7 @@ BOOL WINAPI VTDAPI_DeviceIoControl( DWORD code, LPVOID lpvInBuffer, DWORD cbInBu return TRUE; default: - FIXME( "Control %d not implemented\n", code); + FIXME( "Control %ld not implemented\n", code); return FALSE; } }

1 0

Eric Pouech : vwin32.vxd: Enable compilation with long types.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 1699c3a5345cc52fba3d6caabe652ed2ee16cc39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1699c3a5345cc52fba3d6caa… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:59:19 2022 +0100 vwin32.vxd: 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/vwin32.vxd/Makefile.in | 1 - dlls/vwin32.vxd/vwin32.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/vwin32.vxd/Makefile.in b/dlls/vwin32.vxd/Makefile.in index 81282166549..6157900448c 100644 --- a/dlls/vwin32.vxd/Makefile.in +++ b/dlls/vwin32.vxd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vwin32.vxd IMPORTS = kernel diff --git a/dlls/vwin32.vxd/vwin32.c b/dlls/vwin32.vxd/vwin32.c index 5a33f2ba665..63c440fdbe4 100644 --- a/dlls/vwin32.vxd/vwin32.c +++ b/dlls/vwin32.vxd/vwin32.c @@ -123,8 +123,8 @@ BOOL WINAPI VWIN32_DeviceIoControl(DWORD dwIoControlCode, BYTE intnum = 0; TRACE( "Control '%s': " - "eax=0x%08x, ebx=0x%08x, ecx=0x%08x, " - "edx=0x%08x, esi=0x%08x, edi=0x%08x\n", + "eax=0x%08lx, ebx=0x%08lx, ecx=0x%08lx, " + "edx=0x%08lx, esi=0x%08lx, edi=0x%08lx\n", (dwIoControlCode == VWIN32_DIOC_DOS_IOCTL)? "VWIN32_DIOC_DOS_IOCTL" : (dwIoControlCode == VWIN32_DIOC_DOS_INT25)? "VWIN32_DIOC_DOS_INT25" : (dwIoControlCode == VWIN32_DIOC_DOS_INT26)? "VWIN32_DIOC_DOS_INT26" : @@ -165,7 +165,7 @@ BOOL WINAPI VWIN32_DeviceIoControl(DWORD dwIoControlCode, return FALSE; default: - FIXME( "Unknown Control %d\n", dwIoControlCode); + FIXME( "Unknown Control %ld\n", dwIoControlCode); return FALSE; } } @@ -191,7 +191,7 @@ DWORD WINAPI VWIN32_VxDCall( DWORD service, CONTEXT *context ) { DWORD parm = stack32_pop(context); - FIXME("Get VMCPD Version(%08x): partial stub!\n", parm); + FIXME("Get VMCPD Version(%08lx): partial stub!\n", parm); /* FIXME: This is what Win98 returns, it may * not be correct in all situations. @@ -204,7 +204,7 @@ DWORD WINAPI VWIN32_VxDCall( DWORD service, CONTEXT *context ) DWORD callnum = stack32_pop(context); DWORD parm = stack32_pop(context); - TRACE("Int31/DPMI dispatch(%08x)\n", callnum); + TRACE("Int31/DPMI dispatch(%08lx)\n", callnum); context->Eax = callnum; context->Ecx = parm; @@ -217,7 +217,7 @@ DWORD WINAPI VWIN32_VxDCall( DWORD service, CONTEXT *context ) return callnum; /* FIXME: should really call INT_Int41Handler() */ } default: - FIXME("Unknown service %08x\n", service); + FIXME("Unknown service %08lx\n", service); return 0xffffffff; } }

1 0

Eric Pouech : virtdisk: Enable compilation with long types.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 7f44de63f78fc8bc63ef044267f9fcfa2230ce54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f44de63f78fc8bc63ef0442… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:58:44 2022 +0100 virtdisk: 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/virtdisk/Makefile.in | 1 - dlls/virtdisk/virtdisk_main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/virtdisk/Makefile.in b/dlls/virtdisk/Makefile.in index 0b224bd459b..949065907fc 100644 --- a/dlls/virtdisk/Makefile.in +++ b/dlls/virtdisk/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = virtdisk.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/virtdisk/virtdisk_main.c b/dlls/virtdisk/virtdisk_main.c index c4d13241698..bad01a31f46 100644 --- a/dlls/virtdisk/virtdisk_main.c +++ b/dlls/virtdisk/virtdisk_main.c @@ -30,7 +30,7 @@ DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_ { ULONG temp_size = sizeof(STORAGE_DEPENDENCY_INFO); - FIXME("(%p, 0x%x, %u, %p, %p): stub\n", obj, flags, size, info, used); + FIXME("(%p, 0x%x, %lu, %p, %p): stub\n", obj, flags, size, info, used); if (used) *used = temp_size; @@ -61,6 +61,6 @@ DWORD WINAPI OpenVirtualDisk(VIRTUAL_STORAGE_TYPE *type, const WCHAR *path, VIRT DWORD WINAPI DetachVirtualDisk(HANDLE handle, DETACH_VIRTUAL_DISK_FLAG flags, ULONG specific_flags) { - FIXME("(%p, 0x%x, %d): stub\n", handle, flags, specific_flags); + FIXME("(%p, 0x%x, %ld): stub\n", handle, flags, specific_flags); return ERROR_INVALID_PARAMETER; }

1 0

Eric Pouech : vssapi: Enable compilation with long types.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 2c656759555a94158c3210bf0b7f7acbab64eb5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c656759555a94158c3210bf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:59:07 2022 +0100 vssapi: 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/vssapi/Makefile.in | 1 - dlls/vssapi/main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/vssapi/Makefile.in b/dlls/vssapi/Makefile.in index 0df40af2830..867a56287a5 100644 --- a/dlls/vssapi/Makefile.in +++ b/dlls/vssapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vssapi.dll C_SRCS = \ diff --git a/dlls/vssapi/main.c b/dlls/vssapi/main.c index ce06ca23929..c6abead7850 100644 --- a/dlls/vssapi/main.c +++ b/dlls/vssapi/main.c @@ -61,7 +61,7 @@ HRESULT __thiscall VSSAPI_CVssWriter_Initialize( struct CVssWriter *writer, VSS_ VSS_APPLICATION_LEVEL level, DWORD timeout, VSS_ALTERNATE_WRITER_STATE alt_writer_state, BOOL throttle, LPCWSTR instance ) { - FIXME( "%p, %s, %s, %u, %u, %u, %u, %u, %d, %s\n", writer, debugstr_guid(&id), + FIXME( "%p, %s, %s, %u, %u, %u, %lu, %u, %d, %s\n", writer, debugstr_guid(&id), debugstr_w(name), usage_type, source_type, level, timeout, alt_writer_state, throttle, debugstr_w(instance) ); return S_OK; @@ -73,7 +73,7 @@ HRESULT __thiscall VSSAPI_CVssWriter_Initialize( struct CVssWriter *writer, VSS_ DEFINE_THISCALL_WRAPPER( VSSAPI_CVssWriter_Subscribe, 8 ) HRESULT __thiscall VSSAPI_CVssWriter_Subscribe( struct CVssWriter *writer, DWORD flags ) { - FIXME( "%p, %x\n", writer, flags ); + FIXME( "%p, %lx\n", writer, flags ); return S_OK; }

1 0