August 2020 - Wine-commits - list.winehq.org

Nikolay Sivov : combase: Move HPALETTE marshalling stubs.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: f0a30d892968d7520ac19b93de36af7cf5ce82a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0a30d892968d7520ac19b93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 3 12:08:39 2020 +0300 combase: Move HPALETTE marshalling stubs. Signed-off-by: Nikolay Sivov <nsivov(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 | 4 ++ dlls/combase/usrmarshal.c | 99 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/ole32.spec | 8 ++-- dlls/ole32/usrmarshal.c | 100 ---------------------------------------------- 4 files changed, 107 insertions(+), 104 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index a612d250d1..9d0bad29f0 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -205,6 +205,10 @@ @ stdcall HMENU_UserMarshal(ptr ptr ptr) @ stdcall HMENU_UserSize(ptr long ptr) @ stdcall HMENU_UserUnmarshal(ptr ptr ptr) +@ stdcall HPALETTE_UserFree(ptr ptr) +@ stdcall HPALETTE_UserMarshal(ptr ptr ptr) +@ stdcall HPALETTE_UserSize(ptr long ptr) +@ stdcall HPALETTE_UserUnmarshal(ptr ptr ptr) @ stub HSTRING_UserFree @ stub -arch=win64 HSTRING_UserFree64 @ stub HSTRING_UserMarshal diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index 5b3062f0c2..c88e8c57cd 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -541,6 +541,105 @@ void __RPC_USER HBITMAP_UserFree(ULONG *flags, HBITMAP *bmp) DeleteObject(*bmp); } +/****************************************************************************** + * HPALETTE_UserSize (combase.@) + * + * Calculates the buffer size required to marshal a palette. + * + * PARAMS + * pFlags [I] Flags. See notes. + * StartingSize [I] Starting size of the buffer. This value is added on to + * the buffer size required for the clip format. + * phPal [I] Palette to size. + * + * RETURNS + * The buffer size required to marshal a palette plus the starting size. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +ULONG __RPC_USER HPALETTE_UserSize(ULONG *pFlags, ULONG StartingSize, HPALETTE *phPal) +{ + FIXME(":stub\n"); + return StartingSize; +} + +/****************************************************************************** + * HPALETTE_UserMarshal (combase.@) + * + * Marshals a palette into a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the clip format into. + * phPal [I] Palette to marshal. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +unsigned char * __RPC_USER HPALETTE_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HPALETTE *phPal) +{ + FIXME(":stub\n"); + return pBuffer; +} + +/****************************************************************************** + * HPALETTE_UserUnmarshal (combase.@) + * + * Unmarshals a palette from a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the clip format from. + * phPal [O] Address that receive the unmarshaled palette. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to an ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is an ULONG. + * This function is only intended to be called by the RPC runtime. + */ +unsigned char * __RPC_USER HPALETTE_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HPALETTE *phPal) +{ + FIXME(":stub\n"); + return pBuffer; +} + +/****************************************************************************** + * HPALETTE_UserFree (combase.@) + * + * Frees an unmarshaled palette. + * + * PARAMS + * pFlags [I] Flags. See notes. + * phPal [I] Palette to free. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of + * which the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +void __RPC_USER HPALETTE_UserFree(ULONG *pFlags, HPALETTE *phPal) +{ + FIXME(":stub\n"); +} + /****************************************************************************** * WdtpInterfacePointer_UserSize (combase.@) * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 9f13f12327..97618e0893 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -163,10 +163,10 @@ @ stdcall HMETAFILE_UserMarshal(ptr ptr ptr) @ stdcall HMETAFILE_UserSize(ptr long ptr) @ stdcall HMETAFILE_UserUnmarshal(ptr ptr ptr) -@ stdcall HPALETTE_UserFree(ptr ptr) -@ stdcall HPALETTE_UserMarshal(ptr ptr ptr) -@ stdcall HPALETTE_UserSize(ptr long ptr) -@ stdcall HPALETTE_UserUnmarshal(ptr ptr ptr) +@ stdcall HPALETTE_UserFree(ptr ptr) combase.HPALETTE_UserFree +@ stdcall HPALETTE_UserMarshal(ptr ptr ptr) combase.HPALETTE_UserMarshal +@ stdcall HPALETTE_UserSize(ptr long ptr) combase.HPALETTE_UserSize +@ stdcall HPALETTE_UserUnmarshal(ptr ptr ptr) combase.HPALETTE_UserUnmarshal @ stdcall HWND_UserFree(ptr ptr) combase.HWND_UserFree @ stdcall HWND_UserMarshal(ptr ptr ptr) combase.HWND_UserMarshal @ stdcall HWND_UserSize(ptr long ptr) combase.HWND_UserSize diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index d12f81f504..694ef60764 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -375,106 +375,6 @@ void __RPC_USER HGLOBAL_UserFree(ULONG *pFlags, HGLOBAL *phGlobal) GlobalFree(*phGlobal); } -/****************************************************************************** - * HPALETTE_UserSize [OLE32.@] - * - * Calculates the buffer size required to marshal a palette. - * - * PARAMS - * pFlags [I] Flags. See notes. - * StartingSize [I] Starting size of the buffer. This value is added on to - * the buffer size required for the clip format. - * phPal [I] Palette to size. - * - * RETURNS - * The buffer size required to marshal a palette plus the starting size. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -ULONG __RPC_USER HPALETTE_UserSize(ULONG *pFlags, ULONG StartingSize, HPALETTE *phPal) -{ - FIXME(":stub\n"); - return StartingSize; -} - -/****************************************************************************** - * HPALETTE_UserMarshal [OLE32.@] - * - * Marshals a palette into a buffer. - * - * PARAMS - * pFlags [I] Flags. See notes. - * pBuffer [I] Buffer to marshal the clip format into. - * phPal [I] Palette to marshal. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -unsigned char * __RPC_USER HPALETTE_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HPALETTE *phPal) -{ - FIXME(":stub\n"); - return pBuffer; -} - -/****************************************************************************** - * HPALETTE_UserUnmarshal [OLE32.@] - * - * Unmarshals a palette from a buffer. - * - * PARAMS - * pFlags [I] Flags. See notes. - * pBuffer [I] Buffer to marshal the clip format from. - * phPal [O] Address that receive the unmarshaled palette. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to an ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is an ULONG. - * This function is only intended to be called by the RPC runtime. - */ -unsigned char * __RPC_USER HPALETTE_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HPALETTE *phPal) -{ - FIXME(":stub\n"); - return pBuffer; -} - -/****************************************************************************** - * HPALETTE_UserFree [OLE32.@] - * - * Frees an unmarshaled palette. - * - * PARAMS - * pFlags [I] Flags. See notes. - * phPal [I] Palette to free. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of - * which the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -void __RPC_USER HPALETTE_UserFree(ULONG *pFlags, HPALETTE *phPal) -{ - FIXME(":stub\n"); -} - - /****************************************************************************** * HMETAFILE_UserSize [OLE32.@] *

1 0

Huw Davies : maintainers: Add combase to the OLE RPC section.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: 88730d225436fe7cf82d1b70ab2ed6c6aa1142d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88730d225436fe7cf82d1b70… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 3 10:47:19 2020 +0100 maintainers: Add combase to the OLE RPC section. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 6cc1699665..46b3d40ec3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -195,6 +195,7 @@ F: dlls/ole32/oleobj.c OLE RPC M: Huw Davies <huw(a)codeweavers.com> +F: dlls/combase/ F: dlls/ole32/compobj.c F: dlls/ole32/marshal.c F: dlls/ole32/rpc.c

1 0

Jeff Smith : setupapi/tests: Change return values from coinst functions.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: cfde18c4904cd76eff40336e064cba86b9831633 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfde18c4904cd76eff40336e… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Jul 29 09:29:23 2020 -0500 setupapi/tests: Change return values from coinst functions. As co_error and class_error both return 0xdeadbeef, use of 0xdeadbeef as a canary value as well can lead to ambiguous tests results. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/coinst.c | 4 ++-- dlls/setupapi/tests/devinst.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/tests/coinst.c b/dlls/setupapi/tests/coinst.c index 5e8d890cfa..ba526a5d3a 100644 --- a/dlls/setupapi/tests/coinst.c +++ b/dlls/setupapi/tests/coinst.c @@ -47,7 +47,7 @@ DWORD WINAPI class_default(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA * DWORD WINAPI class_error(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA *device) { - return 0xdeadbeef; + return 0xdeadc0de; } DWORD WINAPI co_success(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA *device, @@ -67,5 +67,5 @@ DWORD WINAPI CoDeviceInstall(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA DWORD WINAPI co_error(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA *device, COINSTALLER_CONTEXT_DATA *context) { - return 0xdeadbeef; + return 0xdeadc0de; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index d4c82dea1f..cb77fdf3c4 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2727,17 +2727,17 @@ static void test_class_installer(void) ret = SetupDiCallClassInstaller(DIF_ALLOW_INSTALL, set, &device); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); + ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); ret = SetupDiCallClassInstaller(DIF_REGISTERDEVICE, set, &device); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); + ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); ret = SetupDiCallClassInstaller(DIF_REMOVE, set, &device); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); + ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); SetupDiDestroyDeviceInfoList(set); @@ -2875,12 +2875,12 @@ static void test_class_coinstaller(void) ret = SetupDiCallClassInstaller(DIF_ALLOW_INSTALL, set, &device); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); + ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); ret = SetupDiCallClassInstaller(DIF_REGISTERDEVICE, set, &device); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); + ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); SetupDiDestroyDeviceInfoList(set);

1 0

Jeff Smith : setupapi/tests: Add error tests for SetupDiDestroyDeviceInfoList.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: f9028142d1e57322f893d7e47d846f72a8c6c72c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9028142d1e57322f893d7e4… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Jul 29 09:29:24 2020 -0500 setupapi/tests: Add error tests for SetupDiDestroyDeviceInfoList. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index cb77fdf3c4..58b6303608 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2708,7 +2708,10 @@ static void test_class_installer(void) ok(*coinst_last_message == DIF_REMOVE, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2740,7 +2743,10 @@ static void test_class_installer(void) ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* Test returning ERROR_DI_DO_DEFAULT. */ @@ -2766,7 +2772,10 @@ static void test_class_installer(void) ok(ret, "Failed to call class installer, error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* The default entry point is ClassInstall(). */ @@ -2786,7 +2795,10 @@ static void test_class_installer(void) ok(*coinst_last_message == DIF_ALLOW_INSTALL, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2854,7 +2866,10 @@ static void test_class_coinstaller(void) ok(*coinst_last_message == DIF_REMOVE, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); todo_wine ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); todo_wine ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2883,7 +2898,10 @@ static void test_class_coinstaller(void) ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* The default entry point is CoDeviceInstall(). */ @@ -2906,7 +2924,10 @@ static void test_class_coinstaller(void) ok(*coinst_last_message == DIF_ALLOW_INSTALL, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2954,7 +2975,10 @@ static void test_call_class_installer(void) ok(ret, "Failed to call class installer, error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); load_resource("coinst.dll", "C:\\windows\\system32\\winetest_coinst.dll");

