November 2021 - Wine-Commits

Gabriel Ivăncescu : jscript: Throw when defining a PROTREF prop on a non-extensible object.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: 3f135a0611d4fbcffc62481ae4a3695efefb0f66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f135a0611d4fbcffc62481a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 24 16:10:32 2021 +0200 jscript: Throw when defining a PROTREF prop on a non-extensible object. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 2 +- dlls/mshtml/tests/es5.js | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index ad6623f2648..8c0d84b8023 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2555,7 +2555,7 @@ HRESULT jsdisp_define_property(jsdisp_t *obj, const WCHAR *name, property_desc_t if(FAILED(hres)) return hres; - if((!prop || prop->type == PROP_DELETED) && !obj->extensible) + if((!prop || prop->type == PROP_DELETED || prop->type == PROP_PROTREF) && !obj->extensible) return throw_error(obj->ctx, JS_E_OBJECT_NONEXTENSIBLE, name); if(!prop && !(prop = alloc_prop(obj, name, PROP_DELETED, 0))) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 81c06a4145e..ede94191ab6 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -999,6 +999,12 @@ sync_test("preventExtensions", function() { ok(o.prop === 1, "o.prop = " + o.prop); r = Object.isExtensible(o); ok(r === false, "isExtensible(o) returned " + r); + try { + Object.defineProperty(o, "prop", { value: true }); + ok(false, "expected exception"); + }catch(e) { + ok(e.name === "TypeError", "got " + e.name + " exception"); + } r = Object.isExtensible({}); ok(r === true, "isExtensible(o) returned " + r);

1 0

Gabriel Ivăncescu : jscript: Fixup PROTREF props when looking them up.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: 738894a47c7c7afa9e8464774e0ee1d0b9dbf196 URL: https://source.winehq.org/git/wine.git/?a=commit;h=738894a47c7c7afa9e846477… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 24 16:10:31 2021 +0200 jscript: Fixup PROTREF props when looking them up. Convert them to PROP_DELETE if the referenced prop in the prototype chain doesn't exist anymore. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 26 +++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index df81e1a0d99..ad6623f2648 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -60,6 +60,24 @@ struct _dispex_prop_t { int bucket_next; }; +static void fix_protref_prop(jsdisp_t *jsdisp, dispex_prop_t *prop) +{ + DWORD ref; + + if(prop->type != PROP_PROTREF) + return; + ref = prop->u.ref; + + while((jsdisp = jsdisp->prototype)) { + if(ref >= jsdisp->prop_cnt || jsdisp->props[ref].type == PROP_DELETED) + break; + if(jsdisp->props[ref].type != PROP_PROTREF) + return; + ref = jsdisp->props[ref].u.ref; + } + prop->type = PROP_DELETED; +} + static inline DISPID prop_to_id(jsdisp_t *This, dispex_prop_t *prop) { return prop - This->props; @@ -67,10 +85,11 @@ static inline DISPID prop_to_id(jsdisp_t *This, dispex_prop_t *prop) static inline dispex_prop_t *get_prop(jsdisp_t *This, DISPID id) { - if(id < 0 || id >= This->prop_cnt || This->props[id].type == PROP_DELETED) + if(id < 0 || id >= This->prop_cnt) return NULL; + fix_protref_prop(This, &This->props[id]); - return This->props+id; + return This->props[id].type == PROP_DELETED ? NULL : &This->props[id]; } static inline BOOL is_function_prop(dispex_prop_t *prop) @@ -284,6 +303,7 @@ static HRESULT find_prop_name_prot(jsdisp_t *This, unsigned hash, const WCHAR *n if(prop && prop->type==PROP_DELETED) { del = prop; } else if(prop) { + fix_protref_prop(This, prop); *ret = prop; return S_OK; } @@ -292,7 +312,7 @@ static HRESULT find_prop_name_prot(jsdisp_t *This, unsigned hash, const WCHAR *n hres = find_prop_name_prot(This->prototype, hash, name, &prop); if(FAILED(hres)) return hres; - if(prop) { + if(prop && prop->type != PROP_DELETED) { if(del) { del->type = PROP_PROTREF; del->u.ref = prop - This->prototype->props; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index f259c70e92e..e4f5882246a 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1569,6 +1569,8 @@ ok((delete inobj.test1) === true, "delete inobj.test1 returned false"); ok(!("test1" in inobj), "test1 is still in inobj after delete"); ok((delete inobj.test3) === true, "delete inobj.test3 returned false"); ok("test3" in inobj, "test3 is not in inobj after delete"); +ok((delete forinTestObj.prototype.test3) === true, "delete forinTestObj.prototype.test3 returned false"); +ok(!("test3" in inobj), "test3 is still in inobj after delete on prototype"); tmp = new Object(); tmp.test = false;

1 0

Huw Davies : winecoreaudio: Remove system includes.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: a73bc760a58350ec935d93becb962cb93173afcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a73bc760a58350ec935d93be… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 24 11:26:51 2021 +0000 winecoreaudio: Remove system includes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 413e22d18ba..b4cf325c9d2 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -15,42 +15,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#define NONAMELESSUNION #define COBJMACROS -#include "config.h" - -#define LoadResource __carbon_LoadResource -#define CompareString __carbon_CompareString -#define GetCurrentThread __carbon_GetCurrentThread -#define GetCurrentProcess __carbon_GetCurrentProcess #include <stdarg.h> -#include <errno.h> -#include <limits.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/ioctl.h> -#include <fcntl.h> -#include <fenv.h> -#include <unistd.h> - -#include <libkern/OSAtomic.h> -#include <CoreAudio/CoreAudio.h> -#include <AudioToolbox/AudioFormat.h> -#include <AudioToolbox/AudioConverter.h> -#include <AudioUnit/AudioUnit.h> - -#undef LoadResource -#undef CompareString -#undef GetCurrentThread -#undef GetCurrentProcess -#undef _CDECL - #include "windef.h" #include "winbase.h" #include "winnls.h"

1 0

Huw Davies : winecoreaudio: Store the device id as a DWORD.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: 8d812e23301da7a62ff25311dbcc112b8e4be83b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d812e23301da7a62ff25311… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 24 11:26:50 2021 +0000 winecoreaudio: Store the device id as a DWORD. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 047979df4f3..413e22d18ba 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -129,7 +129,7 @@ struct ACImpl { HANDLE event; float *vols; - AudioDeviceID adevid; + DWORD dev_id; HANDLE timer; AudioSession *session; @@ -406,7 +406,7 @@ end: return params.result; } -static BOOL get_deviceid_by_guid(GUID *guid, AudioDeviceID *id, EDataFlow *flow) +static BOOL get_deviceid_by_guid(GUID *guid, DWORD *id, EDataFlow *flow) { HKEY devices_key; UINT i = 0; @@ -470,13 +470,13 @@ static BOOL get_deviceid_by_guid(GUID *guid, AudioDeviceID *id, EDataFlow *flow) HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { ACImpl *This; - AudioDeviceID adevid; + DWORD dev_id; EDataFlow dataflow; HRESULT hr; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); - if(!get_deviceid_by_guid(guid, &adevid, &dataflow)) + if(!get_deviceid_by_guid(guid, &dev_id, &dataflow)) return AUDCLNT_E_DEVICE_INVALIDATED; if(dataflow != eRender && dataflow != eCapture) @@ -504,7 +504,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->parent = dev; IMMDevice_AddRef(This->parent); - This->adevid = adevid; + This->dev_id = dev_id; *out = (IAudioClient *)&This->IAudioClient3_iface; IAudioClient3_AddRef(&This->IAudioClient3_iface); @@ -765,7 +765,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - params.dev_id = This->adevid; + params.dev_id = This->dev_id; params.flow = This->dataflow; params.share = mode; params.duration = duration; @@ -882,7 +882,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, TRACE("(%p)->(%x, %p, %p)\n", This, mode, pwfx, outpwfx); if(pwfx) dump_fmt(pwfx); - params.dev_id = This->adevid; + params.dev_id = This->dev_id; params.flow = This->dataflow; params.share = mode; params.fmt_in = pwfx; @@ -915,7 +915,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, return E_POINTER; *pwfx = NULL; - params.dev_id = This->adevid; + params.dev_id = This->dev_id; params.flow = This->dataflow; params.fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); if(!params.fmt)

1 0

Huw Davies : winecoreaudio: Move is_started to the unixlib.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: 22981cc913ecfce1f31f0e69dcd133e847cf0302 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22981cc913ecfce1f31f0e69… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 24 11:26:47 2021 +0000 winecoreaudio: Move is_started to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 14 ++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 8 ++++---- dlls/winecoreaudio.drv/unixlib.h | 7 +++++++ 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index f59723d48f6..9636975607c 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1541,6 +1541,19 @@ static NTSTATUS get_frequency(void *args) return STATUS_SUCCESS; } +static NTSTATUS is_started(void *args) +{ + struct is_started_params *params = args; + struct coreaudio_stream *stream = params->stream; + + if(stream->playing) + params->result = S_OK; + else + params->result = S_FALSE; + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1561,4 +1574,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_next_packet_size, get_position, get_frequency, + is_started, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index f79d808d8ed..07260c16ff0 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1628,6 +1628,7 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, AudioSessionState *state) { AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); + struct is_started_params params; ACImpl *client; TRACE("(%p)->(%p)\n", This, state); @@ -1644,14 +1645,13 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, } LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry){ - OSSpinLockLock(&client->stream->lock); - if(client->stream->playing){ + params.stream = client->stream; + UNIX_CALL(is_started, &params); + if(params.result == S_OK){ *state = AudioSessionStateActive; - OSSpinLockUnlock(&client->stream->lock); LeaveCriticalSection(&g_sessions_lock); return S_OK; } - OSSpinLockUnlock(&client->stream->lock); } LeaveCriticalSection(&g_sessions_lock); diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 5dcefe2eb05..aac2df15f47 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -188,6 +188,12 @@ struct get_frequency_params UINT64 *freq; }; +struct is_started_params +{ + struct coreaudio_stream *stream; + HRESULT result; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -208,6 +214,7 @@ enum unix_funcs unix_get_next_packet_size, unix_get_position, unix_get_frequency, + unix_is_started, }; extern unixlib_handle_t coreaudio_handle;

