March 2021 - Wine-commits - list.winehq.org

Hugh McMaster : reg: Simplify basic syntax checks.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: 8801118e384b7388a0fa5c43b5540bfd7f257ab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8801118e384b7388a0fa5c43… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 18 22:36:50 2021 +1100 reg: Simplify basic syntax checks. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 354ece86f61..533a9378f92 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -349,7 +349,6 @@ static enum operations get_operation(const WCHAR *str, int *op_help) int __cdecl wmain(int argc, WCHAR *argvW[]) { int i, op, op_help, ret; - BOOL show_op_help = FALSE; static const WCHAR switchVAW[] = {'v','a',0}; static const WCHAR switchVEW[] = {'v','e',0}; WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; @@ -377,22 +376,26 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) output_message(STRING_REG_HELP); return 1; } - - if (argc > 2) - show_op_help = is_help_switch(argvW[2]); - - if (argc == 2 || ((show_op_help || op == REG_IMPORT) && argc > 3)) + else if (argc == 2) /* Valid operation, no arguments supplied */ { output_message(STRING_INVALID_SYNTAX); output_message(STRING_FUNC_HELP, wcsupr(argvW[1])); return 1; } - else if (show_op_help) + + if (is_help_switch(argvW[2])) { output_message(op_help); return 0; } + if (op == REG_IMPORT && argc > 3) + { + output_message(STRING_INVALID_SYNTAX); + output_message(STRING_FUNC_HELP, wcsupr(argvW[1])); + return 1; + } + if (op == REG_IMPORT) return reg_import(argvW[2]);

1 0

Hugh McMaster : reg: Move 'import' syntax checks to reg_import().
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: 4cbf47054fc7d95bcbab368fa53fc71908472309 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cbf47054fc7d95bcbab368f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 18 22:36:51 2021 +1100 reg: Move 'import' syntax checks to reg_import(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 13 +++++++++++-- programs/reg/reg.c | 9 +-------- programs/reg/reg.h | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index 9e21bcc6a7e..13e54e6a69a 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -983,13 +983,22 @@ cleanup: return NULL; } -int reg_import(const WCHAR *filename) +int reg_import(int argc, WCHAR *argvW[]) { + WCHAR *filename, *pos; FILE *fp; static const WCHAR rb_mode[] = {'r','b',0}; BYTE s[2]; struct parser parser; - WCHAR *pos; + + if (argc > 3) + { + output_message(STRING_INVALID_SYNTAX); + output_message(STRING_FUNC_HELP, wcsupr(argvW[1])); + return 1; + } + + filename = argvW[2]; fp = _wfopen(filename, rb_mode); if (!fp) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 533a9378f92..daeec5f5718 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -389,15 +389,8 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) return 0; } - if (op == REG_IMPORT && argc > 3) - { - output_message(STRING_INVALID_SYNTAX); - output_message(STRING_FUNC_HELP, wcsupr(argvW[1])); - return 1; - } - if (op == REG_IMPORT) - return reg_import(argvW[2]); + return reg_import(argc, argvW); if (op == REG_EXPORT) return reg_export(argc, argvW); diff --git a/programs/reg/reg.h b/programs/reg/reg.h index b29c2c21a1f..703dd0d37af 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -56,7 +56,7 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, int reg_export(int argc, WCHAR *argv[]); /* import.c */ -int reg_import(const WCHAR *filename); +int reg_import(int argc, WCHAR *argvW[]); /* query.c */ int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name,

1 0

