November 2022 - Wine-Commits

Piotr Caban : localspl: Run XcvOpenPort tests when InitializePrintMonitor2 is used.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 50a2e2f0e9fdba3307c74e96f186ca79eebea8f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/50a2e2f0e9fdba3307c74e96f186ca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 24 19:33:20 2022 +0100 localspl: Run XcvOpenPort tests when InitializePrintMonitor2 is used. --- dlls/localspl/tests/localmon.c | 56 +++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 02415610640..9f10ed8e3bf 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -254,6 +254,13 @@ static BOOL call_AddPortEx(WCHAR *name, DWORD level, BYTE *buf, WCHAR *mon) return pAddPortEx2(hmon, name, level, buf, mon); } +static BOOL call_XcvOpenPort(const WCHAR *name, ACCESS_MASK access, HANDLE *h) +{ + if (pXcvOpenPort) + return pXcvOpenPort(name, access, h); + return pXcvOpenPort2(hmon, name, access, h); +} + /* ########################### */ static void find_installed_ports(void) @@ -885,7 +892,7 @@ static void test_XcvClosePort(void) SetLastError(0xdeadbeef); hXcv2 = (HANDLE) 0xdeadbeef; - res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv2); + res = call_XcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv2); ok(res, "returned %ld with %lu and %p (expected '!= 0')\n", res, GetLastError(), hXcv2); if (res) { @@ -985,6 +992,10 @@ static void test_XcvDataPort_ConfigureLPTPortCommandOK(void) skip("'ConfigureLPTPortCommandOK' not supported\n"); return; } + if (res == ERROR_ACCESS_DENIED) { + skip("'ConfigureLPTPortCommandOK' failed with ERROR_ACCESS_DENIED\n"); + return; + } ok( res == ERROR_SUCCESS, "returned %ld with %lu (expected ERROR_SUCCESS)\n", res, GetLastError()); needed = sizeof(buffer)-1 ; res = RegQueryValueExA(hroot, TransmissionRetryTimeoutA, NULL, NULL, (PBYTE) buffer, &needed); @@ -1120,7 +1131,13 @@ static void test_XcvDataPort_GetTransmissionRetryTimeout(void) "ERROR_FILE_NOT_FOUND)\n", res, needed, org_value); /* Get default value (documented as 90 in the w2k reskit, but that is wrong) */ - RegDeleteValueA(hroot, TransmissionRetryTimeoutA); + res = RegDeleteValueA(hroot, TransmissionRetryTimeoutA); + if (res == ERROR_ACCESS_DENIED) { + RegCloseKey(hroot); + skip("ACCESS_DENIED\n"); + return; + } + ok( res == ERROR_SUCCESS, "RegDeleteValue(TransmissionRetryTimeout) returned %lu\n", res); needed = (DWORD) 0xdeadbeef; buffer[0] = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -1131,7 +1148,7 @@ static void test_XcvDataPort_GetTransmissionRetryTimeout(void) /* the default timeout is returned, when the value is empty */ res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)emptyA, 1); - ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", GetLastError()); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu (%lu)\n", res, GetLastError()); needed = (DWORD) 0xdeadbeef; buffer[0] = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -1313,17 +1330,17 @@ static void test_XcvDataPort_PortIsValid(void) } - /* hXcv is ignored for the command "PortIsValid" */ needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataPort(NULL, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W), NULL, 0, NULL); - ok( res == ERROR_SUCCESS, "returned %ld with %lu (expected ERROR_SUCCESS)\n", res, GetLastError()); + res = pXcvDataPort(NULL, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W), NULL, 0, &needed); + todo_wine ok( res == ERROR_INVALID_PARAMETER || broken(res == ERROR_SUCCESS), + "returned %ld with %lu\n", res, GetLastError()); - /* needed is ignored */ needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W), NULL, 0, NULL); - ok( res == ERROR_SUCCESS, "returned %ld with %lu (expected ERROR_SUCCESS)\n", res, GetLastError()); + todo_wine ok( res == ERROR_INVALID_PARAMETER || broken(res == ERROR_SUCCESS), + "returned %ld with %lu\n", res, GetLastError()); /* cbInputData is ignored */ @@ -1360,9 +1377,8 @@ static void test_XcvDataPort_PortIsValid(void) needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) emptyW, sizeof(emptyW), NULL, 0, &needed); - ok( res == ERROR_PATH_NOT_FOUND, - "returned %ld with %lu and 0x%lx (expected ERROR_PATH_NOT_FOUND)\n", - res, GetLastError(), needed); + todo_wine ok( res == ERROR_FILE_NOT_FOUND || broken(res == ERROR_PATH_NOT_FOUND), + "returned %ld with %lu and 0x%lx\n", res, GetLastError(), needed); /* a directory is not allowed */ @@ -1440,15 +1456,15 @@ static void test_XcvOpenPort(void) if (0) { /* crash with native localspl.dll (w2k+xp) */ - pXcvOpenPort(NULL, SERVER_ACCESS_ADMINISTER, &hXcv2); - pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, NULL); + call_XcvOpenPort(NULL, SERVER_ACCESS_ADMINISTER, &hXcv2); + call_XcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, NULL); } /* The returned handle is the result from a previous "spoolss.dll,DllAllocSplMem" */ SetLastError(0xdeadbeef); hXcv2 = (HANDLE) 0xdeadbeef; - res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv2); + res = call_XcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv2); ok(res, "returned %ld with %lu and %p (expected '!= 0')\n", res, GetLastError(), hXcv2); if (res) pXcvClosePort(hXcv2); @@ -1456,7 +1472,7 @@ static void test_XcvOpenPort(void) /* The ACCESS_MASK is not checked in XcvOpenPort */ SetLastError(0xdeadbeef); hXcv2 = (HANDLE) 0xdeadbeef; - res = pXcvOpenPort(emptyW, 0, &hXcv2); + res = call_XcvOpenPort(emptyW, 0, &hXcv2); ok(res, "returned %ld with %lu and %p (expected '!= 0')\n", res, GetLastError(), hXcv2); if (res) pXcvClosePort(hXcv2); @@ -1464,13 +1480,13 @@ static void test_XcvOpenPort(void) /* A copy of pszObject is saved in the Memory-Block */ SetLastError(0xdeadbeef); hXcv2 = (HANDLE) 0xdeadbeef; - res = pXcvOpenPort(portname_lpt1W, SERVER_ALL_ACCESS, &hXcv2); + res = call_XcvOpenPort(portname_lpt1W, SERVER_ALL_ACCESS, &hXcv2); ok(res, "returned %ld with %lu and %p (expected '!= 0')\n", res, GetLastError(), hXcv2); if (res) pXcvClosePort(hXcv2); SetLastError(0xdeadbeef); hXcv2 = (HANDLE) 0xdeadbeef; - res = pXcvOpenPort(portname_fileW, SERVER_ALL_ACCESS, &hXcv2); + res = call_XcvOpenPort(portname_fileW, SERVER_ALL_ACCESS, &hXcv2); ok(res, "returned %ld with %lu and %p (expected '!= 0')\n", res, GetLastError(), hXcv2); if (res) pXcvClosePort(hXcv2); @@ -1572,13 +1588,13 @@ START_TEST(localmon) GET_MONITOR_FUNC(XcvDataPort); GET_MONITOR_FUNC(XcvClosePort); - if ((pXcvOpenPort) && (pXcvDataPort) && (pXcvClosePort)) { + if ((pXcvOpenPort || pXcvOpenPort2) && pXcvDataPort && pXcvClosePort) { SetLastError(0xdeadbeef); - res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + res = call_XcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); ok(res, "hXcv: %ld with %lu and %p (expected '!= 0')\n", res, GetLastError(), hXcv); SetLastError(0xdeadbeef); - res = pXcvOpenPort(emptyW, 0, &hXcv_noaccess); + res = call_XcvOpenPort(emptyW, 0, &hXcv_noaccess); ok(res, "hXcv_noaccess: %ld with %lu and %p (expected '!= 0')\n", res, GetLastError(), hXcv_noaccess); } }

