September 2021 - Wine-Commits

Gerald Pfeifer : winebus.sys: Fix non-Linux builds.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 0c81dc223d2a63eae38fe54b6cbbf6422265e7c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c81dc223d2a63eae38fe54b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Sep 27 11:32:47 2021 +0200 winebus.sys: Fix non-Linux builds. commit 40a9f69a1de088fb72c6b8966bc4333dea5fdfff winebus.sys: Rename UDEV bus device variables to be consistent. Introducing a struct base_device, and hidraw_device / lnxev_device depending on the sub-type of the device. moved an existing use of ABS_VOLUME that was guarded by #ifdef HAS_PROPER_INPUT_HEADER outside that guard, breaking the build on non-Linux platforms. Address this by putting appropriate guards in place. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 48 ++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 88db78360e2..fce3a7672d9 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -110,11 +110,23 @@ struct base_device int device_fd; }; +static inline struct base_device *impl_from_unix_device(struct unix_device *iface) +{ + return CONTAINING_RECORD(iface, struct base_device, unix_device); +} + struct hidraw_device { struct base_device base; }; +static inline struct hidraw_device *hidraw_impl_from_unix_device(struct unix_device *iface) +{ + return CONTAINING_RECORD(impl_from_unix_device(iface), struct hidraw_device, base); +} + +#ifdef HAS_PROPER_INPUT_HEADER + #define HID_REL_MAX (REL_MISC+1) #define HID_ABS_MAX (ABS_VOLUME+1) @@ -130,21 +142,13 @@ struct lnxev_device int haptic_effect_id; }; -static inline struct base_device *impl_from_unix_device(struct unix_device *iface) -{ - return CONTAINING_RECORD(iface, struct base_device, unix_device); -} - -static inline struct hidraw_device *hidraw_impl_from_unix_device(struct unix_device *iface) -{ - return CONTAINING_RECORD(impl_from_unix_device(iface), struct hidraw_device, base); -} - static inline struct lnxev_device *lnxev_impl_from_unix_device(struct unix_device *iface) { return CONTAINING_RECORD(impl_from_unix_device(iface), struct lnxev_device, base); } +#endif /* HAS_PROPER_INPUT_HEADER */ + #define MAX_DEVICES 128 static int close_fds[MAX_DEVICES]; static struct pollfd poll_fds[MAX_DEVICES]; @@ -201,6 +205,18 @@ static struct base_device *find_device_from_fd(int fd) return NULL; } +static struct base_device *find_device_from_udev(struct udev_device *dev) +{ + struct base_device *impl; + + LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry) + if (impl->udev_device == dev) return impl; + + return NULL; +} + +#ifdef HAS_PROPER_INPUT_HEADER + static const char *get_device_syspath(struct udev_device *dev) { struct udev_device *parent; @@ -224,18 +240,6 @@ static struct base_device *find_device_from_syspath(const char *path) return NULL; } -static struct base_device *find_device_from_udev(struct udev_device *dev) -{ - struct base_device *impl; - - LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry) - if (impl->udev_device == dev) return impl; - - return NULL; -} - -#ifdef HAS_PROPER_INPUT_HEADER - static const BYTE ABS_TO_HID_MAP[][2] = { {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_X}, /*ABS_X*/ {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Y}, /*ABS_Y*/

1 0

Nikolay Sivov : d3d10/effect: Handle D3D10_SVT_UINT when reading float constants.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: f96499af6a63d6493a060de8c41753437ede845c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f96499af6a63d6493a060de8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 24 08:10:14 2021 +0300 d3d10/effect: Handle D3D10_SVT_UINT when reading float constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 8aed914c909..668efcda666 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1503,6 +1503,10 @@ static BOOL read_float_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, floa out_data[idx] = (INT)value; return TRUE; + case D3D10_SVT_UINT: + out_data[idx] = value; + return TRUE; + default: FIXME("Unhandled in_type %#x.\n", in_type); return FALSE;

1 0