1 0

Jeff Smith : setupapi: Clear error on SetupDiDestroyDeviceInfoList success.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: babb1019d1a6adaa5a52398c192b55a083327f45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=babb1019d1a6adaa5a52398c… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Jul 29 09:29:25 2020 -0500 setupapi: Clear error on SetupDiDestroyDeviceInfoList success. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49332 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 1 + dlls/setupapi/tests/devinst.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9dacde29ac..de0413e74f 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2854,6 +2854,7 @@ BOOL WINAPI SetupDiDestroyDeviceInfoList(HDEVINFO devinfo) } heap_free(set); + SetLastError(ERROR_SUCCESS); return TRUE; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 58b6303608..48b84c21e8 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2711,7 +2711,7 @@ static void test_class_installer(void) SetLastError(0xdeadbeef); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list.\n"); - todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); + ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2746,7 +2746,7 @@ static void test_class_installer(void) SetLastError(0xdeadbeef); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list.\n"); - todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); + ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* Test returning ERROR_DI_DO_DEFAULT. */ @@ -2775,7 +2775,7 @@ static void test_class_installer(void) SetLastError(0xdeadbeef); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list.\n"); - todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); + ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* The default entry point is ClassInstall(). */ @@ -2798,7 +2798,7 @@ static void test_class_installer(void) SetLastError(0xdeadbeef); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list.\n"); - todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); + ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2869,7 +2869,7 @@ static void test_class_coinstaller(void) SetLastError(0xdeadbeef); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list.\n"); - todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); + ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); todo_wine ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); todo_wine ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2901,7 +2901,7 @@ static void test_class_coinstaller(void) SetLastError(0xdeadbeef); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list.\n"); - todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); + ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* The default entry point is CoDeviceInstall(). */ @@ -2927,7 +2927,7 @@ static void test_class_coinstaller(void) SetLastError(0xdeadbeef); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list.\n"); - todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); + ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2978,7 +2978,7 @@ static void test_call_class_installer(void) SetLastError(0xdeadbeef); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list.\n"); - todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); + ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); load_resource("coinst.dll", "C:\\windows\\system32\\winetest_coinst.dll");