Hugh McMaster : reg: Use 'argvW' array naming in export.c.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: d37375e47033f92375ec4a431b5c3c2f28dd5829 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d37375e47033f92375ec4a43… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 18 22:36:52 2021 +1100 reg: Use 'argvW' array naming in export.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 10 +++++----- programs/reg/reg.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 214c94b1368..8ce1945a693 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -360,7 +360,7 @@ static BOOL is_overwrite_switch(const WCHAR *s) return is_switch(s, 'y'); } -int reg_export(int argc, WCHAR *argv[]) +int reg_export(int argc, WCHAR *argvW[]) { HKEY root, hkey; WCHAR *path, *long_key; @@ -371,10 +371,10 @@ int reg_export(int argc, WCHAR *argv[]) if (argc == 3 || argc > 5) goto error; - if (!parse_registry_key(argv[2], &root, &path, &long_key)) + if (!parse_registry_key(argvW[2], &root, &path, &long_key)) return 1; - if (argc == 5 && !(overwrite_file = is_overwrite_switch(argv[4]))) + if (argc == 5 && !(overwrite_file = is_overwrite_switch(argvW[4]))) goto error; if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey)) @@ -383,7 +383,7 @@ int reg_export(int argc, WCHAR *argv[]) return 1; } - hFile = get_file_handle(argv[3], overwrite_file); + hFile = get_file_handle(argvW[3], overwrite_file); export_file_header(hFile); ret = export_registry_data(hFile, hkey, long_key); export_newline(hFile); @@ -395,6 +395,6 @@ int reg_export(int argc, WCHAR *argv[]) error: output_message(STRING_INVALID_SYNTAX); - output_message(STRING_FUNC_HELP, wcsupr(argv[1])); + output_message(STRING_FUNC_HELP, wcsupr(argvW[1])); return 1; } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 703dd0d37af..83bcf516297 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -53,7 +53,7 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL value_all, BOOL force); /* export.c */ -int reg_export(int argc, WCHAR *argv[]); +int reg_export(int argc, WCHAR *argvW[]); /* import.c */ int reg_import(int argc, WCHAR *argvW[]);

1 0