1 0

Ivo Ivanov : dinput: Always send both "Type Specific" and "Set Effect" reports on initial Download.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: cd75ed18007d8545cc2cb01463e38e2ef7da7c4b URL: https://gitlab.winehq.org/wine/wine/-/commit/cd75ed18007d8545cc2cb01463e38e… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Tue Jul 26 13:22:17 2022 +0300 dinput: Always send both "Type Specific" and "Set Effect" reports on initial Download. Fixes the Download method not sending an initial type specific HID PID report in the rare cases where all type specific params are set to 0 through the initial SetParameters call, so they aren't considered as modified. FH5 is affected by this issue, since it initially sets the direction of its constant effect to 0, which translates to 0 magnitude in dinput. --- dlls/dinput/joystick_hid.c | 4 +++- dlls/dinput/tests/force_feedback.c | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 2065fe429eb..311e5903878 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2993,6 +2993,7 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) case PID_USAGE_ET_SAWTOOTH_DOWN: case PID_USAGE_ET_CONSTANT_FORCE: case PID_USAGE_ET_RAMP: + if (!(impl->flags & DIEP_ENVELOPE)) break; if (!(impl->modified & DIEP_ENVELOPE)) break; set_parameter_value( impl, impl->set_envelope_buf, set_envelope->attack_level_caps, @@ -3100,7 +3101,7 @@ static HRESULT WINAPI hid_joystick_effect_Unload( IDirectInputEffect *iface ) else hr = DIERR_INPUTLOST; } - impl->modified = impl->flags; + impl->modified = ~0; impl->index = 0; check_empty_force_feedback_state( joystick ); } @@ -3161,6 +3162,7 @@ static HRESULT hid_joystick_create_effect( IDirectInputDevice8W *iface, IDirectI impl->params.rgdwAxes = impl->axes; impl->params.rglDirection = impl->directions; impl->params.dwTriggerButton = -1; + impl->modified = ~0; impl->status = 0; *out = &impl->IDirectInputEffect_iface; diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index d9ae039f681..de7d5990f34 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -367,7 +367,6 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO .report_id = 5, .report_len = 2, .report_buf = {0x05,0x00}, - .todo = TRUE, }, /* set envelope */ { @@ -375,7 +374,6 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO .report_id = 6, .report_len = 7, .report_buf = {0x06,0x00,0x00,0x00,0x00,0x00,0x00}, - .todo = TRUE, }, /* update effect */ { @@ -393,7 +391,6 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO .report_id = 5, .report_len = 2, .report_buf = {0x05,0x00}, - .todo = TRUE, }, /* update effect */ {

