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

Alexandre Julliard : d3drm: Build with msvcrt.
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: c70e8b64ab9169409b8e977b01de71b1404cd5ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=c70e8b64ab9169409b8e977b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 09:15:21 2019 +0200 d3drm: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/Makefile.in | 2 ++ dlls/d3drm/d3drm.c | 3 --- dlls/d3drm/d3drm_main.c | 3 --- dlls/d3drm/device.c | 3 --- dlls/d3drm/face.c | 3 --- dlls/d3drm/frame.c | 3 --- dlls/d3drm/light.c | 3 --- dlls/d3drm/material.c | 3 --- dlls/d3drm/math.c | 3 --- dlls/d3drm/meshbuilder.c | 3 --- dlls/d3drm/texture.c | 3 --- dlls/d3drm/viewport.c | 3 --- 12 files changed, 2 insertions(+), 33 deletions(-) diff --git a/dlls/d3drm/Makefile.in b/dlls/d3drm/Makefile.in index f75a14b..1c2cbf4 100644 --- a/dlls/d3drm/Makefile.in +++ b/dlls/d3drm/Makefile.in @@ -2,6 +2,8 @@ MODULE = d3drm.dll IMPORTLIB = d3drm IMPORTS = d3dxof ddraw +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ d3drm.c \ d3drm_main.c \ diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index d0f2023..e649bad 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c index 1abfe6f..075b331 100644 --- a/dlls/d3drm/d3drm_main.c +++ b/dlls/d3drm/d3drm_main.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "initguid.h" #include "d3drm_private.h" diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 2aa7e48..2e1b5f2 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); diff --git a/dlls/d3drm/face.c b/dlls/d3drm/face.c index 324b1de..1799ad9 100644 --- a/dlls/d3drm/face.c +++ b/dlls/d3drm/face.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 11105db..8bed50b 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index e31c026..2f53f20 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); diff --git a/dlls/d3drm/material.c b/dlls/d3drm/material.c index 62acb5a..e402ea6 100644 --- a/dlls/d3drm/material.c +++ b/dlls/d3drm/material.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index a6c0c85..01d596b 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" /* Create a RGB color from its components */ diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 0090555..9b85c2d 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 7741718..07f0896 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 5c0e24b..81d3af4 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "d3drm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm);

1 0

Alexandre Julliard : d3dx11: Build with msvcrt.
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: f277b969081eb45a0b3d3b3b8a5cca8f83da80ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=f277b969081eb45a0b3d3b3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 09:17:00 2019 +0200 d3dx11: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/Makefile.in | 2 ++ dlls/d3dx11_43/Makefile.in | 2 ++ dlls/d3dx11_43/async.c | 7 ++----- dlls/d3dx11_43/main.c | 2 -- dlls/d3dx11_43/texture.c | 2 -- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in index 4a8fd0b..41792c9 100644 --- a/dlls/d3dx11_42/Makefile.in +++ b/dlls/d3dx11_42/Makefile.in @@ -3,6 +3,8 @@ MODULE = d3dx11_42.dll IMPORTS = d3dcompiler PARENTSRC = ../d3dx11_43 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ async.c \ main.c \ diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in index c64d037..bf5a263 100644 --- a/dlls/d3dx11_43/Makefile.in +++ b/dlls/d3dx11_43/Makefile.in @@ -3,6 +3,8 @@ MODULE = d3dx11_43.dll IMPORTLIB = d3dx11 IMPORTS = d3dcompiler +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ async.c \ main.c \ diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index f640b6c..cde87ce 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -16,13 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3dx11.h" #include "d3dcompiler.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -317,13 +314,13 @@ HRESULT WINAPI D3DX11CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX11DataLo return E_OUTOFMEMORY; object->ID3DX11DataLoader_iface.lpVtbl = &filedataloadervtbl; - object->u.file.path = HeapAlloc(GetProcessHeap(), 0, (strlenW(filename) + 1) * sizeof(WCHAR)); + object->u.file.path = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(filename) + 1) * sizeof(WCHAR)); if (!object->u.file.path) { HeapFree(GetProcessHeap(), 0, object); return E_OUTOFMEMORY; } - strcpyW(object->u.file.path, filename); + lstrcpyW(object->u.file.path, filename); object->data = NULL; object->size = 0; diff --git a/dlls/d3dx11_43/main.c b/dlls/d3dx11_43/main.c index b1bf969..215a51b 100644 --- a/dlls/d3dx11_43/main.c +++ b/dlls/d3dx11_43/main.c @@ -17,8 +17,6 @@ * */ -#include "config.h" -#include "wine/port.h" #include <stdarg.h> #define COBJMACROS diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c index 6aaf8a7..bc30015 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3dx11.h" #include "d3dcompiler.h"

