August 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : dinput: Add read event and callback for file-based devices.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: b36c6ae0e8d529cec1272156e808dddf04996187 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b36c6ae0e8d529cec1272156… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 27 12:45:20 2021 +0200 dinput: Add read event and callback for file-based devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device_private.h | 6 +++++ dlls/dinput/dinput_main.c | 53 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 1811e0cc5a6..0e72ee77bf1 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -53,6 +53,8 @@ typedef struct UINT_PTR uAppData; } ActionMap; +typedef HRESULT dinput_device_read_state( IDirectInputDevice8W *iface ); + /* Device implementation */ typedef struct IDirectInputDeviceImpl IDirectInputDeviceImpl; struct IDirectInputDeviceImpl @@ -84,6 +86,10 @@ struct IDirectInputDeviceImpl /* Action mapping */ int num_actions; /* number of actions mapped */ ActionMap *action_map; /* array of mappings */ + + /* internal device file reading */ + HANDLE read_event; + dinput_device_read_state *read_callback; }; extern HRESULT direct_input_device_alloc( SIZE_T size, const IDirectInputDevice8WVtbl *vtbl, const GUID *guid, diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 88ee1855675..1cd6d390430 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1289,6 +1289,12 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam static DWORD WINAPI hook_thread_proc(void *param) { static HHOOK kbd_hook, mouse_hook; + IDirectInputDeviceImpl *impl; + IDirectInputDevice8W *iface; + SIZE_T events_count = 0; + HANDLE finished_event; + HANDLE events[128]; + DWORD ret; MSG msg; di_em_win = CreateWindowW( di_em_win_w, di_em_win_w, 0, 0, 0, 0, 0, @@ -1298,13 +1304,42 @@ static DWORD WINAPI hook_thread_proc(void *param) PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ); SetEvent(param); - while (GetMessageW( &msg, 0, 0, 0 )) + while ((ret = MsgWaitForMultipleObjectsEx( events_count, events, INFINITE, QS_ALLINPUT, 0 )) <= events_count) { UINT kbd_cnt = 0, mice_cnt = 0; - if (msg.message == WM_USER+0x10) + if (ret < events_count) { - HANDLE finished_event = (HANDLE)msg.lParam; + iface = NULL; + EnterCriticalSection( &dinput_hook_crit ); + LIST_FOR_EACH_ENTRY( impl, &acquired_device_list, IDirectInputDeviceImpl, entry ) + { + if (impl->read_event == events[ret]) + { + iface = &impl->IDirectInputDevice8W_iface; + IDirectInputDevice8_AddRef( iface ); + break; + } + } + LeaveCriticalSection( &dinput_hook_crit ); + + if (iface) + { + impl->read_callback( iface ); + IDirectInputDevice8_Release( iface ); + } + } + + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) + { + if (msg.message != WM_USER+0x10) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + continue; + } + + finished_event = (HANDLE)msg.lParam; TRACE( "Processing hook change notification wp:%ld lp:%#lx\n", msg.wParam, msg.lParam ); @@ -1313,12 +1348,19 @@ static DWORD WINAPI hook_thread_proc(void *param) if (kbd_hook) UnhookWindowsHookEx( kbd_hook ); if (mouse_hook) UnhookWindowsHookEx( mouse_hook ); kbd_hook = mouse_hook = NULL; - break; + goto done; } + events_count = 0; EnterCriticalSection( &dinput_hook_crit ); kbd_cnt = list_count( &acquired_keyboard_list ); mice_cnt = list_count( &acquired_mouse_list ); + LIST_FOR_EACH_ENTRY( impl, &acquired_device_list, IDirectInputDeviceImpl, entry ) + { + if (!impl->read_event || !impl->read_callback) continue; + if (events_count >= ARRAY_SIZE(events)) break; + events[events_count++] = impl->read_event; + } LeaveCriticalSection( &dinput_hook_crit ); if (kbd_cnt && !kbd_hook) @@ -1340,10 +1382,9 @@ static DWORD WINAPI hook_thread_proc(void *param) if (finished_event) SetEvent(finished_event); } - TranslateMessage(&msg); - DispatchMessageW(&msg); } +done: DestroyWindow( di_em_win ); di_em_win = NULL;

1 0