1 0

Ivo Ivanov : windows.gaming.input: Implement IForceFeedbackMotor_get_SupportedAxes.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 5f8f6c34526a406a72516b1c3e3bd53623f2260b URL: https://gitlab.winehq.org/wine/wine/-/commit/5f8f6c34526a406a72516b1c3e3bd5… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Sat Jul 23 16:48:37 2022 +0300 windows.gaming.input: Implement IForceFeedbackMotor_get_SupportedAxes. --- dlls/dinput/tests/force_feedback.c | 13 +++++++++---- dlls/windows.gaming.input/force_feedback.c | 26 ++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index de7d5990f34..d743f959f55 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5735,10 +5735,10 @@ static void test_windows_gaming_input(void) EventRegistrationToken controller_added_token; IPeriodicForceEffectFactory *periodic_factory; struct bool_async_handler bool_async_handler; + ForceFeedbackEffectAxes supported_axes, axes; IVectorView_ForceFeedbackMotor *motors_view; IConditionForceEffect *condition_effect; ConditionForceEffectKind condition_kind; - ForceFeedbackEffectAxes supported_axes; IActivationFactory *activation_factory; IPeriodicForceEffect *periodic_effect; IConstantForceEffect *constant_effect; @@ -5856,12 +5856,17 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "get_IsEnabled returned %#lx\n", hr ); ok( enabled == TRUE, "got enabled %u\n", enabled ); + /* SupportedAxes always returns ForceFeedbackEffectAxes_X on Windows, + * no matter which axis is available for FFB in the Set Effects report, + * or whether a X axis is declared at all. + */ + supported_axes = 0xdeadbeef; hr = IForceFeedbackMotor_get_SupportedAxes( motor, &supported_axes ); - todo_wine ok( hr == S_OK, "get_SupportedAxes returned %#lx\n", hr ); - todo_wine - ok( supported_axes == ForceFeedbackEffectAxes_X, "got axes %#x\n", supported_axes ); + axes = ForceFeedbackEffectAxes_X | ForceFeedbackEffectAxes_Y | ForceFeedbackEffectAxes_Z; + ok( supported_axes == axes || broken( supported_axes == ForceFeedbackEffectAxes_X ), + "got axes %#x\n", supported_axes ); set_hid_expect( file, &expect_pause, sizeof(expect_pause) ); hr = IForceFeedbackMotor_PauseAllEffects( motor ); diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index 198268eac24..e32e6fea9b4 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -532,10 +532,32 @@ static HRESULT WINAPI motor_get_IsEnabled( IForceFeedbackMotor *iface, BOOLEAN * return hr; } +static BOOL CALLBACK check_ffb_axes( const DIDEVICEOBJECTINSTANCEW *obj, void *args ) +{ + ForceFeedbackEffectAxes *value = args; + + if (obj->dwType & DIDFT_FFACTUATOR) + { + if (IsEqualIID( &obj->guidType, &GUID_XAxis )) *value |= ForceFeedbackEffectAxes_X; + else if (IsEqualIID( &obj->guidType, &GUID_YAxis )) *value |= ForceFeedbackEffectAxes_Y; + else if (IsEqualIID( &obj->guidType, &GUID_ZAxis )) *value |= ForceFeedbackEffectAxes_Z; + } + + return DIENUM_CONTINUE; +} + static HRESULT WINAPI motor_get_SupportedAxes( IForceFeedbackMotor *iface, enum ForceFeedbackEffectAxes *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct motor *impl = impl_from_IForceFeedbackMotor( iface ); + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + *value = ForceFeedbackEffectAxes_None; + if (FAILED(hr = IDirectInputDevice8_EnumObjects( impl->device, check_ffb_axes, value, DIDFT_AXIS ))) + *value = ForceFeedbackEffectAxes_None; + + return hr; } static HRESULT WINAPI motor_load_effect_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result )

1 0

