April 2020 - Wine-commits - list.winehq.org

Zebediah Figura : wineboot: Install wineusb as a root-enumerated PnP service.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 561a84ec9190b1bac3d8d7fe085ed6dd8fdeca20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=561a84ec9190b1bac3d8d7fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 19:58:19 2020 -0500 wineboot: Install wineusb as a root-enumerated PnP service. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index e1dbe66302..54e48d0310 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1367,6 +1367,7 @@ static void install_root_pnp_devices(void) root_devices[] = { {"root\\wine\\winebus", "root\\winebus\0", "C:\\windows\\inf\\winebus.inf"}, + {"root\\wine\\wineusb", "root\\wineusb\0", "C:\\windows\\inf\\wineusb.inf"}, }; SP_DEVINFO_DATA device = {sizeof(device)}; unsigned int i;

1 0

Zebediah Figura : devenum: Ignore the "left" parameter to IMoniker::BindToObject().
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 6cfd0924aad872afe582a22584df908db54c57b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cfd0924aad872afe582a225… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 14:46:04 2020 -0500 devenum: Ignore the "left" parameter to IMoniker::BindToObject(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/mediacatenum.c | 88 ++++++++++++++++++++------------------------ dlls/devenum/tests/devenum.c | 18 ++++++++- 2 files changed, 56 insertions(+), 50 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 15e5c9642c..b03b17f945 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -377,73 +377,63 @@ static HRESULT WINAPI moniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *pcbSiz return S_OK; } -static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, - IMoniker *pmkToLeft, REFIID riidResult, void **ppvResult) +static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *bind_ctx, + IMoniker *left, REFIID iid, void **out) { - struct moniker *This = impl_from_IMoniker(iface); - IUnknown * pObj = NULL; - IPropertyBag * pProp = NULL; - CLSID clsID; + struct moniker *moniker = impl_from_IMoniker(iface); + IPersistPropertyBag *persist_bag; + IPropertyBag *prop_bag; + IUnknown *unk; + CLSID clsid; VARIANT var; - HRESULT res = E_FAIL; + HRESULT hr; - TRACE("(%p)->(%p, %p, %s, %p)\n", This, pbc, pmkToLeft, debugstr_guid(riidResult), ppvResult); + TRACE("moniker %p, bind_ctx %p, left %p, iid %s, out %p.\n", + moniker, bind_ctx, left, debugstr_guid(iid), out); - if (!ppvResult) + if (!out) return E_POINTER; VariantInit(&var); - *ppvResult = NULL; + *out = NULL; - if(pmkToLeft==NULL) + if (FAILED(hr = IMoniker_BindToStorage(iface, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag))) + return hr; + + V_VT(&var) = VT_BSTR; + if (FAILED(hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL))) { - /* first activation of this class */ - LPVOID pvptr; - res=IMoniker_BindToStorage(iface, NULL, NULL, &IID_IPropertyBag, &pvptr); - pProp = pvptr; - if (SUCCEEDED(res)) - { - V_VT(&var) = VT_BSTR; - res = IPropertyBag_Read(pProp, clsidW, &var, NULL); - } - if (SUCCEEDED(res)) - { - res = CLSIDFromString(V_BSTR(&var), &clsID); - VariantClear(&var); - } - if (SUCCEEDED(res)) - { - res=CoCreateInstance(&clsID,NULL,CLSCTX_ALL,&IID_IUnknown,&pvptr); - pObj = pvptr; - } + IPropertyBag_Release(prop_bag); + return hr; } - if (pObj!=NULL) + hr = CLSIDFromString(V_BSTR(&var), &clsid); + VariantClear(&var); + if (FAILED(hr)) { - /* get the requested interface from the loaded class */ - res = S_OK; - if (pProp) { - HRESULT res2; - LPVOID ppv = NULL; - res2 = IUnknown_QueryInterface(pObj, &IID_IPersistPropertyBag, &ppv); - if (SUCCEEDED(res2)) { - res = IPersistPropertyBag_Load((IPersistPropertyBag *) ppv, pProp, NULL); - IPersistPropertyBag_Release((IPersistPropertyBag *) ppv); - } - } - if (SUCCEEDED(res)) - res= IUnknown_QueryInterface(pObj,riidResult,ppvResult); - IUnknown_Release(pObj); + IPropertyBag_Release(prop_bag); + return hr; } - if (pProp) + if (FAILED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_ALL, &IID_IUnknown, (void **)&unk))) { - IPropertyBag_Release(pProp); + IPropertyBag_Release(prop_bag); + return hr; + } + + if (SUCCEEDED(IUnknown_QueryInterface(unk, &IID_IPersistPropertyBag, (void **)&persist_bag))) + { + hr = IPersistPropertyBag_Load(persist_bag, prop_bag, NULL); + IPersistPropertyBag_Release(persist_bag); } - TRACE("<- 0x%x\n", res); + if (SUCCEEDED(hr)) + hr = IUnknown_QueryInterface(unk, iid, out); - return res; + IUnknown_Release(unk); + IPropertyBag_Release(prop_bag); + + return hr; } static HRESULT WINAPI moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 01e6be98da..decc53ff81 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -46,8 +46,9 @@ static void test_devenum(void) GUID cat_guid, clsid; WCHAR *displayname; IBindCtx *bindctx; + HRESULT hr, hr2; + IUnknown *unk; VARIANT var; - HRESULT hr; int count; hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, @@ -114,6 +115,21 @@ static void test_devenum(void) hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got %#x\n", hr); + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); + /* Instantiating the WMT Screen Capture Filter crashes on Windows XP. */ + if (hr != S_OK || wcscmp(V_BSTR(&var), L"{31087270-D348-432C-899E-2D2F38FF29A0}")) + { + hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IUnknown, (void **)&unk); + if (hr == S_OK) + IUnknown_Release(unk); + hr2 = IMoniker_BindToObject(moniker, NULL, (IMoniker *)0xdeadbeef, + &IID_IUnknown, (void **)&unk); + if (hr2 == S_OK) + IUnknown_Release(unk); + ok(hr2 == hr, "Expected hr %#x, got %#x.\n", hr, hr2); + } + hr = CreateBindCtx(0, &bindctx); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag);