Rémi Bernon : dinput: Implement HID joystick IDirectInputDevice8_GetProperty.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 6ba3a548427f3edee7117fdca72aa6bd44a404cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ba3a548427f3edee7117fdc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 27 12:45:22 2021 +0200 dinput: Implement HID joystick IDirectInputDevice8_GetProperty. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 58 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index d7efc44e806..01864bb91e5 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -56,6 +56,8 @@ struct hid_joystick PHIDP_PREPARSED_DATA preparsed; DIDEVICEINSTANCEW instance; + WCHAR device_path[MAX_PATH]; + HIDD_ATTRIBUTES attrs; }; static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) @@ -88,6 +90,56 @@ static HRESULT WINAPI hid_joystick_GetCapabilities( IDirectInputDevice8W *iface, return DIERR_UNSUPPORTED; } +static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, const GUID *guid, + DIPROPHEADER *header ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + + TRACE( "iface %p, guid %s, header %p\n", iface, debugstr_guid( guid ), header ); + + if (!header) return DIERR_INVALIDPARAM; + if (!IS_DIPROP( guid )) return DI_OK; + + switch (LOWORD( guid )) + { + case (DWORD_PTR)DIPROP_PRODUCTNAME: + { + DIPROPSTRING *value = (DIPROPSTRING *)header; + lstrcpynW( value->wsz, impl->instance.tszProductName, MAX_PATH ); + return DI_OK; + } + case (DWORD_PTR)DIPROP_INSTANCENAME: + { + DIPROPSTRING *value = (DIPROPSTRING *)header; + lstrcpynW( value->wsz, impl->instance.tszInstanceName, MAX_PATH ); + return DI_OK; + } + case (DWORD_PTR)DIPROP_VIDPID: + { + DIPROPDWORD *value = (DIPROPDWORD *)header; + if (!impl->attrs.VendorID || !impl->attrs.ProductID) return DIERR_UNSUPPORTED; + value->dwData = MAKELONG( impl->attrs.VendorID, impl->attrs.ProductID ); + return DI_OK; + } + case (DWORD_PTR)DIPROP_JOYSTICKID: + { + DIPROPDWORD *value = (DIPROPDWORD *)header; + value->dwData = impl->instance.guidInstance.Data3; + return DI_OK; + } + case (DWORD_PTR)DIPROP_GUIDANDPATH: + { + DIPROPGUIDANDPATH *value = (DIPROPGUIDANDPATH *)header; + lstrcpynW( value->wszPath, impl->device_path, MAX_PATH ); + return DI_OK; + } + default: + return IDirectInputDevice2WImpl_GetProperty( iface, guid, header ); + } + + return DI_OK; +} + static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, DWORD len, void *ptr ) { FIXME( "iface %p, len %u, ptr %p stub!\n", iface, len, ptr ); @@ -144,7 +196,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = /*** IDirectInputDevice methods ***/ hid_joystick_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, - IDirectInputDevice2WImpl_GetProperty, + hid_joystick_GetProperty, IDirectInputDevice2WImpl_SetProperty, IDirectInputDevice2WImpl_Acquire, IDirectInputDevice2WImpl_Unacquire, @@ -322,7 +374,6 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID }; HIDD_ATTRIBUTES attrs = {.Size = sizeof(attrs)}; struct hid_joystick *impl = NULL; - WCHAR device_path[MAX_PATH]; HIDP_CAPS caps; HRESULT hr; @@ -344,11 +395,12 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": hid_joystick.base.crit"); impl->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; - hr = hid_joystick_device_open( -1, &instance, device_path, &impl->device, &impl->preparsed, + hr = hid_joystick_device_open( -1, &instance, impl->device_path, &impl->device, &impl->preparsed, &attrs, &caps, dinput->dwVersion ); if (hr != DI_OK) goto failed; impl->instance = instance; + impl->attrs = attrs; *out = &impl->base.IDirectInputDevice8W_iface; return DI_OK;

1 0

Rémi Bernon : dinput: Implement HID joystick IDirectInputDevice8_GetCapabilities.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 10a812fb7dfe2d24632821fc33a571de62391e47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10a812fb7dfe2d24632821fc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 27 12:45:24 2021 +0200 dinput: Implement HID joystick IDirectInputDevice8_GetCapabilities. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 53dc97177a1..601de3b00b0 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -59,6 +59,7 @@ struct hid_joystick DIDEVICEINSTANCEW instance; WCHAR device_path[MAX_PATH]; HIDD_ATTRIBUTES attrs; + DIDEVCAPS dev_caps; }; static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) @@ -84,11 +85,15 @@ static ULONG WINAPI hid_joystick_Release( IDirectInputDevice8W *iface ) static HRESULT WINAPI hid_joystick_GetCapabilities( IDirectInputDevice8W *iface, DIDEVCAPS *caps ) { - FIXME( "iface %p, caps %p stub!\n", iface, caps ); + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + + TRACE( "iface %p, caps %p.\n", iface, caps ); if (!caps) return E_POINTER; - return DIERR_UNSUPPORTED; + *caps = impl->dev_caps; + + return DI_OK; } static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, const GUID *guid, @@ -404,6 +409,9 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID impl->instance = instance; impl->attrs = attrs; + impl->dev_caps.dwSize = sizeof(impl->dev_caps); + impl->dev_caps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; + impl->dev_caps.dwDevType = instance.dwDevType; *out = &impl->base.IDirectInputDevice8W_iface; return DI_OK;