Ivo Ivanov : windows.gaming.input: Add gain of 1.0 to the initialization params of (Constant|Ramp)Effect's SetParameters.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: eccfcc80113e3aad62467e77758036db1f211fae URL: https://gitlab.winehq.org/wine/wine/-/commit/eccfcc80113e3aad62467e77758036… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Wed Jul 27 10:29:08 2022 +0300 windows.gaming.input: Add gain of 1.0 to the initialization params of (Constant|Ramp)Effect's SetParameters. Fixes FH5 not having (or having very subtle) force feedback. Potentially affects most WGI games, since the constant effect is usually the main effect. --- dlls/windows.gaming.input/constant_effect.c | 1 + dlls/windows.gaming.input/ramp_effect.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/windows.gaming.input/constant_effect.c b/dlls/windows.gaming.input/constant_effect.c index 0af5d736f48..15763b30d67 100644 --- a/dlls/windows.gaming.input/constant_effect.c +++ b/dlls/windows.gaming.input/constant_effect.c @@ -107,6 +107,7 @@ static HRESULT WINAPI effect_SetParameters( IConstantForceEffect *iface, Vector3 .direction = direction, .duration = duration, .repeat_count = 1, + .gain = 1., }, }; struct constant_effect *impl = impl_from_IConstantForceEffect( iface ); diff --git a/dlls/windows.gaming.input/ramp_effect.c b/dlls/windows.gaming.input/ramp_effect.c index a498942cabe..fadcf151c04 100644 --- a/dlls/windows.gaming.input/ramp_effect.c +++ b/dlls/windows.gaming.input/ramp_effect.c @@ -108,6 +108,7 @@ static HRESULT WINAPI effect_SetParameters( IRampForceEffect *iface, Vector3 sta .end_vector = end_vector, .duration = duration, .repeat_count = 1, + .gain = 1., }, }; struct ramp_effect *impl = impl_from_IRampForceEffect( iface );

1 0