1 0

Zebediah Figura : devenum: Access the IPropertyBag interface directly in IMoniker::BindToObject().
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 7133ed2569a02c85ada685326c266ca9197aa618 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7133ed2569a02c85ada68532… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 14:46:05 2020 -0500 devenum: Access the IPropertyBag interface directly in IMoniker::BindToObject(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/mediacatenum.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index b03b17f945..d0c4a303b5 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -382,7 +382,6 @@ static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *bind_ctx, { struct moniker *moniker = impl_from_IMoniker(iface); IPersistPropertyBag *persist_bag; - IPropertyBag *prop_bag; IUnknown *unk; CLSID clsid; VARIANT var; @@ -397,33 +396,21 @@ static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *bind_ctx, VariantInit(&var); *out = NULL; - if (FAILED(hr = IMoniker_BindToStorage(iface, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag))) - return hr; - V_VT(&var) = VT_BSTR; - if (FAILED(hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL))) - { - IPropertyBag_Release(prop_bag); + if (FAILED(hr = IPropertyBag_Read(&moniker->IPropertyBag_iface, L"CLSID", &var, NULL))) return hr; - } hr = CLSIDFromString(V_BSTR(&var), &clsid); VariantClear(&var); if (FAILED(hr)) - { - IPropertyBag_Release(prop_bag); return hr; - } if (FAILED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_ALL, &IID_IUnknown, (void **)&unk))) - { - IPropertyBag_Release(prop_bag); return hr; - } if (SUCCEEDED(IUnknown_QueryInterface(unk, &IID_IPersistPropertyBag, (void **)&persist_bag))) { - hr = IPersistPropertyBag_Load(persist_bag, prop_bag, NULL); + hr = IPersistPropertyBag_Load(persist_bag, &moniker->IPropertyBag_iface, NULL); IPersistPropertyBag_Release(persist_bag); } @@ -431,7 +418,6 @@ static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *bind_ctx, hr = IUnknown_QueryInterface(unk, iid, out); IUnknown_Release(unk); - IPropertyBag_Release(prop_bag); return hr; }

1 0

