May 2019 - Wine-commits - list.winehq.org

Andrey Gusev : ext-ms-win-shell-comctl32-init-l1-1-0: Add dll.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: f1c60104a7bd23ade044332978f256dc643d4a89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1c60104a7bd23ade0443329… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat May 25 16:54:14 2019 +0300 ext-ms-win-shell-comctl32-init-l1-1-0: Add dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46090 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-shell-comctl32-init-l1-1-0/Makefile.in | 1 + .../ext-ms-win-shell-comctl32-init-l1-1-0.spec | 1 + tools/make_specfiles | 4 ++++ 5 files changed, 9 insertions(+) diff --git a/configure b/configure index 4e408bd..396ca9e 100755 --- a/configure +++ b/configure @@ -1315,6 +1315,7 @@ enable_ext_ms_win_rtcore_ntuser_syscolors_l1_1_0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 enable_ext_ms_win_security_credui_l1_1_0 enable_ext_ms_win_security_cryptui_l1_1_0 +enable_ext_ms_win_shell_comctl32_init_l1_1_0 enable_ext_ms_win_uxtheme_themes_l1_1_0 enable_faultrep enable_feclient @@ -20178,6 +20179,7 @@ wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0 enable_ex wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-security-credui-l1-1-0 enable_ext_ms_win_security_credui_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-security-cryptui-l1-1-0 enable_ext_ms_win_security_cryptui_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-shell-comctl32-init-l1-1-0 enable_ext_ms_win_shell_comctl32_init_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-uxtheme-themes-l1-1-0 enable_ext_ms_win_uxtheme_themes_l1_1_0 wine_fn_config_makefile dlls/faultrep enable_faultrep wine_fn_config_makefile dlls/faultrep/tests enable_tests diff --git a/configure.ac b/configure.ac index f548e3e..01b26f2 100644 --- a/configure.ac +++ b/configure.ac @@ -3251,6 +3251,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-comctl32-init-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/faultrep) WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) diff --git a/dlls/ext-ms-win-shell-comctl32-init-l1-1-0/Makefile.in b/dlls/ext-ms-win-shell-comctl32-init-l1-1-0/Makefile.in new file mode 100644 index 0000000..b880c28 --- /dev/null +++ b/dlls/ext-ms-win-shell-comctl32-init-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-shell-comctl32-init-l1-1-0.dll diff --git a/dlls/ext-ms-win-shell-comctl32-init-l1-1-0/ext-ms-win-shell-comctl32-init-l1-1-0.spec b/dlls/ext-ms-win-shell-comctl32-init-l1-1-0/ext-ms-win-shell-comctl32-init-l1-1-0.spec new file mode 100644 index 0000000..e14fc55 --- /dev/null +++ b/dlls/ext-ms-win-shell-comctl32-init-l1-1-0/ext-ms-win-shell-comctl32-init-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall InitCommonControlsEx(ptr) comctl32.InitCommonControlsEx diff --git a/tools/make_specfiles b/tools/make_specfiles index 4a8cc9a..1678e17 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -153,6 +153,10 @@ my @dll_groups = "ext-ms-win-authz-context-l1-1-0", ], [ + "comctl32", + "ext-ms-win-shell-comctl32-init-l1-1-0", + ], + [ "credui", "ext-ms-win-security-credui-l1-1-0", ],

1 0