Piotr Caban : localspl: Run OpenPort tests when InitializePrintMonitor2 is used.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 3d62544f1f512924b5698f2a2e61e3d78ca2a18e URL: https://gitlab.winehq.org/wine/wine/-/commit/3d62544f1f512924b5698f2a2e61e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 24 18:53:43 2022 +0100 localspl: Run OpenPort tests when InitializePrintMonitor2 is used. --- dlls/localspl/tests/localmon.c | 53 +++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index dbc22a99c93..b48d35c6303 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -242,6 +242,13 @@ static BOOL call_EnumPorts(WCHAR *name, DWORD level, BYTE *buf, DWORD size, return pEnumPorts2(hmon, name, level, buf, size, needed, count); } +static BOOL call_OpenPort(WCHAR *name, HANDLE *h) +{ + if (pOpenPort) + return pOpenPort(name, h); + return pOpenPort2(hmon, name, h); +} + static BOOL call_AddPortEx(WCHAR *name, DWORD level, BYTE *buf, WCHAR *mon) { if (pAddPortEx) @@ -456,15 +463,15 @@ static void test_ClosePort(void) DWORD res2; - if (!pOpenPort || !pClosePort) return; + if ((!pOpenPort && !pOpenPort2) || !pClosePort) return; if (have_com[0]) { nameW = have_com; hPort = (HANDLE) 0xdeadbeef; - res = pOpenPort(nameW, &hPort); + res = call_OpenPort(nameW, &hPort); hPort2 = (HANDLE) 0xdeadbeef; - res2 = pOpenPort(nameW, &hPort2); + res2 = call_OpenPort(nameW, &hPort2); if (res2 && (hPort2 != hPort)) { SetLastError(0xdeadbeef); @@ -484,9 +491,9 @@ static void test_ClosePort(void) nameW = have_lpt; hPort = (HANDLE) 0xdeadbeef; - res = pOpenPort(nameW, &hPort); + res = call_OpenPort(nameW, &hPort); hPort2 = (HANDLE) 0xdeadbeef; - res2 = pOpenPort(nameW, &hPort2); + res2 = call_OpenPort(nameW, &hPort2); if (res2 && (hPort2 != hPort)) { SetLastError(0xdeadbeef); @@ -506,9 +513,9 @@ static void test_ClosePort(void) nameW = have_file; hPort = (HANDLE) 0xdeadbeef; - res = pOpenPort(nameW, &hPort); + res = call_OpenPort(nameW, &hPort); hPort2 = (HANDLE) 0xdeadbeef; - res2 = pOpenPort(nameW, &hPort2); + res2 = call_OpenPort(nameW, &hPort2); if (res2 && (hPort2 != hPort)) { SetLastError(0xdeadbeef); @@ -764,21 +771,21 @@ static void test_OpenPort(void) DWORD res; DWORD res2; - if (!pOpenPort || !pClosePort) return; + if ((!pOpenPort && !pOpenPort2) || !pClosePort) return; if (have_com[0]) { nameW = have_com; hPort = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pOpenPort(nameW, &hPort); + res = call_OpenPort(nameW, &hPort); ok( res, "got %lu with %lu and %p (expected '!= 0')\n", res, GetLastError(), hPort); /* the same HANDLE is returned for a second OpenPort in native localspl */ hPort2 = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); - res2 = pOpenPort(nameW, &hPort2); + res2 = call_OpenPort(nameW, &hPort2); ok( res2, "got %lu with %lu and %p (expected '!= 0')\n", res2, GetLastError(), hPort2); @@ -791,7 +798,7 @@ static void test_OpenPort(void) hPort = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pOpenPort(nameW, &hPort); + res = call_OpenPort(nameW, &hPort); ok( res || (GetLastError() == ERROR_ACCESS_DENIED), "got %lu with %lu and %p (expected '!= 0' or '0' with ERROR_ACCESS_DENIED)\n", res, GetLastError(), hPort); @@ -799,7 +806,7 @@ static void test_OpenPort(void) /* the same HANDLE is returned for a second OpenPort in native localspl */ hPort2 = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); - res2 = pOpenPort(nameW, &hPort2); + res2 = call_OpenPort(nameW, &hPort2); ok( res2 || (GetLastError() == ERROR_ACCESS_DENIED), "got %lu with %lu and %p (expected '!= 0' or '0' with ERROR_ACCESS_DENIED)\n", res2, GetLastError(), hPort2); @@ -813,14 +820,14 @@ static void test_OpenPort(void) hPort = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pOpenPort(nameW, &hPort); + res = call_OpenPort(nameW, &hPort); ok( res, "got %lu with %lu and %p (expected '!= 0')\n", res, GetLastError(), hPort); /* a different HANDLE is returned for a second OpenPort */ hPort2 = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); - res2 = pOpenPort(nameW, &hPort2); + res2 = call_OpenPort(nameW, &hPort2); ok( res2 && (hPort2 != hPort), "got %lu with %lu and %p (expected '!= 0' and '!= %p')\n", res2, GetLastError(), hPort2, hPort); @@ -834,23 +841,21 @@ static void test_OpenPort(void) if (nameW) { hPort = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pOpenPort(nameW, NULL); + res = call_OpenPort(nameW, NULL); trace("got %lu with %lu and %p\n", res, GetLastError(), hPort); } } - hPort = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pOpenPort(does_not_existW, &hPort); - ok (!res && (hPort == (HANDLE) 0xdeadbeef), - "got %lu with 0x%lx and %p (expected '0' and 0xdeadbeef)\n", res, GetLastError(), hPort); + res = call_OpenPort(does_not_existW, &hPort); + ok (!res, "got %lu with 0x%lx and %p (expected '0' and 0xdeadbeef)\n", + res, GetLastError(), hPort); if (res) pClosePort(hPort); - hPort = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pOpenPort(emptyW, &hPort); - ok (!res && (hPort == (HANDLE) 0xdeadbeef), - "got %lu with 0x%lx and %p (expected '0' and 0xdeadbeef)\n", res, GetLastError(), hPort); + res = call_OpenPort(emptyW, &hPort); + ok (!res, "got %lu with 0x%lx and %p (expected '0' and 0xdeadbeef)\n", + res, GetLastError(), hPort); if (res) pClosePort(hPort); @@ -858,7 +863,7 @@ static void test_OpenPort(void) if (0) { hPort = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pOpenPort(NULL, &hPort); + res = call_OpenPort(NULL, &hPort); trace("got %lu with %lu and %p\n", res, GetLastError(), hPort); }

1 0