Zebediah Figura : devenum: Implement IMoniker::BindToObject() for DMO devices.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 6bdb22108c07df27d697c99a2d0727da6bee640a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bdb22108c07df27d697c99a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 14:46:06 2020 -0500 devenum: Implement IMoniker::BindToObject() for DMO devices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/Makefile.in | 2 +- dlls/devenum/devenum_private.h | 17 ++--------- dlls/devenum/mediacatenum.c | 21 +++++++++++--- dlls/devenum/tests/devenum.c | 66 ++++++++++++++++++++++++++++++++++++------ 4 files changed, 78 insertions(+), 28 deletions(-) diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in index d563b9a83e..6ce1967a6d 100644 --- a/dlls/devenum/Makefile.in +++ b/dlls/devenum/Makefile.in @@ -1,5 +1,5 @@ MODULE = devenum.dll -IMPORTS = strmiids uuid ole32 oleaut32 avicap32 winmm user32 advapi32 dsound msdmo +IMPORTS = dmoguids strmiids uuid ole32 oleaut32 avicap32 winmm user32 advapi32 dsound msdmo DELAYIMPORTS = msvfw32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 43a5a0c50e..6bd3c7cac4 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -22,21 +22,10 @@ * - Private file where devenum globals are declared */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" - #define COBJMACROS - -#include "ole2.h" -#include "strmif.h" -#include "olectl.h" -#include "uuids.h" +#include "dshow.h" +#include "dmo.h" +#include "dmodshow.h" /********************************************************************** * Dll lifetime tracking declaration for devenum.dll diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index d0c4a303b5..c0006ad53e 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -23,9 +23,6 @@ */ #include "devenum_private.h" -#include "oleauto.h" -#include "ocidl.h" -#include "dmoreg.h" #include "wine/debug.h" @@ -393,9 +390,25 @@ static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *bind_ctx, if (!out) return E_POINTER; - VariantInit(&var); *out = NULL; + if (moniker->type == DEVICE_DMO) + { + IDMOWrapperFilter *wrapper; + + if (FAILED(hr = CoCreateInstance(&CLSID_DMOWrapperFilter, NULL, + CLSCTX_INPROC_SERVER, &IID_IDMOWrapperFilter, (void **)&wrapper))) + return hr; + + if (SUCCEEDED(hr = IDMOWrapperFilter_Init(wrapper, &moniker->clsid, &moniker->class))) + { + hr = IDMOWrapperFilter_QueryInterface(wrapper, iid, out); + } + IDMOWrapperFilter_Release(wrapper); + return hr; + } + + VariantInit(&var); V_VT(&var) = VT_BSTR; if (FAILED(hr = IPropertyBag_Read(&moniker->IPropertyBag_iface, L"CLSID", &var, NULL))) return hr; diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index decc53ff81..93692f75e6 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -20,20 +20,15 @@ #define COBJMACROS -#include <stdio.h> - -#include "wine/test.h" #include "initguid.h" -#include "ole2.h" -#include "strmif.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include "mmsystem.h" +#include "dshow.h" +#include "dmo.h" +#include "dmodshow.h" #include "dsound.h" #include "mmddk.h" #include "vfw.h" -#include "dmoreg.h" #include "setupapi.h" +#include "wine/test.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -603,10 +598,15 @@ static void test_dmo(void) { IParseDisplayName *parser; IPropertyBag *prop_bag; + IBaseFilter *filter; + IMediaObject *dmo; + IEnumDMO *enumdmo; WCHAR buffer[200]; IMoniker *mon; VARIANT var; + WCHAR *name; HRESULT hr; + GUID clsid; hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); @@ -657,6 +657,54 @@ static void test_dmo(void) } IPropertyBag_Release(prop_bag); IMoniker_Release(mon); + + hr = DMOEnum(&DMOCATEGORY_AUDIO_DECODER, 0, 0, NULL, 0, NULL, &enumdmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + while (IEnumDMO_Next(enumdmo, 1, &clsid, &name, NULL) == S_OK) + { + wcscpy(buffer, L"@device:dmo:"); + StringFromGUID2(&clsid, buffer + wcslen(buffer), CHARS_IN_GUID); + StringFromGUID2(&DMOCATEGORY_AUDIO_DECODER, buffer + wcslen(buffer), CHARS_IN_GUID); + mon = check_display_name(parser, buffer); + ok(find_moniker(&DMOCATEGORY_AUDIO_DECODER, mon), "DMO was not found.\n"); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); + ok(hr == S_OK, "got %#x\n", hr); + ok(!wcscmp(V_BSTR(&var), name), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(L"devenum test"); + hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); + ok(hr == E_ACCESSDENIED, "Write failed: %#x\n", hr); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); + ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "got %#x\n", hr); + + IPropertyBag_Release(prop_bag); + CoTaskMemFree(name); + + hr = IMoniker_BindToObject(mon, NULL, NULL, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IBaseFilter_GetClassID(filter, &clsid); + ok(hr == S_OK, "got %#x\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_DMOWrapperFilter), "Got CLSID %s.\n", debugstr_guid(&clsid)); + + hr = IBaseFilter_QueryInterface(filter, &IID_IMediaObject, (void **)&dmo); + ok(hr == S_OK, "got %#x\n", hr); + IMediaObject_Release(dmo); + + IBaseFilter_Release(filter); + } + IEnumDMO_Release(enumdmo); + IParseDisplayName_Release(parser); }