1 0

Zebediah Figura : d3dcompiler: Rip out the HLSL compiler.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 85fa778f937abdc7f60177ff40e079b11d38df99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85fa778f937abdc7f60177ff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 26 12:03:01 2021 -0500 d3dcompiler: Rip out the HLSL compiler. The compiler is completely non-functional as-is, and lives in libvkd3d-shader now. When a vkd3d release is made d3dcompiler will access it via the libvkd3d-shader public API. Accordingly there's no reason to keep it around in wine's d3dcompiler. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_33/Makefile.in | 2 - dlls/d3dcompiler_34/Makefile.in | 2 - dlls/d3dcompiler_35/Makefile.in | 2 - dlls/d3dcompiler_36/Makefile.in | 2 - dlls/d3dcompiler_37/Makefile.in | 2 - dlls/d3dcompiler_38/Makefile.in | 2 - dlls/d3dcompiler_39/Makefile.in | 2 - dlls/d3dcompiler_40/Makefile.in | 2 - dlls/d3dcompiler_41/Makefile.in | 2 - dlls/d3dcompiler_42/Makefile.in | 2 - dlls/d3dcompiler_43/Makefile.in | 2 - dlls/d3dcompiler_43/compiler.c | 180 +- dlls/d3dcompiler_43/d3dcompiler_private.h | 607 ------ dlls/d3dcompiler_43/hlsl.l | 292 --- dlls/d3dcompiler_43/hlsl.y | 3059 ----------------------------- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 9 +- dlls/d3dcompiler_43/utils.c | 1530 --------------- dlls/d3dcompiler_46/Makefile.in | 2 - dlls/d3dcompiler_47/Makefile.in | 2 - 19 files changed, 10 insertions(+), 5693 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85fa778f937abdc7f601…

1 0