Piotr Caban : localspl: Run AddPortEx tests when InitializePrintMonitor2 is used.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 8e9bcf428084e29b005bd9b0e63fcbdf66f5204e URL: https://gitlab.winehq.org/wine/wine/-/commit/8e9bcf428084e29b005bd9b0e63fcb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 24 18:35:55 2022 +0100 localspl: Run AddPortEx tests when InitializePrintMonitor2 is used. --- dlls/localspl/tests/localmon.c | 45 ++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index af9ce899476..ccbc43f280d 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -224,18 +224,21 @@ static MONITORREG monreg = QueryValue }; -static DWORD delete_port(LPWSTR portname) +static BOOL delete_port(LPWSTR portname) { - DWORD res; + if (pDeletePort) + return pDeletePort(NULL, 0, portname); + if (pDeletePort2) + return pDeletePort2(hmon, NULL, 0, portname); + return pXcvDataPort(hXcv, cmd_DeletePortW, (PBYTE) portname, + (lstrlenW(portname) + 1) * sizeof(WCHAR), NULL, 0, NULL) == ERROR_SUCCESS; +} - if (pDeletePort) { - res = pDeletePort(NULL, 0, portname); - } - else - { - res = pXcvDataPort(hXcv, cmd_DeletePortW, (PBYTE) portname, (lstrlenW(portname) + 1) * sizeof(WCHAR), NULL, 0, NULL); - } - return res; +static BOOL call_AddPortEx(WCHAR *name, DWORD level, BYTE *buf, WCHAR *mon) +{ + if (pAddPortEx) + return pAddPortEx(name, level, buf, mon); + return pAddPortEx2(hmon, name, level, buf, mon); } /* ########################### */ @@ -331,11 +334,11 @@ static void test_AddPortEx(void) PORT_INFO_2W pi; DWORD res; - if (!pAddPortEx) { + if (!pAddPortEx && !pAddPortEx2) { skip("AddPortEx\n"); return; } - if ((!pDeletePort) && (!hXcv)) { + if (!pDeletePort && !pDeletePort2 && !pXcvDataPort) { skip("No API to delete a Port\n"); return; } @@ -348,13 +351,13 @@ static void test_AddPortEx(void) /* tests crash with native localspl.dll in w2k, but works with native localspl.dll in wine */ SetLastError(0xdeadbeef); - res = pAddPortEx(NULL, 1, (LPBYTE) &pi, LocalPortW); + res = call_AddPortEx(NULL, 1, (LPBYTE) &pi, LocalPortW); trace("returned %lu with %lu\n", res, GetLastError() ); ok( res, "got %lu with %lu (expected '!= 0')\n", res, GetLastError()); /* port already exists: */ SetLastError(0xdeadbeef); - res = pAddPortEx(NULL, 1, (LPBYTE) &pi, LocalPortW); + res = call_AddPortEx(NULL, 1, (LPBYTE) &pi, LocalPortW); trace("returned %lu with %lu\n", res, GetLastError() ); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), "got %lu with %lu (expected '0' with ERROR_INVALID_PARAMETER)\n", @@ -365,7 +368,7 @@ static void test_AddPortEx(void) /* NULL for pMonitorName is documented for Printmonitors, but localspl.dll fails always with ERROR_INVALID_PARAMETER */ SetLastError(0xdeadbeef); - res = pAddPortEx(NULL, 1, (LPBYTE) &pi, NULL); + res = call_AddPortEx(NULL, 1, (LPBYTE) &pi, NULL); trace("returned %lu with %lu\n", res, GetLastError() ); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), "got %lu with %lu (expected '0' with ERROR_INVALID_PARAMETER)\n", @@ -374,7 +377,7 @@ static void test_AddPortEx(void) SetLastError(0xdeadbeef); - res = pAddPortEx(NULL, 1, (LPBYTE) &pi, emptyW); + res = call_AddPortEx(NULL, 1, (LPBYTE) &pi, emptyW); trace("returned %lu with %lu\n", res, GetLastError() ); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), "got %lu with %lu (expected '0' with ERROR_INVALID_PARAMETER)\n", @@ -383,7 +386,7 @@ static void test_AddPortEx(void) SetLastError(0xdeadbeef); - res = pAddPortEx(NULL, 1, (LPBYTE) &pi, does_not_existW); + res = call_AddPortEx(NULL, 1, (LPBYTE) &pi, does_not_existW); trace("returned %lu with %lu\n", res, GetLastError() ); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), "got %lu with %lu (expected '0' with ERROR_INVALID_PARAMETER)\n", @@ -393,7 +396,7 @@ static void test_AddPortEx(void) pi.pPortName = NULL; SetLastError(0xdeadbeef); - res = pAddPortEx(NULL, 1, (LPBYTE) &pi, LocalPortW); + res = call_AddPortEx(NULL, 1, (LPBYTE) &pi, LocalPortW); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), "got %lu with %lu (expected '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); @@ -407,7 +410,7 @@ static void test_AddPortEx(void) pi.fPortType = PORT_TYPE_WRITE; SetLastError(0xdeadbeef); - res = pAddPortEx(NULL, 2, (LPBYTE) &pi, LocalPortW); + res = call_AddPortEx(NULL, 2, (LPBYTE) &pi, LocalPortW); ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), "got %lu with %lu (expected '0' with ERROR_INVALID_LEVEL)\n", res, GetLastError()); @@ -416,7 +419,7 @@ static void test_AddPortEx(void) /* invalid levels */ SetLastError(0xdeadbeef); - res = pAddPortEx(NULL, 0, (LPBYTE) &pi, LocalPortW); + res = call_AddPortEx(NULL, 0, (LPBYTE) &pi, LocalPortW); ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), "got %lu with %lu (expected '0' with ERROR_INVALID_LEVEL)\n", res, GetLastError()); @@ -424,7 +427,7 @@ static void test_AddPortEx(void) SetLastError(0xdeadbeef); - res = pAddPortEx(NULL, 3, (LPBYTE) &pi, LocalPortW); + res = call_AddPortEx(NULL, 3, (LPBYTE) &pi, LocalPortW); ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), "got %lu with %lu (expected '0' with ERROR_INVALID_LEVEL)\n", res, GetLastError());

1 0