Rémi Bernon : windows.gaming.input: Implement IGamepadStatics stubs.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: 800bbece7824f8fe4778964331db13477e2dcac4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=800bbece7824f8fe47789643… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 18 09:58:45 2021 +0100 windows.gaming.input: Implement IGamepadStatics stubs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/main.c | 113 ++++++++++++++++++++++++++++++++ dlls/windows.gaming.input/tests/input.c | 8 +-- 2 files changed, 117 insertions(+), 4 deletions(-) diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index 05ef844893b..50d73a1adf4 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -29,7 +29,10 @@ #include "initguid.h" #include "activation.h" +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" +#define WIDL_using_Windows_Gaming_Input #include "windows.gaming.input.h" WINE_DEFAULT_DEBUG_CHANNEL(input); @@ -46,6 +49,7 @@ static const char *debugstr_hstring(HSTRING hstr) struct windows_gaming_input { IActivationFactory IActivationFactory_iface; + IGamepadStatics IGamepadStatics_iface; LONG ref; }; @@ -54,9 +58,16 @@ static inline struct windows_gaming_input *impl_from_IActivationFactory(IActivat return CONTAINING_RECORD(iface, struct windows_gaming_input, IActivationFactory_iface); } +static inline struct windows_gaming_input *impl_from_IGamepadStatics(IGamepadStatics *iface) +{ + return CONTAINING_RECORD(iface, struct windows_gaming_input, IGamepadStatics_iface); +} + static HRESULT STDMETHODCALLTYPE windows_gaming_input_QueryInterface( IActivationFactory *iface, REFIID iid, void **out) { + struct windows_gaming_input *impl = impl_from_IActivationFactory(iface); + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IUnknown) || @@ -69,6 +80,13 @@ static HRESULT STDMETHODCALLTYPE windows_gaming_input_QueryInterface( return S_OK; } + if (IsEqualGUID(iid, &IID_IGamepadStatics)) + { + IUnknown_AddRef(iface); + *out = &impl->IGamepadStatics_iface; + return S_OK; + } + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; return E_NOINTERFACE; @@ -133,9 +151,104 @@ static const struct IActivationFactoryVtbl activation_factory_vtbl = windows_gaming_input_ActivateInstance, }; +static HRESULT STDMETHODCALLTYPE gamepad_statics_QueryInterface( + IGamepadStatics *iface, REFIID iid, void **out) +{ + struct windows_gaming_input *impl = impl_from_IGamepadStatics(iface); + return windows_gaming_input_QueryInterface(&impl->IActivationFactory_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE gamepad_statics_AddRef( + IGamepadStatics *iface) +{ + struct windows_gaming_input *impl = impl_from_IGamepadStatics(iface); + return windows_gaming_input_AddRef(&impl->IActivationFactory_iface); +} + +static ULONG STDMETHODCALLTYPE gamepad_statics_Release( + IGamepadStatics *iface) +{ + struct windows_gaming_input *impl = impl_from_IGamepadStatics(iface); + return windows_gaming_input_Release(&impl->IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE gamepad_statics_GetIids( + IGamepadStatics *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE gamepad_statics_GetRuntimeClassName( + IGamepadStatics *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE gamepad_statics_GetTrustLevel( + IGamepadStatics *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE gamepad_statics_add_GamepadAdded( + IGamepadStatics *iface, IEventHandler_Gamepad *value, EventRegistrationToken* token) +{ + FIXME("iface %p, value %p, token %p stub!\n", iface, value, token); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE gamepad_statics_remove_GamepadAdded( + IGamepadStatics *iface, EventRegistrationToken token) +{ + FIXME("iface %p, token %#I64x stub!\n", iface, token.value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE gamepad_statics_add_GamepadRemoved( + IGamepadStatics *iface, IEventHandler_Gamepad *value, EventRegistrationToken* token) +{ + FIXME("iface %p, value %p, token %p stub!\n", iface, value, token); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE gamepad_statics_remove_GamepadRemoved( + IGamepadStatics *iface, EventRegistrationToken token) +{ + FIXME("iface %p, token %#I64x stub!\n", iface, token.value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE gamepad_statics_get_Gamepads( + IGamepadStatics *iface, IVectorView_Gamepad **value) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static const struct IGamepadStaticsVtbl gamepad_statics_vtbl = +{ + gamepad_statics_QueryInterface, + gamepad_statics_AddRef, + gamepad_statics_Release, + /* IInspectable methods */ + gamepad_statics_GetIids, + gamepad_statics_GetRuntimeClassName, + gamepad_statics_GetTrustLevel, + /* IGamepadStatics methods */ + gamepad_statics_add_GamepadAdded, + gamepad_statics_remove_GamepadAdded, + gamepad_statics_add_GamepadRemoved, + gamepad_statics_remove_GamepadRemoved, + gamepad_statics_get_Gamepads, +}; + static struct windows_gaming_input windows_gaming_input = { {&activation_factory_vtbl}, + {&gamepad_statics_vtbl}, 1 }; diff --git a/dlls/windows.gaming.input/tests/input.c b/dlls/windows.gaming.input/tests/input.c index fa437dade6e..2d2b76255d0 100644 --- a/dlls/windows.gaming.input/tests/input.c +++ b/dlls/windows.gaming.input/tests/input.c @@ -138,8 +138,7 @@ static void test_Gamepad(void) ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IGamepadStatics, (void **)&gamepad_statics); - todo_wine ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IGamepadStatics failed, hr %#x\n", hr); - if (FAILED(hr)) goto done; + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IGamepadStatics failed, hr %#x\n", hr); hr = IGamepadStatics_QueryInterface(gamepad_statics, &IID_IInspectable, (void **)&tmp_inspectable); ok(hr == S_OK, "IGamepadStatics_QueryInterface IID_IInspectable failed, hr %#x\n", hr); @@ -152,7 +151,8 @@ static void test_Gamepad(void) IAgileObject_Release(tmp_agile_object); hr = IGamepadStatics_get_Gamepads(gamepad_statics, &gamepads); - ok(hr == S_OK, "IGamepadStatics_get_Gamepads failed, hr %#x\n", hr); + todo_wine ok(hr == S_OK, "IGamepadStatics_get_Gamepads failed, hr %#x\n", hr); + if (FAILED(hr)) goto done; hr = IVectorView_Gamepad_QueryInterface(gamepads, &IID_IInspectable, (void **)&tmp_inspectable); ok(hr == S_OK, "IVectorView_Gamepad_QueryInterface failed, hr %#x\n", hr); @@ -171,6 +171,7 @@ static void test_Gamepad(void) IVectorView_Gamepad_Release(gamepads); +done: token.value = 0xdeadbeef; hr = IGamepadStatics_add_GamepadAdded(gamepad_statics, &gamepad_event_handler.IEventHandler_Gamepad_iface, &token); todo_wine ok(hr == S_OK, "IGamepadStatics_add_GamepadAdded failed, hr %#x\n", hr); @@ -189,7 +190,6 @@ static void test_Gamepad(void) IGamepadStatics_Release(gamepad_statics); -done: IAgileObject_Release(agile_object); IInspectable_Release(inspectable); IActivationFactory_Release(factory);