Francois Gouget : wpcap: Make wrap_pcap_handler() static.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: d7b3451f8a7893dbca76b8bba4b6611ec8caf42e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7b3451f8a7893dbca76b8bb… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:57:40 2021 +0200 wpcap: Make wrap_pcap_handler() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/unixlib.c b/dlls/wpcap/unixlib.c index 531fa05941f..f3eb06a2849 100644 --- a/dlls/wpcap/unixlib.c +++ b/dlls/wpcap/unixlib.c @@ -90,7 +90,7 @@ static const char * CDECL wrap_datalink_val_to_name( int link ) return pcap_datalink_val_to_name( link ); } -void wrap_pcap_handler( unsigned char *user, const struct pcap_pkthdr *hdr, const unsigned char *packet ) +static void wrap_pcap_handler( unsigned char *user, const struct pcap_pkthdr *hdr, const unsigned char *packet ) { struct handler_callback *cb = (struct handler_callback *)user; callbacks->handler( cb, hdr, packet );

1 0

Francois Gouget : wmphoto: Make the wmp_decoder_*() functions static.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 50439d5ac1cf0799c17afe712a5272f5a04764d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50439d5ac1cf0799c17afe71… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:59:28 2021 +0200 wmphoto: Make the wmp_decoder_*() functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmphoto/unix_lib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wmphoto/unix_lib.c b/dlls/wmphoto/unix_lib.c index 235828941f7..94a67434b7e 100644 --- a/dlls/wmphoto/unix_lib.c +++ b/dlls/wmphoto/unix_lib.c @@ -180,7 +180,7 @@ static JXR_ERR wmp_stream_GetPos(struct WMPStream *iface, size_t *pos) return WMP_errSuccess; } -HRESULT CDECL wmp_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) +static HRESULT CDECL wmp_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) { struct wmp_decoder *This = impl_from_decoder(iface); HRESULT hr; @@ -252,7 +252,7 @@ HRESULT CDECL wmp_decoder_initialize(struct decoder *iface, IStream *stream, str return S_OK; } -HRESULT CDECL wmp_decoder_get_frame_info(struct decoder *iface, UINT frame, struct decoder_frame *info) +static HRESULT CDECL wmp_decoder_get_frame_info(struct decoder *iface, UINT frame, struct decoder_frame *info) { struct wmp_decoder *This = impl_from_decoder(iface); @@ -268,7 +268,7 @@ HRESULT CDECL wmp_decoder_get_frame_info(struct decoder *iface, UINT frame, stru return S_OK; } -HRESULT CDECL wmp_decoder_copy_pixels(struct decoder *iface, UINT frame, const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer) +static HRESULT CDECL wmp_decoder_copy_pixels(struct decoder *iface, UINT frame, const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer) { struct wmp_decoder *This = impl_from_decoder(iface); PKRect pkrect; @@ -306,7 +306,7 @@ HRESULT CDECL wmp_decoder_copy_pixels(struct decoder *iface, UINT frame, const W prc, stride, buffersize, buffer); } -HRESULT CDECL wmp_decoder_get_metadata_blocks(struct decoder* iface, UINT frame, UINT *count, struct decoder_block **blocks) +static HRESULT CDECL wmp_decoder_get_metadata_blocks(struct decoder* iface, UINT frame, UINT *count, struct decoder_block **blocks) { TRACE("iface %p, frame %d, count %p, blocks %p\n", iface, frame, count, blocks); @@ -315,7 +315,7 @@ HRESULT CDECL wmp_decoder_get_metadata_blocks(struct decoder* iface, UINT frame, return S_OK; } -HRESULT CDECL wmp_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, BYTE **data, DWORD *datasize) +static HRESULT CDECL wmp_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, BYTE **data, DWORD *datasize) { struct wmp_decoder *This = impl_from_decoder(iface); U32 count; @@ -348,7 +348,7 @@ HRESULT CDECL wmp_decoder_get_color_context(struct decoder* iface, UINT frame, U return S_OK; } -void CDECL wmp_decoder_destroy(struct decoder* iface) +static void CDECL wmp_decoder_destroy(struct decoder* iface) { struct wmp_decoder *This = impl_from_decoder(iface);

1 0

Rémi Bernon : dinput: Implement HID joystick IDirectInputDevice8_GetDeviceInfo.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 787d4af53b739d843d804fbb9ba6ddc4c343f3f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=787d4af53b739d843d804fbb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 27 12:45:21 2021 +0200 dinput: Implement HID joystick IDirectInputDevice8_GetDeviceInfo. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 0d362cf9af3..d7efc44e806 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -54,6 +54,8 @@ struct hid_joystick HANDLE device; PHIDP_PREPARSED_DATA preparsed; + + DIDEVICEINSTANCEW instance; }; static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) @@ -97,14 +99,18 @@ static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, DIDEVICEINSTANCEW *instance ) { - FIXME( "iface %p, instance %p stub!\n", iface, instance ); + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + + TRACE( "iface %p, instance %p.\n", iface, instance ); if (!instance) return E_POINTER; if (instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W) && instance->dwSize != sizeof(DIDEVICEINSTANCEW)) return DIERR_INVALIDPARAM; - return DIERR_UNSUPPORTED; + memcpy( instance, &impl->instance, instance->dwSize ); + + return S_OK; } static HRESULT WINAPI hid_joystick_BuildActionMap( IDirectInputDevice8W *iface, DIACTIONFORMATW *format, @@ -342,6 +348,8 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID &attrs, &caps, dinput->dwVersion ); if (hr != DI_OK) goto failed; + impl->instance = instance; + *out = &impl->base.IDirectInputDevice8W_iface; return DI_OK;

1 0