Piotr Caban : localspl: Run EnumPorts tests when InitializePrintMonitor2 is used.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 9498fabfd32199182cf024a99db55a5394373583 URL: https://gitlab.winehq.org/wine/wine/-/commit/9498fabfd32199182cf024a99db55a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 24 18:47:15 2022 +0100 localspl: Run EnumPorts tests when InitializePrintMonitor2 is used. --- dlls/localspl/tests/localmon.c | 43 ++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index ccbc43f280d..dbc22a99c93 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -234,6 +234,14 @@ static BOOL delete_port(LPWSTR portname) (lstrlenW(portname) + 1) * sizeof(WCHAR), NULL, 0, NULL) == ERROR_SUCCESS; } +static BOOL call_EnumPorts(WCHAR *name, DWORD level, BYTE *buf, DWORD size, + DWORD *needed, DWORD *count) +{ + if (pEnumPorts) + return pEnumPorts(name, level, buf, size, needed, count); + return pEnumPorts2(hmon, name, level, buf, size, needed, count); +} + static BOOL call_AddPortEx(WCHAR *name, DWORD level, BYTE *buf, WCHAR *mon) { if (pAddPortEx) @@ -256,13 +264,13 @@ static void find_installed_ports(void) have_lpt[0] = '\0'; have_file[0] = '\0'; - if (!pEnumPorts) return; + if (!pEnumPorts && !pEnumPorts2) return; - res = pEnumPorts(NULL, 1, NULL, 0, &needed, &returned); + res = call_EnumPorts(NULL, 1, NULL, 0, &needed, &returned); if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { pi = HeapAlloc(GetProcessHeap(), 0, needed); } - res = pEnumPorts(NULL, 1, (LPBYTE) pi, needed, &needed, &returned); + res = call_EnumPorts(NULL, 1, (LPBYTE) pi, needed, &needed, &returned); if (!res) { skip("no ports found\n"); @@ -619,7 +627,7 @@ static void test_EnumPorts(void) DWORD pcbNeeded; DWORD pcReturned; - if (!pEnumPorts) return; + if (!pEnumPorts && !pEnumPorts2) return; /* valid levels are 1 and 2 */ for(level = 0; level < 4; level++) { @@ -627,15 +635,14 @@ static void test_EnumPorts(void) cbBuf = 0xdeadbeef; pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); - res = pEnumPorts(NULL, level, NULL, 0, &cbBuf, &pcReturned); + res = call_EnumPorts(NULL, level, NULL, 0, &cbBuf, &pcReturned); /* use only a short test, when we test with an invalid level */ if(!level || (level > 2)) { - /* NT4 fails with ERROR_INVALID_LEVEL (as expected) - XP succeeds with ERROR_SUCCESS () */ - ok( (cbBuf == 0) && (pcReturned == 0), - "(%ld) returned %ld with %lu and %ld, %ld (expected 0, 0)\n", - level, res, GetLastError(), cbBuf, pcReturned); + todo_wine ok(!res || broken(res && !GetLastError()), + "EnumPorts succeeded with level %ld\n", level); + todo_wine ok(GetLastError() == ERROR_INVALID_LEVEL || broken(res && !GetLastError()), + "GetLastError() = %ld\n", GetLastError()); continue; } @@ -650,7 +657,7 @@ static void test_EnumPorts(void) pcbNeeded = 0xdeadbeef; pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); - res = pEnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, &pcReturned); + res = call_EnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, &pcReturned); ok( res, "(%ld) returned %ld with %lu and %ld, %ld (expected '!= 0')\n", level, res, GetLastError(), pcbNeeded, pcReturned); /* We can compare the returned Data with the Registry / "win.ini",[Ports] here */ @@ -658,14 +665,14 @@ static void test_EnumPorts(void) pcbNeeded = 0xdeadbeef; pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); - res = pEnumPorts(NULL, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); + res = call_EnumPorts(NULL, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); ok( res, "(%ld) returned %ld with %lu and %ld, %ld (expected '!= 0')\n", level, res, GetLastError(), pcbNeeded, pcReturned); pcbNeeded = 0xdeadbeef; pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); - res = pEnumPorts(NULL, level, buffer, cbBuf-1, &pcbNeeded, &pcReturned); + res = call_EnumPorts(NULL, level, buffer, cbBuf-1, &pcbNeeded, &pcReturned); ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), "(%ld) returned %ld with %lu and %ld, %ld (expected '0' with " "ERROR_INSUFFICIENT_BUFFER)\n", @@ -674,23 +681,23 @@ static void test_EnumPorts(void) if (0) { /* The following tests crash this app with native localmon/localspl */ - pEnumPorts(NULL, level, NULL, cbBuf, &pcbNeeded, &pcReturned); - pEnumPorts(NULL, level, buffer, cbBuf, NULL, &pcReturned); - pEnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); + call_EnumPorts(NULL, level, NULL, cbBuf, &pcbNeeded, &pcReturned); + call_EnumPorts(NULL, level, buffer, cbBuf, NULL, &pcReturned); + call_EnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); } /* The Servername is ignored */ pcbNeeded = 0xdeadbeef; pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); - res = pEnumPorts(emptyW, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); + res = call_EnumPorts(emptyW, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); ok( res, "(%ld) returned %ld with %lu and %ld, %ld (expected '!= 0')\n", level, res, GetLastError(), pcbNeeded, pcReturned); pcbNeeded = 0xdeadbeef; pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); - res = pEnumPorts(server_does_not_existW, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); + res = call_EnumPorts(server_does_not_existW, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); ok( res, "(%ld) returned %ld with %lu and %ld, %ld (expected '!= 0')\n", level, res, GetLastError(), pcbNeeded, pcReturned);