Connor McAdams : user32/tests: Add missing winevents to test_defwinproc() message sequences.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 51bf6cc0fd1566d5570194c725609f22b1d95d94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51bf6cc0fd1566d5570194c7… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 24 22:33:22 2021 -0400 user32/tests: Add missing winevents to test_defwinproc() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f968ea4c2b7..f81c1bf483c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16005,17 +16005,20 @@ static const struct message WmRestoreMinimizedOverlappedSeq[] = { WM_WINDOWPOSCHANGING, sent|optional }, { WM_GETMINMAXINFO, sent|defwinproc }, { WM_NCCALCSIZE, sent|optional }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, { WM_WINDOWPOSCHANGED, sent|optional }, { HCBT_ACTIVATE, hook }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, { WM_ACTIVATEAPP, sent|wparam, TRUE }, { WM_NCACTIVATE, sent|wparam, TRUE }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam, TRUE }, { HCBT_SETFOCUS, hook }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc }, { WM_NCPAINT, sent }, { WM_GETTEXT, sent|defwinproc|optional }, @@ -16026,6 +16029,9 @@ static const struct message WmRestoreMinimizedOverlappedSeq[] = { WM_NCCALCSIZE, sent|optional }, { WM_NCPAINT, sent|optional }, { WM_ERASEBKGND, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */ + { EVENT_SYSTEM_MINIMIZEEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_ACTIVATE, sent|wparam, TRUE }, { WM_SYNCPAINT, sent|optional }, { WM_PAINT, sent }, @@ -16043,12 +16049,15 @@ static const struct message WmRestoreActiveMinimizedOverlappedSeq[] = { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_NCCALCSIZE, sent|optional }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Sent on Win7. */ { WM_MOVE, sent|optional }, { WM_SIZE, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Sent on Win7. */ { WM_GETTEXT, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_GETMINMAXINFO, sent|defwinproc }, { WM_NCCALCSIZE, sent }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Sent on Win8+. */ { WM_NCPAINT, sent }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent }, @@ -16058,7 +16067,11 @@ static const struct message WmRestoreActiveMinimizedOverlappedSeq[] = { WM_NCCALCSIZE, sent|optional }, { WM_NCPAINT, sent|optional }, { WM_ERASEBKGND, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */ + { EVENT_SYSTEM_MINIMIZEEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_SETFOCUS, hook }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent }, /* Note this WM_ACTIVATE messages even if the window is already active */ { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, @@ -18658,6 +18671,11 @@ START_TEST(msg) test_nullCallback(); test_dbcs_wm_char(); test_unicode_wm_char(); + test_defwinproc(); + test_desktop_winproc(); + test_clipboard_viewers(); + test_keyflags(); + test_hotkey(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18668,11 +18686,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_defwinproc(); - test_desktop_winproc(); - test_clipboard_viewers(); - test_keyflags(); - test_hotkey(); test_layered_window(); test_TrackPopupMenu(); test_TrackPopupMenuEmpty();

1 0

Rémi Bernon : winebus.sys: Move hidraw_device code around.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 55e978168e7f3d6ac48046002ec92bf631ddaf58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55e978168e7f3d6ac4804600… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 27 11:32:48 2021 +0200 winebus.sys: Move hidraw_device code around. To keep lnxev_device functions and related helpers all together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 375 ++++++++++++++++++++++---------------------- 1 file changed, 186 insertions(+), 189 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55e978168e7f3d6ac480…

1 0

Jacek Caban : gdi32: Directly use ntdll in update_font_system_link_info.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 3671eb44342d69cadea18de1e866bdfbefbfc646 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3671eb44342d69cadea18de1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 27 13:04:31 2021 +0200 gdi32: Directly use ntdll in update_font_system_link_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 89 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 38 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 805fbe7abcc..0a5f69325cb 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -132,6 +132,11 @@ static struct font_gamma_ramp font_gamma_ramp; static void add_face_to_cache( struct gdi_font_face *face ); static void remove_face_from_cache( struct gdi_font_face *face ); +static void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) +{ + while (len--) *dst++ = (unsigned char)*src++; +} + static UINT asciiz_to_unicode( WCHAR *dst, const char *src ) { WCHAR *p = dst; @@ -1410,11 +1415,18 @@ static void add_gdi_font_link_entry( struct gdi_font_link *link, const WCHAR *fa list_add_tail( &link->links, &entry->entry ); } +static const WCHAR lucida_sans_unicodeW[] = + {'L','u','c','i','d','a',' ','S','a','n','s',' ','U','n','i','c','o','d','e',0}; +static const WCHAR microsoft_sans_serifW[] = + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}; +static const WCHAR tahomaW[] = + {'T','a','h','o','m','a',0}; + static const WCHAR * const font_links_list[] = { - L"Lucida Sans Unicode", - L"Microsoft Sans Serif", - L"Tahoma" + lucida_sans_unicodeW, + microsoft_sans_serifW, + tahomaW }; static const struct font_links_defaults_list @@ -2531,47 +2543,48 @@ static void update_font_association_info(UINT current_ansi_codepage) reg_delete_tree( NULL, font_assoc_keyW, sizeof(font_assoc_keyW) ); } -static void set_multi_value_key(HKEY hkey, const WCHAR *name, const WCHAR *value, DWORD len) +static void set_multi_value_key( HKEY hkey, const WCHAR *name, const char *value, DWORD len ) { + WCHAR valueW[256]; + ascii_to_unicode( valueW, value, len ); if (value) - RegSetValueExW(hkey, name, 0, REG_MULTI_SZ, (const BYTE *)value, len); + set_reg_value( hkey, name, REG_MULTI_SZ, valueW, len * sizeof(WCHAR) ); else if (name) - RegDeleteValueW(hkey, name); + reg_delete_value( hkey, name ); } static void update_font_system_link_info(UINT current_ansi_codepage) { - static const WCHAR system_link_simplified_chinese[] = - L"SIMSUN.TTC,SimSun\0" - L"MINGLIU.TTC,PMingLiu\0" - L"MSGOTHIC.TTC,MS UI Gothic\0" - L"BATANG.TTC,Batang\0"; - static const WCHAR system_link_traditional_chinese[] = - L"MINGLIU.TTC,PMingLiu\0" - L"SIMSUN.TTC,SimSun\0" - L"MSGOTHIC.TTC,MS UI Gothic\0" - L"BATANG.TTC,Batang\0"; - static const WCHAR system_link_japanese[] = - L"MSGOTHIC.TTC,MS UI Gothic\0" - L"MINGLIU.TTC,PMingLiU\0" - L"SIMSUN.TTC,SimSun\0" - L"GULIM.TTC,Gulim\0"; - static const WCHAR system_link_korean[] = - L"GULIM.TTC,Gulim\0" - L"MSGOTHIC.TTC,MS UI Gothic\0" - L"MINGLIU.TTC,PMingLiU\0" - L"SIMSUN.TTC,SimSun\0"; - static const WCHAR system_link_non_cjk[] = - L"MSGOTHIC.TTC,MS UI Gothic\0" - L"MINGLIU.TTC,PMingLiU\0" - L"SIMSUN.TTC,SimSun\0" - L"GULIM.TTC,Gulim\0"; + static const char system_link_simplified_chinese[] = + "SIMSUN.TTC,SimSun\0" + "MINGLIU.TTC,PMingLiu\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "BATANG.TTC,Batang\0"; + static const char system_link_traditional_chinese[] = + "MINGLIU.TTC,PMingLiu\0" + "SIMSUN.TTC,SimSun\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "BATANG.TTC,Batang\0"; + static const char system_link_japanese[] = + "MSGOTHIC.TTC,MS UI Gothic\0" + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0" + "GULIM.TTC,Gulim\0"; + static const char system_link_korean[] = + "GULIM.TTC,Gulim\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0"; + static const char system_link_non_cjk[] = + "MSGOTHIC.TTC,MS UI Gothic\0" + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0" + "GULIM.TTC,Gulim\0"; HKEY hkey; - if (!RegCreateKeyW(HKEY_LOCAL_MACHINE, - L"Software\\Microsoft\\Windows NT\\CurrentVersion\\FontLink\\SystemLink", &hkey)) + if ((hkey = reg_create_key( NULL, system_link_keyW, sizeof(system_link_keyW), 0, NULL ))) { - const WCHAR *link; + const char *link; DWORD len; switch (current_ansi_codepage) @@ -2596,10 +2609,10 @@ static void update_font_system_link_info(UINT current_ansi_codepage) link = system_link_non_cjk; len = sizeof(system_link_non_cjk); } - set_multi_value_key(hkey, L"Lucida Sans Unicode", link, len); - set_multi_value_key(hkey, L"Microsoft Sans Serif", link, len); - set_multi_value_key(hkey, L"Tahoma", link, len); - RegCloseKey(hkey); + set_multi_value_key(hkey, lucida_sans_unicodeW, link, len); + set_multi_value_key(hkey, microsoft_sans_serifW, link, len); + set_multi_value_key(hkey, tahomaW, link, len); + NtClose( hkey ); } }

