February 2022 - Wine-commits

Nikolay Sivov : usp10/tests: Remove workarounds for missing functions.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 2a4b57624f26ffe1839f7185753d8901d3074e0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a4b57624f26ffe1839f7185… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 19 11:45:22 2022 +0300 usp10/tests: Remove workarounds for missing functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 122 +++++++++++++++-------------------------------- include/usp10.h | 15 ++++++ 2 files changed, 53 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2a4b57624f26ffe1839f…

1 0

Nikolay Sivov : scrrun: Move IO mode check to writing helper.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: a9c4bda48138627b9f98bda403bea7f7a74e185c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9c4bda48138627b9f98bda4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 20 17:09:14 2022 +0300 scrrun: Move IO mode check to writing helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 4794437a71d..0e51929ea54 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -609,11 +609,14 @@ static HRESULT WINAPI textstream_ReadAll(ITextStream *iface, BSTR *text) return read_from_buffer(This, This->read_buf_size, text, 0) ? S_FALSE : E_OUTOFMEMORY; } -static HRESULT textstream_writestr(struct textstream *stream, BSTR text) +static HRESULT textstream_write(struct textstream *stream, BSTR text) { DWORD written = 0; BOOL ret; + if (textstream_check_iomode(stream, IOWrite)) + return CTL_E_BADFILEMODE; + if (stream->unicode) { ret = WriteFile(stream->file, text, SysStringByteLen(text), &written, NULL); return (ret && written == SysStringByteLen(text)) ? S_OK : create_error(GetLastError()); @@ -636,14 +639,11 @@ static HRESULT textstream_writestr(struct textstream *stream, BSTR text) static HRESULT WINAPI textstream_Write(ITextStream *iface, BSTR text) { - struct textstream *This = impl_from_ITextStream(iface); - - TRACE("(%p)->(%s)\n", This, debugstr_w(text)); + struct textstream *stream = impl_from_ITextStream(iface); - if (textstream_check_iomode(This, IOWrite)) - return CTL_E_BADFILEMODE; + TRACE("%p, %s.\n", iface, debugstr_w(text)); - return textstream_writestr(This, text); + return textstream_write(stream, text); } static HRESULT textstream_writecrlf(struct textstream *stream) @@ -669,17 +669,14 @@ static HRESULT textstream_writecrlf(struct textstream *stream) static HRESULT WINAPI textstream_WriteLine(ITextStream *iface, BSTR text) { - struct textstream *This = impl_from_ITextStream(iface); + struct textstream *stream = impl_from_ITextStream(iface); HRESULT hr; - TRACE("(%p)->(%s)\n", This, debugstr_w(text)); - - if (textstream_check_iomode(This, IOWrite)) - return CTL_E_BADFILEMODE; + TRACE("%p, %s.\n", iface, debugstr_w(text)); - hr = textstream_writestr(This, text); + hr = textstream_write(stream, text); if (SUCCEEDED(hr)) - hr = textstream_writecrlf(This); + hr = textstream_writecrlf(stream); return hr; }

1 0

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

21 Feb '22

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 21 Feb '22

21 Feb '22

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 : wshom: Implement standard streams properties for Exec object.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 1128970a757a4b31a531e7c9178a44acec78bbfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=1128970a757a4b31a531e7c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 20 17:09:17 2022 +0300 wshom: Implement standard streams properties for Exec object. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38210 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index d1942c73cea..e04844458b1 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -230,29 +230,38 @@ static HRESULT WINAPI WshExec_get_Status(IWshExec *iface, WshExecStatus *status) static HRESULT WINAPI WshExec_get_StdIn(IWshExec *iface, ITextStream **stream) { - WshExecImpl *This = impl_from_IWshExec(iface); + WshExecImpl *exec = impl_from_IWshExec(iface); - FIXME("(%p)->(%p): stub\n", This, stream); + TRACE("%p, %p.\n", iface, stream); - return E_NOTIMPL; + *stream = exec->stdin_stream; + ITextStream_AddRef(*stream); + + return S_OK; } static HRESULT WINAPI WshExec_get_StdOut(IWshExec *iface, ITextStream **stream) { - WshExecImpl *This = impl_from_IWshExec(iface); + WshExecImpl *exec = impl_from_IWshExec(iface); - FIXME("(%p)->(%p): stub\n", This, stream); + TRACE("%p, %p.\n", iface, stream); - return E_NOTIMPL; + *stream = exec->stdout_stream; + ITextStream_AddRef(*stream); + + return S_OK; } static HRESULT WINAPI WshExec_get_StdErr(IWshExec *iface, ITextStream **stream) { - WshExecImpl *This = impl_from_IWshExec(iface); + WshExecImpl *exec = impl_from_IWshExec(iface); - FIXME("(%p)->(%p): stub\n", This, stream); + TRACE("%p, %p.\n", iface, stream); - return E_NOTIMPL; + *stream = exec->stderr_stream; + ITextStream_AddRef(*stream); + + return S_OK; } static HRESULT WINAPI WshExec_get_ProcessID(IWshExec *iface, DWORD *pid)

1 0

Nikolay Sivov : mfplat: Add VT_R4 case for propvariant tracing.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 6dc3d258ce69c8ee34f7399ebf0460300f210b0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dc3d258ce69c8ee34f7399e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 20 18:48:12 2022 +0300 mfplat: Add VT_R4 case for propvariant tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat_private.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index dc29545df73..8418c8eb2ef 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -133,6 +133,8 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) return wine_dbg_sprintf("%p {VT_UI8: %s}", v, wine_dbgstr_longlong(v->uhVal.QuadPart)); case VT_I8: return wine_dbg_sprintf("%p {VT_I8: %s}", v, wine_dbgstr_longlong(v->hVal.QuadPart)); + case VT_R4: + return wine_dbg_sprintf("%p {VT_R4: %.8e}", v, v->fltVal); case VT_R8: return wine_dbg_sprintf("%p {VT_R8: %lf}", v, v->dblVal); case VT_CLSID:

1 0

Nikolay Sivov : shcore/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: f3a87a92e9780e85d42e89c98547a28d98a32c4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3a87a92e9780e85d42e89c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 20 19:31:10 2022 +0300 shcore/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/shcore/tests/Makefile.in | 1 - dlls/shcore/tests/shcore.c | 136 +++++++++++++++++++++--------------------- 2 files changed, 68 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f3a87a92e9780e85d42e…

1 0

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

21 Feb '22

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 21 Feb '22

21 Feb '22

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 21 Feb '22

21 Feb '22

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