1 0

Jacek Caban : winevulkan: Don't try to convert unions without selectors.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 274a9db57a387cbea7b2491f954c9262d8fbd4ac URL: https://gitlab.winehq.org/wine/wine/-/commit/274a9db57a387cbea7b2491f954c92… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 24 22:04:36 2022 +0100 winevulkan: Don't try to convert unions without selectors. --- dlls/winevulkan/make_vulkan | 12 ++++-- dlls/winevulkan/vulkan_thunks.c | 88 ++++++++++++++--------------------------- 2 files changed, 38 insertions(+), 62 deletions(-)

1 0

Alex Henrie : dmusic: Don't force a calling convention on internal functions.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 81a6c8c882e9d00a3f459983d8281327f25e333a URL: https://gitlab.winehq.org/wine/wine/-/commit/81a6c8c882e9d00a3f459983d82813… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 20:54:30 2022 -0700 dmusic: Don't force a calling convention on internal functions. --- dlls/dmusic/collection.c | 2 +- dlls/dmusic/dmusic.c | 2 +- dlls/dmusic/dmusic_main.c | 2 +- dlls/dmusic/dmusic_private.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 05f67d5578d..8473c0078ec 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -522,7 +522,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; -HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) +HRESULT DMUSIC_CreateDirectMusicCollectionImpl(REFIID lpcGUID, void **ppobj, IUnknown *pUnkOuter) { IDirectMusicCollectionImpl* obj; HRESULT hr; diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index cb94497883e..3a1824143d7 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -588,7 +588,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object) } /* For ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNOWN unkouter) +HRESULT DMUSIC_CreateDirectMusicImpl(REFIID riid, void **ret_iface, IUnknown *unkouter) { IDirectMusic8Impl *dmusic; HRESULT ret; diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 6f69e48d607..5d4939937a9 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -43,7 +43,7 @@ LONG DMUSIC_refCount = 0; typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); + HRESULT (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); } IClassFactoryImpl; /****************************************************************** diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index ea6b7482f33..18d3e079b12 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -95,8 +95,8 @@ typedef struct instrument_articulation { */ /* CLSID */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicImpl(REFIID riid, void **ret_iface, IUnknown *pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicCollectionImpl(REFIID riid, void **ppobj, IUnknown *pUnkOuter) DECLSPEC_HIDDEN; /* Internal */ extern HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface) DECLSPEC_HIDDEN;

1 0

Alex Henrie : dmscript: Don't force a calling convention on internal functions.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 5dab1e4ea46d3aa8b0b47248aed3d228458da4ff URL: https://gitlab.winehq.org/wine/wine/-/commit/5dab1e4ea46d3aa8b0b47248aed3d2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 20:54:30 2022 -0700 dmscript: Don't force a calling convention on internal functions. --- dlls/dmscript/dmscript_main.c | 4 ++-- dlls/dmscript/dmscript_private.h | 4 ++-- dlls/dmscript/script.c | 2 +- dlls/dmscript/scripttrack.c | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 7191129f96d..f6785176aec 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -42,10 +42,10 @@ LONG DMSCRIPT_refCount = 0; typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); + HRESULT (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); } IClassFactoryImpl; -static HRESULT WINAPI create_unimpl_instance(REFIID riid, void **ppv, IUnknown *pUnkOuter) +static HRESULT create_unimpl_instance(REFIID riid, void **ppv, IUnknown *pUnkOuter) { FIXME("(%p, %s, %p) stub\n", pUnkOuter, debugstr_dmguid(riid), ppv); diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index a6723e36aa1..3b3a4c86c84 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -44,9 +44,9 @@ /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicScriptImpl(REFIID riid, void **ppobj, IUnknown *pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ppobj, IUnknown *pUnkOuter) DECLSPEC_HIDDEN; /********************************************************************** * Dll lifetime tracking declaration for dmscript.dll diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 5bc6a8b3067..375eebf69aa 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -488,7 +488,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj, IUnknown *pUnkOuter) +HRESULT DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj, IUnknown *pUnkOuter) { IDirectMusicScriptImpl *obj; HRESULT hr; diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 6e430de3f39..fbe454c09e5 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -317,8 +317,7 @@ static const IPersistStreamVtbl persist_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ret_iface, - IUnknown *pUnkOuter) +HRESULT DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ret_iface, IUnknown *pUnkOuter) { DirectMusicScriptTrack *track; HRESULT hr;

1 0