February 2022 - Wine-Commits

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

Feb. 21, 2022

Module: wine Branch: master Commit: 7ffff5c5564d0f786452b32cc0171c83f9068d81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ffff5c5564d0f786452b32c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:58:02 2022 +0100 vcomp*: 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/vcomp/Makefile.in | 1 - dlls/vcomp/main.c | 2 +- dlls/vcomp100/Makefile.in | 1 - dlls/vcomp110/Makefile.in | 1 - dlls/vcomp120/Makefile.in | 1 - dlls/vcomp140/Makefile.in | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/vcomp/Makefile.in b/dlls/vcomp/Makefile.in index 201b855718a..a54a86f8eb6 100644 --- a/dlls/vcomp/Makefile.in +++ b/dlls/vcomp/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcomp.dll C_SRCS = \ diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index c4f2572c86a..374adf3991a 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -1951,7 +1951,7 @@ void WINAPIV C2VectParallel(int start, int end, int step, BOOL end_included, int BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { - TRACE("(%p, %d, %p)\n", instance, reason, reserved); + TRACE("(%p, %ld, %p)\n", instance, reason, reserved); switch (reason) { diff --git a/dlls/vcomp100/Makefile.in b/dlls/vcomp100/Makefile.in index 6c4d19a9797..b087e894ad7 100644 --- a/dlls/vcomp100/Makefile.in +++ b/dlls/vcomp100/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcomp100.dll PARENTSRC = ../vcomp diff --git a/dlls/vcomp110/Makefile.in b/dlls/vcomp110/Makefile.in index c44f5eae8d8..abd3d465934 100644 --- a/dlls/vcomp110/Makefile.in +++ b/dlls/vcomp110/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcomp110.dll PARENTSRC = ../vcomp diff --git a/dlls/vcomp120/Makefile.in b/dlls/vcomp120/Makefile.in index c52812f4384..9a2f2428f6f 100644 --- a/dlls/vcomp120/Makefile.in +++ b/dlls/vcomp120/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcomp120.dll PARENTSRC = ../vcomp diff --git a/dlls/vcomp140/Makefile.in b/dlls/vcomp140/Makefile.in index 10263e2112f..644ac670af9 100644 --- a/dlls/vcomp140/Makefile.in +++ b/dlls/vcomp140/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcomp140.dll PARENTSRC = ../vcomp

1 0

Nikolay Sivov : scrrun: Use same write implementation for pipe stream.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 0faf9c1f065fb220827fef31a3567739bc43097d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0faf9c1f065fb220827fef31… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 20 17:09:15 2022 +0300 scrrun: Use same write implementation for pipe stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 6 ++++-- dlls/scrrun/tests/filesystem.c | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 0e51929ea54..d7ad255e517 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -791,9 +791,11 @@ static HRESULT WINAPI pipestream_ReadAll(ITextStream *iface, BSTR *text) static HRESULT WINAPI pipestream_Write(ITextStream *iface, BSTR text) { - FIXME("%p, %s.\n", iface, debugstr_w(text)); + struct textstream *stream = impl_from_ITextStream(iface); - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, debugstr_w(text)); + + return textstream_write(stream, text); } static HRESULT WINAPI pipestream_WriteLine(ITextStream *iface, BSTR text) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 894b6251f34..79af87591ff 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -2656,11 +2656,9 @@ static void test_DoOpenPipeStream(void) { str = SysAllocString(L"data"); hr = ITextStream_Write(stream_write, str); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Write(stream_read, str); - todo_wine ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); SysFreeString(str);

1 0

Nikolay Sivov : wshom: Create standard streams when starting new process with Exec().
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: a51400101905a21f65151d8ef879348ff5e50942 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a51400101905a21f65151d8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 20 17:09:16 2022 +0300 wshom: Create standard streams when starting new process with Exec(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/Makefile.in | 1 + dlls/wshom.ocx/Makefile.in | 2 +- dlls/wshom.ocx/shell.c | 116 ++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 106 insertions(+), 13 deletions(-) diff --git a/dlls/scrrun/Makefile.in b/dlls/scrrun/Makefile.in index 31ef016f48e..12be899162b 100644 --- a/dlls/scrrun/Makefile.in +++ b/dlls/scrrun/Makefile.in @@ -1,4 +1,5 @@ MODULE = scrrun.dll +IMPORTLIB = scrrun IMPORTS = uuid oleaut32 version advapi32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index fed2babda33..1264e9c96a5 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -1,5 +1,5 @@ MODULE = wshom.ocx -IMPORTS = uuid oleaut32 ole32 shell32 user32 advapi32 +IMPORTS = uuid oleaut32 ole32 shell32 user32 advapi32 scrrun EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 82d618b1142..d1942c73cea 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -25,6 +25,8 @@ #include "wine/debug.h" +extern HRESULT WINAPI DoOpenPipeStream(HANDLE pipe, IOMode mode, ITextStream **stream); + WINE_DEFAULT_DEBUG_CHANNEL(wshom); typedef struct @@ -64,6 +66,9 @@ typedef struct IWshExec IWshExec_iface; LONG ref; PROCESS_INFORMATION info; + ITextStream *stdin_stream; + ITextStream *stdout_stream; + ITextStream *stderr_stream; } WshExecImpl; static inline WshCollection *impl_from_IWshCollection( IWshCollection *iface ) @@ -122,14 +127,22 @@ static ULONG WINAPI WshExec_AddRef(IWshExec *iface) static ULONG WINAPI WshExec_Release(IWshExec *iface) { - WshExecImpl *This = impl_from_IWshExec(iface); - LONG ref = InterlockedDecrement(&This->ref); + WshExecImpl *exec = impl_from_IWshExec(iface); + LONG ref = InterlockedDecrement(&exec->ref); + TRACE("%p, refcount %ld.\n", iface, ref); - if (!ref) { - CloseHandle(This->info.hThread); - CloseHandle(This->info.hProcess); - free(This); + if (!ref) + { + CloseHandle(exec->info.hThread); + CloseHandle(exec->info.hProcess); + if (exec->stdin_stream) + ITextStream_Release(exec->stdin_stream); + if (exec->stdout_stream) + ITextStream_Release(exec->stdout_stream); + if (exec->stderr_stream) + ITextStream_Release(exec->stderr_stream); + free(exec); } return ref; @@ -314,10 +327,35 @@ static const IWshExecVtbl WshExecVtbl = { WshExec_Terminate }; +static HRESULT create_pipe(HANDLE *hread, HANDLE *hwrite) +{ + SECURITY_ATTRIBUTES sa; + + sa.nLength = sizeof(sa); + sa.bInheritHandle = TRUE; + sa.lpSecurityDescriptor = NULL; + + *hread = *hwrite = NULL; + if (!CreatePipe(hread, hwrite, &sa, 0)) + return HRESULT_FROM_WIN32(GetLastError()); + return S_OK; +} + +static void close_pipe(HANDLE *hread, HANDLE *hwrite) +{ + CloseHandle(*hread); + CloseHandle(*hwrite); + *hread = *hwrite = NULL; +} + static HRESULT WshExec_create(BSTR command, IWshExec **ret) { + HANDLE stdout_read, stdout_write; + HANDLE stderr_read, stderr_write; + HANDLE stdin_read, stdin_write; STARTUPINFOW si = {0}; WshExecImpl *object; + HRESULT hr; *ret = NULL; @@ -326,17 +364,71 @@ static HRESULT WshExec_create(BSTR command, IWshExec **ret) object->IWshExec_iface.lpVtbl = &WshExecVtbl; object->ref = 1; + init_classinfo(&CLSID_WshExec, (IUnknown *)&object->IWshExec_iface, &object->classinfo); - if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &object->info)) + if (FAILED(hr = create_pipe(&stdin_read, &stdin_write))) { - free(object); - return HRESULT_FROM_WIN32(GetLastError()); + WARN("Failed to create stdin pipe.\n"); + goto failed; } - init_classinfo(&CLSID_WshExec, (IUnknown *)&object->IWshExec_iface, &object->classinfo); - *ret = &object->IWshExec_iface; + if (FAILED(hr = create_pipe(&stdout_read, &stdout_write))) + { + close_pipe(&stdin_read, &stdin_write); + WARN("Failed to create stdout pipe.\n"); + goto failed; + } - return S_OK; + if (FAILED(hr = create_pipe(&stderr_read, &stderr_write))) + { + close_pipe(&stdin_read, &stdin_write); + close_pipe(&stdout_read, &stdout_write); + WARN("Failed to create stderr pipe.\n"); + goto failed; + } + + if (SUCCEEDED(hr)) + { + SetHandleInformation(stdin_write, HANDLE_FLAG_INHERIT, 0); + SetHandleInformation(stdout_read, HANDLE_FLAG_INHERIT, 0); + SetHandleInformation(stderr_read, HANDLE_FLAG_INHERIT, 0); + } + + if (SUCCEEDED(hr)) + hr = DoOpenPipeStream(stdin_write, ForWriting, &object->stdin_stream); + if (SUCCEEDED(hr)) + hr = DoOpenPipeStream(stdout_read, ForReading, &object->stdout_stream); + if (SUCCEEDED(hr)) + hr = DoOpenPipeStream(stderr_read, ForReading, &object->stderr_stream); + + si.cb = sizeof(si); + si.hStdError = stderr_write; + si.hStdOutput = stdout_write; + si.hStdInput = stdin_read; + si.dwFlags = STARTF_USESTDHANDLES; + + if (SUCCEEDED(hr)) + { + if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &object->info)) + hr = HRESULT_FROM_WIN32(GetLastError()); + } + + CloseHandle(stderr_write); + CloseHandle(stdout_write); + CloseHandle(stdin_read); + + if (SUCCEEDED(hr)) + { + *ret = &object->IWshExec_iface; + + return S_OK; + } + +failed: + + IWshExec_Release(&object->IWshExec_iface); + + return hr; } static HRESULT WINAPI WshEnvironment_QueryInterface(IWshEnvironment *iface, REFIID riid, void **obj)

1 0

Nikolay Sivov : dxva2/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: f22b55b749bba50b52e4ea710e15bb38ed95e3c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f22b55b749bba50b52e4ea71… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 20 19:31:32 2022 +0300 dxva2/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/tests/Makefile.in | 1 - dlls/dxva2/tests/dxva2.c | 182 +++++++++++++++++++++---------------------- 2 files changed, 91 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f22b55b749bba50b52e4…

1 0

Nikolay Sivov : t2embed/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 30a418c34e3a01ab519e8b1600995ff0b3ff20e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30a418c34e3a01ab519e8b16… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 20 21:04:06 2022 +0300 t2embed/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/tests/Makefile.in | 1 - dlls/t2embed/tests/t2embed.c | 54 ++++++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/t2embed/tests/Makefile.in b/dlls/t2embed/tests/Makefile.in index 69d91384869..c4f49a3f6ca 100644 --- a/dlls/t2embed/tests/Makefile.in +++ b/dlls/t2embed/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = t2embed.dll IMPORTS = user32 gdi32 t2embed diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c index 4ffc3daed12..004ba5492ae 100644 --- a/dlls/t2embed/tests/t2embed.c +++ b/dlls/t2embed/tests/t2embed.c @@ -43,7 +43,7 @@ static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm UINT fsType = otm.otmfsType & 0xf; ret = TTGetEmbeddingType(hdc, &status); - ok(ret == E_NONE || ret == E_NOTATRUETYPEFONT, "Unexpected return value %#x.\n", ret); + ok(ret == E_NONE || ret == E_NOTATRUETYPEFONT, "Unexpected return value %#lx.\n", ret); if (ret == E_NONE) { @@ -56,7 +56,7 @@ static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm else if (fsType & LICENSE_NOEMBEDDING) expected = EMBED_NOEMBEDDING; - ok(expected == status, "%s: status %d, expected %d, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status, + ok(expected == status, "%s: status %ld, expected %ld, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status, expected, otm.otmfsType); } } @@ -64,8 +64,8 @@ static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm { status = 0xdeadbeef; ret = TTGetEmbeddingType(hdc, &status); - ok(ret == E_NOTATRUETYPEFONT, "%s: got %d\n", enumlf->elfLogFont.lfFaceName, ret); - ok(status == 0xdeadbeef, "%s: got status %d\n", enumlf->elfLogFont.lfFaceName, status); + ok(ret == E_NOTATRUETYPEFONT, "%s: got %ld.\n", enumlf->elfLogFont.lfFaceName, ret); + ok(status == 0xdeadbeef, "%s: got status %#lx.\n", enumlf->elfLogFont.lfFaceName, status); } SelectObject(hdc, old_font); @@ -84,27 +84,28 @@ static void test_TTGetEmbeddingType(void) HDC hdc; ret = TTGetEmbeddingType(NULL, NULL); - ok(ret == E_HDCINVALID, "got %d\n", ret); + ok(ret == E_HDCINVALID, "Unexpected retval %#lx.\n", ret); status = 0xdeadbeef; ret = TTGetEmbeddingType(NULL, &status); - ok(ret == E_HDCINVALID, "got %#x\n", ret); - ok(status == 0xdeadbeef, "got %u\n", status); + ok(ret == E_HDCINVALID, "Unexpected retval %#lx.\n", ret); + ok(status == 0xdeadbeef, "Unexpected status %#lx.\n", status); status = 0xdeadbeef; ret = TTGetEmbeddingType((HDC)0xdeadbeef, &status); - ok(ret == E_NOTATRUETYPEFONT || broken(ret == E_ERRORACCESSINGFONTDATA) /* xp, vista */, "got %#x\n", ret); - ok(status == 0xdeadbeef, "got %u\n", status); + ok(ret == E_NOTATRUETYPEFONT || broken(ret == E_ERRORACCESSINGFONTDATA) /* xp, vista */, + "Unexpected retval %#lx.\n", ret); + ok(status == 0xdeadbeef, "Unexpected status %#lx.\n", status); hdc = CreateCompatibleDC(0); ret = TTGetEmbeddingType(hdc, NULL); - ok(ret == E_NOTATRUETYPEFONT, "got %#x\n", ret); + ok(ret == E_NOTATRUETYPEFONT, "Unexpected retval %#lx.\n", ret); status = 0xdeadbeef; ret = TTGetEmbeddingType(hdc, &status); - ok(ret == E_NOTATRUETYPEFONT, "got %#x\n", ret); - ok(status == 0xdeadbeef, "got %u\n", status); + ok(ret == E_NOTATRUETYPEFONT, "Unexpected retval %#lx.\n", ret); + ok(status == 0xdeadbeef, "Unexpected status %#lx.\n", status); memset(&logfont, 0, sizeof(logfont)); logfont.lfHeight = 12; @@ -117,11 +118,11 @@ static void test_TTGetEmbeddingType(void) status = 0; ret = TTGetEmbeddingType(hdc, &status); - ok(ret == E_NONE, "got %#x\n", ret); - ok(status != 0, "got %u\n", status); + ok(ret == E_NONE, "Unexpected retval %#lx.\n", ret); + ok(status != 0, "Unexpected status %lu.\n", status); ret = TTGetEmbeddingType(hdc, NULL); - ok(ret == E_PERMISSIONSINVALID, "got %#x\n", ret); + ok(ret == E_PERMISSIONSINVALID, "Unexpected retval %#lx.\n", ret); SelectObject(hdc, old_font); DeleteObject(hfont); @@ -140,36 +141,37 @@ static void test_TTIsEmbeddingEnabledForFacename(void) LONG ret; ret = TTIsEmbeddingEnabledForFacename(NULL, NULL); - ok(ret == E_FACENAMEINVALID, "got %#x\n", ret); + ok(ret == E_FACENAMEINVALID, "Unexpected retval %#lx.\n", ret); status = 123; ret = TTIsEmbeddingEnabledForFacename(NULL, &status); - ok(ret == E_FACENAMEINVALID, "got %#x\n", ret); + ok(ret == E_FACENAMEINVALID, "Unexpected retval %#lx.\n", ret); ok(status == 123, "got %d\n", status); ret = TTIsEmbeddingEnabledForFacename("Arial", NULL); - ok(ret == E_PBENABLEDINVALID, "got %#x\n", ret); + ok(ret == E_PBENABLEDINVALID, "Unexpected retval %#lx.\n", ret); status = 123; ret = TTIsEmbeddingEnabledForFacename("Arial", &status); - ok(ret == E_NONE, "got %#x\n", ret); + ok(ret == E_NONE, "Unexpected retval %#lx.\n", ret); ok(status != 123, "got %d\n", status); } static void test_TTIsEmbeddingEnabled(void) { HFONT old_font, hfont; - LONG ret, status; LOGFONTA logfont; + BOOL status; + LONG ret; HDC hdc; ret = TTIsEmbeddingEnabled(NULL, NULL); - ok(ret == E_HDCINVALID, "got %#x\n", ret); + ok(ret == E_HDCINVALID, "Unexpected retval %#lx.\n", ret); status = 123; ret = TTIsEmbeddingEnabled(NULL, &status); - ok(ret == E_HDCINVALID, "got %#x\n", ret); - ok(status == 123, "got %d\n", status); + ok(ret == E_HDCINVALID, "Unexpected retval %#lx.\n", ret); + ok(status == 123, "Unexpected status %d.\n", status); hdc = CreateCompatibleDC(0); @@ -183,12 +185,12 @@ static void test_TTIsEmbeddingEnabled(void) old_font = SelectObject(hdc, hfont); ret = TTIsEmbeddingEnabled(hdc, NULL); - ok(ret == E_PBENABLEDINVALID, "Unexpected return value %#x.\n", ret); + ok(ret == E_PBENABLEDINVALID, "Unexpected retval %#lx.\n", ret); status = 123; ret = TTIsEmbeddingEnabled(hdc, &status); - ok(ret == E_NONE, "got %#x\n", ret); - ok(status != 123, "got %u\n", status); + ok(ret == E_NONE, "Unexpected retval %#lx.\n", ret); + ok(status != 123, "Unexpected status %d.\n", status); SelectObject(hdc, old_font); DeleteObject(hfont);

1 0

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

Feb. 21, 2022

Module: wine Branch: master Commit: b9c3bdea88413c8deeb720f4c7f05253456745a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9c3bdea88413c8deeb720f4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:57:32 2022 +0100 usbd.sys: 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/usbd.sys/Makefile.in | 1 - dlls/usbd.sys/usbd.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/usbd.sys/Makefile.in b/dlls/usbd.sys/Makefile.in index 026f4ba4219..6040071ddaf 100644 --- a/dlls/usbd.sys/Makefile.in +++ b/dlls/usbd.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = usbd.sys IMPORTLIB = usbd IMPORTS = ntoskrnl diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c index 1cb25259258..d562cf1f81e 100644 --- a/dlls/usbd.sys/usbd.c +++ b/dlls/usbd.sys/usbd.c @@ -173,7 +173,7 @@ PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptorEx( PUSB_INTERFACE_DESCRIPTOR interface; - TRACE( "(%p, %p, %d, %d, %d, %d, %d)\n", ConfigurationDescriptor, + TRACE( "(%p, %p, %ld, %ld, %ld, %ld, %ld)\n", ConfigurationDescriptor, StartPosition, InterfaceNumber, AlternateSetting, InterfaceClass, InterfaceSubClass, InterfaceProtocol ); @@ -214,7 +214,7 @@ PUSB_COMMON_DESCRIPTOR WINAPI USBD_ParseDescriptors( { PUSB_COMMON_DESCRIPTOR common; - TRACE( "(%p, %u, %p, %d)\n", DescriptorBuffer, TotalLength, StartPosition, DescriptorType ); + TRACE( "(%p, %lu, %p, %ld)\n", DescriptorBuffer, TotalLength, StartPosition, DescriptorType ); for (common = (PUSB_COMMON_DESCRIPTOR)DescriptorBuffer; ((char*)common) + sizeof(USB_COMMON_DESCRIPTOR) <= ((char*)DescriptorBuffer) + TotalLength; @@ -233,7 +233,7 @@ USBD_STATUS WINAPI USBD_ValidateConfigurationDescriptor( PUCHAR *offset, ULONG tag ) { - FIXME( "(%p, %u, %u, %p, %u) partial stub!\n", descr, length, level, offset, tag ); + FIXME( "(%p, %lu, %u, %p, %lu) partial stub!\n", descr, length, level, offset, tag ); if (offset) *offset = 0;

1 0

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

Feb. 21, 2022

Module: wine Branch: master Commit: f383ad10b1e4011bf3fac64eeb761a454e01fa5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f383ad10b1e4011bf3fac64e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:57:38 2022 +0100 userenv: 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/userenv/Makefile.in | 1 - dlls/userenv/userenv_main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/userenv/Makefile.in b/dlls/userenv/Makefile.in index 8dde5344c9c..dcda835708e 100644 --- a/dlls/userenv/Makefile.in +++ b/dlls/userenv/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = userenv.dll IMPORTS = advapi32 IMPORTLIB = userenv diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 08dede60d35..2b5171254dc 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -349,7 +349,7 @@ BOOL WINAPI ExpandEnvironmentStringsForUserA( HANDLE hToken, LPCSTR lpSrc, { BOOL ret; - TRACE("%p %s %p %d\n", hToken, debugstr_a(lpSrc), lpDest, dwSize); + TRACE("%p %s %p %ld\n", hToken, debugstr_a(lpSrc), lpDest, dwSize); ret = ExpandEnvironmentStringsA( lpSrc, lpDest, dwSize ); TRACE("<- %s\n", debugstr_a(lpDest)); @@ -361,7 +361,7 @@ BOOL WINAPI ExpandEnvironmentStringsForUserW( HANDLE hToken, LPCWSTR lpSrc, { BOOL ret; - TRACE("%p %s %p %d\n", hToken, debugstr_w(lpSrc), lpDest, dwSize); + TRACE("%p %s %p %ld\n", hToken, debugstr_w(lpSrc), lpDest, dwSize); ret = ExpandEnvironmentStringsW( lpSrc, lpDest, dwSize ); TRACE("<- %s\n", debugstr_w(lpDest)); @@ -648,7 +648,7 @@ BOOL WINAPI LeaveCriticalPolicySection(HANDLE hSection) DWORD WINAPI GetAppliedGPOListW(DWORD dwFlags, LPCWSTR pMachineName, PSID pSidUser, GUID *pGuidExtension, PGROUP_POLICY_OBJECTW *ppGPOList) { - FIXME("(%x %s %p %s %p)\n", dwFlags, debugstr_w(pMachineName), pSidUser, debugstr_guid(pGuidExtension), ppGPOList); + FIXME("(%lx %s %p %s %p)\n", dwFlags, debugstr_w(pMachineName), pSidUser, debugstr_guid(pGuidExtension), ppGPOList); return ERROR_ACCESS_DENIED; } @@ -681,7 +681,7 @@ BOOL WINAPI USERENV_138( int csidl, LPCSTR lnk_dir, LPCSTR lnk_filename, LPCSTR work_directory, WORD hotkey, DWORD win_state, LPCSTR comment, LPCSTR loc_filename_resfile, DWORD loc_filename_resid) { - FIXME("(%d,%s,%s,%s,%s,%d,%s,0x%x,%d,%s,%s,%d) - stub\n", csidl, debugstr_a(lnk_dir), + FIXME("(%d,%s,%s,%s,%s,%ld,%s,0x%x,%ld,%s,%s,%ld) - stub\n", csidl, debugstr_a(lnk_dir), debugstr_a(lnk_filename), debugstr_a(lnk_target), debugstr_a(lnk_iconfile), lnk_iconid, debugstr_a(work_directory), hotkey, win_state, debugstr_a(comment), debugstr_a(loc_filename_resfile), loc_filename_resid );

1 0

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

Feb. 21, 2022

Module: wine Branch: master Commit: 341b341605e1130a2f9c0d68263c40a39c477263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=341b341605e1130a2f9c0d68… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:57:44 2022 +0100 user.exe16: 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/user.exe16/Makefile.in | 1 - dlls/user.exe16/bidi.c | 2 +- dlls/user.exe16/comm.c | 8 ++++---- dlls/user.exe16/dialog.c | 4 ++-- dlls/user.exe16/message.c | 4 ++-- dlls/user.exe16/network.c | 2 +- dlls/user.exe16/user.c | 8 ++++---- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/user.exe16/Makefile.in b/dlls/user.exe16/Makefile.in index e4a2c4a723a..7e2438d033f 100644 --- a/dlls/user.exe16/Makefile.in +++ b/dlls/user.exe16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = user.exe16 IMPORTS = mpr user32 gdi32 win32u EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520 diff --git a/dlls/user.exe16/bidi.c b/dlls/user.exe16/bidi.c index d9a320f0271..7b91a322a10 100644 --- a/dlls/user.exe16/bidi.c +++ b/dlls/user.exe16/bidi.c @@ -309,7 +309,7 @@ void WINAPI SetDlgItemTextEx16( HWND16 hwnd, INT16 id, */ BOOL16 WINAPI SetProcessDefaultLayout16( DWORD dwDefaultLayout ) { - FIXME( "( %08x ): No BiDi16\n", dwDefaultLayout ); + FIXME( "( %08lx ): No BiDi16\n", dwDefaultLayout ); return SetProcessDefaultLayout( dwDefaultLayout ); } diff --git a/dlls/user.exe16/comm.c b/dlls/user.exe16/comm.c index 9125c6d0f37..911e0eeea4b 100644 --- a/dlls/user.exe16/comm.c +++ b/dlls/user.exe16/comm.c @@ -194,11 +194,11 @@ static VOID WINAPI COMM16_ReadComplete(DWORD dwErrorCode, DWORD len, LPOVERLAPPE /* read data from comm port */ if (dwErrorCode != NO_ERROR) { - ERR("async read failed, error %d\n",dwErrorCode); + ERR("async read failed, error %ld\n",dwErrorCode); COM[cid].commerror = CE_RXOVER; return; } - TRACE("async read completed %d bytes\n",len); + TRACE("async read completed %ld bytes\n",len); prev = comm_inbuf(ptr); @@ -274,11 +274,11 @@ static VOID WINAPI COMM16_WriteComplete(DWORD dwErrorCode, DWORD len, LPOVERLAPP /* read data from comm port */ if (dwErrorCode != NO_ERROR) { - ERR("async write failed, error %d\n",dwErrorCode); + ERR("async write failed, error %ld\n",dwErrorCode); COM[cid].commerror = CE_RXOVER; return; } - TRACE("async write completed %d bytes\n",len); + TRACE("async write completed %ld bytes\n",len); /* update the buffer pointers */ prev = comm_outbuf(&COM[cid]); diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index 10416384562..ecd7acb9bfc 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -156,7 +156,7 @@ static LPCSTR DIALOG_GetControl16( LPCSTR p, DLG_CONTROL_INFO *info ) p += *p + 1; - TRACE(" %s %s %d, %d, %d, %d, %d, %08x, %p\n", + TRACE(" %s %s %d, %d, %d, %d, %d, %08lx, %p\n", debugstr_a(info->className), debugstr_a(info->windowName), info->id, info->x, info->y, info->cx, info->cy, info->style, info->data ); @@ -238,7 +238,7 @@ static LPCSTR DIALOG_ParseTemplate16( LPCSTR p, DLG_TEMPLATE * result ) result->cy = GET_WORD(p); p += sizeof(WORD); TRACE("DIALOG %d, %d, %d, %d\n", result->x, result->y, result->cx, result->cy ); - TRACE(" STYLE %08x\n", result->style ); + TRACE(" STYLE %08lx\n", result->style ); /* Get the menu name */ diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 5d388a55312..6d3de0f77e6 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -895,7 +895,7 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 case 1: break; /* atom, nothing to do */ case 3: - WARN("DDE_ACK: %lx both atom and handle... choosing handle\n", hi); + WARN("DDE_ACK: %Ix both atom and handle... choosing handle\n", hi); /* fall through */ case 2: hi = convert_handle_16_to_32(hi, GMEM_DDESHARE); @@ -1278,7 +1278,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT case 1: break; /* atom, nothing to do */ case 3: - WARN("DDE_ACK: %lx both atom and handle... choosing handle\n", hi); + WARN("DDE_ACK: %Ix both atom and handle... choosing handle\n", hi); /* fall through */ case 2: hi = convert_handle_32_to_16(hi, GMEM_DDESHARE); diff --git a/dlls/user.exe16/network.c b/dlls/user.exe16/network.c index c137bb19f70..96135a3064a 100644 --- a/dlls/user.exe16/network.c +++ b/dlls/user.exe16/network.c @@ -319,7 +319,7 @@ WORD WINAPI WNetGetUser16( LPSTR szUser, LPINT16 nBufferSize ) case ERROR_MORE_DATA: return WN16_MORE_DATA; default: - FIXME("Untranslated return value %d\n", ret); + FIXME("Untranslated return value %ld\n", ret); } return ret; } diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 5063f9d2343..4a56a67389b 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -1659,7 +1659,7 @@ HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr) LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg, LPARAM lParam1, LPARAM lParam2) { - FIXME( "devID=0x%08x hDrv=0x%04x wMsg=%04x lP1=0x%08lx lP2=0x%08lx: stub\n", + FIXME( "devID=0x%08lx hDrv=0x%04x wMsg=%04x lP1=0x%08lx lP2=0x%08lx: stub\n", dwDevID, hDriv, wMsg, lParam1, lParam2); return 0; } @@ -1681,7 +1681,7 @@ BOOL16 WINAPI GetDriverInfo16(HDRVR16 hDrvr, struct DRIVERINFOSTRUCT16 *lpDrvInf */ HDRVR16 WINAPI GetNextDriver16(HDRVR16 hDrvr, DWORD dwFlags) { - FIXME( "(%04x, %08x): stub\n", hDrvr, dwFlags); + FIXME( "(%04x, %08lx): stub\n", hDrvr, dwFlags); return 0; } @@ -3170,7 +3170,7 @@ DWORD WINAPI FormatMessage16( BOOL eos = FALSE; LPSTR allocstring = NULL; - TRACE("(0x%x,%x,%d,0x%x,%p,%d,%p)\n", + TRACE("(0x%lx,%lx,%d,0x%x,%p,%d,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); if ((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM) && (dwFlags & FORMAT_MESSAGE_FROM_HMODULE)) return 0; @@ -3179,7 +3179,7 @@ DWORD WINAPI FormatMessage16( || (dwFlags & FORMAT_MESSAGE_FROM_HMODULE))) return 0; if (width && width != FORMAT_MESSAGE_MAX_WIDTH_MASK) - FIXME("line wrapping (%u) not supported.\n", width); + FIXME("line wrapping (%lu) not supported.\n", width); from = NULL; if (dwFlags & FORMAT_MESSAGE_FROM_STRING) {

1 0

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

Feb. 21, 2022

Module: wine Branch: master Commit: 354be197cddc279ca2afb077be4cc0b9f7c6b514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=354be197cddc279ca2afb077… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:57:50 2022 +0100 uxtheme: 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/uxtheme/Makefile.in | 1 - dlls/uxtheme/draw.c | 12 ++++++------ dlls/uxtheme/main.c | 2 +- dlls/uxtheme/msstyles.c | 2 +- dlls/uxtheme/scrollbar.c | 2 +- dlls/uxtheme/system.c | 22 +++++++++++----------- 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in index 42f4c9867b4..933650f4261 100644 --- a/dlls/uxtheme/Makefile.in +++ b/dlls/uxtheme/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = uxtheme.dll IMPORTLIB = uxtheme IMPORTS = user32 gdi32 advapi32 diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 75db466967c..d503fad3fea 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -57,7 +57,7 @@ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD new_flag) DWORD old_flag = 0; BOOL res; - TRACE("(%p,%#x\n", hwnd, new_flag); + TRACE("(%p,%#lx\n", hwnd, new_flag); new_flag &= ETDT_VALIDBITS; @@ -267,7 +267,7 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, int iPartId, int iStat } } if(reqsize.x <= size.x && reqsize.y <= size.y) { - TRACE("Using image size %dx%d, image %d\n", reqsize.x, reqsize.y, + TRACE("Using image size %ldx%ld, image %d\n", reqsize.x, reqsize.y, imagefile_index_to_property(i)); return fileProp; } @@ -957,7 +957,7 @@ static HRESULT UXTHEME_DrawBackgroundFill(HTHEME hTheme, HDC hdc, int iPartId, HRESULT hr = S_OK; int filltype = FT_SOLID; - TRACE("(%d,%d,%d)\n", iPartId, iStateId, pOptions->dwFlags); + TRACE("(%d,%d,%ld)\n", iPartId, iStateId, pOptions->dwFlags); if(pOptions->dwFlags & DTBG_OMITCONTENT) return S_OK; @@ -1055,7 +1055,7 @@ HRESULT WINAPI DrawThemeBackgroundEx(HTHEME hTheme, HDC hdc, int iPartId, int bgtype = BT_BORDERFILL; RECT rt; - TRACE("(%p,%p,%d,%d,%d,%d)\n", hTheme, hdc, iPartId, iStateId,pRect->left,pRect->top); + TRACE("(%p,%p,%d,%d,%ld,%ld)\n", hTheme, hdc, iPartId, iStateId,pRect->left,pRect->top); if(!hTheme) return E_HANDLE; @@ -1744,14 +1744,14 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME hTheme, HDC hdc, int iPartId, int iStateId int oldBkMode; int fontProp; - TRACE("%p %p %d %d %s:%d 0x%08x %p %p\n", hTheme, hdc, iPartId, iStateId, + TRACE("%p %p %d %d %s:%d 0x%08lx %p %p\n", hTheme, hdc, iPartId, iStateId, debugstr_wn(pszText, iCharCount), iCharCount, flags, rect, options); if(!hTheme) return E_HANDLE; if (options->dwFlags & ~(DTT_TEXTCOLOR | DTT_FONTPROP)) - FIXME("unsupported flags 0x%08x\n", options->dwFlags); + FIXME("unsupported flags 0x%08lx\n", options->dwFlags); if (options->dwFlags & DTT_FONTPROP) fontProp = options->iFontPropId; diff --git a/dlls/uxtheme/main.c b/dlls/uxtheme/main.c index 5f79dd6ed0d..211b6e3bddc 100644 --- a/dlls/uxtheme/main.c +++ b/dlls/uxtheme/main.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); /* For the moment, do nothing here. */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, void *reserved) { - TRACE("%p 0x%x %p\n", hInstDLL, fdwReason, reserved); + TRACE("%p 0x%lx %p\n", hInstDLL, fdwReason, reserved); switch(fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 376d8bc6db9..7d3ee72efe8 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -98,7 +98,7 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST } if((versize = SizeofResource(hTheme, hrsc)) != 2) { - TRACE("Version resource found, but wrong size: %d\n", versize); + TRACE("Version resource found, but wrong size: %ld\n", versize); hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT); goto invalid_theme; } diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c index e96e5e89b69..719081ad5b8 100644 --- a/dlls/uxtheme/scrollbar.c +++ b/dlls/uxtheme/scrollbar.c @@ -273,7 +273,7 @@ LRESULT WINAPI UXTHEME_ScrollbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR HTHEME theme; LRESULT result; - TRACE("(%p, 0x%x, %lu, %lu, %d)\n", hwnd, msg, wParam, lParam, unicode); + TRACE("(%p, 0x%x, %Iu, %Iu, %d)\n", hwnd, msg, wParam, lParam, unicode); switch (msg) { case WM_CREATE: diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 37c484387ec..8333d6b99ce 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -153,7 +153,7 @@ static void UXTHEME_LoadTheme(void) } else { bThemeActive = FALSE; - TRACE("Failed to get ThemeActive: %d\n", GetLastError()); + TRACE("Failed to get ThemeActive: %ld\n", GetLastError()); } buffsize = sizeof(szCurrentColor); if (RegQueryValueExW(hKey, L"ColorName", NULL, NULL, (BYTE*)szCurrentColor, &buffsize)) @@ -446,7 +446,7 @@ HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) if (!RegQueryValueExW(hKey, L"LoadedBefore", NULL, NULL, (BYTE *)tmp, &size)) loaded_before = (tmp[0] != '0'); else - WARN("Failed to get LoadedBefore: %d\n", GetLastError()); + WARN("Failed to get LoadedBefore: %ld\n", GetLastError()); RegCloseKey(hKey); } if (loaded_before && same_theme) @@ -621,7 +621,7 @@ static HTHEME open_theme_data(HWND hwnd, LPCWSTR pszClassList, DWORD flags, UINT LPCWSTR pszAppName; LPCWSTR pszUseClassList; HTHEME hTheme = NULL; - TRACE("(%p,%s, %x)\n", hwnd, debugstr_w(pszClassList), flags); + TRACE("(%p,%s, %lx)\n", hwnd, debugstr_w(pszClassList), flags); if(!pszClassList) { @@ -630,7 +630,7 @@ static HTHEME open_theme_data(HWND hwnd, LPCWSTR pszClassList, DWORD flags, UINT } if(flags) - FIXME("unhandled flags: %x\n", flags); + FIXME("unhandled flags: %lx\n", flags); if(bThemeActive) { @@ -738,7 +738,7 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName, HRESULT WINAPI SetWindowThemeAttribute(HWND hwnd, enum WINDOWTHEMEATTRIBUTETYPE type, PVOID attribute, DWORD size) { - FIXME("(%p,%d,%p,%d): stub\n", hwnd, type, attribute, size); + FIXME("(%p,%d,%p,%ld): stub\n", hwnd, type, attribute, size); return E_NOTIMPL; } @@ -770,7 +770,7 @@ DWORD WINAPI GetThemeAppProperties(void) */ void WINAPI SetThemeAppProperties(DWORD dwFlags) { - TRACE("(0x%08x)\n", dwFlags); + TRACE("(0x%08lx)\n", dwFlags); dwThemeAppProperties = dwFlags; } @@ -793,7 +793,7 @@ HRESULT WINAPI HitTestThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, const RECT *pRect, HRGN hrgn, POINT ptTest, WORD *pwHitTestCode) { - FIXME("%d %d 0x%08x: stub\n", iPartId, iStateId, dwOptions); + FIXME("%d %d 0x%08lx: stub\n", iPartId, iStateId, dwOptions); if(!hTheme) return E_HANDLE; return E_NOTIMPL; @@ -912,7 +912,7 @@ HRESULT WINAPI OpenThemeFile(LPCWSTR pszThemeFileName, LPCWSTR pszColorName, LPCWSTR pszSizeName, HTHEMEFILE *hThemeFile, DWORD unknown) { - TRACE("(%s,%s,%s,%p,%d)\n", debugstr_w(pszThemeFileName), + TRACE("(%s,%s,%s,%p,%ld)\n", debugstr_w(pszThemeFileName), debugstr_w(pszColorName), debugstr_w(pszSizeName), hThemeFile, unknown); return MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, pszSizeName, (PTHEME_FILE*)hThemeFile); @@ -992,7 +992,7 @@ HRESULT WINAPI GetThemeDefaults(LPCWSTR pszThemeFileName, LPWSTR pszColorName, { PTHEME_FILE pt; HRESULT hr; - TRACE("(%s,%p,%d,%p,%d)\n", debugstr_w(pszThemeFileName), + TRACE("(%s,%p,%ld,%p,%ld)\n", debugstr_w(pszThemeFileName), pszColorName, dwColorNameLen, pszSizeName, dwSizeNameLen); @@ -1107,7 +1107,7 @@ HRESULT WINAPI EnumThemeColors(LPWSTR pszThemeFileName, LPWSTR pszSizeName, HRESULT hr; LPWSTR tmp; UINT resourceId = dwColorNum + 1000; - TRACE("(%s,%s,%d)\n", debugstr_w(pszThemeFileName), + TRACE("(%s,%s,%ld)\n", debugstr_w(pszThemeFileName), debugstr_w(pszSizeName), dwColorNum); hr = MSSTYLES_OpenThemeFile(pszThemeFileName, NULL, pszSizeName, &pt); @@ -1165,7 +1165,7 @@ HRESULT WINAPI EnumThemeSizes(LPWSTR pszThemeFileName, LPWSTR pszColorName, HRESULT hr; LPWSTR tmp; UINT resourceId = dwSizeNum + 3000; - TRACE("(%s,%s,%d)\n", debugstr_w(pszThemeFileName), + TRACE("(%s,%s,%ld)\n", debugstr_w(pszThemeFileName), debugstr_w(pszColorName), dwSizeNum); hr = MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, NULL, &pt);

1 0

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

Feb. 21, 2022

Module: wine Branch: master Commit: 4690d5f0205c4f31cb9add852c7d3f4aa48fe0d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4690d5f0205c4f31cb9add85… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:58:32 2022 +0100 ver.dll16: 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/ver.dll16/Makefile.in | 1 - dlls/ver.dll16/version.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ver.dll16/Makefile.in b/dlls/ver.dll16/Makefile.in index ca72752ca4f..1c68dfc5035 100644 --- a/dlls/ver.dll16/Makefile.in +++ b/dlls/ver.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ver.dll16 IMPORTS = version lz32 diff --git a/dlls/ver.dll16/version.c b/dlls/ver.dll16/version.c index dac9ff28ddf..6dfbc55c33b 100644 --- a/dlls/ver.dll16/version.c +++ b/dlls/ver.dll16/version.c @@ -436,7 +436,7 @@ DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType, OFSTRUCT ofs; DWORD reslen = dwResLen; - TRACE("(%s,type=%p,id=%p,off=%d,len=%d,data=%p)\n", + TRACE("(%s,type=%p,id=%p,off=%ld,len=%ld,data=%p)\n", debugstr_a(lpszFileName), lpszResType, lpszResId, dwFileOffset, dwResLen, lpvData ); @@ -476,7 +476,7 @@ DWORD WINAPI GetFileVersionInfoSize16( LPCSTR filename, LPDWORD handle ) */ DWORD WINAPI GetFileVersionInfo16( LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { - TRACE("(%s, %08x, %d, %p)\n", debugstr_a(filename), handle, datasize, data ); + TRACE("(%s, %08lx, %ld, %p)\n", debugstr_a(filename), handle, datasize, data ); return GetFileResource16( filename, (LPCSTR)RT_VERSION, (LPCSTR)VS_VERSION_INFO, 0, datasize, data ); }

1 0