1 0

Rémi Bernon : dinput: Stub IDirectInputDevice8_GetForceFeedbackState implementation.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: 5abf6efcd96bd2edfce6b69b099c86f525b606cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5abf6efcd96bd2edfce6b69b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 24 16:09:41 2021 +0100 dinput: Stub IDirectInputDevice8_GetForceFeedbackState implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52062 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 12 ++++++++++-- dlls/dinput8/tests/hid.c | 10 ---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 02a71e6923c..19fbe724b56 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1762,9 +1762,17 @@ static HRESULT WINAPI dinput_device_GetEffectInfo( IDirectInputDevice8W *iface, static HRESULT WINAPI dinput_device_GetForceFeedbackState( IDirectInputDevice8W *iface, DWORD *out ) { - FIXME( "iface %p, out %p stub!\n", iface, out ); + struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); + + FIXME( "iface %p, out %p semi-stub!\n", iface, out ); + if (!out) return E_POINTER; - return DIERR_UNSUPPORTED; + *out = 0; + + if (!(impl->caps.dwFlags & DIDC_FORCEFEEDBACK)) return DIERR_UNSUPPORTED; + if (!impl->acquired || !(impl->dwCoopLevel & DISCL_EXCLUSIVE)) return DIERR_NOTEXCLUSIVEACQUIRED; + + return DI_OK; } static HRESULT WINAPI dinput_device_SendForceFeedbackCommand( IDirectInputDevice8W *iface, DWORD command ) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index bcff4b59846..bda738bc178 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -8062,7 +8062,6 @@ static void test_force_feedback_joystick( DWORD version ) hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); - todo_wine ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetForceFeedbackState returned %#x\n", hr ); hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_RESET ); ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "SendForceFeedbackCommand returned %#x\n", hr ); @@ -8819,7 +8818,6 @@ static void test_device_managed_effect(void) hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); - todo_wine ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetForceFeedbackState returned %#x\n", hr ); hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_RESET ); ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "SendForceFeedbackCommand returned %#x\n", hr ); @@ -8839,7 +8837,6 @@ static void test_device_managed_effect(void) set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); res = 0xdeadbeef; hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); - todo_wine ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); flags = DIGFFS_STOPPED|DIGFFS_EMPTY; todo_wine @@ -8863,7 +8860,6 @@ static void test_device_managed_effect(void) set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); res = 0xdeadbeef; hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); - todo_wine ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); flags = DIGFFS_PAUSED|DIGFFS_EMPTY|DIGFFS_ACTUATORSON|DIGFFS_POWERON|DIGFFS_SAFETYSWITCHON|DIGFFS_USERFFSWITCHON; todo_wine @@ -8910,7 +8906,6 @@ static void test_device_managed_effect(void) set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); res = 0xdeadbeef; hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); - todo_wine ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); flags = DIGFFS_STOPPED|DIGFFS_EMPTY; todo_wine @@ -8931,7 +8926,6 @@ static void test_device_managed_effect(void) set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); res = 0xdeadbeef; hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); - todo_wine ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); flags = DIGFFS_STOPPED; todo_wine @@ -8969,7 +8963,6 @@ static void test_device_managed_effect(void) set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); res = 0xdeadbeef; hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); - todo_wine ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); flags = DIGFFS_ACTUATORSOFF|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF; todo_wine @@ -8988,7 +8981,6 @@ static void test_device_managed_effect(void) set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); res = 0xdeadbeef; hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); - todo_wine ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); flags = DIGFFS_PAUSED|DIGFFS_ACTUATORSON|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF; todo_wine @@ -9009,7 +9001,6 @@ static void test_device_managed_effect(void) set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); res = 0xdeadbeef; hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); - todo_wine ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); flags = DIGFFS_PAUSED|DIGFFS_ACTUATORSON|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF; todo_wine @@ -9030,7 +9021,6 @@ static void test_device_managed_effect(void) set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); res = 0xdeadbeef; hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); - todo_wine ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr ); flags = DIGFFS_EMPTY|DIGFFS_PAUSED|DIGFFS_ACTUATORSON|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF; todo_wine