Francois Gouget : qcap: Make v4l_device_create() static.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 80b37cd512547588d07af68ec3771c6781662eb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80b37cd512547588d07af68e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:36:49 2021 +0200 qcap: Make v4l_device_create() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 82af4dba9e1..12fbe8162e0 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -401,7 +401,7 @@ static LONG CDECL v4l_device_get_caps_count(struct video_capture_device *device) return device->caps_count; } -struct video_capture_device * CDECL v4l_device_create(USHORT index) +static struct video_capture_device * CDECL v4l_device_create(USHORT index) { struct v4l2_frmsizeenum frmsize = {0}; struct video_capture_device *device;

1 0

Francois Gouget : kernel32/tests: Fix ASCII / ANSI mixups in comments.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 463850baa6db02251432dfb569a013be26626e70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=463850baa6db02251432dfb5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:46:26 2021 +0200 kernel32/tests: Fix ASCII / ANSI mixups in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/format_msg.c | 4 ++-- dlls/kernel32/tests/process.c | 4 ++-- dlls/kernel32/tests/profile.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 4997f8991bd..794069e341d 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -144,7 +144,7 @@ static void test_message_from_string_wide(void) ok(!lstrcmpW(L"test", out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4, "failed: r=%d\n", r); - /* S is ascii */ + /* S is ansi */ r = doitW(FORMAT_MESSAGE_FROM_STRING, L"%1!S!", 0, 0, out, ARRAY_SIZE(out), "test"); ok(!lstrcmpW(L"test", out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4, "failed: r=%d\n", r); @@ -417,7 +417,7 @@ static void test_message_from_string(void) ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); - /* s is ascii */ + /* s is ansi */ r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!s!", 0, 0, out, ARRAY_SIZE(out), "test"); ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e729bca87ef..b1b76a88878 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1952,9 +1952,9 @@ static void test_QueryFullProcessImageNameA(void) expect_eq_d(4, size); expect_eq_s(INIT_STR, buf); - /* this is a difference between the ascii and the unicode version + /* this is a difference between the ansi and the unicode version * the unicode version crashes when the size is big enough to hold - * the result while the ascii version throws an error + * the result while the ansi version throws an error */ size = 1024; expect_eq_d(FALSE, pQueryFullProcessImageNameA(GetCurrentProcess(), 0, NULL, &size)); diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index f9815585480..94ef0a85467 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -150,7 +150,7 @@ static void test_profile_string(void) WriteFile( h, content2, sizeof(content2), &count, NULL); CloseHandle( h); - /* works only in unicode, ascii crashes */ + /* works only in unicode, ansi crashes */ ret=GetPrivateProfileStringW(emptyW, keyW, emptyW, bufW, ARRAY_SIZE(bufW), TESTFILE2W); todo_wine ok(ret == 13, "expected 13, got %u\n", ret); @@ -158,7 +158,7 @@ static void test_profile_string(void) ok(!lstrcmpW(valsectionW,bufW), "expected %s, got %s\n", wine_dbgstr_w(valsectionW), wine_dbgstr_w(bufW) ); - /* works only in unicode, ascii crashes */ + /* works only in unicode, ansi crashes */ ret=GetPrivateProfileStringW(sW, emptyW, emptyW, bufW, ARRAY_SIZE(bufW), TESTFILE2W); ok(ret == 10, "expected 10, got %u\n", ret); ok(!lstrcmpW(valnokeyW,bufW), "expected %s, got %s\n",

1 0

Francois Gouget : kernel32: Fix ASCII / ANSI mixups in comments.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: e87e24a3c124594c67f82f83f356dcd6a9eefdf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e87e24a3c124594c67f82f83… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:45:34 2021 +0200 kernel32: Fix ASCII / ANSI mixups in comments. It's quite possible that the device name is entirely composed of ASCII characters but, as far as the API is concerned, it's still an ANSI string. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/comm.c | 12 ++++++------ dlls/kernel32/lcformat.c | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index e9dd0feac58..e6d1c06b11e 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -398,7 +398,7 @@ static BOOL COMM_BuildNewCommDCB(LPCWSTR device, LPDCB lpdcb, LPCOMMTIMEOUTS lpt * BuildCommDCBA (KERNEL32.@) * * Updates a device control block data structure with values from an - * ascii device control string. The device control string has two forms + * ANSI device control string. The device control string has two forms * normal and extended, it must be exclusively in one or the other form. * * RETURNS @@ -406,7 +406,7 @@ static BOOL COMM_BuildNewCommDCB(LPCWSTR device, LPDCB lpdcb, LPCOMMTIMEOUTS lpt * True on success, false on a malformed control string. */ BOOL WINAPI BuildCommDCBA( - LPCSTR device, /* [in] The ascii device control string used to update the DCB. */ + LPCSTR device, /* [in] The ANSI device control string used to update the DCB. */ LPDCB lpdcb) /* [out] The device control block to be updated. */ { return BuildCommDCBAndTimeoutsA(device,lpdcb,NULL); @@ -416,7 +416,7 @@ BOOL WINAPI BuildCommDCBA( * BuildCommDCBAndTimeoutsA (KERNEL32.@) * * Updates a device control block data structure with values from an - * ascii device control string. Taking timeout values from a timeouts + * ANSI device control string. Taking timeout values from a timeouts * struct if desired by the control string. * * RETURNS @@ -424,7 +424,7 @@ BOOL WINAPI BuildCommDCBA( * True on success, false bad handles etc. */ BOOL WINAPI BuildCommDCBAndTimeoutsA( - LPCSTR device, /* [in] The ascii device control string. */ + LPCSTR device, /* [in] The ANSI device control string. */ LPDCB lpdcb, /* [out] The device control block to be updated. */ LPCOMMTIMEOUTS lptimeouts) /* [in] The COMMTIMEOUTS structure to be updated. */ { @@ -705,7 +705,7 @@ BOOL WINAPI GetDefaultCommConfigW( /************************************************************************** * GetDefaultCommConfigA (KERNEL32.@) * - * Acquires the default configuration of the specified communication device. (ascii) + * Acquires the default configuration of the specified communication device. * * RETURNS * @@ -713,7 +713,7 @@ BOOL WINAPI GetDefaultCommConfigW( * if the device is not found or the buffer is too small. */ BOOL WINAPI GetDefaultCommConfigA( - LPCSTR lpszName, /* [in] The ascii name of the device targeted for configuration. */ + LPCSTR lpszName, /* [in] The ANSI name of the device targeted for configuration. */ LPCOMMCONFIG lpCC, /* [out] The default configuration for the device. */ LPDWORD lpdwSize) /* [in/out] Initially the size of the default configuration buffer, afterwards the number of bytes copied to the buffer or diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 5711d05b76f..22a9efb24c7 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -315,7 +315,7 @@ static const NLS_FORMAT_NODE *NLS_GetFormats(LCID lcid, DWORD dwFlags) /************************************************************************** * NLS_IsUnicodeOnlyLcid <internal> * - * Determine if a locale is Unicode only, and thus invalid in ASCII calls. + * Determine if a locale is Unicode only, and thus invalid in ANSI calls. */ static BOOL NLS_IsUnicodeOnlyLcid(LCID lcid) { @@ -816,7 +816,7 @@ static INT NLS_GetDateTimeFormatA(LCID lcid, DWORD dwFlags, *| gg Era string, for example 'AD'. * - To output any literal character that could be misidentified as a token, * enclose it in single quotes. - * - The Ascii version of this function fails if lcid is Unicode only. + * - The ANSI version of this function fails if lcid is Unicode only. * * RETURNS * Success: The number of character written to lpDateStr, or that would @@ -922,7 +922,7 @@ INT WINAPI GetDateFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, *| tt Long time marker (e.g. "AM", "PM") * - To output any literal character that could be misidentified as a token, * enclose it in single quotes. - * - The Ascii version of this function fails if lcid is Unicode only. + * - The ANSI version of this function fails if lcid is Unicode only. * * RETURNS * Success: The number of character written to lpTimeStr, or that would @@ -1006,7 +1006,7 @@ INT WINAPI GetTimeFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, * - This function rounds the number string if the number of decimals exceeds the * locales normal number of decimal places. * - If cchOut is 0, this function does not write to lpNumberStr. - * - The Ascii version of this function fails if lcid is Unicode only. + * - The ANSI version of this function fails if lcid is Unicode only. * * RETURNS * Success: The number of character written to lpNumberStr, or that would @@ -1370,7 +1370,7 @@ INT WINAPI GetNumberFormatEx(LPCWSTR name, DWORD flags, * - This function rounds the currency if the number of decimals exceeds the * locales number of currency decimal places. * - If cchOut is 0, this function does not write to lpCurrencyStr. - * - The Ascii version of this function fails if lcid is Unicode only. + * - The ANSI version of this function fails if lcid is Unicode only. * * RETURNS * Success: The number of character written to lpNumberStr, or that would

1 0