1 0

Alexandre Julliard : setupapi: Add a few printer directory ids.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: 00b9c975d4bd3a24ae41c99057d7a1a32f329c00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00b9c975d4bd3a24ae41c990… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 18 11:24:17 2021 +0100 setupapi: Add a few printer directory ids. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/Makefile.in | 2 +- dlls/setupapi/dirid.c | 63 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 54 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index 70ffd23d245..e89d1f25b56 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_SETUPAPI_ MODULE = setupapi.dll IMPORTLIB = setupapi IMPORTS = uuid version advapi32 rpcrt4 kernelbase -DELAYIMPORTS = cabinet shell32 wintrust ole32 winspool.drv comdlg32 user32 +DELAYIMPORTS = cabinet shell32 wintrust ole32 comdlg32 user32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/setupapi/dirid.c b/dlls/setupapi/dirid.c index ec263d9f181..b28e8b9dffd 100644 --- a/dlls/setupapi/dirid.c +++ b/dlls/setupapi/dirid.c @@ -28,7 +28,6 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" -#include "winspool.h" #include "setupapi.h" #include "shlobj.h" #include "setupapi_private.h" @@ -46,9 +45,22 @@ struct user_dirid WCHAR *str; }; +#ifdef __i386__ +static const WCHAR printer_env[] = L"w32x86"; +#elif defined __x86_64__ +static const WCHAR printer_env[] = L"x64"; +#elif defined __arm__ +static const WCHAR printer_env[] = L"arm"; +#elif defined __aarch64__ +static const WCHAR printer_env[] = L"arm64"; +#else +#error not defined for this cpu +#endif + static int nb_user_dirids; /* number of user dirids in use */ static int alloc_user_dirids; /* number of allocated user dirids */ static struct user_dirid *user_dirids; +static const WCHAR *printer_dirids[5]; /* 66000..66004 */ static const WCHAR *system_dirids[MAX_SYSTEM_DIRID+1]; static const WCHAR *csidl_dirids[MAX_CSIDL_DIRID-MIN_CSIDL_DIRID+1]; @@ -74,7 +86,6 @@ static const WCHAR *create_system_dirid( int dirid ) { WCHAR buffer[MAX_PATH+32], *str; int len; - DWORD needed; switch(dirid) { @@ -122,11 +133,11 @@ static const WCHAR *create_system_dirid( int dirid ) lstrcatW( buffer, L"\\system" ); break; case DIRID_SPOOL: - GetWindowsDirectoryW( buffer, MAX_PATH ); + GetSystemDirectoryW( buffer, MAX_PATH ); lstrcatW( buffer, L"\\spool" ); break; case DIRID_SPOOLDRIVERS: - GetWindowsDirectoryW( buffer, MAX_PATH ); + GetSystemDirectoryW( buffer, MAX_PATH ); lstrcatW( buffer, L"\\spool\\drivers" ); break; case DIRID_USERPROFILE: @@ -135,11 +146,9 @@ static const WCHAR *create_system_dirid( int dirid ) case DIRID_LOADER: return L"C:\\"; /* FIXME */ case DIRID_PRINTPROCESSOR: - if (!GetPrintProcessorDirectoryW(NULL, NULL, 1, (LPBYTE)buffer, sizeof(buffer), &needed)) - { - WARN( "cannot retrieve print processor directory\n" ); - return get_unknown_dirid(); - } + GetSystemDirectoryW( buffer, MAX_PATH ); + lstrcatW( buffer, L"\\spool\\prtprocs\\" ); + lstrcatW( buffer, printer_env ); break; default: FIXME( "unknown dirid %d\n", dirid ); @@ -150,6 +159,35 @@ static const WCHAR *create_system_dirid( int dirid ) return str; } +static const WCHAR *create_printer_dirid( DWORD dirid ) +{ + WCHAR buffer[MAX_PATH+32], *str; + int len; + + switch (dirid) + { + case 66000: /* printer driver */ + GetSystemDirectoryW( buffer, MAX_PATH ); + lstrcatW( buffer, L"\\spool\\drivers\\" ); + lstrcatW( buffer, printer_env ); + break; + case 66001: /* print processor */ + return create_system_dirid( DIRID_PRINTPROCESSOR ); + case 66002: /* system directory (FIXME: only for native architecture) */ + GetSystemDirectoryW( buffer, MAX_PATH ); + break; + case 66003: /* color directory */ + return create_system_dirid( DIRID_COLOR ); + case 66004: /* asp files directory */ + default: + FIXME( "unsupported dirid %d\n", dirid ); + return get_unknown_dirid(); + } + len = (lstrlenW(buffer) + 1) * sizeof(WCHAR); + if ((str = HeapAlloc( GetProcessHeap(), 0, len ))) memcpy( str, buffer, len ); + return str; +} + static const WCHAR *get_csidl_dir( DWORD csidl ) { WCHAR buffer[MAX_PATH], *str; @@ -172,7 +210,12 @@ const WCHAR *DIRID_get_string( int dirid ) if (dirid == DIRID_ABSOLUTE || dirid == DIRID_ABSOLUTE_16BIT) dirid = DIRID_NULL; - if (dirid >= DIRID_USER) + if (dirid >= 66000 && dirid <= 66004) + { + if (!printer_dirids[dirid - 66000]) printer_dirids[dirid - 66000] = create_printer_dirid( dirid ); + return printer_dirids[dirid - 66000]; + } + else if (dirid >= DIRID_USER) { for (i = 0; i < nb_user_dirids; i++) if (user_dirids[i].id == dirid) return user_dirids[i].str;