1 0

Francois Gouget : winex11: Set res_class to the program name for Crostini.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 6eb05dab7c83893684b5e17e9e3a765835d77fcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eb05dab7c83893684b5e17e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 17 00:47:16 2020 +0200 winex11: Set res_class to the program name for Crostini. GNOME implements the startup notification protocol correctly which means it checks StartupWMClass against both WM name (res_name) and WM class (res_class). Thus it does not need this patch. The situation is different for desktop environments that thunk to Wayland such as Crostini. Wayland does not have separate concepts that WM name and WM class can be mapped to. So Crostini decided to only use res_class resulting in it trying to match 'Wine' to the program name stored in StartupWMClass. While Crostini's choice is unfortunate for Wine, most other applications (e.g. all GTK applications) already store the same value in both WM name and class. So in the interest of compatiblity it makes sense for Wine to do the same. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4676b09935..52e345ceb6 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -822,10 +822,8 @@ static void set_initial_wm_hints( Display *display, Window window ) /* class hints */ if ((class_hints = XAllocClassHint())) { - static char wine[] = "Wine"; - class_hints->res_name = process_name; - class_hints->res_class = wine; + class_hints->res_class = process_name; XSetClassHint( display, window, class_hints ); XFree( class_hints ); }

1 0

Owen Rudge : winecfg: Add support for '/v' parameter allowing Windows version to be changed.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 90c0123533377e9a2a7f27762ac0d514e88b5b1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=90c0123533377e9a2a7f2776… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Apr 16 15:06:27 2020 +0100 winecfg: Add support for '/v' parameter allowing Windows version to be changed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41559 Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/appdefaults.c | 101 ++++++++++++++++++++++++++--------------- programs/winecfg/main.c | 35 ++++++++------ programs/winecfg/winecfg.h | 3 ++ 3 files changed, 87 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90c0123533377e9a2a7f…

1 0

Owen Rudge : winecfg: Add /? parameter to print help and valid versions.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 2f5a3fa16fa79889534686606935b8a723f77c8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f5a3fa16fa7988953468660… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Apr 16 15:06:47 2020 +0100 winecfg: Add /? parameter to print help and valid versions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41559 Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/appdefaults.c | 10 ++++++++++ programs/winecfg/main.c | 14 ++++++++++++++ programs/winecfg/winecfg.h | 1 + 3 files changed, 25 insertions(+) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 050b0e029d..1ac2985a11 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -484,6 +484,16 @@ BOOL set_winver_from_string(const char *version) return FALSE; } +void print_windows_versions(void) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(win_versions); i++) + { + printf(" %10s %s\n", win_versions[i].szVersion, win_versions[i].szDescription); + } +} + static void on_winver_change(HWND dialog) { int selection = SendDlgItemMessageW(dialog, IDC_WINVER, CB_GETCURSEL, 0, 0); diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index c5d4807e93..c6947bc042 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -202,6 +202,20 @@ ProcessCmdLine(LPSTR lpCmdLine) return set_winver_from_string(&lpCmdLine[3]); } + if (lpCmdLine[1] == '?') + { + printf("Usage: winecfg [options]\n\n"); + printf("Options:\n"); + printf(" [no option] Launch the graphical version of this program.\n"); + printf(" /D Autodetect drives.\n"); + printf(" /v version Set global Windows version to 'version'.\n"); + printf(" /? Display this information and exit.\n\n"); + printf("Valid versions for 'version':\n\n"); + print_windows_versions(); + + return 0; + } + return -1; } diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index a8d5d5b0ee..b1325c163c 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -91,6 +91,7 @@ INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara /* Windows version management */ BOOL set_winver_from_string(const char *version); +void print_windows_versions(void); /* Drive management */ BOOL load_drives(void);