1 0

Alexandre Julliard : winevdm: Build with msvcrt.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: cd3e6db5a557db306db9d12e5e4ec465c706cf1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd3e6db5a557db306db9d12e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 12:31:50 2021 +0200 winevdm: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winevdm/Makefile.in | 2 +- programs/winevdm/winevdm.c | 96 ++++++++------------------------------------ 2 files changed, 18 insertions(+), 80 deletions(-) diff --git a/programs/winevdm/Makefile.in b/programs/winevdm/Makefile.in index bce66758a7a..cc3dddb09c6 100644 --- a/programs/winevdm/Makefile.in +++ b/programs/winevdm/Makefile.in @@ -1,7 +1,7 @@ MODULE = winevdm.exe IMPORTS = user32 kernel comctl32 -EXTRADLLFLAGS = -mwindows -mcygwin +EXTRADLLFLAGS = -mwindows C_SRCS = \ winevdm.c diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 1ab91f41d66..19f3c778513 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -18,20 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "wine/winbase16.h" #include "winuser.h" #include "wincon.h" #include "commctrl.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winevdm); @@ -106,75 +104,32 @@ typedef struct { #include "poppack.h" -/*********************************************************************** - * find_dosbox - */ -static char *find_dosbox(void) -{ - const char *envpath = getenv( "PATH" ); - struct stat st; - char *path, *p, *buffer, *dir; - size_t envpath_len; - - if (!envpath) return NULL; - - envpath_len = strlen( envpath ); - path = HeapAlloc( GetProcessHeap(), 0, envpath_len + 1 ); - buffer = HeapAlloc( GetProcessHeap(), 0, envpath_len + strlen(DOSBOX) + 2 ); - strcpy( path, envpath ); - - p = path; - while (*p) - { - while (*p == ':') p++; - if (!*p) break; - dir = p; - while (*p && *p != ':') p++; - if (*p == ':') *p++ = 0; - strcpy( buffer, dir ); - strcat( buffer, "/" DOSBOX ); - if (!stat( buffer, &st )) - { - HeapFree( GetProcessHeap(), 0, path ); - return buffer; - } - } - HeapFree( GetProcessHeap(), 0, buffer ); - HeapFree( GetProcessHeap(), 0, path ); - return NULL; -} - - /*********************************************************************** * start_dosbox */ static void start_dosbox( const char *appname, const char *args ) { - static const WCHAR cfgW[] = {'c','f','g',0}; - const char *home = getenv( "HOME" ); - const char *prefix = getenv( "WINEPREFIX" ); + const WCHAR *config_dir = _wgetenv( L"WINECONFIGDIR" ); WCHAR path[MAX_PATH], config[MAX_PATH]; HANDLE file; - char *p, *buffer, app[MAX_PATH]; - int i, len; - int ret = 1; + char *p, *prefix, *buffer, app[MAX_PATH]; + int i; + NTSTATUS ret = STATUS_OBJECT_NAME_NOT_FOUND; DWORD written, drives = GetLogicalDrives(); - char *dosbox = find_dosbox(); - if (!dosbox) return; + if (!config_dir || !(prefix = wine_get_unix_file_name( config_dir ))) return; if (!GetTempPathW( MAX_PATH, path )) return; - if (!GetTempFileNameW( path, cfgW, 0, config )) return; + if (!GetTempFileNameW( path, L"cfg", 0, config )) return; if (!GetCurrentDirectoryW( MAX_PATH, path )) return; if (!GetShortPathNameA( appname, app, MAX_PATH )) return; GetShortPathNameW( path, path, MAX_PATH ); file = CreateFileW( config, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); if (file == INVALID_HANDLE_VALUE) return; - len = prefix ? strlen(prefix) : strlen(home) + strlen("/.wine"); buffer = HeapAlloc( GetProcessHeap(), 0, sizeof("[autoexec]") + sizeof("mount -z c") + sizeof("config -securemode") + - 25 * (len + sizeof("mount c /dosdevices/c:")) + - 4 * strlenW( path ) + + 26 * (strlen(prefix) + sizeof("mount c /dosdevices/c:")) + + 4 * lstrlenW( path ) + 6 + strlen( app ) + strlen( args ) + 20 ); p = buffer; p += sprintf( p, "[autoexec]\n" ); @@ -187,13 +142,10 @@ static void start_dosbox( const char *appname, const char *args ) for (i = 0; i <= 25; i++) { if (!(drives & (1 << i))) continue; - if (prefix) - p += sprintf( p, "mount %c %s/dosdevices/%c:\n", 'a' + i, prefix, 'a' + i ); - else - p += sprintf( p, "mount %c %s/.wine/dosdevices/%c:\n", 'a' + i, home, 'a' + i ); + p += sprintf( p, "mount %c %s/dosdevices/%c:\n", 'a' + i, prefix, 'a' + i ); } p += sprintf( p, "%c:\ncd ", path[0] ); - p += WideCharToMultiByte( CP_UNIXCP, 0, path + 2, -1, p, 4 * strlenW(path), NULL, NULL ) - 1; + p += WideCharToMultiByte( CP_UNIXCP, 0, path + 2, -1, p, 4 * lstrlenW(path), NULL, NULL ) - 1; p += sprintf( p, "\nconfig -securemode\n" ); p += sprintf( p, "%s %s\n", app, args ); p += sprintf( p, "exit\n" ); @@ -201,30 +153,21 @@ static void start_dosbox( const char *appname, const char *args ) { const char *args[5]; char *config_file = wine_get_unix_file_name( config ); - args[0] = dosbox; + args[0] = DOSBOX; args[1] = "-userconf"; args[2] = "-conf"; args[3] = config_file; args[4] = NULL; - ret = _spawnvp( _P_WAIT, args[0], args ); + ret = __wine_unix_spawnvp( (char **)args, TRUE ); } CloseHandle( file ); DeleteFileW( config ); HeapFree( GetProcessHeap(), 0, buffer ); + if (FAILED(ret)) MESSAGE( "winevdm: %s is a DOS application, you need to install DOSBox.\n", appname ); ExitProcess( ret ); } -/*********************************************************************** - * start_dos_exe - */ -static void start_dos_exe( LPCSTR filename, LPCSTR cmdline ) -{ - start_dosbox( filename, cmdline ); - WINE_MESSAGE( "winevdm: %s is a DOS application, you need to install DOSBox.\n", filename ); - ExitProcess(1); -} - /*********************************************************************** * read_pif_file *pif386rec_tu @@ -367,7 +310,7 @@ static VOID pif_cmd( char *filename, char *cmdline) * - hot key's * - etc. */ - start_dos_exe( progpath, cmdline ); + start_dosbox( progpath, cmdline ); } /*********************************************************************** @@ -561,13 +504,8 @@ int main( int argc, char *argv[] ) if( ( p = strrchr( appname, '.' )) && !strcasecmp( p, ".pif")) pif_cmd( appname, cmdline + 1); else - { /* try DOS format */ - /* loader expects arguments to be regular C strings */ - start_dos_exe( appname, cmdline + 1 ); - } - /* if we get back here it failed */ - instance = GetLastError(); + start_dosbox( appname, cmdline + 1 ); } WINE_MESSAGE( "winevdm: can't exec '%s': ", appname );