1 0

Jacek Caban : ieframe: Keep Busy property in sync with download state.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: d535df42f665a097ec721b10fb49d7b18f899be9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d535df42f665a097ec721b10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 29 20:06:27 2019 +0200 ieframe: Keep Busy property in sync with download state. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47069 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/dochost.c | 3 ++- dlls/ieframe/navigate.c | 5 ++-- dlls/ieframe/shellbrowser.c | 3 --- dlls/ieframe/tests/webbrowser.c | 56 ++++++++++++++++++++++++++++------------- 4 files changed, 43 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d535df42f665a097ec72…

1 0

Rémi Bernon : xinput: Fix rumble amount value rounding.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: d636cc18ba53ed7ca798c919dd56b0d5dabee9fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=d636cc18ba53ed7ca798c919… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 28 16:41:20 2019 +0200 xinput: Fix rumble amount value rounding. XINPUT_VIBRATION structure documentation says that wLeftMotorSpeed and wRightMotorSpeed can range from 0 to 65535. The values were incorrectly divided by 255 in HID_set_state, which made the value range overflow one byte. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 34e4e51..dc5601c 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -469,8 +469,8 @@ DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state) report.report = 0; report.pad1[0] = 0x8; report.pad1[1] = 0x0; - report.left = (BYTE)(state->wLeftMotorSpeed / 255); - report.right = (BYTE)(state->wRightMotorSpeed / 255); + report.left = (BYTE)(state->wLeftMotorSpeed / 256); + report.right = (BYTE)(state->wRightMotorSpeed / 256); memset(&report.pad2, 0, sizeof(report.pad2)); EnterCriticalSection(&private->crit);

1 0