1 0

Alexandre Julliard : winecfg: Use Windows paths to load the library list.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: cca5b4a150381fee0882ff85fb52697a34ab9f4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cca5b4a150381fee0882ff85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 17 12:38:12 2020 +0200 winecfg: Use Windows paths to load the library list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/libraries.c | 65 +++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 15c308c77e..ae66509c9d 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -26,7 +26,6 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <commdlg.h> -#include <wine/library.h> #include <wine/debug.h> #include <stdio.h> #include <dirent.h> @@ -254,33 +253,39 @@ static void clear_settings(HWND dialog) static void load_library_list_from_dir( HWND dialog, const char *dir_path, int check_subdirs ) { static const char * const ext[] = { ".dll", ".dll.so", ".so", "" }; - char *buffer = NULL, name[256]; + char *buffer, *p, name[256]; unsigned int i; - struct dirent *de; - DIR *dir = opendir( dir_path ); + HANDLE handle; + WIN32_FIND_DATAA data; - if (!dir) return; + buffer = HeapAlloc( GetProcessHeap(), 0, strlen(dir_path) + 2 * sizeof(name) + 10 ); - if (check_subdirs) - buffer = HeapAlloc( GetProcessHeap(), 0, strlen(dir_path) + 2 * sizeof(name) + 10 ); + strcpy( buffer, dir_path ); + strcat( buffer, "\\*" ); + buffer[1] = '\\'; /* change \??\ to \\?\ */ + p = buffer + strlen(buffer) - 1; - while ((de = readdir( dir ))) + if ((handle = FindFirstFileA( buffer, &data )) == INVALID_HANDLE_VALUE) { - size_t len = strlen(de->d_name); + HeapFree( GetProcessHeap(), 0, buffer ); + return; + } + + do + { + size_t len = strlen(data.cFileName); if (len > sizeof(name)) continue; if (check_subdirs) { - struct stat st; - - if (!strcmp( de->d_name, "." )) continue; - if (!strcmp( de->d_name, ".." )) continue; - if (!show_dll_in_list( de->d_name )) continue; + if (!strcmp( data.cFileName, "." )) continue; + if (!strcmp( data.cFileName, ".." )) continue; + if (!show_dll_in_list( data.cFileName )) continue; for (i = 0; i < ARRAY_SIZE( ext ); i++) { - sprintf( buffer, "%s/%s/%s%s", dir_path, de->d_name, de->d_name, ext[i] ); - if (!stat( buffer, &st )) + sprintf( p, "%s\\%s%s", data.cFileName, data.cFileName, ext[i] ); + if (GetFileAttributesA( buffer ) != INVALID_FILE_ATTRIBUTES) { - SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)de->d_name ); + SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)data.cFileName ); break; } } @@ -290,18 +295,19 @@ static void load_library_list_from_dir( HWND dialog, const char *dir_path, int c for (i = 0; i < ARRAY_SIZE( ext ); i++) { if (!ext[i][0]) continue; - if (len > strlen(ext[i]) && !strcmp( de->d_name + len - strlen(ext[i]), ext[i])) + if (len > strlen(ext[i]) && !strcmp( data.cFileName + len - strlen(ext[i]), ext[i])) { len -= strlen( ext[i] ); - memcpy( name, de->d_name, len ); + memcpy( name, data.cFileName, len ); name[len] = 0; if (!show_dll_in_list( name )) continue; SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)name ); } } } - } - closedir( dir ); + } while (FindNextFileA( handle, &data )); + + FindClose( handle ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -309,21 +315,24 @@ static void load_library_list_from_dir( HWND dialog, const char *dir_path, int c static void load_library_list( HWND dialog ) { unsigned int i = 0; - const char *path, *build_dir = wine_get_build_dir(); - char item1[256], item2[256]; + char item1[256], item2[256], var[32], path[MAX_PATH]; HCURSOR old_cursor = SetCursor( LoadCursorW(0, (LPWSTR)IDC_WAIT) ); - if (build_dir) + if (GetEnvironmentVariableA( "WINEBUILDDIR", path, MAX_PATH )) { - char *dir = HeapAlloc( GetProcessHeap(), 0, strlen(build_dir) + sizeof("/dlls") ); - strcpy( dir, build_dir ); - strcat( dir, "/dlls" ); + char *dir = HeapAlloc( GetProcessHeap(), 0, strlen(path) + sizeof("\\dlls") ); + strcpy( dir, path ); + strcat( dir, "\\dlls" ); load_library_list_from_dir( dialog, dir, TRUE ); HeapFree( GetProcessHeap(), 0, dir ); } - while ((path = wine_dll_enum_load_path( i++ ))) + for (;;) + { + sprintf( var, "WINEDLLDIR%u", i++ ); + if (!GetEnvironmentVariableA( var, path, MAX_PATH )) break; load_library_list_from_dir( dialog, path, FALSE ); + } /* get rid of duplicate entries */