1 0

Nikolay Sivov : d3d10/tests: Regenerate state group test effect with newer compiler.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 5227259043a8168b533107875f6f46911dc68279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5227259043a8168b53310787… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 24 08:10:15 2021 +0300 d3d10/tests: Regenerate state group test effect with newer compiler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 186 ++++++++++++++++------------------------------ 1 file changed, 62 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5227259043a8168b5331…

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 2d47d9fecd582736b301dd2b33ec02cfe4ce7ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d47d9fecd582736b301dd2b… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sat Sep 25 23:23:15 2021 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/po/nl.po b/po/nl.po index e4616d5aacf..e0daa9dff21 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-09-11 20:20+0200\n" +"PO-Revision-Date: 2021-09-25 22:40+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -787,7 +787,7 @@ msgstr "Gelijke &hoofd-/kleine letters" #: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76 msgid "Direction" -msgstr "Zoekrichting" +msgstr "Oriëntatie" #: dlls/comdlg32/comdlg32.rc:326 programs/view/view.rc:42 msgid "&Up" @@ -3722,34 +3722,28 @@ msgid "&Disable" msgstr "&Uitzetten" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "Terugzetten" +msgstr "&Terugzetten" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" -msgstr "Activ&eren" +msgstr "&Activeren" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "DLL Bewerken" +msgstr "&Overschrijven" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "Verbonden" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "Steminvoer apparaat:" +msgstr "Verbonden (xinput apparaat)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" -msgstr "Deactiveren" +msgstr "Uitgeschakeld" #: dlls/joy.cpl/joy.rc:50 msgid "" @@ -3757,7 +3751,7 @@ msgid "" "updated here until you restart this applet." msgstr "" "Na het uit- of inschakelen van een apparaat zullen de aangesloten joysticks " -"niet vernieuwd worden totdat u deze applet herstart." +"niet vernieuwd worden totdat deze applicatie herstart wordt." #: dlls/joy.cpl/joy.rc:55 msgid "Test Joystick"