Sven Baars : shell32: Fix a use after free (Coverity).
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: e6ce281d30e6a63fb5c84e0b9df72c35476e63f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6ce281d30e6a63fb5c84e0b… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue May 28 23:51:04 2019 +0200 shell32: Fix a use after free (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellitem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index fc95e7c..b9e4903 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -1289,9 +1289,11 @@ HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, if(SUCCEEDED(ret)) { ret = create_shellitemarray(array, cidl, ppsiItemArray); - heap_free(array); if(SUCCEEDED(ret)) + { + heap_free(array); return ret; + } } /* Something failed, clean up. */

1 0

Zebediah Figura : qcap/avimux: Use strmbase filter methods directly.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: ffe9fee151dda690de72de45413510e0e08755eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffe9fee151dda690de72de45… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 28 23:10:20 2019 -0500 qcap/avimux: Use strmbase filter methods directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 57 ++++-------------------------------------------------- 1 file changed, 4 insertions(+), 53 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 3ca55ca..bf10fe3 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -709,55 +709,6 @@ static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart) return S_OK; } -static HRESULT WINAPI AviMux_EnumPins(IBaseFilter *iface, IEnumPins **ppEnum) -{ - AviMux *This = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%p)\n", This, ppEnum); - return BaseFilterImpl_EnumPins(iface, ppEnum); -} - -static HRESULT WINAPI AviMux_FindPin(IBaseFilter *iface, LPCWSTR Id, IPin **ppPin) -{ - AviMux *This = impl_from_IBaseFilter(iface); - int i; - - TRACE("(%p)->(%s %p)\n", This, debugstr_w(Id), ppPin); - - if(!Id || !ppPin) - return E_POINTER; - - if(!lstrcmpiW(Id, This->out->pin.pin.pinInfo.achName)) { - IPin_AddRef(&This->out->pin.pin.IPin_iface); - *ppPin = &This->out->pin.pin.IPin_iface; - return S_OK; - } - - for(i=0; i<This->input_pin_no; i++) { - if(lstrcmpiW(Id, This->in[i]->pin.pin.pinInfo.achName)) - continue; - - IPin_AddRef(&This->in[i]->pin.pin.IPin_iface); - *ppPin = &This->in[i]->pin.pin.IPin_iface; - return S_OK; - } - - return VFW_E_NOT_FOUND; -} - -static HRESULT WINAPI AviMux_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *pInfo) -{ - AviMux *This = impl_from_IBaseFilter(iface); - FIXME("(%p)->(%p)\n", This, pInfo); - return E_NOTIMPL; -} - -static HRESULT WINAPI AviMux_QueryVendorInfo(IBaseFilter *iface, LPWSTR *pVendorInfo) -{ - AviMux *This = impl_from_IBaseFilter(iface); - FIXME("(%p)->(%p)\n", This, pVendorInfo); - return E_NOTIMPL; -} - static const IBaseFilterVtbl AviMuxVtbl = { AviMux_QueryInterface, BaseFilterImpl_AddRef, @@ -769,11 +720,11 @@ static const IBaseFilterVtbl AviMuxVtbl = { BaseFilterImpl_GetState, BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, - AviMux_EnumPins, - AviMux_FindPin, - AviMux_QueryFilterInfo, + BaseFilterImpl_EnumPins, + BaseFilterImpl_FindPin, + BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, - AviMux_QueryVendorInfo + BaseFilterImpl_QueryVendorInfo }; static inline AviMux* impl_from_IConfigAviMux(IConfigAviMux *iface)

1 0

Dmitry Timoshkov : ieframe: Prefer built-in version.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 097733fe0dc31e2fb9a9399fd0f65eb04b78b9a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=097733fe0dc31e2fb9a9399f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 29 19:11:08 2019 +0800 ieframe: Prefer built-in version. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ieframe_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index e207ce0..5abe502 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -187,8 +187,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: ieframe_instance = hInstDLL; register_iewindow_class();

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 7c99d05a966f5b8e481f3eb6574a6df2c718e507 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c99d05a966f5b8e481f3eb6… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Wed May 22 06:09:17 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 148 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 79 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7c99d05a966f5b8e481f…

1 0