Andrey Gusev : ext-ms-win-shell-comdlg32-l1-1-0: Add dll.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: f40c21c3c307c9bce1dafcdedf85918a3a471cc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f40c21c3c307c9bce1dafcde… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat May 25 16:55:27 2019 +0300 ext-ms-win-shell-comdlg32-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-shell-comdlg32-l1-1-0/Makefile.in | 1 + .../ext-ms-win-shell-comdlg32-l1-1-0.spec | 3 +++ tools/make_specfiles | 4 ++++ 5 files changed, 11 insertions(+) diff --git a/configure b/configure index 396ca9e..dea836b 100755 --- a/configure +++ b/configure @@ -1316,6 +1316,7 @@ enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 enable_ext_ms_win_security_credui_l1_1_0 enable_ext_ms_win_security_cryptui_l1_1_0 enable_ext_ms_win_shell_comctl32_init_l1_1_0 +enable_ext_ms_win_shell_comdlg32_l1_1_0 enable_ext_ms_win_uxtheme_themes_l1_1_0 enable_faultrep enable_feclient @@ -20180,6 +20181,7 @@ wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ex wine_fn_config_makefile dlls/ext-ms-win-security-credui-l1-1-0 enable_ext_ms_win_security_credui_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-security-cryptui-l1-1-0 enable_ext_ms_win_security_cryptui_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-shell-comctl32-init-l1-1-0 enable_ext_ms_win_shell_comctl32_init_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-shell-comdlg32-l1-1-0 enable_ext_ms_win_shell_comdlg32_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-uxtheme-themes-l1-1-0 enable_ext_ms_win_uxtheme_themes_l1_1_0 wine_fn_config_makefile dlls/faultrep enable_faultrep wine_fn_config_makefile dlls/faultrep/tests enable_tests diff --git a/configure.ac b/configure.ac index 01b26f2..941d64f 100644 --- a/configure.ac +++ b/configure.ac @@ -3252,6 +3252,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-comctl32-init-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-comdlg32-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/faultrep) WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) diff --git a/dlls/ext-ms-win-shell-comdlg32-l1-1-0/Makefile.in b/dlls/ext-ms-win-shell-comdlg32-l1-1-0/Makefile.in new file mode 100644 index 0000000..da2014d --- /dev/null +++ b/dlls/ext-ms-win-shell-comdlg32-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-shell-comdlg32-l1-1-0.dll diff --git a/dlls/ext-ms-win-shell-comdlg32-l1-1-0/ext-ms-win-shell-comdlg32-l1-1-0.spec b/dlls/ext-ms-win-shell-comdlg32-l1-1-0/ext-ms-win-shell-comdlg32-l1-1-0.spec new file mode 100644 index 0000000..1fd45c3 --- /dev/null +++ b/dlls/ext-ms-win-shell-comdlg32-l1-1-0/ext-ms-win-shell-comdlg32-l1-1-0.spec @@ -0,0 +1,3 @@ +@ stdcall CommDlgExtendedError() comdlg32.CommDlgExtendedError +@ stdcall GetOpenFileNameW(ptr) comdlg32.GetOpenFileNameW +@ stdcall GetSaveFileNameW(ptr) comdlg32.GetSaveFileNameW diff --git a/tools/make_specfiles b/tools/make_specfiles index 1678e17..9449c22 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -157,6 +157,10 @@ my @dll_groups = "ext-ms-win-shell-comctl32-init-l1-1-0", ], [ + "comdlg32", + "ext-ms-win-shell-comdlg32-l1-1-0", + ], + [ "credui", "ext-ms-win-security-credui-l1-1-0", ],

1 0