1 0

Alexandre Julliard : setupapi: Support arbitrary wildcards in fake dlls creation.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: 5d3d73f80360014c13d8a44d06a384288c89b19d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d3d73f80360014c13d8a44d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 18 12:48:45 2021 +0100 setupapi: Support arbitrary wildcards in fake dlls creation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 58 +++++++++++++++++++++++++------------------------ loader/wine.inf.in | 28 ++---------------------- 2 files changed, 32 insertions(+), 54 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 3196708a7f7..552bec27f31 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -466,7 +466,7 @@ done: } /* create the fake dll destination file */ -static HANDLE create_dest_file( const WCHAR *name ) +static HANDLE create_dest_file( const WCHAR *name, BOOL delete ) { /* first check for an existing file */ HANDLE h = CreateFileW( name, GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL ); @@ -478,11 +478,17 @@ static HANDLE create_dest_file( const WCHAR *name ) CloseHandle( h ); return 0; } + if (delete) + { + CloseHandle( h ); + DeleteFileW( name ); + return INVALID_HANDLE_VALUE; + } /* truncate the file */ SetFilePointer( h, 0, NULL, FILE_BEGIN ); SetEndOfFile( h ); } - else + else if (!delete) { if (GetLastError() == ERROR_PATH_NOT_FOUND) create_directories( name ); @@ -872,7 +878,7 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size, } /* copy a fake dll file to the dest directory */ -static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL expect_builtin, struct list *delay_copy ) +static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL delete, BOOL expect_builtin, struct list *delay_copy ) { int ret; SIZE_T size; @@ -897,7 +903,7 @@ static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL ex if (ret != -1) { - HANDLE h = create_dest_file( dest ); + HANDLE h = create_dest_file( dest, delete ); if (h && h != INVALID_HANDLE_VALUE) { @@ -935,7 +941,7 @@ static void delay_copy_files( struct list *delay_copy ) continue; } - h = create_dest_file( copy->dest ); + h = create_dest_file( copy->dest, FALSE ); if (h && h != INVALID_HANDLE_VALUE) { ret = (WriteFile( h, data, size, &written, NULL ) && written == size); @@ -948,7 +954,8 @@ static void delay_copy_files( struct list *delay_copy ) } /* find and install all fake dlls in a given lib directory */ -static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *default_ext, BOOL expect_builtin ) +static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *wildcard, + const WCHAR *default_ext, BOOL delete, BOOL expect_builtin ) { WCHAR *name; intptr_t handle; @@ -958,7 +965,7 @@ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *default_ext, file[1] = '\\'; /* change \??\ to \\?\ */ name = file + lstrlenW(file); *name++ = '\\'; - lstrcpyW( name, L"*" ); + lstrcpyW( name, wildcard ); if ((handle = _wfindfirst( file, &data )) == -1) return; do @@ -973,14 +980,14 @@ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *default_ext, lstrcatW( name, data.name ); if (wcschr( data.name, '.' )) /* module possibly already has an extension */ { - if (install_fake_dll( dest, file, NULL, expect_builtin, &delay_copy )) continue; - if (install_fake_dll( dest, file, L".fake", FALSE, &delay_copy )) continue; + if (install_fake_dll( dest, file, NULL, delete, expect_builtin, &delay_copy )) continue; + if (install_fake_dll( dest, file, L".fake", delete, FALSE, &delay_copy )) continue; } lstrcatW( name, default_ext ); - if (install_fake_dll( dest, file, NULL, expect_builtin, &delay_copy )) continue; - if (install_fake_dll( dest, file, L".fake", FALSE, &delay_copy )) continue; + if (install_fake_dll( dest, file, NULL, delete, expect_builtin, &delay_copy )) continue; + if (install_fake_dll( dest, file, L".fake", delete, FALSE, &delay_copy )) continue; } - else install_fake_dll( dest, file, NULL, expect_builtin, &delay_copy ); + else install_fake_dll( dest, file, NULL, delete, expect_builtin, &delay_copy ); } while (!_wfindnext( handle, &data )); _findclose( handle ); @@ -989,12 +996,12 @@ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *default_ext, } /* create fake dlls in dirname for all the files we can find */ -static BOOL create_wildcard_dlls( const WCHAR *dirname ) +static BOOL create_wildcard_dlls( const WCHAR *dirname, const WCHAR *wildcard, BOOL delete ) { const WCHAR *build_dir = _wgetenv( L"WINEBUILDDIR" ); const WCHAR *path; unsigned int i, maxlen = 0; - WCHAR *file, *dest; + WCHAR *file, *dest, *p; if (build_dir) maxlen = lstrlenW(build_dir) + ARRAY_SIZE(L"\\programs") + 1; for (i = 0; (path = enum_load_path(i)); i++) maxlen = max( maxlen, lstrlenW(path) ); @@ -1007,24 +1014,24 @@ static BOOL create_wildcard_dlls( const WCHAR *dirname ) return FALSE; } lstrcpyW( dest, dirname ); - dest[lstrlenW(dest) - 1] = 0; /* remove wildcard */ + if ((p = wcsrchr( dest, '\\' ))) p[1] = 0; /* remove wildcard */ if (build_dir) { lstrcpyW( file, build_dir ); lstrcatW( file, L"\\dlls" ); - install_lib_dir( dest, file, L".dll", TRUE ); + install_lib_dir( dest, file, wildcard, L".dll", delete, TRUE ); lstrcpyW( file, build_dir ); lstrcatW( file, L"\\programs" ); - install_lib_dir( dest, file, L".exe", TRUE ); + install_lib_dir( dest, file, wildcard, L".exe", delete, TRUE ); } for (i = 0; (path = enum_load_path( i )); i++) { lstrcpyW( file, path ); - install_lib_dir( dest, file, NULL, TRUE ); + install_lib_dir( dest, file, wildcard, NULL, delete, TRUE ); lstrcpyW( file, path ); lstrcatW( file, L"\\fakedlls" ); - install_lib_dir( dest, file, NULL, FALSE ); + install_lib_dir( dest, file, wildcard, NULL, delete, FALSE ); } HeapFree( GetProcessHeap(), 0, file ); HeapFree( GetProcessHeap(), 0, dest ); @@ -1042,6 +1049,7 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) SIZE_T size; const WCHAR *filename; void *buffer; + BOOL delete = !wcscmp( source, L"-" ); /* '-' source means delete the file */ if (!(filename = wcsrchr( name, '\\' ))) filename = name; else filename++; @@ -1052,20 +1060,14 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) create_directories( name ); return TRUE; } - if (filename[0] == '*' && !filename[1]) return create_wildcard_dlls( name ); + if (wcspbrk( filename, L"*?" )) return create_wildcard_dlls( name, filename, delete ); add_handled_dll( filename ); - if (!(h = create_dest_file( name ))) return TRUE; /* not a fake dll */ + if (!(h = create_dest_file( name, delete ))) return TRUE; /* not a fake dll */ if (h == INVALID_HANDLE_VALUE) return FALSE; - if (source[0] == '-' && !source[1]) - { - /* '-' source means delete the file */ - TRACE( "deleting %s\n", debugstr_w(name) ); - ret = FALSE; - } - else if ((buffer = load_fake_dll( source, &size ))) + if ((buffer = load_fake_dll( source, &size ))) { DWORD written; diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4cef944fb88..3abcc41ffa1 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2630,19 +2630,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,syswow64,stdole2.tlb 11,,iexplore.exe 11,,winetest.exe,- -12,,fltmgr.sys,- -12,,hidclass.sys,- -12,,http.sys,- -12,,ksecdd.sys,- -12,,mountmgr.sys,- -12,,ndis.sys,- -12,,netio.sys,- -12,,scsiport.sys,- -12,,tdi.sys,- -12,,usbd.sys,- -12,,winebus.sys,- -12,,winehid.sys,- -12,,wineusb.sys,- ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- @@ -2665,6 +2652,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll 16427,System\ADO,msado15.dll +12,,*.sys,- 11,,* [FakeDlls] @@ -2685,19 +2673,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,notepad.exe 11,,winetest.exe,- -12,,fltmgr.sys -12,,hidclass.sys -12,,http.sys -12,,ksecdd.sys -12,,mountmgr.sys -12,,ndis.sys -12,,netio.sys -12,,scsiport.sys -12,,tdi.sys -12,,usbd.sys -12,,winebus.sys -12,,winehid.sys -12,,wineusb.sys ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- @@ -2732,6 +2707,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll 16427,System\ADO,msado15.dll +12,,*.sys,- 11,,* [SystemIni]

1 0

Alexandre Julliard : setupapi: Create fakedlls before copying files.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: 1244b501455b4dac8f4ec9c65067e06f87729b72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1244b501455b4dac8f4ec9c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 18 11:40:13 2021 +0100 setupapi: Create fakedlls before copying files. Some files may come from dll resources. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 56a9d4f36c3..23f0fbdd4f1 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1085,6 +1085,13 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, if (!iterate_section_fields( hinf, section, L"WinePreInstall", registry_callback, &info )) return FALSE; } + if (flags & SPINST_REGSVR) + { + if (iterate_section_fields( hinf, section, L"WineFakeDlls", fake_dlls_callback, NULL )) + cleanup_fake_dlls(); + else + return FALSE; + } if (flags & SPINST_FILES) { struct files_callback_info info; @@ -1121,24 +1128,14 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, } if (flags & SPINST_REGSVR) { - struct register_dll_info info; + struct register_dll_info info = { .unregister = FALSE }; HRESULT hr; - info.unregister = FALSE; - info.modules_size = 0; - info.modules_count = 0; - info.modules = NULL; if (flags & SPINST_REGISTERCALLBACKAWARE) { info.callback = callback; info.callback_context = context; } - else info.callback = NULL; - - if (iterate_section_fields( hinf, section, L"WineFakeDlls", fake_dlls_callback, NULL )) - cleanup_fake_dlls(); - else - return FALSE; hr = CoInitialize(NULL); @@ -1153,19 +1150,14 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, } if (flags & SPINST_UNREGSVR) { - struct register_dll_info info; + struct register_dll_info info = { .unregister = TRUE }; HRESULT hr; - info.unregister = TRUE; - info.modules_size = 0; - info.modules_count = 0; - info.modules = NULL; if (flags & SPINST_REGISTERCALLBACKAWARE) { info.callback = callback; info.callback_context = context; } - else info.callback = NULL; hr = CoInitialize(NULL);

1 0

Alexandre Julliard : wine.inf: Specify the full module path for the source of copied files.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: 8cd5c1bc37cb617a6e88698e289516cee8d2449f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cd5c1bc37cb617a6e88698e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 18 11:41:13 2021 +0100 wine.inf: Specify the full module path for the source of copied files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3abcc41ffa1..2b7bc358829 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -4038,12 +4038,12 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGa HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001 [ColorFiles] -srgb color space profile.icm,"@mscms.dll,-1" +srgb color space profile.icm,"@%11%\mscms.dll,-1" [InfFiles] -winebus.inf,"@winebus.sys,-1" -winehid.inf,"@winehid.sys,-1" -wineusb.inf,"@wineusb.sys,-1" +winebus.inf,"@%12%\winebus.sys,-1" +winehid.inf,"@%12%\winehid.sys,-1" +wineusb.inf,"@%12%\wineusb.sys,-1" [NlsFiles] c_037.nls

1 0

Alexandre Julliard : wine.inf: Put wineps.drv in the printer driver directory.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: 47d8d5659f8970ddcf4a35ea18ac33f4944472a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47d8d5659f8970ddcf4a35ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 18 11:41:34 2021 +0100 wine.inf: Put wineps.drv in the printer driver directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 2 -- loader/wine.inf.in | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 56d73798538..b95180ee558 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2609,7 +2609,6 @@ static void test_GetPrinterDriver(void) hf = CreateFileA(di_2->pDriverPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(hf != INVALID_HANDLE_VALUE) CloseHandle(hf); - todo_wine ok(hf != INVALID_HANDLE_VALUE, "Could not open %s\n", di_2->pDriverPath); hf = CreateFileA(di_2->pDataFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -2620,7 +2619,6 @@ static void test_GetPrinterDriver(void) hf = CreateFileA(di_2->pConfigFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(hf != INVALID_HANDLE_VALUE) CloseHandle(hf); - todo_wine ok(hf != INVALID_HANDLE_VALUE, "Could not open %s\n", di_2->pConfigFile); /* XP allocates memory for both ANSI and unicode names */ diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 2b7bc358829..aaed4cf6824 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2609,6 +2609,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,dosx.exe 11,,dsound.vxd 11,,winhlp32.exe +52,win40\0,wineps16.drv,wineps16.drv16 ; 64bit-only fake dlls [FakeDllsWin64] @@ -2652,6 +2653,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll 16427,System\ADO,msado15.dll +66000,3,wineps.drv 12,,*.sys,- 11,,* @@ -2707,6 +2709,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll 16427,System\ADO,msado15.dll +66000,3,wineps.drv 12,,*.sys,- 11,,*

1 0

Alistair Leslie-Hughes : msado15: Improve return when field cannot be found.
by Alexandre Julliard 18 Mar '21

18 Mar '21

Module: wine Branch: master Commit: c93798bd56d03225474eda6bf2f3804b74b63ae8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c93798bd56d03225474eda6b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 18 16:29:41 2021 +1100 msado15: Improve return when field cannot be found. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 0b91358f83d..b690e243189 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -620,7 +620,7 @@ static HRESULT map_index( struct fields *fields, VARIANT *index, ULONG *ret ) } } - return E_INVALIDARG; + return MAKE_ADO_HRESULT(adErrItemNotFound); } static HRESULT WINAPI fields_get_Item( Fields *iface, VARIANT index, Field **obj )

1 0