Zebediah Figura : newdev: Implement UpdateDriverForPlugAndPlayDevices().
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 85ff60bb7d3d27673843afc0cec00b6dcb616623 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85ff60bb7d3d27673843afc0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 28 19:14:14 2019 -0500 newdev: Implement UpdateDriverForPlugAndPlayDevices(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/newdev/Makefile.in | 1 + dlls/newdev/main.c | 97 ++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 88 insertions(+), 10 deletions(-) diff --git a/dlls/newdev/Makefile.in b/dlls/newdev/Makefile.in index 728dea3..c447a38 100644 --- a/dlls/newdev/Makefile.in +++ b/dlls/newdev/Makefile.in @@ -1,4 +1,5 @@ MODULE = newdev.dll IMPORTLIB = newdev +IMPORTS = setupapi C_SRCS = main.c diff --git a/dlls/newdev/main.c b/dlls/newdev/main.c index b1a5ccf..108aec0 100644 --- a/dlls/newdev/main.c +++ b/dlls/newdev/main.c @@ -1,5 +1,5 @@ /* - * NewDev + * New Device installation API * * Copyright 2003 Ulrich Czekalla * @@ -25,12 +25,14 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" +#include "cfgmgr32.h" #include "newdev.h" -#include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/unicode.h" -WINE_DEFAULT_DEBUG_CHANNEL(newdev); +WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /*********************************************************************** * InstallNewDevice (NEWDEV.@) @@ -53,21 +55,96 @@ BOOL WINAPI InstallSelectedDriver(HWND parent, HDEVINFO info, const WCHAR *reser /*********************************************************************** * UpdateDriverForPlugAndPlayDevicesA (NEWDEV.@) */ -BOOL WINAPI UpdateDriverForPlugAndPlayDevicesA(HWND hwndParent, LPCSTR HardwareId, - LPCSTR FullInfPath, DWORD InstallFlags, PBOOL bRebootRequired OPTIONAL) +BOOL WINAPI UpdateDriverForPlugAndPlayDevicesA(HWND parent, const char *hardware_id, + const char *inf_path, DWORD flags, BOOL *reboot) { - FIXME("Stub! %s %s 0x%08x\n", HardwareId, FullInfPath, InstallFlags); - return TRUE; + WCHAR hardware_idW[MAX_DEVICE_ID_LEN]; + WCHAR inf_pathW[MAX_PATH]; + + MultiByteToWideChar(CP_ACP, 0, hardware_id, -1, hardware_idW, ARRAY_SIZE(hardware_idW)); + MultiByteToWideChar(CP_ACP, 0, inf_path, -1, inf_pathW, ARRAY_SIZE(inf_pathW)); + + return UpdateDriverForPlugAndPlayDevicesW(parent, hardware_idW, inf_pathW, flags, reboot); } +static BOOL hardware_id_matches(const WCHAR *id, const WCHAR *device_ids) +{ + while (*device_ids) + { + if (!strcmpW(id, device_ids)) + return TRUE; + device_ids += strlenW(device_ids) + 1; + } + return FALSE; +} /*********************************************************************** * UpdateDriverForPlugAndPlayDevicesW (NEWDEV.@) */ -BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND hwndParent, LPCWSTR HardwareId, - LPCWSTR FullInfPath, DWORD InstallFlags, PBOOL bRebootRequired OPTIONAL) +BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND parent, const WCHAR *hardware_id, + const WCHAR *inf_path, DWORD flags, BOOL *reboot) { - FIXME("Stub! %s %s 0x%08x\n", debugstr_w(HardwareId), debugstr_w(FullInfPath), InstallFlags); + SP_DEVINSTALL_PARAMS_W params = {sizeof(params)}; + SP_DEVINFO_DATA device = {sizeof(device)}; + WCHAR *device_ids = NULL; + DWORD size = 0, i, j; + HDEVINFO set; + + static const DWORD dif_list[] = + { + DIF_SELECTBESTCOMPATDRV, + DIF_ALLOW_INSTALL, + DIF_INSTALLDEVICEFILES, + DIF_REGISTER_COINSTALLERS, + DIF_INSTALLINTERFACES, + DIF_INSTALLDEVICE, + DIF_NEWDEVICEWIZARD_FINISHINSTALL, + }; + + TRACE("parent %p, hardware_id %s, inf_path %s, flags %#x, reboot %p.\n", + parent, debugstr_w(hardware_id), debugstr_w(inf_path), flags, reboot); + + if (flags) + FIXME("Unhandled flags %#x.\n", flags); + + if (reboot) *reboot = FALSE; + + if ((set = SetupDiGetClassDevsW(NULL, NULL, 0, DIGCF_ALLCLASSES)) == INVALID_HANDLE_VALUE) + return FALSE; + + for (i = 0; SetupDiEnumDeviceInfo(set, i, &device); ++i) + { + if (!SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_HARDWAREID, NULL, (BYTE *)device_ids, size, &size)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + continue; + device_ids = heap_realloc(device_ids, size); + SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_HARDWAREID, NULL, (BYTE *)device_ids, size, NULL); + } + + if (!hardware_id_matches(hardware_id, device_ids)) + continue; + + if (!SetupDiGetDeviceInstallParamsW(set, &device, &params)) + continue; + + strcpyW(params.DriverPath, inf_path); + params.Flags |= DI_ENUMSINGLEINF; + if (!SetupDiSetDeviceInstallParamsW(set, &device, &params)) + continue; + + if (!SetupDiBuildDriverInfoList(set, &device, SPDIT_COMPATDRIVER)) + continue; + + for (j = 0; j < ARRAY_SIZE(dif_list); ++j) + { + if (!SetupDiCallClassInstaller(dif_list[j], set, &device) && GetLastError() != ERROR_DI_DO_DEFAULT) + break; + } + } + + SetupDiDestroyDeviceInfoList(set); + heap_free(device_ids); return TRUE; }

