February 2022 - Wine-Commits

Zebediah Figura : setupapi/tests: Add more tests for SetupInstallFilesFromInfSection().
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 63cdb0b91a80d6e4bfd7528131157a3f20f2de6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=63cdb0b91a80d6e4bfd75281… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 6 22:53:31 2022 -0600 setupapi/tests: Add more tests for SetupInstallFilesFromInfSection(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 4a452435652..3a40f1450ab 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -1065,9 +1065,13 @@ static void test_install_files_queue(void) { static const char inf_data[] = "[Version]\n" "Signature=\"$Chicago$\"\n" + "[DefaultInstall]\n" - "CopyFiles=files_section\n" - "[files_section]\n" + "CopyFiles=copy_section\n" + "DelFiles=delete_section\n" + "RenFiles=rename_section\n" + + "[copy_section]\n" "one.txt\n" "two.txt\n" "three.txt\n" @@ -1076,11 +1080,19 @@ static void test_install_files_queue(void) "six.txt\n" "seven.txt\n" "eight.txt\n" + + "[delete_section]\n" + "nine.txt\n" + + "[rename_section]\n" + "eleven.txt,ten.txt\n" + "[SourceDisksNames]\n" "1=heis\n" "2=duo,,,alpha\n" "3=treis,treis.cab\n" "4=tessares,tessares.cab,,alpha\n" + "[SourceDisksFiles]\n" "one.txt=1\n" "two.txt=1,beta\n" @@ -1090,8 +1102,11 @@ static void test_install_files_queue(void) "six.txt=3,beta\n" "seven.txt=4\n" "eight.txt=4,beta\n" + "[DestinationDirs]\n" - "files_section=40000,dst\n"; + "copy_section=40000,dst\n" + "delete_section=40000,dst\n" + "rename_section=40000,dst\n"; char path[MAX_PATH + 9]; HSPFILEQ queue; @@ -1116,12 +1131,17 @@ static void test_install_files_queue(void) ret = SetupSetDirectoryIdA(hinf, 40000, CURR_DIR); ok(ret, "Failed to set directory ID, error %u.\n", GetLastError()); + ret = CreateDirectoryA("dst", NULL); + ok(ret, "Failed to create test directory, error %u.\n", GetLastError()); + create_file("src/one.txt"); create_file("src/beta/two.txt"); create_file("src/alpha/three.txt"); create_file("src/alpha/beta/four.txt"); create_cab_file("src/treis.cab", "src\\beta\\five.txt\0six.txt\0"); create_cab_file("src/alpha/tessares.cab", "seven.txt\0eight.txt\0"); + create_file("dst/nine.txt"); + create_file("dst/ten.txt"); queue = SetupOpenFileQueue(); ok(queue != INVALID_HANDLE_VALUE, "Failed to open queue, error %#x.\n", GetLastError()); @@ -1147,6 +1167,9 @@ static void test_install_files_queue(void) ok(delete_file("dst/six.txt"), "Destination file should exist.\n"); ok(delete_file("dst/seven.txt"), "Destination file should exist.\n"); ok(delete_file("dst/eight.txt"), "Destination file should exist.\n"); + todo_wine ok(!delete_file("dst/nine.txt"), "Destination file should not exist.\n"); + todo_wine ok(!delete_file("dst/ten.txt"), "Destination file should not exist.\n"); + todo_wine ok(delete_file("dst/eleven.txt"), "Destination file should exist.\n"); SetupTermDefaultQueueCallback(context); ret = SetupCloseFileQueue(queue);

1 0

Hans Leidekker : msi/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 54b8c8c7eaafd19780cb4d91b763fe2f20327f50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54b8c8c7eaafd19780cb4d91… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 7 17:47:06 2022 +0100 msi/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/Makefile.in | 1 - dlls/msi/tests/action.c | 472 ++++---- dlls/msi/tests/automation.c | 397 +++---- dlls/msi/tests/custom.c | 2 +- dlls/msi/tests/db.c | 164 +-- dlls/msi/tests/format.c | 207 ++-- dlls/msi/tests/install.c | 102 +- dlls/msi/tests/msi.c | 2651 +++++++++++++++++++++---------------------- dlls/msi/tests/package.c | 454 ++++---- dlls/msi/tests/patch.c | 25 +- dlls/msi/tests/record.c | 22 +- dlls/msi/tests/source.c | 654 +++++------ dlls/msi/tests/suminfo.c | 2 +- 13 files changed, 2577 insertions(+), 2576 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54b8c8c7eaafd19780cb…

1 0

Zebediah Figura : d3dx9: Implement D3DXSHProjectCubeMap().
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: d049e5dc1cfc3ad54fbac7ed53d808f5177c1994 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d049e5dc1cfc3ad54fbac7ed… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 3 20:03:21 2022 -0600 d3dx9: Implement D3DXSHProjectCubeMap(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46284 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/d3dx9_private.h | 2 + dlls/d3dx9_36/math.c | 147 +++++++++++++++++++++++++++++ dlls/d3dx9_36/surface.c | 2 +- dlls/d3dx9_36/tests/math.c | 208 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- include/d3dx9math.h | 1 + 25 files changed, 379 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d049e5dc1cfc3ad54fba…

1 0

Nikolay Sivov : mshtml: Implement layerX/layerY properties for mouse event.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: f961e832848330f5dfc7d2df0126d29258ea838d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f961e832848330f5dfc7d2df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 6 17:10:58 2022 +0300 mshtml: Implement layerX/layerY properties for mouse event. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 50ca4cbb168..327bb1f915c 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1685,15 +1685,33 @@ static HRESULT WINAPI DOMMouseEvent_get_pageY(IDOMMouseEvent *iface, LONG *p) static HRESULT WINAPI DOMMouseEvent_get_layerX(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + LONG r; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetLayerX(This->mouse_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_layerY(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + LONG r; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetLayerY(This->mouse_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_which(IDOMMouseEvent *iface, USHORT *p)

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: cf4eecbf4f7326f7fe14b10c544f07211217cd74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf4eecbf4f7326f7fe14b10c… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sat Feb 5 10:30:22 2022 +0100 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/po/nl.po b/po/nl.po index 51a3e0f88e8..f174bf9c3e8 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-12-22 10:00+0100\n" +"PO-Revision-Date: 2022-02-05 10:30+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -6972,54 +6972,40 @@ msgid "This network connection does not exist.\n" msgstr "Deze netwerkverbinding bestaat niet.\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "Ongeldig op interruptietijd.\n" +msgstr "Oproep onderbroken.\n" #: dlls/kernel32/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "Ongeldige handle.\n" +msgstr "Ongeldige bestandsingang.\n" #: dlls/kernel32/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "Ongeldig netwerkadres.\n" +msgstr "Ongeldig pointeradres.\n" #: dlls/kernel32/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "Ongeldige naam.\n" +msgstr "Ongeldig argument.\n" #: dlls/kernel32/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "Verbinding opnieuw ingesteld door gelijkwaardige computer.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "Punt niet gevonden.\n" +msgstr "Host niet gevonden.\n" #: dlls/kernel32/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "Kenmerk is niet gevonden.\n" +msgstr "Niet-gemachtigde host niet gevonden.\n" #: dlls/kernel32/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "Onherstelbare fout opgetreden.\n" +msgstr "Onherstelbare fout.\n" #: dlls/kernel32/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "Geldige naam, geen gegevensrecord.\n" #: dlls/kernel32/winerror.mc:3817 msgid "Not implemented.\n"

1 0

Rémi Bernon : dinput/tests: Add some CoCreateInstance and aggregation tests.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 22663565428264c32aeb00243b28baa2bbfe85de URL: https://source.winehq.org/git/wine.git/?a=commit;h=22663565428264c32aeb0024… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:23:25 2022 +0100 dinput/tests: Add some CoCreateInstance and aggregation tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/dinput.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 795a9ed39c6..a2c7f5dbd8d 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -76,6 +76,41 @@ static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *con return DIENUM_STOP; } +static HRESULT WINAPI outer_QueryInterface( IUnknown *iface, REFIID iid, void **obj ) +{ + ok( 0, "unexpected call %s\n", debugstr_guid( iid ) ); + + if (IsEqualGUID( iid, &IID_IUnknown )) + { + *obj = (IUnknown *)iface; + return S_OK; + } + + ok( 0, "unexpected call %s\n", debugstr_guid( iid ) ); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef( IUnknown *iface ) +{ + ok( 0, "unexpected call\n" ); + return 2; +} + +static ULONG WINAPI outer_Release( IUnknown *iface ) +{ + ok( 0, "unexpected call\n" ); + return 1; +} + +static IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown outer = {&outer_vtbl}; + static void test_CoCreateInstance( DWORD version ) { static const struct @@ -113,6 +148,7 @@ static void test_CoCreateInstance( DWORD version ) IDirectInputDeviceA *device; IDirectInputA *dinput; + IUnknown *unknown; HRESULT hr; LONG ref; int i; @@ -127,6 +163,14 @@ static void test_CoCreateInstance( DWORD version ) return; } + if (version < 0x800) hr = CoCreateInstance( &CLSID_DirectInput, &outer, CLSCTX_INPROC_SERVER, + &IID_IDirectInputA, (void **)&unknown ); + else hr = CoCreateInstance( &CLSID_DirectInput8, &outer, CLSCTX_INPROC_SERVER, + &IID_IDirectInput8A, (void **)&unknown ); + todo_wine + ok( hr == CLASS_E_NOAGGREGATION, "CoCreateInstance returned %#x\n", hr ); + if (SUCCEEDED( hr )) IUnknown_Release( unknown ); + for (i = 0; i < ARRAY_SIZE(create_device_tests); i++) { winetest_push_context( "%u", i ); @@ -204,6 +248,14 @@ static void test_DirectInputCreate( DWORD version ) HRESULT hr; int i; + unknown = (void *)0xdeadbeef; + hr = DirectInputCreateW( hInstance, version, (IDirectInputW **)&unknown, &outer ); + todo_wine_if(version == 0x800) + ok( hr == DI_OK, "DirectInputCreateW returned %#x\n", hr ); + todo_wine_if(version <= 0x700) + ok( unknown == NULL, "got IUnknown %p\n", unknown ); + if (unknown) IUnknown_Release( unknown ); + for (i = 0; i < ARRAY_SIZE(create_tests); i++) { winetest_push_context( "%u", i ); @@ -271,6 +323,14 @@ static void test_DirectInputCreateEx( DWORD version ) return; } + unknown = (void *)0xdeadbeef; + hr = pDirectInputCreateEx( hInstance, version, &IID_IDirectInputW, (void **)&unknown, &outer ); + todo_wine_if(version == 0x800) + ok( hr == DI_OK, "DirectInputCreateW returned %#x\n", hr ); + todo_wine_if(version <= 0x700) + ok( unknown == NULL, "got IUnknown %p\n", unknown ); + if (unknown) IUnknown_Release( unknown ); + for (i = 0; i < ARRAY_SIZE(create_tests); i++) { winetest_push_context( "%u", i ); @@ -356,6 +416,13 @@ static void test_DirectInput8Create( DWORD version ) HRESULT hr; int i; + unknown = (void *)0xdeadbeef; + hr = DirectInput8Create( hInstance, version, &IID_IDirectInput8W, (void **)&unknown, &outer ); + ok( hr == DI_OK, "DirectInputCreateW returned %#x\n", hr ); + todo_wine + ok( unknown == NULL, "got IUnknown %p\n", unknown ); + if (unknown) IUnknown_Release( unknown ); + for (i = 0; i < ARRAY_SIZE(create_tests); i++) { winetest_push_context( "%u", i );

1 0

Nikolay Sivov : xmllite/tests: Build without WINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 05b07dbeddaf734bb3619bee8cca92e49cc7a9f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05b07dbeddaf734bb3619bee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 7 15:35:21 2022 +0300 xmllite/tests: Build without WINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/Makefile.in | 1 - dlls/xmllite/tests/reader.c | 488 ++++++++++++++--------------- dlls/xmllite/tests/writer.c | 694 ++++++++++++++++++++--------------------- 3 files changed, 591 insertions(+), 592 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05b07dbeddaf734bb361…

1 0

Rémi Bernon : dinput/tests: Merge dinput8.c tests with dinput.c.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 0c3686f5497561051b2c38b8e9e9648103af92ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c3686f5497561051b2c38b8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:23:24 2022 +0100 dinput/tests: Merge dinput8.c tests with dinput.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/Makefile.in | 1 - dlls/dinput/tests/dinput.c | 1096 +++++++++++++++++++++++++++-------------- dlls/dinput/tests/dinput8.c | 728 --------------------------- 3 files changed, 723 insertions(+), 1102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c3686f5497561051b2c…

1 0

Nikolay Sivov : rtworkq/tests: Build without WINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 6d7aeedec2de0a06e87797b0f0d97231220fdd6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d7aeedec2de0a06e87797b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 7 11:33:30 2022 +0300 rtworkq/tests: Build without WINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/tests/Makefile.in | 1 - dlls/rtworkq/tests/rtworkq.c | 32 ++++++++++++++++---------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/rtworkq/tests/Makefile.in b/dlls/rtworkq/tests/Makefile.in index 7a2f6db51c7..8354cd810d1 100644 --- a/dlls/rtworkq/tests/Makefile.in +++ b/dlls/rtworkq/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = rtworkq.dll IMPORTS = rtworkq ole32 diff --git a/dlls/rtworkq/tests/rtworkq.c b/dlls/rtworkq/tests/rtworkq.c index 627e024d761..2ff74d57b84 100644 --- a/dlls/rtworkq/tests/rtworkq.c +++ b/dlls/rtworkq/tests/rtworkq.c @@ -33,72 +33,72 @@ static void test_platform_init(void) /* Startup initializes MTA. */ hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#lx.\n", hr); hr = RtwqStartup(); - ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = RtwqShutdown(); - ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#lx.\n", hr); /* Try with STA initialized before startup. */ hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = RtwqStartup(); - ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = RtwqShutdown(); - ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); CoUninitialize(); /* Startup -> init main STA -> uninitialize -> shutdown */ hr = RtwqStartup(); - ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); CoUninitialize(); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = RtwqShutdown(); - ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); } START_TEST(rtworkq)

1 0

Eric Pouech : wusa: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 827988bd8a3bc2abd7de695c5f2cfdb65768056b URL: https://source.winehq.org/git/wine.git/?a=commit;h=827988bd8a3bc2abd7de695c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:50 2022 +0100 wusa: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wusa/Makefile.in | 1 - programs/wusa/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in index a5702bfe657..171377bc2f2 100644 --- a/programs/wusa/Makefile.in +++ b/programs/wusa/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wusa.exe IMPORTS = cabinet shlwapi ole32 oleaut32 advapi32 diff --git a/programs/wusa/main.c b/programs/wusa/main.c index bcb795a80fa..d1bb385cd06 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -1035,7 +1035,7 @@ static void restart_as_x86_64(void) CloseHandle(pi.hProcess); CloseHandle(pi.hThread); } - else ERR("Failed to restart 64-bit %s, err %u\n", wine_dbgstr_w(filename), GetLastError()); + else ERR("Failed to restart 64-bit %s, err %lu\n", wine_dbgstr_w(filename), GetLastError()); Wow64RevertWow64FsRedirection(redir); ExitProcess(exit_code);

1 0