Andrey Gusev : ext-ms-win-shell-shell32-l1-2-0: Add dll.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 48505cad0564570edb6a6dd277431e250df52a2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=48505cad0564570edb6a6dd2… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat May 25 16:55:44 2019 +0300 ext-ms-win-shell-shell32-l1-2-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-shell-shell32-l1-2-0/Makefile.in | 1 + .../ext-ms-win-shell-shell32-l1-2-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index dea836b..90c8e1a 100755 --- a/configure +++ b/configure @@ -1317,6 +1317,7 @@ enable_ext_ms_win_security_credui_l1_1_0 enable_ext_ms_win_security_cryptui_l1_1_0 enable_ext_ms_win_shell_comctl32_init_l1_1_0 enable_ext_ms_win_shell_comdlg32_l1_1_0 +enable_ext_ms_win_shell_shell32_l1_2_0 enable_ext_ms_win_uxtheme_themes_l1_1_0 enable_faultrep enable_feclient @@ -20182,6 +20183,7 @@ wine_fn_config_makefile dlls/ext-ms-win-security-credui-l1-1-0 enable_ext_ms_win wine_fn_config_makefile dlls/ext-ms-win-security-cryptui-l1-1-0 enable_ext_ms_win_security_cryptui_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-shell-comctl32-init-l1-1-0 enable_ext_ms_win_shell_comctl32_init_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-shell-comdlg32-l1-1-0 enable_ext_ms_win_shell_comdlg32_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-shell-shell32-l1-2-0 enable_ext_ms_win_shell_shell32_l1_2_0 wine_fn_config_makefile dlls/ext-ms-win-uxtheme-themes-l1-1-0 enable_ext_ms_win_uxtheme_themes_l1_1_0 wine_fn_config_makefile dlls/faultrep enable_faultrep wine_fn_config_makefile dlls/faultrep/tests enable_tests diff --git a/configure.ac b/configure.ac index 941d64f..ef7af70 100644 --- a/configure.ac +++ b/configure.ac @@ -3253,6 +3253,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-comctl32-init-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-comdlg32-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-shell32-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/faultrep) WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) diff --git a/dlls/ext-ms-win-shell-shell32-l1-2-0/Makefile.in b/dlls/ext-ms-win-shell-shell32-l1-2-0/Makefile.in new file mode 100644 index 0000000..2d8bcf9 --- /dev/null +++ b/dlls/ext-ms-win-shell-shell32-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-shell-shell32-l1-2-0.dll diff --git a/dlls/ext-ms-win-shell-shell32-l1-2-0/ext-ms-win-shell-shell32-l1-2-0.spec b/dlls/ext-ms-win-shell-shell32-l1-2-0/ext-ms-win-shell-shell32-l1-2-0.spec new file mode 100644 index 0000000..8b8739a --- /dev/null +++ b/dlls/ext-ms-win-shell-shell32-l1-2-0/ext-ms-win-shell-shell32-l1-2-0.spec @@ -0,0 +1 @@ +@ stdcall ShellExecuteW(long wstr wstr wstr wstr long) shell32.ShellExecuteW diff --git a/tools/make_specfiles b/tools/make_specfiles index 9449c22..c2fa929 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -352,6 +352,7 @@ my @dll_groups = "api-ms-win-downlevel-shell32-l1-1-0", "api-ms-win-shell-shellcom-l1-1-0", "api-ms-win-shell-shellfolders-l1-1-0", + "ext-ms-win-shell-shell32-l1-2-0", ], [ "shlwapi",

1 0

Alexandre Julliard : acledit: Build with msvcrt.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: dec89ddd0934ad07f72a9acd38392e83c85edd52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dec89ddd0934ad07f72a9acd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 27 15:48:57 2019 +0200 acledit: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/acledit/Makefile.in | 2 ++ dlls/acledit/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/acledit/Makefile.in b/dlls/acledit/Makefile.in index f503874..941eb07 100644 --- a/dlls/acledit/Makefile.in +++ b/dlls/acledit/Makefile.in @@ -1,4 +1,6 @@ MODULE = acledit.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/acledit/main.c b/dlls/acledit/main.c index 49de8b5..50797c0 100644 --- a/dlls/acledit/main.c +++ b/dlls/acledit/main.c @@ -25,7 +25,6 @@ #include "winuser.h" #include "wfext.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(acledit);

1 0

Alexandre Julliard : aclui: Build with msvcrt.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 420e6cb244763e9067372e52e5101275da42603d URL: https://source.winehq.org/git/wine.git/?a=commit;h=420e6cb244763e9067372e52… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 27 15:49:19 2019 +0200 aclui: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/aclui/Makefile.in | 2 ++ dlls/aclui/aclui_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in index f5b401c..83bd379 100644 --- a/dlls/aclui/Makefile.in +++ b/dlls/aclui/Makefile.in @@ -1,4 +1,6 @@ MODULE = aclui.dll IMPORTLIB = aclui +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = aclui_main.c diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 808f1f0..033a471 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "initguid.h"

1 0

Louis Lenders : gdiplus: Add version resource.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 89c1f511512809b834c5635bf9d1bd6099af8125 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89c1f511512809b834c5635b… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu May 23 17:23:56 2019 +0200 gdiplus: Add version resource. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47137 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.rc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/gdiplus/gdiplus.rc b/dlls/gdiplus/gdiplus.rc index 5c7e2cf..6191c1a 100644 --- a/dlls/gdiplus/gdiplus.rc +++ b/dlls/gdiplus/gdiplus.rc @@ -18,6 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINE_FILEDESCRIPTION_STR "Wine gdiplus" +#define WINE_FILENAME_STR "gdiplus.dll" +#define WINE_FILEVERSION 6,1,7601,17514 +#define WINE_FILEVERSION_STR "6.1.7601.17514" +#define WINE_PRODUCTVERSION 6,1,7601,17514 +#define WINE_PRODUCTVERSION_STR "6.1.7601.17514" + +#include "wine/wine_common_ver.rc" + /* @makedep: gdiplus.manifest */ WINE_MANIFEST 24 gdiplus.manifest

1 0

Zebediah Figura : setupapi: Add a basic implementation of SetupDiInstallDevice().
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: dc9c4221bd08ddc398593bae5307c9761a750dca URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc9c4221bd08ddc398593bae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 24 23:33:52 2019 -0500 setupapi: Add a basic implementation of SetupDiInstallDevice(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 58 ++++++++++++++++++++++++++++++++++++++++++++- dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 864e6dd..f60fd53 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3684,8 +3684,9 @@ BOOL WINAPI SetupDiCallClassInstaller(DI_FUNCTION function, HDEVINFO devinfo, SP return SetupDiInstallDriverFiles(devinfo, device_data); case DIF_INSTALLINTERFACES: return SetupDiInstallDeviceInterfaces(devinfo, device_data); - case DIF_FINISHINSTALL_ACTION: case DIF_INSTALLDEVICE: + return SetupDiInstallDevice(devinfo, device_data); + case DIF_FINISHINSTALL_ACTION: case DIF_PROPERTYCHANGE: case DIF_SELECTDEVICE: case DIF_UNREMOVE: @@ -4677,3 +4678,58 @@ BOOL WINAPI SetupDiInstallDriverFiles(HDEVINFO devinfo, SP_DEVINFO_DATA *device_ SetupCloseInfFile(hinf); return TRUE; } + +/*********************************************************************** + * SetupDiInstallDevice (SETUPAPI.@) + */ +BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) +{ + WCHAR section[LINE_LEN], section_ext[LINE_LEN]; + UINT install_flags = SPINST_ALL; + struct device *device; + struct driver *driver; + void *callback_ctx; + HKEY driver_key; + INFCONTEXT ctx; + HINF hinf; + LONG l; + + TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (!(driver = device->selected_driver)) + { + ERR("No driver selected for device %p.\n", devinfo); + SetLastError(ERROR_NO_DRIVER_SELECTED); + return FALSE; + } + + if ((hinf = SetupOpenInfFileW(driver->inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + return FALSE; + + SetupFindFirstLineW(hinf, driver->mfg_key, driver->description, &ctx); + SetupGetStringFieldW(&ctx, 1, section, ARRAY_SIZE(section), NULL); + SetupDiGetActualSectionToInstallW(hinf, section, section_ext, ARRAY_SIZE(section_ext), NULL, NULL); + + if ((l = create_driver_key(device, &driver_key))) + { + SetLastError(l); + SetupCloseInfFile(hinf); + return FALSE; + } + + if (device->params.Flags & DI_NOFILECOPY) + install_flags &= ~SPINST_FILES; + + callback_ctx = SetupInitDefaultQueueCallback(NULL); + + SetupInstallFromInfSectionW(NULL, hinf, section_ext, install_flags, driver_key, NULL, + SP_COPY_NEWER_ONLY, SetupDefaultQueueCallbackW, callback_ctx, NULL, NULL); + + SetupTermDefaultQueueCallback(callback_ctx); + SetupCloseInfFile(hinf); + RegCloseKey(driver_key); + return TRUE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 97347f5..81256a3 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -366,7 +366,7 @@ @ stub SetupDiInstallClassExA @ stub SetupDiInstallClassExW @ stdcall SetupDiInstallClassW(long wstr long ptr) -@ stub SetupDiInstallDevice +@ stdcall SetupDiInstallDevice(ptr ptr) @ stdcall SetupDiInstallDeviceInterfaces(ptr ptr) @ stdcall SetupDiInstallDriverFiles(ptr ptr) @ stdcall SetupDiLoadClassIcon(ptr ptr ptr)

1 0

Zebediah Figura : setupapi: Copy the INF file to C:/windows/inf/ and record it in the driver key.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: d4c18c89d5437845a781c7e2a70301f05f0b82ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4c18c89d5437845a781c7e2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 24 23:33:53 2019 -0500 setupapi: Copy the INF file to C:/windows/inf/ and record it in the driver key. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index f60fd53..9d0cb99 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4684,7 +4684,10 @@ BOOL WINAPI SetupDiInstallDriverFiles(HDEVINFO devinfo, SP_DEVINFO_DATA *device_ */ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) { - WCHAR section[LINE_LEN], section_ext[LINE_LEN]; + static const WCHAR infpathW[] = {'I','n','f','P','a','t','h',0}; + static const WCHAR infsectionW[] = {'I','n','f','S','e','c','t','i','o','n',0}; + static const WCHAR infsectionextW[] = {'I','n','f','S','e','c','t','i','o','n','E','x','t',0}; + WCHAR section[LINE_LEN], section_ext[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; UINT install_flags = SPINST_ALL; struct device *device; struct driver *driver; @@ -4711,7 +4714,7 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) SetupFindFirstLineW(hinf, driver->mfg_key, driver->description, &ctx); SetupGetStringFieldW(&ctx, 1, section, ARRAY_SIZE(section), NULL); - SetupDiGetActualSectionToInstallW(hinf, section, section_ext, ARRAY_SIZE(section_ext), NULL, NULL); + SetupDiGetActualSectionToInstallW(hinf, section, section_ext, ARRAY_SIZE(section_ext), NULL, &extptr); if ((l = create_driver_key(device, &driver_key))) { @@ -4730,6 +4733,15 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) SetupTermDefaultQueueCallback(callback_ctx); SetupCloseInfFile(hinf); + + SetupCopyOEMInfW(driver->inf_path, NULL, SPOST_NONE, 0, inf_path, ARRAY_SIZE(inf_path), NULL, &filepart); + TRACE("Copied INF file %s to %s.\n", debugstr_w(driver->inf_path), debugstr_w(inf_path)); + + RegSetValueExW(driver_key, infpathW, 0, REG_SZ, (BYTE *)filepart, strlenW(filepart) * sizeof(WCHAR)); + RegSetValueExW(driver_key, infsectionW, 0, REG_SZ, (BYTE *)section, strlenW(section) * sizeof(WCHAR)); + if (extptr) + RegSetValueExW(driver_key, infsectionextW, 0, REG_SZ, (BYTE *)extptr, strlenW(extptr) * sizeof(WCHAR)); + RegCloseKey(driver_key); return TRUE; }

1 0

Zebediah Figura : setupapi: Process the .HW subsection in SetupDiInstallDevice().
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: cd6ee00cfd0f0fb5c47e36bdd00653d0b59ea2f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd6ee00cfd0f0fb5c47e36bd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 24 23:33:54 2019 -0500 setupapi: Process the .HW subsection in SetupDiInstallDevice(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9d0cb99..9bedb73 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4687,12 +4687,13 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) static const WCHAR infpathW[] = {'I','n','f','P','a','t','h',0}; static const WCHAR infsectionW[] = {'I','n','f','S','e','c','t','i','o','n',0}; static const WCHAR infsectionextW[] = {'I','n','f','S','e','c','t','i','o','n','E','x','t',0}; - WCHAR section[LINE_LEN], section_ext[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; + static const WCHAR dothwW[] = {'.','H','W',0}; + WCHAR section[LINE_LEN], section_ext[LINE_LEN], subsection[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; UINT install_flags = SPINST_ALL; + HKEY driver_key, device_key; struct device *device; struct driver *driver; void *callback_ctx; - HKEY driver_key; INFCONTEXT ctx; HINF hinf; LONG l; @@ -4723,6 +4724,15 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) return FALSE; } + if ((l = RegCreateKeyExW(device->key, DeviceParameters, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &device_key, NULL))) + { + SetLastError(l); + RegCloseKey(driver_key); + SetupCloseInfFile(hinf); + return FALSE; + } + if (device->params.Flags & DI_NOFILECOPY) install_flags &= ~SPINST_FILES; @@ -4731,6 +4741,12 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) SetupInstallFromInfSectionW(NULL, hinf, section_ext, install_flags, driver_key, NULL, SP_COPY_NEWER_ONLY, SetupDefaultQueueCallbackW, callback_ctx, NULL, NULL); + strcpyW(subsection, section_ext); + strcatW(subsection, dothwW); + + SetupInstallFromInfSectionW(NULL, hinf, subsection, install_flags, device_key, NULL, + SP_COPY_NEWER_ONLY, SetupDefaultQueueCallbackW, callback_ctx, NULL, NULL); + SetupTermDefaultQueueCallback(callback_ctx); SetupCloseInfFile(hinf); @@ -4742,6 +4758,7 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) if (extptr) RegSetValueExW(driver_key, infsectionextW, 0, REG_SZ, (BYTE *)extptr, strlenW(extptr) * sizeof(WCHAR)); + RegCloseKey(device_key); RegCloseKey(driver_key); return TRUE; }

1 0

Zebediah Figura : setupapi: Process the .Services subsection in SetupDiInstallDevice().
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: b2adecd5e429d0e651da123aa7e7bcbe204d0419 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2adecd5e429d0e651da123a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 24 23:33:55 2019 -0500 setupapi: Process the .Services subsection in SetupDiInstallDevice(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9bedb73..0279d10 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4688,6 +4688,8 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) static const WCHAR infsectionW[] = {'I','n','f','S','e','c','t','i','o','n',0}; static const WCHAR infsectionextW[] = {'I','n','f','S','e','c','t','i','o','n','E','x','t',0}; static const WCHAR dothwW[] = {'.','H','W',0}; + static const WCHAR dotservicesW[] = {'.','S','e','r','v','i','c','e','s',0}; + static const WCHAR addserviceW[] = {'A','d','d','S','e','r','v','i','c','e',0}; WCHAR section[LINE_LEN], section_ext[LINE_LEN], subsection[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; UINT install_flags = SPINST_ALL; HKEY driver_key, device_key; @@ -4747,6 +4749,26 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) SetupInstallFromInfSectionW(NULL, hinf, subsection, install_flags, device_key, NULL, SP_COPY_NEWER_ONLY, SetupDefaultQueueCallbackW, callback_ctx, NULL, NULL); + strcpyW(subsection, section_ext); + strcatW(subsection, dotservicesW); + SetupInstallServicesFromInfSectionW(hinf, subsection, 0); + + if (SetupFindFirstLineW(hinf, subsection, addserviceW, &ctx)) + { + do + { + INT flags; + + if (SetupGetIntField(&ctx, 2, &flags) && (flags & SPSVCINST_ASSOCSERVICE)) + { + WCHAR svc_name[LINE_LEN]; + if (SetupGetStringFieldW(&ctx, 1, svc_name, ARRAY_SIZE(svc_name), NULL) && svc_name[0]) + RegSetValueExW(device->key, Service, 0, REG_SZ, (BYTE *)svc_name, strlenW(svc_name) * sizeof(WCHAR)); + break; + } + } while (SetupFindNextMatchLineW(&ctx, addserviceW, &ctx)); + } + SetupTermDefaultQueueCallback(callback_ctx); SetupCloseInfFile(hinf);

1 0