1 0

Zebediah Figura : d3dcompiler: Make printed IR a bit more readable.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 2573e698ffd95db98cfcf3220739be63c505c391 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2573e698ffd95db98cfcf322… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 14 19:39:54 2020 -0500 d3dcompiler: Make printed IR a bit more readable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 0c8b918d13..d24341329d 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1904,7 +1904,10 @@ static void debug_dump_instr_list(const struct list *list) static void debug_dump_src(const struct hlsl_ir_node *node) { - wine_dbg_printf("%p", node); + if (node->index) + wine_dbg_printf("@%u", node->index); + else + wine_dbg_printf("%p", node); } static void debug_dump_ir_var(const struct hlsl_ir_var *var) @@ -2178,7 +2181,10 @@ static void debug_dump_ir_loop(const struct hlsl_ir_loop *loop) static void debug_dump_instr(const struct hlsl_ir_node *instr) { - wine_dbg_printf("%4u: %p: ", instr->index, instr); + if (instr->index) + wine_dbg_printf("%4u: ", instr->index); + else + wine_dbg_printf("%p: ", instr); switch (instr->type) { case HLSL_IR_EXPR:

1 0

Zebediah Figura : d3dcompiler: Avoid using the lookahead token for location.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 53e6b328f68901ed2fc141bbd7146d055796442e URL: https://source.winehq.org/git/wine.git/?a=commit;h=53e6b328f68901ed2fc141bb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 14 19:39:56 2020 -0500 d3dcompiler: Avoid using the lookahead token for location. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index d3ef18bb6e..ccabd6d29f 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -2035,7 +2035,7 @@ primary_expr: C_FLOAT YYABORT; } c->node.type = HLSL_IR_CONSTANT; - c->node.loc = get_location(&yylloc); + c->node.loc = get_location(&@1); c->node.data_type = new_hlsl_type(d3dcompiler_strdup("float"), HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1); c->v.value.f[0] = $1; if (!($$ = make_list(&c->node))) @@ -2050,7 +2050,7 @@ primary_expr: C_FLOAT YYABORT; } c->node.type = HLSL_IR_CONSTANT; - c->node.loc = get_location(&yylloc); + c->node.loc = get_location(&@1); c->node.data_type = new_hlsl_type(d3dcompiler_strdup("int"), HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1); c->v.value.i[0] = $1; if (!($$ = make_list(&c->node))) @@ -2065,7 +2065,7 @@ primary_expr: C_FLOAT YYABORT; } c->node.type = HLSL_IR_CONSTANT; - c->node.loc = get_location(&yylloc); + c->node.loc = get_location(&@1); c->node.data_type = new_hlsl_type(d3dcompiler_strdup("bool"), HLSL_CLASS_SCALAR, HLSL_TYPE_BOOL, 1, 1); c->v.value.b[0] = $1; if (!($$ = make_list(&c->node)))

1 0