1 0

Zebediah Figura : include: Add newdev.h.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 948f4ebd76ab5c9c8616ae686004f72f5ed3b017 URL: https://source.winehq.org/git/wine.git/?a=commit;h=948f4ebd76ab5c9c8616ae68… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 28 19:14:12 2019 -0500 include: Add newdev.h. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/newdev.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 81ad3f9..e9312b3 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -471,6 +471,7 @@ SOURCES = \ netfw.idl \ netioapi.h \ netlistmgr.idl \ + newdev.h \ nldef.h \ npapi.h \ nserror.h \ diff --git a/include/newdev.h b/include/newdev.h new file mode 100644 index 0000000..94b8a94 --- /dev/null +++ b/include/newdev.h @@ -0,0 +1,50 @@ +/* + * New Device installation API + * + * Copyright 2019 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _INC_NEWDEV +#define _INC_NEWDEV + +#include "setupapi.h" + +#define INSTALLFLAG_FORCE 0x1 +#define INSTALLFLAG_READONLY 0x2 +#define INSTALLFLAG_NONINTERACTIVE 0x4 +#define INSTALLFLAG_BITS 0x7 + +BOOL WINAPI UpdateDriverForPlugAndPlayDevicesA(HWND parent, const char *hardware_id, const char *inf_path, DWORD flags, BOOL *reboot); +BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND parent, const WCHAR *hardware_id, const WCHAR *inf_path, DWORD flags, BOOL *reboot); +#define UpdateDriverForPlugAndPlayDevices WINELIB_NAME_AW(UpdateDriverForPlugAndPlayDevices) + +#define DIIRFLAG_INF_ALREADY_COPIED 0x01 +#define DIIRFLAG_FORCE_INF 0x02 +#define DIIRFLAG_HW_USING_THE_INF 0x04 +#define DIIRFLAG_HOTPATCH 0x08 +#define DIIRFLAG_NOBACKUP 0x10 +#define DIIRFLAG_PRE_CONFIGURE_INF 0x20 +#define DIIRFLAG_INSTALL_AS_SET 0x40 +#define DIIRFLAG_BITS (DIIRFLAG_FORCE_INF | DIIRFLAG_HOTPATCH | DIIRFLAG_PRE_CONFIGURE_INF | DIIRFLAG_INSTALL_AS_SET) +#define DIIRFLAG_SYSTEM_BITS (DIIRFLAG_INF_ALREADY_COPIED | DIIRFLAG_FORCE_INF | DIIRFLAG_HW_USING_THE_INF \ + | DIIRFLAG_HOTPATCH | DIIRFLAG_NOBACKUP | DIIRFLAG_PRE_CONFIGURE_INF | DIIRFLAG_INSTALL_AS_SET) + +BOOL WINAPI DiInstallDriverA(HWND parent, const char *inf_path, DWORD flags, BOOL *reboot); +BOOL WINAPI DiInstallDriverW(HWND parent, const WCHAR *inf_path, DWORD flags, BOOL *reboot); +#define DiInstallDriver WINELIB_NAME_AW(DiInstallDriver) + +#endif

1 0