1 0

Huw Davies : winecoreaudio: Avoid 64-bit ptr truncation.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: 80be5c25e3eedb401ca42b480b3e884f771e7388 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80be5c25e3eedb401ca42b48… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 24 11:26:52 2021 +0000 winecoreaudio: Avoid 64-bit ptr truncation. This makes winecoreaudio consistent with the other midi drivers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/midi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 64fc3618f61..32826cb658c 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -958,9 +958,9 @@ static DWORD WINAPI MIDIIn_MessageThread(LPVOID p) /************************************************************************** * modMessage */ -DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) +DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("%d %08x %08x %08x %08x\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); + TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { case DRVM_INIT: @@ -999,9 +999,9 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw /************************************************************************** * midMessage */ -DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) +DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("%d %08x %08x %08x %08x\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); + TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { case DRVM_INIT: case DRVM_EXIT:

1 0

Zebediah Figura : ddraw/tests: Pass the correct size to VirtualQuery().
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: 2292e5fb5d5aae2789d67f204d85c02f891eddca URL: https://source.winehq.org/git/wine.git/?a=commit;h=2292e5fb5d5aae2789d67f20… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 23 16:16:23 2021 -0600 ddraw/tests: Pass the correct size to VirtualQuery(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index f9c3634c03e..c9f2aead75c 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -14119,14 +14119,14 @@ done: DestroyWindow(window); } -static void check_vtbl_protection_(int line, const void *vtbl, SIZE_T size) +static void check_vtbl_protection_(int line, const void *vtbl) { MEMORY_BASIC_INFORMATION info; - SIZE_T ret = VirtualQuery(vtbl, &info, size); + SIZE_T ret = VirtualQuery(vtbl, &info, sizeof(info)); ok_(__FILE__, line)(ret == sizeof(info), "Failed to query memory.\n"); ok_(__FILE__, line)(info.Protect & (PAGE_READWRITE | PAGE_WRITECOPY), "Got protection %#x.\n", info.Protect); } -#define check_vtbl_protection(a) check_vtbl_protection_(__LINE__, a, sizeof(*(a))) +#define check_vtbl_protection(a) check_vtbl_protection_(__LINE__, a) static void test_vtbl_protection(void) {

1 0

Alexandre Julliard : wnaspi32: Build with msvcrt.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: b089dc16bfdd0b1832b470c34bfb5658ef9f4f2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b089dc16bfdd0b1832b470c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 24 17:23:14 2021 +0100 wnaspi32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wnaspi32/Makefile.in | 2 -- dlls/wnaspi32/aspi.c | 8 ++------ dlls/wnaspi32/aspi.h | 8 -------- dlls/wnaspi32/winaspi32.c | 2 -- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/wnaspi32/Makefile.in b/dlls/wnaspi32/Makefile.in index 7b19b1bd1e4..5c3fa66e9d0 100644 --- a/dlls/wnaspi32/Makefile.in +++ b/dlls/wnaspi32/Makefile.in @@ -2,8 +2,6 @@ MODULE = wnaspi32.dll IMPORTLIB = wnaspi32 IMPORTS = advapi32 -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ aspi.c \ winaspi32.c diff --git a/dlls/wnaspi32/aspi.c b/dlls/wnaspi32/aspi.c index 73ef6f59950..903c618f9ba 100644 --- a/dlls/wnaspi32/aspi.c +++ b/dlls/wnaspi32/aspi.c @@ -29,14 +29,11 @@ * aspi controllers, e-mail me if you need help. */ - -#include "config.h" -#include "wine/port.h" - #include <stdio.h> #include <stdarg.h> #include <sys/types.h> #include <string.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -45,7 +42,6 @@ #include "winescsi.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(aspi); @@ -132,5 +128,5 @@ DWORD ASPI_GetHCforController( int controller ) } RegCloseKey(hkeyPort); - return (atoiW(&wPortName[9]) << 16) + atoiW(&wBusName[9]); + return (wcstol(&wPortName[9], NULL, 10) << 16) + wcstol(&wBusName[9], NULL, 10); } diff --git a/dlls/wnaspi32/aspi.h b/dlls/wnaspi32/aspi.h index a9912ffc9e4..617dd00faf0 100644 --- a/dlls/wnaspi32/aspi.h +++ b/dlls/wnaspi32/aspi.h @@ -26,11 +26,6 @@ #include "winbase.h" #include "pshpack1.h" -#ifdef __cplusplus -extern "C" { -#endif /* #ifdef __cplusplus */ - -/*********** OLD ****************/ /* Target status codes */ #define STATUS_GOOD 0x00 @@ -76,9 +71,6 @@ extern "C" { #define SENSE_BUFFER(prb) (&prb->CDBByte[prb->SRB_CDBLen]) -#ifdef __cplusplus -} -#endif /* #ifdef __cplusplus */ #include "poppack.h" #endif diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c index ea6d6d82e9a..d8dfd1a2e3f 100644 --- a/dlls/wnaspi32/winaspi32.c +++ b/dlls/wnaspi32/winaspi32.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <assert.h> #include <stdlib.h> #include <stdarg.h>

1 0

Alexandre Julliard : ntdll: Add a helper function to append .dll to a module name.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: afb6f1696e9d98619179241fc870df7524315e77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afb6f1696e9d98619179241f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 24 12:25:03 2021 +0100 ntdll: Add a helper function to append .dll to a module name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 78 +++++++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2ce39585fac..508e4214f19 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -184,8 +184,7 @@ static WINE_MODREF *last_failed_modref; static LDR_DDAG_NODE *node_ntdll, *node_kernel32; -static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WCHAR *default_ext, - DWORD flags, WINE_MODREF** pwm ); +static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, DWORD flags, WINE_MODREF** pwm ); static NTSTATUS process_attach( LDR_DDAG_NODE *node, LPVOID lpReserved ); static FARPROC find_ordinal_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, DWORD ordinal, LPCWSTR load_path ); @@ -602,6 +601,26 @@ static NTSTATUS build_import_name( WCHAR buffer[256], const char *import, int le } +/********************************************************************** + * append_dll_ext + */ +static WCHAR *append_dll_ext( const WCHAR *name ) +{ + const WCHAR *ext = wcsrchr( name, '.' ); + + if (!ext || wcschr( ext, '/' ) || wcschr( ext, '\\')) + { + WCHAR *ret = RtlAllocateHeap( GetProcessHeap(), 0, + wcslen(name) * sizeof(WCHAR) + sizeof(L".dll") ); + if (!ret) return NULL; + wcscpy( ret, name ); + wcscat( ret, L".dll" ); + return ret; + } + return NULL; +} + + /*********************************************************************** * is_import_dll_system */ @@ -741,7 +760,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS if (!(wm = find_basename_module( mod_name ))) { TRACE( "delay loading %s for '%s'\n", debugstr_w(mod_name), forward ); - if (load_dll( load_path, mod_name, NULL, 0, &wm ) == STATUS_SUCCESS && + if (load_dll( load_path, mod_name, 0, &wm ) == STATUS_SUCCESS && !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) { if (!imports_fixup_done && current_modref) @@ -934,7 +953,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP } status = build_import_name( buffer, name, len ); - if (!status) status = load_dll( load_path, buffer, NULL, 0, &wmImp ); + if (!status) status = load_dll( load_path, buffer, 0, &wmImp ); if (status) { @@ -1204,7 +1223,7 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * prev = current_modref; current_modref = wm; assert( !wm->ldr.DdagNode->Dependencies.Tail ); - if (!(status = load_dll( load_path, L"mscoree.dll", NULL, 0, &imp )) + if (!(status = load_dll( load_path, L"mscoree.dll", 0, &imp )) && !add_module_dependency_after( wm->ldr.DdagNode, imp->ldr.DdagNode, NULL )) status = STATUS_NO_MEMORY; current_modref = prev; @@ -2882,29 +2901,15 @@ done: * * Find the file (or already loaded module) for a given dll name. */ -static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, const WCHAR *default_ext, - UNICODE_STRING *nt_name, WINE_MODREF **pwm, HANDLE *mapping, - SECTION_IMAGE_INFORMATION *image_info, struct file_id *id ) +static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, UNICODE_STRING *nt_name, + WINE_MODREF **pwm, HANDLE *mapping, SECTION_IMAGE_INFORMATION *image_info, + struct file_id *id ) { - WCHAR *ext, *dllname; + WCHAR *fullname = NULL; NTSTATUS status; ULONG wow64_old_value = 0; *pwm = NULL; - dllname = NULL; - - if (default_ext) /* first append default extension */ - { - if (!(ext = wcsrchr( libname, '.')) || wcschr( ext, '/' ) || wcschr( ext, '\\')) - { - if (!(dllname = RtlAllocateHeap( GetProcessHeap(), 0, - (wcslen(libname)+wcslen(default_ext)+1) * sizeof(WCHAR)))) - return STATUS_NO_MEMORY; - wcscpy( dllname, libname ); - wcscat( dllname, default_ext ); - libname = dllname; - } - } /* Win 7/2008R2 and up seem to re-enable WoW64 FS redirection when loading libraries */ RtlWow64EnableFsRedirectionEx( 0, &wow64_old_value ); @@ -2913,14 +2918,11 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, con if (!contains_path( libname )) { - WCHAR *fullname = NULL; - status = find_actctx_dll( libname, &fullname ); if (status == STATUS_SUCCESS) { TRACE ("found %s for %s\n", debugstr_w(fullname), debugstr_w(libname) ); - RtlFreeHeap( GetProcessHeap(), 0, dllname ); - libname = dllname = fullname; + libname = fullname; } else { @@ -2945,7 +2947,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, con if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) status = STATUS_INVALID_IMAGE_FORMAT; done: - RtlFreeHeap( GetProcessHeap(), 0, dllname ); + RtlFreeHeap( GetProcessHeap(), 0, fullname ); if (wow64_old_value) RtlWow64EnableFsRedirectionEx( 1, &wow64_old_value ); return status; } @@ -2957,8 +2959,7 @@ done: * Load a PE style module according to the load order. * The loader_section must be locked while calling this function. */ -static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WCHAR *default_ext, - DWORD flags, WINE_MODREF** pwm ) +static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, DWORD flags, WINE_MODREF** pwm ) { UNICODE_STRING nt_name; struct file_id id; @@ -2969,7 +2970,7 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC TRACE( "looking for %s in %s\n", debugstr_w(libname), debugstr_w(load_path) ); - nts = find_dll_file( load_path, libname, default_ext, &nt_name, pwm, &mapping, &image_info, &id ); + nts = find_dll_file( load_path, libname, &nt_name, pwm, &mapping, &image_info, &id ); if (*pwm) /* found already loaded module */ { @@ -3060,10 +3061,11 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, { WINE_MODREF *wm; NTSTATUS nts; + WCHAR *dllname = append_dll_ext( libname->Buffer ); RtlEnterCriticalSection( &loader_section ); - nts = load_dll( path_name, libname->Buffer, L".dll", flags, &wm ); + nts = load_dll( path_name, dllname ? dllname : libname->Buffer, flags, &wm ); if (nts == STATUS_SUCCESS && !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) { @@ -3077,6 +3079,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, *hModule = (wm) ? wm->ldr.DllBase : NULL; RtlLeaveCriticalSection( &loader_section ); + RtlFreeHeap( GetProcessHeap(), 0, dllname ); return nts; } @@ -3122,6 +3125,7 @@ NTSTATUS WINAPI LdrGetDllHandleEx( ULONG flags, LPCWSTR load_path, ULONG *dll_ch struct file_id id; NTSTATUS status; WINE_MODREF *wm; + WCHAR *dllname; HANDLE mapping; TRACE( "flag %#x, load_path %p, dll_characteristics %p, name %p, base %p.\n", @@ -3136,9 +3140,12 @@ NTSTATUS WINAPI LdrGetDllHandleEx( ULONG flags, LPCWSTR load_path, ULONG *dll_ch if (flags & ~supported_flags) FIXME( "Unsupported flags %#x.\n", flags ); if (dll_characteristics) FIXME( "dll_characteristics unsupported.\n" ); + dllname = append_dll_ext( name->Buffer ); + RtlEnterCriticalSection( &loader_section ); - status = find_dll_file( load_path, name->Buffer, L".dll", &nt_name, &wm, &mapping, &image_info, &id ); + status = find_dll_file( load_path, dllname ? dllname : name->Buffer, + &nt_name, &wm, &mapping, &image_info, &id ); if (wm) *base = wm->ldr.DllBase; else @@ -3157,6 +3164,7 @@ NTSTATUS WINAPI LdrGetDllHandleEx( ULONG flags, LPCWSTR load_path, ULONG *dll_ch } RtlLeaveCriticalSection( &loader_section ); + RtlFreeHeap( GetProcessHeap(), 0, dllname ); TRACE( "%s -> %p (load path %s)\n", debugstr_us(name), status ? NULL : *base, debugstr_w(load_path) ); return status; } @@ -3839,7 +3847,7 @@ static void init_wow64( CONTEXT *context ) NTSTATUS status; static const WCHAR wow64_path[] = L"C:\\windows\\system32\\wow64.dll"; - if ((status = load_dll( NULL, wow64_path, NULL, 0, &wm ))) + if ((status = load_dll( NULL, wow64_path, 0, &wm ))) { ERR( "could not load %s, status %x\n", debugstr_w(wow64_path), status ); NtTerminateProcess( GetCurrentProcess(), status ); @@ -3987,7 +3995,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR if (NtCurrentTeb()->WowTebOffset) init_wow64( context ); - if ((status = load_dll( NULL, L"kernel32.dll", NULL, 0, &kernel32 )) != STATUS_SUCCESS) + if ((status = load_dll( NULL, L"kernel32.dll", 0, &kernel32 )) != STATUS_SUCCESS) { MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); NtTerminateProcess( GetCurrentProcess(), status );

1 0