March 2022 - Wine-Commits - list.winehq.org

Eric Pouech : oledlg/tests: Enable compilation with long types.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: 137946d61bde0c3ce6abb1f69d15e577a319d0e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=137946d61bde0c3ce6abb1f6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:04:47 2022 +0100 oledlg/tests: 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/oledlg/tests/Makefile.in | 1 - dlls/oledlg/tests/main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/oledlg/tests/Makefile.in b/dlls/oledlg/tests/Makefile.in index 10f77e8042e..5c6227bb59d 100644 --- a/dlls/oledlg/tests/Makefile.in +++ b/dlls/oledlg/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = oledlg.dll IMPORTS = oledlg ole32 user32 diff --git a/dlls/oledlg/tests/main.c b/dlls/oledlg/tests/main.c index 919cd008542..384b7b38626 100644 --- a/dlls/oledlg/tests/main.c +++ b/dlls/oledlg/tests/main.c @@ -51,7 +51,7 @@ static ULONG WINAPI enumverbs_Release(IEnumOLEVERB *iface) static int g_enumpos; static HRESULT WINAPI enumverbs_Next(IEnumOLEVERB *iface, ULONG count, OLEVERB *verbs, ULONG *fetched) { - ok(count == 1, "got %u\n", count); + ok(count == 1, "got %lu\n", count); ok(fetched == NULL, "got %p\n", fetched); ok(g_enumpos == 0 || g_enumpos == 1, "got pos %d\n", g_enumpos); @@ -209,7 +209,7 @@ static HRESULT WINAPI oleobject_GetUserClassID(IOleObject *iface, CLSID *clsid) static HRESULT WINAPI oleobject_GetUserType(IOleObject *iface, DWORD formoftype, LPOLESTR *usertype) { - ok(formoftype == USERCLASSTYPE_SHORT, "got %d\n", formoftype); + ok(formoftype == USERCLASSTYPE_SHORT, "got %ld\n", formoftype); *usertype = CoTaskMemAlloc(sizeof(L"test")); lstrcpyW(*usertype, L"test"); return S_OK;

1 0

Bernhard Kölbl : include/windows.media.speechrecognition.idl: Add SpeechRecognizer.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: 1bbbc7b4519c659120c21661a60a5672227d5936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bbbc7b4519c659120c21661… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 1 17:42:40 2022 +0100 include/windows.media.speechrecognition.idl: Add SpeechRecognizer. And its dependencies. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.media.speechrecognition.idl | 108 ++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1bbbc7b4519c659120c2…

1 0

Matteo Bruni : combase: Add RoSetErrorReportingFlags() stub.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: 430583893e52a46eabca5056da3b73455501369a URL: https://source.winehq.org/git/wine.git/?a=commit;h=430583893e52a46eabca5056… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 2 14:05:32 2022 +0100 combase: Add RoSetErrorReportingFlags() stub. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 9 +++++++++ include/roerrorapi.h | 10 ++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c2fafacdea3..b3f4d25b42c 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -312,7 +312,7 @@ @ stub RoReportUnhandledError @ stub RoResolveRestrictedErrorInfoReference @ stub RoRevokeActivationFactories -@ stub RoSetErrorReportingFlags +@ stdcall RoSetErrorReportingFlags(long) @ stub RoTransformError @ stub RoTransformErrorW @ stdcall RoUninitialize() diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 0a17f02b776..46adf088247 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -299,6 +299,15 @@ BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message) return FALSE; } +/*********************************************************************** + * RoSetErrorReportingFlags (combase.@) + */ +HRESULT WINAPI RoSetErrorReportingFlags(UINT32 flags) +{ + FIXME("(%08x): stub\n", flags); + return S_OK; +} + /*********************************************************************** * CleanupTlsOleState (combase.@) */ diff --git a/include/roerrorapi.h b/include/roerrorapi.h index 454e1a6c2e9..741347455b1 100644 --- a/include/roerrorapi.h +++ b/include/roerrorapi.h @@ -23,8 +23,18 @@ #include <restrictederrorinfo.h> #include <rpc.h> +typedef enum +{ + RO_ERROR_REPORTING_NONE = 0x0, + RO_ERROR_REPORTING_SUPPRESSEXCEPTIONS = 0x1, + RO_ERROR_REPORTING_FORCEEXCEPTIONS = 0x2, + RO_ERROR_REPORTING_USESETERRORINFO = 0x4, + RO_ERROR_REPORTING_SUPPRESSSETERRORINFO = 0x8, +} RO_ERROR_REPORTING_FLAGS; + HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info); BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message); BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception); +HRESULT WINAPI RoSetErrorReportingFlags(UINT32 flags); #endif /* _ROERROR_H */

1 0

Eric Pouech : oleacc/tests: Enable compilation with long types.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: 83991665db8eb70194b3acecb77e0e89f29b3813 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83991665db8eb70194b3acec… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:04:34 2022 +0100 oleacc/tests: 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/oleacc/tests/Makefile.in | 1 - dlls/oleacc/tests/main.c | 358 +++++++++++++++++++++--------------------- 2 files changed, 179 insertions(+), 180 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=83991665db8eb70194b3…

1 0

Eric Pouech : oleacc/tests: Use correct integral type.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: 79d1c69635ce3852e097050a81fbb17de807a5ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=79d1c69635ce3852e097050a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:04:28 2022 +0100 oleacc/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 6b0000e5f56..379611e17d8 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -538,7 +538,7 @@ static void test_GetStateText(void) ok(!ret, "31) GetStateText succeeded: %d\n", ret); } -static int Object_ref = 1; +static LONG Object_ref = 1; static HRESULT WINAPI Object_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { if(IsEqualIID(riid, &IID_IUnknown)) {

1 0

Eric Pouech : ole32/tests: Enable compilation with long types.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: a74217447c7d550532152b3df05560bbd1a0ae76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a74217447c7d550532152b3d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:04:21 2022 +0100 ole32/tests: 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/ole32/tests/Makefile.in | 1 - dlls/ole32/tests/clipboard.c | 570 +++++++++--------- dlls/ole32/tests/compobj.c | 882 ++++++++++++++-------------- dlls/ole32/tests/defaulthandler.c | 48 +- dlls/ole32/tests/dragdrop.c | 40 +- dlls/ole32/tests/errorinfo.c | 8 +- dlls/ole32/tests/hglobalstream.c | 144 ++--- dlls/ole32/tests/marshal.c | 248 ++++---- dlls/ole32/tests/moniker.c | 1162 ++++++++++++++++++------------------- dlls/ole32/tests/ole2.c | 826 +++++++++++++------------- dlls/ole32/tests/ole_server.c | 86 +-- dlls/ole32/tests/propvariant.c | 72 +-- dlls/ole32/tests/stg_prop.c | 238 ++++---- dlls/ole32/tests/storage32.c | 724 +++++++++++------------ dlls/ole32/tests/usrmarshal.c | 238 ++++---- 15 files changed, 2643 insertions(+), 2644 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a74217447c7d55053215…

1 0

Eric Pouech : ole32/tests: Use correct integral type.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: 3aa87091f0c2312630d60266a891ea7fbfe2a715 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa87091f0c2312630d60266… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:04:15 2022 +0100 ole32/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index afbea762e89..ec4273284e3 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3183,7 +3183,7 @@ static void test_generic_composite_moniker(void) for (i = 0; i < ARRAY_SIZE(simplify_tests); ++i) { IMoniker *left, *right, *composite = NULL; - unsigned int moniker_type; + DWORD moniker_type; WCHAR *name; winetest_push_context("simplify[%u]", i);

1 0

Eric Pouech : ntprint/tests: Use correct integral type.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: 7f6c2330bf6a2fd7c6e95226bb2bbc806f10526c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f6c2330bf6a2fd7c6e95226… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:03:57 2022 +0100 ntprint/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntprint/tests/ntprint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntprint/tests/ntprint.c b/dlls/ntprint/tests/ntprint.c index 57caa49ab27..7e27c1ce58b 100644 --- a/dlls/ntprint/tests/ntprint.c +++ b/dlls/ntprint/tests/ntprint.c @@ -67,7 +67,7 @@ static void test_PSetupCreateMonitorInfo(VOID) { HANDLE mi; WCHAR buffer[1024] = {'\\','\\'}; - UINT len = ARRAY_SIZE(buffer) - 2; + DWORD len = ARRAY_SIZE(buffer) - 2; GetComputerNameW(buffer + 2, &len); SetLastError(0xdeadbeef);

1 0

Matteo Bruni : d3dx11/tests: Use CRT allocation functions.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: 8d47851835d72ffe8404fc93b877464390475f2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d47851835d72ffe8404fc93… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 2 14:05:30 2022 +0100 d3dx11/tests: Use CRT allocation functions. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/tests/d3dx11.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx11_43/tests/d3dx11.c b/dlls/d3dx11_43/tests/d3dx11.c index 89fc0721c92..357a84ce457 100644 --- a/dlls/d3dx11_43/tests/d3dx11.c +++ b/dlls/d3dx11_43/tests/d3dx11.c @@ -21,7 +21,6 @@ #include "d3d11.h" #include "d3dx11.h" #include "wine/test.h" -#include "wine/heap.h" #ifndef MAKEFOURCC #define MAKEFOURCC(ch0, ch1, ch2, ch3) \ @@ -503,8 +502,8 @@ static HRESULT WINAPI test_d3dinclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE if (!strcmp(filename, "include1.h")) { - buffer = heap_alloc(strlen(include1)); - CopyMemory(buffer, include1, strlen(include1)); + buffer = malloc(strlen(include1)); + memcpy(buffer, include1, strlen(include1)); *bytes = strlen(include1); ok(include_type == D3D_INCLUDE_LOCAL, "Unexpected include type %d.\n", include_type); ok(!strncmp(include2, parent_data, strlen(include2)), @@ -512,8 +511,8 @@ static HRESULT WINAPI test_d3dinclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE } else if (!strcmp(filename, "include\\include2.h")) { - buffer = heap_alloc(strlen(include2)); - CopyMemory(buffer, include2, strlen(include2)); + buffer = malloc(strlen(include2)); + memcpy(buffer, include2, strlen(include2)); *bytes = strlen(include2); ok(!parent_data, "Unexpected parent_data value.\n"); ok(include_type == D3D_INCLUDE_LOCAL, "Unexpected include type %d.\n", include_type); @@ -530,7 +529,7 @@ static HRESULT WINAPI test_d3dinclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE static HRESULT WINAPI test_d3dinclude_close(ID3DInclude *iface, const void *data) { - heap_free((void *)data); + free((void *)data); return S_OK; }

1 0

Eric Pouech : ntprint/tests: Enable compilation with long types.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: 82ad9054c07311d7ef0936ba3934afc478e7e758 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82ad9054c07311d7ef0936ba… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:04:03 2022 +0100 ntprint/tests: 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/ntprint/tests/Makefile.in | 1 - dlls/ntprint/tests/ntprint.c | 32 ++++++++++++++++---------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ntprint/tests/Makefile.in b/dlls/ntprint/tests/Makefile.in index 94a1d9192c6..0c1793fe9e8 100644 --- a/dlls/ntprint/tests/Makefile.in +++ b/dlls/ntprint/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ntprint.dll C_SRCS = \ diff --git a/dlls/ntprint/tests/ntprint.c b/dlls/ntprint/tests/ntprint.c index 7e27c1ce58b..e877b4df1f1 100644 --- a/dlls/ntprint/tests/ntprint.c +++ b/dlls/ntprint/tests/ntprint.c @@ -76,19 +76,19 @@ static void test_PSetupCreateMonitorInfo(VOID) win_skip("The service 'Spooler' is required for many tests\n"); return; } - ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); + ok( mi != NULL, "got %p with %lu (expected '!= NULL')\n", mi, GetLastError()); if (mi) pPSetupDestroyMonitorInfo(mi); SetLastError(0xdeadbeef); mi = pPSetupCreateMonitorInfo(0, buffer); - ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); + ok( mi != NULL, "got %p with %lu (expected '!= NULL')\n", mi, GetLastError()); if (mi) pPSetupDestroyMonitorInfo(mi); SetLastError(0xdeadbeef); mi = pPSetupCreateMonitorInfo(0, buffer + 1); todo_wine { ok( mi == NULL, "got %p\n", mi ); - ok( GetLastError() == ERROR_INVALID_NAME, "got %d\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_NAME, "got %ld\n", GetLastError() ); } if (mi) pPSetupDestroyMonitorInfo(mi); } @@ -103,7 +103,7 @@ static void test_PSetupDestroyMonitorInfo(VOID) SetLastError(0xdeadbeef); pPSetupDestroyMonitorInfo(NULL); /* lasterror is returned */ - trace("returned with %u\n", GetLastError()); + trace("returned with %lu\n", GetLastError()); SetLastError(0xdeadbeef); mi = pPSetupCreateMonitorInfo(0, NULL); @@ -111,20 +111,20 @@ static void test_PSetupDestroyMonitorInfo(VOID) win_skip("The service 'Spooler' is required for many tests\n"); return; } - ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); + ok( mi != NULL, "got %p with %lu (expected '!= NULL')\n", mi, GetLastError()); if (!mi) return; SetLastError(0xdeadbeef); pPSetupDestroyMonitorInfo(mi); /* lasterror is returned */ - trace("returned with %u\n", GetLastError()); + trace("returned with %lu\n", GetLastError()); /* Trying to destroy the handle twice crashes with native ntprint.dll */ if (0) { SetLastError(0xdeadbeef); pPSetupDestroyMonitorInfo(mi); - trace(" with %u\n", GetLastError()); + trace(" with %lu\n", GetLastError()); } } @@ -151,13 +151,13 @@ static void test_PSetupEnumMonitor(VOID) SetLastError(0xdeadbeef); res = pPSetupEnumMonitor(mi, 0, NULL, &minsize); ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER) && (minsize > 0), - "got %u with %u and %u (expected '0' with ERROR_INSUFFICIENT_BUFFER " + "got %lu with %lu and %lu (expected '0' with ERROR_INSUFFICIENT_BUFFER " "and '> 0')\n", res, GetLastError(), minsize); size = ARRAY_SIZE(buffer); if ((minsize + 1) > size) { - skip("overflow: %u\n", minsize); + skip("overflow: %lu\n", minsize); pPSetupDestroyMonitorInfo(mi); return; } @@ -168,7 +168,7 @@ static void test_PSetupEnumMonitor(VOID) size = ARRAY_SIZE(buffer); res = pPSetupEnumMonitor(NULL, 0, buffer, &size); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + "got %lu with %lu (expected '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); } @@ -177,7 +177,7 @@ static void test_PSetupEnumMonitor(VOID) SetLastError(0xdeadbeef); size = ARRAY_SIZE(buffer); res = pPSetupEnumMonitor(mi, 0, NULL, &size); - trace("got %u with %u and %u\n", res, GetLastError(), size); + trace("got %lu with %lu and %lu\n", res, GetLastError(), size); } if (0) { @@ -185,7 +185,7 @@ static void test_PSetupEnumMonitor(VOID) SetLastError(0xdeadbeef); res = pPSetupEnumMonitor(mi, 0, buffer, NULL); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + "got %lu with %lu (expected '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); } @@ -193,20 +193,20 @@ static void test_PSetupEnumMonitor(VOID) size = minsize - 1; res = pPSetupEnumMonitor(mi, 0, buffer, &size); ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "got %u with %u and %u (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", + "got %lu with %lu and %lu (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", res, GetLastError(), size); SetLastError(0xdeadbeef); size = minsize; res = pPSetupEnumMonitor(mi, 0, buffer, &size); - ok( res, "got %u with %u and %u (expected '!= 0')\n", + ok( res, "got %lu with %lu and %lu (expected '!= 0')\n", res, GetLastError(), size); SetLastError(0xdeadbeef); size = minsize + 1; res = pPSetupEnumMonitor(mi, 0, buffer, &size); - ok( res, "got %u with %u and %u (expected '!= 0')\n", + ok( res, "got %lu with %lu and %lu (expected '!= 0')\n", res, GetLastError(), size); /* try max. 20 monitors */ @@ -216,7 +216,7 @@ static void test_PSetupEnumMonitor(VOID) size = ARRAY_SIZE(buffer); res = pPSetupEnumMonitor(mi, index, buffer, &size); ok( res || (GetLastError() == ERROR_NO_MORE_ITEMS), - "(%u) got %u with %u and %u (expected '!=0' or: '0' with " + "(%lu) got %lu with %lu and %lu (expected '!=0' or: '0' with " "ERROR_NO_MORE_ITEMS)\n", index, res, GetLastError(), size); if (res) index++;

1 0