1 0

Rémi Bernon : dinput: Return proper error status from HID joystick GetObjectInfo.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: e990e4b232585e9f4b155ddcba898ad5c33d913e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e990e4b232585e9f4b155ddc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 27 09:43:05 2021 +0200 dinput: Return proper error status from HID joystick GetObjectInfo. When no object matched the enumeration or when DIPH_DEVICE is used. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 7 +++++-- dlls/dinput8/tests/hid.c | 4 ---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 1b5fe6fd044..ade58166e27 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -682,6 +682,7 @@ static HRESULT WINAPI hid_joystick_GetObjectInfo( IDirectInputDevice8W *iface, D .dwHow = how, .dwObj = obj }; + BOOL ret; TRACE( "iface %p, instance %p, obj %#x, how %#x.\n", iface, instance, obj, how ); @@ -689,9 +690,11 @@ static HRESULT WINAPI hid_joystick_GetObjectInfo( IDirectInputDevice8W *iface, D if (instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W) && instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW)) return DIERR_INVALIDPARAM; + if (how == DIPH_DEVICE) return DIERR_INVALIDPARAM; - enum_objects( impl, &filter, DIDFT_ALL, get_object_info, instance ); - return S_OK; + ret = enum_objects( impl, &filter, DIDFT_ALL, get_object_info, instance ); + if (ret != DIENUM_CONTINUE) return DI_OK; + return DIERR_NOTFOUND; } static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, DIDEVICEINSTANCEW *instance ) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index d73d4dabfff..c7f5b82c187 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3959,12 +3959,10 @@ static void test_simple_joystick(void) ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); objinst.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, 0, DIPH_DEVICE ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); res = MAKELONG( HID_USAGE_GENERIC_Z, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYUSAGE ); - todo_wine ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); res = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYUSAGE ); @@ -3988,14 +3986,12 @@ static void test_simple_joystick(void) check_member( objinst, expect_objects[1], "%u", wReportId ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, 0x14, DIPH_BYOFFSET ); - todo_wine ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, 0, DIPH_BYOFFSET ); todo_wine ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); res = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( 3 ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYID ); - todo_wine ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); res = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( 1 ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYID );

1 0

Zebediah Figura : krnl386: Don't handle %ss in fix_selector().
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 4b7355e7f60e71871ca36066d1a7ff699b21f3c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b7355e7f60e71871ca36066… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Sep 26 21:11:13 2021 -0500 krnl386: Don't handle %ss in fix_selector(). Loading %ss with zero isn't valid either. If %ss is invalid we have bigger problems anyway. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/wowthunk.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index 0e9e9b6744c..800f3c275a5 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -93,7 +93,6 @@ static BOOL fix_selector( CONTEXT *context ) switch(instr[0]) { case 0x07: /* pop es */ - case 0x17: /* pop ss */ case 0x1f: /* pop ds */ break; case 0x0f: /* extended instruction */

1 0