1 0

Ziqing Hui : d3dx10/tests: Add more test images for DDS format.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: 439dff76640796002db33765c7f3593d531b2fed URL: https://source.winehq.org/git/wine.git/?a=commit;h=439dff76640796002db33765… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 23 15:59:54 2020 +0800 d3dx10/tests: Add more test images for DDS format. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 292 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 278 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=439dff76640796002db3…

1 0

Vijay Kiran Kamuju : xactengine3_7: Add new dll.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: 255bae60464554d3611b163813a57639843c92ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=255bae60464554d3611b1638… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Jun 13 22:44:23 2020 +0200 xactengine3_7: Add new dll. Based on original patch from Ethan Lee Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/xactengine3_7/Makefile.in | 6 ++++ dlls/xactengine3_7/xact_classes.idl | 28 +++++++++++++++ dlls/xactengine3_7/xact_dll.c | 66 +++++++++++++++++++++++++++++++++++ dlls/xactengine3_7/xactengine3_7.spec | 4 +++ 6 files changed, 107 insertions(+) diff --git a/configure b/configure index f4e188f38e..166c260a6e 100755 --- a/configure +++ b/configure @@ -1704,6 +1704,7 @@ enable_x3daudio1_4 enable_x3daudio1_5 enable_x3daudio1_6 enable_x3daudio1_7 +enable_xactengine3_7 enable_xapofx1_1 enable_xapofx1_2 enable_xapofx1_3 @@ -21329,6 +21330,7 @@ wine_fn_config_makefile dlls/x3daudio1_4 enable_x3daudio1_4 wine_fn_config_makefile dlls/x3daudio1_5 enable_x3daudio1_5 wine_fn_config_makefile dlls/x3daudio1_6 enable_x3daudio1_6 wine_fn_config_makefile dlls/x3daudio1_7 enable_x3daudio1_7 +wine_fn_config_makefile dlls/xactengine3_7 enable_xactengine3_7 wine_fn_config_makefile dlls/xapofx1_1 enable_xapofx1_1 wine_fn_config_makefile dlls/xapofx1_2 enable_xapofx1_2 wine_fn_config_makefile dlls/xapofx1_3 enable_xapofx1_3 diff --git a/configure.ac b/configure.ac index c0a44f3712..6f5aa8da20 100644 --- a/configure.ac +++ b/configure.ac @@ -3895,6 +3895,7 @@ WINE_CONFIG_MAKEFILE(dlls/x3daudio1_4) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_5) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_6) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_7) +WINE_CONFIG_MAKEFILE(dlls/xactengine3_7) WINE_CONFIG_MAKEFILE(dlls/xapofx1_1) WINE_CONFIG_MAKEFILE(dlls/xapofx1_2) WINE_CONFIG_MAKEFILE(dlls/xapofx1_3) diff --git a/dlls/xactengine3_7/Makefile.in b/dlls/xactengine3_7/Makefile.in new file mode 100644 index 0000000000..f92aad6680 --- /dev/null +++ b/dlls/xactengine3_7/Makefile.in @@ -0,0 +1,6 @@ +MODULE = xactengine3_7.dll + +C_SRCS = \ + xact_dll.c + +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl new file mode 100644 index 0000000000..24c792e2f0 --- /dev/null +++ b/dlls/xactengine3_7/xact_classes.idl @@ -0,0 +1,28 @@ +/* + * COM Classes for xactengine + * + * Copyright 2018 Ethan Lee for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +[ + helpstring("XACT3 Class"), + threading(both), + uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e) +] +coclass XACTEngine37 { interface IXACT37Engine; } diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c new file mode 100644 index 0000000000..ffabc3829f --- /dev/null +++ b/dlls/xactengine3_7/xact_dll.c @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2018 Ethan Lee for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "xact3.h" +#include "rpcproxy.h" +#include "xact_classes.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xact3); + +static HINSTANCE instance; + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) +{ + TRACE("(%p, %d, %p)\n", hinstDLL, reason, pReserved); + + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinstDLL; + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + FIXME("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources(instance); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources(instance); +} diff --git a/dlls/xactengine3_7/xactengine3_7.spec b/dlls/xactengine3_7/xactengine3_7.spec new file mode 100644 index 0000000000..b16365d0c9 --- /dev/null +++ b/dlls/xactengine3_7/xactengine3_7.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Vijay Kiran Kamuju : xactengine3_7: Implement IXACT3Engine interface.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: 124cd264fa258354383d9a5d6dd995d8f7868e4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=124cd264fa258354383d9a5d… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Jul 2 09:27:39 2020 +0200 xactengine3_7: Implement IXACT3Engine interface. Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/xactengine3_7/Makefile.in | 3 + dlls/xactengine3_7/xact_dll.c | 463 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 467 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=124cd264fa258354383d…

1 0

Zebediah Figura : Revert "winegstreamer: Check for failure from gst_video_info_set_format().".
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: 3231901ad886198dba016f10822cd8410d6546a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3231901ad886198dba016f10… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Aug 1 14:17:35 2020 -0500 Revert "winegstreamer: Check for failure from gst_video_info_set_format().". This reverts commit ddd43e0a80bfd4c2e6f3ec650ed4b7d37890c46d. This function returns void before 1.12. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49647 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index fe5fe0e60d..e8f65a0e6e 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -413,11 +413,7 @@ static GstCaps *amt_to_gst_caps_video(const AM_MEDIA_TYPE *mt) return NULL; } - if (!gst_video_info_set_format(&info, format, vih->bmiHeader.biWidth, vih->bmiHeader.biHeight)) - { - ERR("Failed to set format.\n"); - return NULL; - } + gst_video_info_set_format(&info, format, vih->bmiHeader.biWidth, vih->bmiHeader.biHeight); if ((caps = gst_video_info_to_caps(&info))) { /* Clear some fields that shouldn't prevent us from connecting. */

1 0

Zebediah Figura : server: Use a separate object for each opened mailslot device file.
by Alexandre Julliard 03 Aug '20

03 Aug '20

Module: wine Branch: master Commit: 31800a1414a33995eba7c89d65a93d69beee47b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31800a1414a33995eba7c89d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Aug 1 23:35:53 2020 -0500 server: Use a separate object for each opened mailslot device file. This is essentially a straight port of 2600ecd4ed. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 4 +- dlls/ntdll/tests/om.c | 4 +- server/mailslot.c | 117 +++++++++++++++++++++++++++++++++++------------- 3 files changed, 89 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=31800a1414a33995eba7…

1 0