September 2021 - Wine-Commits

Alistair Leslie-Hughes : include: Add icodecapi.idl.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 9de0a20e30d3c724b4ec5946b8fa53b42530c787 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9de0a20e30d3c724b4ec5946… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Sep 12 16:19:58 2021 +1000 include: Add icodecapi.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/icodecapi.idl | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 43a4fd98a42..eac1c2e0570 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -338,6 +338,7 @@ SOURCES = \ icftypes.idl \ icm.h \ icmpapi.h \ + icodecapi.idl \ idispids.h \ ieautomation.idl \ iextag.idl \ diff --git a/include/icodecapi.idl b/include/icodecapi.idl new file mode 100644 index 00000000000..7954b3fc2f6 --- /dev/null +++ b/include/icodecapi.idl @@ -0,0 +1,64 @@ +/* + * Copyright 2021 Alistair Leslie-Hughes + * + * 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 + * + */ + +import "unknwn.idl"; +import "oaidl.idl"; + +interface IStream; + +struct CodecAPIEventData +{ + GUID guid; + DWORD dataLength; + DWORD reserved[3]; +}; + +[ + uuid(901db4c7-31ce-41a2-85dc-8fa0bf41b8da), + local, + object, + pointer_default(unique) +] +interface ICodecAPI : IUnknown +{ + HRESULT IsSupported ([in] const GUID *api); + HRESULT IsModifiable ([in] const GUID *api); + + HRESULT GetParameterRange ([in] const GUID *api, [out] VARIANT *min, [out] VARIANT *max, [out] VARIANT *delta); + HRESULT GetParameterValues ([in] const GUID *api, [out, size_is(,*count)] VARIANT **values, [out] ULONG *count); + HRESULT GetParameterValues ([in] const GUID *api, [out, size_is(,*count)] VARIANT **values, [out] ULONG *count); + HRESULT GetDefaultValue ([in] const GUID *api, [out] VARIANT *value); + + HRESULT GetValue ([in] const GUID *api, [out] VARIANT *value); + HRESULT SetValue ([in] const GUID *api, [in] VARIANT *value); + + HRESULT RegisterForEvent ([in] const GUID *api, [in] LONG_PTR userData); + HRESULT UnregisterForEvent ([in] const GUID *api); + + HRESULT SetAllDefaults(void); + + HRESULT SetValueWithNotify ([in] const GUID *api, [in] VARIANT *value, [out, size_is(,*count)] GUID **param, [out] ULONG *count); + + HRESULT SetAllDefaultsWithNotify([out, size_is(,*count)] GUID **param, [out] ULONG *count); + + HRESULT GetAllSettings([in] IStream *stream); + HRESULT SetAllSettings([in] IStream *stream); + + HRESULT SetAllSettingsWithNotify([in] IStream* stream, [out, size_is(,*count)] GUID **param, [out] ULONG *count); +}

1 0

Rémi Bernon : winebus.sys: Query serialnumber string on device creation.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: ff0d402efa65dd11ecd2bfc43a5171b1a0e000b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff0d402efa65dd11ecd2bfc4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 13 13:01:48 2021 +0200 winebus.sys: Query serialnumber string on device creation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 9 +++----- dlls/winebus.sys/bus_sdl.c | 9 ++------ dlls/winebus.sys/bus_udev.c | 50 ++++++++------------------------------------ dlls/winebus.sys/main.c | 11 ++++++++-- dlls/winebus.sys/unixlib.c | 4 ++-- dlls/winebus.sys/unixlib.h | 6 +++--- 6 files changed, 28 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff0d402efa65dd11ecd2…

1 0

Nikolay Sivov : d3dx10_37/tests: Enable tests.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 0727bba57fd6166a8f53d8ba1b317e96ae6b860a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0727bba57fd6166a8f53d8ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 9 09:07:17 2021 +0300 d3dx10_37/tests: Enable tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/d3dx10_37/Makefile.in | 1 + dlls/d3dx10_37/tests/Makefile.in | 6 ++++++ 4 files changed, 9 insertions(+) diff --git a/configure b/configure index 5fe632fdc09..1adbf1789f3 100755 --- a/configure +++ b/configure @@ -20375,6 +20375,7 @@ wine_fn_config_makefile dlls/d3dx10_34 enable_d3dx10_34 wine_fn_config_makefile dlls/d3dx10_35 enable_d3dx10_35 wine_fn_config_makefile dlls/d3dx10_36 enable_d3dx10_36 wine_fn_config_makefile dlls/d3dx10_37 enable_d3dx10_37 +wine_fn_config_makefile dlls/d3dx10_37/tests enable_tests wine_fn_config_makefile dlls/d3dx10_38 enable_d3dx10_38 wine_fn_config_makefile dlls/d3dx10_38/tests enable_tests wine_fn_config_makefile dlls/d3dx10_39 enable_d3dx10_39 diff --git a/configure.ac b/configure.ac index 15b7c2add2a..eb970972936 100644 --- a/configure.ac +++ b/configure.ac @@ -3074,6 +3074,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_34) WINE_CONFIG_MAKEFILE(dlls/d3dx10_35) WINE_CONFIG_MAKEFILE(dlls/d3dx10_36) WINE_CONFIG_MAKEFILE(dlls/d3dx10_37) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_37/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_38) WINE_CONFIG_MAKEFILE(dlls/d3dx10_38/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) diff --git a/dlls/d3dx10_37/Makefile.in b/dlls/d3dx10_37/Makefile.in index f4ea9ee460c..3d429b53ab0 100644 --- a/dlls/d3dx10_37/Makefile.in +++ b/dlls/d3dx10_37/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_37.dll +IMPORTLIB = d3dx10_37 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_37/tests/Makefile.in b/dlls/d3dx10_37/tests/Makefile.in new file mode 100644 index 00000000000..271d0722f48 --- /dev/null +++ b/dlls/d3dx10_37/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_37.dll +IMPORTS = d3dx10_37 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c

1 0

Nikolay Sivov : ole32/filemoniker: Remove helper used once.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 7c518c3bd149c480ccf6e8935178e48d6ec042e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c518c3bd149c480ccf6e893… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 13 10:01:25 2021 +0300 ole32/filemoniker: Remove helper used once. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/filemoniker.c | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index d7c2a5a5ea7..d3940a9365f 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -59,7 +59,6 @@ static inline FileMonikerImpl *impl_from_IROTData(IROTData *iface) /* Local function used by filemoniker implementation */ static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* iface, LPCOLESTR lpszPathName); -static HRESULT FileMonikerImpl_Destroy(FileMonikerImpl* iface); /******************************************************************************* * FileMoniker_QueryInterface @@ -116,21 +115,19 @@ FileMonikerImpl_AddRef(IMoniker* iface) return InterlockedIncrement(&This->ref); } -/****************************************************************************** - * FileMoniker_Release - */ -static ULONG WINAPI -FileMonikerImpl_Release(IMoniker* iface) +static ULONG WINAPI FileMonikerImpl_Release(IMoniker* iface) { - FileMonikerImpl *This = impl_from_IMoniker(iface); - ULONG ref; - - TRACE("(%p)\n",iface); + FileMonikerImpl *moniker = impl_from_IMoniker(iface); + ULONG ref = InterlockedDecrement(&moniker->ref); - ref = InterlockedDecrement(&This->ref); + TRACE("(%p, refcount %d)\n", iface, ref); - /* destroy the object if there are no more references to it */ - if (ref == 0) FileMonikerImpl_Destroy(This); + if (!ref) + { + if (moniker->pMarshal) IUnknown_Release(moniker->pMarshal); + HeapFree(GetProcessHeap(), 0, moniker->filePathName); + HeapFree(GetProcessHeap(), 0, moniker); + } return ref; } @@ -452,20 +449,6 @@ FileMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize) return S_OK; } -/****************************************************************************** - * FileMoniker_Destroy (local function) - *******************************************************************************/ -HRESULT FileMonikerImpl_Destroy(FileMonikerImpl* This) -{ - TRACE("(%p)\n",This); - - if (This->pMarshal) IUnknown_Release(This->pMarshal); - HeapFree(GetProcessHeap(),0,This->filePathName); - HeapFree(GetProcessHeap(),0,This); - - return S_OK; -} - /****************************************************************************** * FileMoniker_BindToObject */

1 0

Nikolay Sivov : d3dx10: Handle null filename for W->A conversion explicitly in D3DX10CreateEffectFromResourceW().
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 613044fab7656288ab50c1ef2d71e6c3ecc9ea60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=613044fab7656288ab50c1ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 9 11:22:41 2021 +0300 d3dx10: Handle null filename for W->A conversion explicitly in D3DX10CreateEffectFromResourceW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/compiler.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx10_43/compiler.c b/dlls/d3dx10_43/compiler.c index 2a306fa8f57..0083ab267f1 100644 --- a/dlls/d3dx10_43/compiler.c +++ b/dlls/d3dx10_43/compiler.c @@ -176,7 +176,7 @@ HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE module, const WCHAR *reso ID3D10EffectPool *effect_pool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors, HRESULT *hresult) { - char *filename; + char *filename = NULL; HRSRC resinfo; void *data; DWORD size; @@ -195,10 +195,13 @@ HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE module, const WCHAR *reso if (FAILED(hr = get_resource_data(module, resinfo, &data, &size))) return hr; - len = WideCharToMultiByte(CP_ACP, 0, filenameW, -1, NULL, 0, NULL, NULL); - if (!(filename = heap_alloc(len))) - return E_OUTOFMEMORY; - WideCharToMultiByte(CP_ACP, 0, filenameW, -1, filename, len, NULL, NULL); + if (filenameW) + { + len = WideCharToMultiByte(CP_ACP, 0, filenameW, -1, NULL, 0, NULL, NULL); + if (!(filename = heap_alloc(len))) + return E_OUTOFMEMORY; + WideCharToMultiByte(CP_ACP, 0, filenameW, -1, filename, len, NULL, NULL); + } hr = D3DX10CreateEffectFromMemory(data, size, filename, defines, include, profile, shader_flags, effect_flags, device, effect_pool, pump, effect, errors, hresult);

1 0

Jacek Caban : gdi32: Remove no longer used printer config driver entry points.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 01fdc50fa2ceb4c7fb3ea64ad412f2299c947e83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01fdc50fa2ceb4c7fb3ea64a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 13 13:51:22 2021 +0200 gdi32: Remove no longer used printer config driver entry points. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 4 -- dlls/gdi32/driver.c | 14 ----- dlls/gdi32/emfdrv.c | 2 - dlls/gdi32/font.c | 2 - dlls/gdi32/path.c | 2 - dlls/wineandroid.drv/init.c | 2 - dlls/winemac.drv/gdi.c | 2 - dlls/wineps.drv/driver.c | 147 -------------------------------------------- dlls/wineps.drv/init.c | 2 - dlls/wineps.drv/psdrv.h | 5 -- dlls/winex11.drv/init.c | 2 - dlls/winex11.drv/xrender.c | 2 - include/wine/gdi_driver.h | 4 +- 13 files changed, 1 insertion(+), 189 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01fdc50fa2ceb4c7fb3e…

1 0

Jacek Caban : wineps: Introduce DrvDocumentProperties entry point.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 0da3ffc4b941ec35e08b93ceb2981c1d42723a4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0da3ffc4b941ec35e08b93ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 13 13:49:44 2021 +0200 wineps: Introduce DrvDocumentProperties entry point. This is not compatible with native. We should use DrvDevicePropertySheets instead, but that requires support for CPSUI support first. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/driver.c | 116 +++++++++++++++++++++------------------- dlls/wineps.drv/wineps.drv.spec | 1 + 2 files changed, 62 insertions(+), 55 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index c4dcd405c26..18ede3d028d 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -435,19 +435,6 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPage) (LPCPROPSHEETPAGEW); static int (WINAPI *pPropertySheet) (LPCPROPSHEETHEADERW); -static PRINTERINFO *PSDRV_FindPrinterInfoA(LPCSTR name) -{ - int len = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); - WCHAR *nameW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - PRINTERINFO *pi; - - MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, len ); - pi = PSDRV_FindPrinterInfo( nameW ); - HeapFree( GetProcessHeap(), 0, nameW ); - - return pi; -} - /*********************************************************** * DEVMODEdupWtoA * @@ -489,27 +476,12 @@ static DEVMODEA *DEVMODEdupWtoA( const DEVMODEW *dmW ) return dmA; } - /****************************************************************** - * PSDRV_ExtDeviceMode +/****************************************************************************** + * DrvDocumentProperties (wineps.drv.@) * * Retrieves or modifies device-initialization information for the PostScript * driver, or displays a driver-supplied dialog box for configuring the driver. * - * PARAMETERS - * lpszDriver -- Driver name - * hwnd -- Parent window for the dialog box - * lpdmOutput -- Address of a DEVMODE structure for writing initialization information - * lpszDevice -- Device name - * lpszPort -- Port name - * lpdmInput -- Address of a DEVMODE structure for reading initialization information - * lpProfile -- Name of initialization file, defaults to WIN.INI if NULL - * wMode -- Operation to perform. Can be a combination if > 0. - * (0) -- Returns number of bytes required by DEVMODE structure - * DM_UPDATE (1) -- Write current settings to environment and initialization file - * DM_COPY (2) -- Write current settings to lpdmOutput - * DM_PROMPT (4) -- Presents the driver's modal dialog box (USER.240) - * DM_MODIFY (8) -- Changes current settings according to lpdmInput before any other operation - * * RETURNS * Returns size of DEVMODE structure if wMode is 0. Otherwise, IDOK is returned for success * for both dialog and non-dialog operations. IDCANCEL is returned if the dialog box was cancelled. @@ -519,31 +491,29 @@ static DEVMODEA *DEVMODEdupWtoA( const DEVMODEW *dmW ) * * Just returns default devmode at the moment. No use of initialization file. */ -INT CDECL PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, - LPSTR lpszDevice, LPSTR lpszPort, LPDEVMODEA lpdmInput, - LPSTR lpszProfile, DWORD dwMode) +INT WINAPI DrvDocumentProperties(HWND hwnd, const WCHAR *device, DEVMODEW *output, + DEVMODEW *input, DWORD mode) { - PRINTERINFO *pi = PSDRV_FindPrinterInfoA(lpszDevice); - if(!pi) return -1; + PRINTERINFO *pi; + + TRACE("(hwnd=%p, Device='%s', devOut=%p, devIn=%p, Mode=%04x)\n", + hwnd, debugstr_w(device), output, input, mode); - TRACE("(Driver=%s, hwnd=%p, devOut=%p, Device='%s', Port='%s', devIn=%p, Profile='%s', Mode=%04x)\n", - lpszDriver, hwnd, lpdmOutput, lpszDevice, lpszPort, lpdmInput, debugstr_a(lpszProfile), dwMode); + if (!(pi = PSDRV_FindPrinterInfo(device))) return -1; - /* If dwMode == 0, return size of DEVMODE structure */ - if(!dwMode) - return pi->Devmode->dmPublic.dmSize + pi->Devmode->dmPublic.dmDriverExtra - CCHDEVICENAME - CCHFORMNAME; + /* If mode == 0, return size of DEVMODE structure */ + if (!mode) + return pi->Devmode->dmPublic.dmSize + pi->Devmode->dmPublic.dmDriverExtra; /* If DM_MODIFY is set, change settings in accordance with lpdmInput */ - if((dwMode & DM_MODIFY) && lpdmInput) + if ((mode & DM_MODIFY) && input) { - DEVMODEW *dmW = GdiConvertToDevmodeW( lpdmInput ); - TRACE("DM_MODIFY set. devIn->dmFields = %08x\n", lpdmInput->dmFields); - if (dmW) PSDRV_MergeDevmodes(pi->Devmode, (PSDRV_DEVMODE *)dmW, pi); - HeapFree( GetProcessHeap(), 0, dmW ); + TRACE("DM_MODIFY set. devIn->dmFields = %08x\n", input->dmFields); + PSDRV_MergeDevmodes(pi->Devmode, (PSDRV_DEVMODE *)input, pi); } /* If DM_PROMPT is set, present modal dialog box */ - if(dwMode & DM_PROMPT) { + if (mode & DM_PROMPT) { HINSTANCE hinstComctl32; HPROPSHEETPAGE hpsp[1]; PROPSHEETPAGEW psp; @@ -581,22 +551,58 @@ INT CDECL PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput } /* If DM_UPDATE is set, should write settings to environment and initialization file */ - if(dwMode & DM_UPDATE) + if (mode & DM_UPDATE) FIXME("Mode DM_UPDATE. Just do the same as DM_COPY\n"); /* If DM_COPY is set, should write settings to lpdmOutput */ - if((dwMode & DM_COPY) || (dwMode & DM_UPDATE)) { - if (lpdmOutput) - { - DEVMODEA *dmA = DEVMODEdupWtoA( &pi->Devmode->dmPublic ); + if (output && (mode & (DM_COPY | DM_UPDATE))) + memcpy( output, &pi->Devmode->dmPublic, + pi->Devmode->dmPublic.dmSize + pi->Devmode->dmPublic.dmDriverExtra ); + return IDOK; +} + +INT CDECL PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, + LPSTR lpszDevice, LPSTR lpszPort, LPDEVMODEA lpdmInput, + LPSTR lpszProfile, DWORD dwMode) +{ + DEVMODEW *outputW = NULL, *inputW = NULL; + WCHAR *device = NULL; + unsigned int len; + int ret; + + len = MultiByteToWideChar(CP_ACP, 0, lpszDevice, -1, NULL, 0); + if (len) { + device = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, lpszDevice, -1, device, len); + } + + if (lpdmOutput && (dwMode & (DM_COPY | DM_UPDATE))) { + ret = DrvDocumentProperties(hwnd, device, NULL, NULL, 0); + if (ret <= 0) { + HeapFree(GetProcessHeap(), 0, device); + return -1; + } + outputW = HeapAlloc(GetProcessHeap(), 0, ret); + } + + if (lpdmInput) inputW = GdiConvertToDevmodeW( lpdmInput ); + + ret = DrvDocumentProperties(hwnd, device, outputW, inputW, dwMode); + + if (ret >= 0 && outputW && (dwMode & (DM_COPY | DM_UPDATE))) { + DEVMODEA *dmA = DEVMODEdupWtoA( outputW ); if (dmA) memcpy( lpdmOutput, dmA, dmA->dmSize + dmA->dmDriverExtra ); HeapFree( GetProcessHeap(), 0, dmA ); } - else - FIXME("lpdmOutput is NULL what should we do??\n"); - } - return IDOK; + + HeapFree(GetProcessHeap(), 0, device); + HeapFree(GetProcessHeap(), 0, inputW); + HeapFree(GetProcessHeap(), 0, outputW); + + if (!dwMode && ret > 0) ret -= CCHDEVICENAME + CCHFORMNAME; + return ret; } + /*********************************************************************** * PSDRV_DeviceCapabilities * diff --git a/dlls/wineps.drv/wineps.drv.spec b/dlls/wineps.drv/wineps.drv.spec index 6cd7e680350..4dbdc0a2998 100644 --- a/dlls/wineps.drv/wineps.drv.spec +++ b/dlls/wineps.drv/wineps.drv.spec @@ -2,3 +2,4 @@ # Printer driver config exports @ stdcall DrvDeviceCapabilities(ptr wstr long ptr ptr) +@ stdcall DrvDocumentProperties(long ptr wstr ptr long)

1 0

Jacek Caban : winspool: Use DeviceCapabilitiesW for DeviceCapabilitiesA.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 7b28bb433df2f4724f33b42cced6094215f77cfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b28bb433df2f4724f33b42c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 13 13:49:18 2021 +0200 winspool: Use DeviceCapabilitiesW for DeviceCapabilitiesA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 67 +++++++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 24 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f14ab103ded..d7f2b7fb7d1 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -197,9 +197,6 @@ static opened_printer_t **printer_handles; static UINT nb_printer_handles; static LONG next_job_id = 1; -static DWORD (WINAPI *GDI_CallDeviceCapabilities16)( LPCSTR lpszDevice, LPCSTR lpszPort, - WORD fwCapability, LPSTR lpszOutput, - LPDEVMODEA lpdm ); static INT (WINAPI *GDI_CallExtDeviceMode16)( HWND hwnd, LPDEVMODEA lpdmOutput, LPSTR lpszDevice, LPSTR lpszPort, LPDEVMODEA lpdmInput, LPSTR lpszProfile, @@ -2464,34 +2461,56 @@ static void free_printer_info( void *data, DWORD level ) * DeviceCapabilitiesA [WINSPOOL.@] * */ -INT WINAPI DeviceCapabilitiesA(LPCSTR pDevice,LPCSTR pPort, WORD cap, - LPSTR pOutput, LPDEVMODEA lpdm) +INT WINAPI DeviceCapabilitiesA(const char *device, const char *portA, WORD cap, + char *output, DEVMODEA *devmodeA) { - INT ret; + WCHAR *device_name = NULL, *port = NULL; + DEVMODEW *devmode = NULL; + DWORD ret, len; - TRACE("%s,%s,%u,%p,%p\n", debugstr_a(pDevice), debugstr_a(pPort), cap, pOutput, lpdm); + len = MultiByteToWideChar(CP_ACP, 0, device, -1, NULL, 0); + if (len) { + device_name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, device, -1, device_name, len); + } - if (!GDI_CallDeviceCapabilities16) - { - GDI_CallDeviceCapabilities16 = (void*)GetProcAddress( GetModuleHandleA("gdi32"), - (LPCSTR)104 ); - if (!GDI_CallDeviceCapabilities16) return -1; + len = MultiByteToWideChar(CP_ACP, 0, portA, -1, NULL, 0); + if (len) { + port = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, portA, -1, port, len); } - ret = GDI_CallDeviceCapabilities16(pDevice, pPort, cap, pOutput, lpdm); - /* If DC_PAPERSIZE map POINT16s to POINTs */ - if(ret != -1 && cap == DC_PAPERSIZE && pOutput) { - POINT16 *tmp = HeapAlloc( GetProcessHeap(), 0, ret * sizeof(POINT16) ); - POINT *pt = (POINT *)pOutput; - INT i; - memcpy(tmp, pOutput, ret * sizeof(POINT16)); - for(i = 0; i < ret; i++, pt++) - { - pt->x = tmp[i].x; - pt->y = tmp[i].y; + if (devmodeA) devmode = GdiConvertToDevmodeW( devmodeA ); + + if (output && (cap == DC_BINNAMES || cap == DC_FILEDEPENDENCIES || cap == DC_PAPERNAMES)) { + /* These need A -> W translation */ + unsigned int size = 0, i; + WCHAR *outputW; + + ret = DeviceCapabilitiesW(device_name, port, cap, NULL, devmode); + if (ret == -1) return ret; + + switch (cap) { + case DC_BINNAMES: + size = 24; + break; + case DC_PAPERNAMES: + case DC_FILEDEPENDENCIES: + size = 64; + break; } - HeapFree( GetProcessHeap(), 0, tmp ); + outputW = HeapAlloc(GetProcessHeap(), 0, size * ret * sizeof(WCHAR)); + ret = DeviceCapabilitiesW(device_name, port, cap, outputW, devmode); + for (i = 0; i < ret; i++) + WideCharToMultiByte(CP_ACP, 0, outputW + (i * size), -1, + output + (i * size), size, NULL, NULL); + HeapFree(GetProcessHeap(), 0, outputW); + } else { + ret = DeviceCapabilitiesW(device_name, port, cap, (WCHAR *)output, devmode); } + HeapFree(GetProcessHeap(), 0, device_name); + HeapFree(GetProcessHeap(), 0, devmode); + HeapFree(GetProcessHeap(), 0, port); return ret; }

1 0

Nikolay Sivov : rpcrt4/tests: Always run tests that don't require special permissions.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 54f9b3347612cbf368e28fd53bef298819082d64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54f9b3347612cbf368e28fd5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 13 10:55:42 2021 +0300 rpcrt4/tests: Always run tests that don't require special permissions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/rpc.c | 105 ++++++++++++++++++++++++++++-------------------- 1 file changed, 61 insertions(+), 44 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 8ae63a140e7..413a715e16d 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -78,35 +78,49 @@ static BOOL Uuid_Comparison_Grid[11][11] = { { TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE } }; -static void UuidConversionAndComparison(void) { +static void test_UuidEqual(void) +{ + UUID Uuid1, Uuid2, *PUuid1, *PUuid2; + RPC_STATUS status; + int i1, i2; + + /* Uuid Equality */ + for (i1 = 0; i1 < 11; i1++) + { + for (i2 = 0; i2 < 11; i2++) + { + if (i1 < 10) + { + Uuid1 = Uuid_Table[i1]; + PUuid1 = &Uuid1; + } + else + PUuid1 = NULL; + + if (i2 < 10) + { + Uuid2 = Uuid_Table[i2]; + PUuid2 = &Uuid2; + } + else + PUuid2 = NULL; + ok(UuidEqual(PUuid1, PUuid2, &status) == Uuid_Comparison_Grid[i1][i2], "UUID Equality\n" ); + } + } +} + +static void test_UuidFromString(void) +{ CHAR strx[100], x; LPSTR str = strx; WCHAR wstrx[100], wx; LPWSTR wstr = wstrx; - UUID Uuid1, Uuid2, *PUuid1, *PUuid2; + UUID Uuid1, Uuid2; RPC_STATUS rslt; int i1,i2; - /* Uuid Equality */ - for (i1 = 0; i1 < 11; i1++) - for (i2 = 0; i2 < 11; i2++) { - if (i1 < 10) { - Uuid1 = Uuid_Table[i1]; - PUuid1 = &Uuid1; - } else { - PUuid1 = NULL; - } - if (i2 < 10) { - Uuid2 = Uuid_Table[i2]; - PUuid2 = &Uuid2; - } else { - PUuid2 = NULL; - } - ok( (UuidEqual(PUuid1, PUuid2, &rslt) == Uuid_Comparison_Grid[i1][i2]), "UUID Equality\n" ); - } - /* Uuid to String to Uuid (char) */ for (i1 = 0; i1 < 10; i1++) { Uuid1 = Uuid_Table[i1]; @@ -141,7 +155,7 @@ static void UuidConversionAndComparison(void) { } } -static void TestDceErrorInqText (void) +static void test_DceErrorInqTextA(void) { char bufferInvalid [1024]; char buffer [1024]; /* The required size is not documented but would @@ -649,17 +663,10 @@ static void test_RpcStringBindingParseA(void) ok(options == NULL, "options was %p instead of NULL\n", options); } -static void test_RpcExceptionFilter(const char *func_name) +static void test_RpcExceptionFilter(void) { + int retval, retval2; ULONG exception; - int retval; - int (WINAPI *pRpcExceptionFilter)(ULONG) = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), func_name); - - if (!pRpcExceptionFilter) - { - win_skip("%s not exported\n", func_name); - return; - } for (exception = 0; exception < STATUS_REG_NAT_CONSUMPTION; exception++) { @@ -668,7 +675,8 @@ static void test_RpcExceptionFilter(const char *func_name) if (exception == 0x40000005) exception = 0x80000000; if (exception == 0x80000005) exception = 0xc0000000; - retval = pRpcExceptionFilter(exception); + retval = RpcExceptionFilter(exception); + retval2 = I_RpcExceptionFilter(exception); switch (exception) { case STATUS_DATATYPE_MISALIGNMENT: @@ -679,17 +687,25 @@ static void test_RpcExceptionFilter(const char *func_name) case STATUS_INSTRUCTION_MISALIGNMENT: case STATUS_STACK_OVERFLOW: case STATUS_POSSIBLE_DEADLOCK: - ok(retval == EXCEPTION_CONTINUE_SEARCH, "%s(0x%x) should have returned %d instead of %d\n", - func_name, exception, EXCEPTION_CONTINUE_SEARCH, retval); + ok(retval == EXCEPTION_CONTINUE_SEARCH, "RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_CONTINUE_SEARCH, retval); + ok(retval2 == EXCEPTION_CONTINUE_SEARCH, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_CONTINUE_SEARCH, retval); break; case STATUS_GUARD_PAGE_VIOLATION: case STATUS_IN_PAGE_ERROR: case STATUS_HANDLE_NOT_CLOSABLE: - trace("%s(0x%x) returned %d\n", func_name, exception, retval); + todo_wine + { + ok(!retval, "Unexpected return value %d.\n", retval); + ok(!retval2, "Unexpected return value %d.\n", retval2); + } break; default: - ok(retval == EXCEPTION_EXECUTE_HANDLER, "%s(0x%x) should have returned %d instead of %d\n", - func_name, exception, EXCEPTION_EXECUTE_HANDLER, retval); + ok(retval == EXCEPTION_EXECUTE_HANDLER, "RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_EXECUTE_HANDLER, retval); + ok(retval2 == EXCEPTION_EXECUTE_HANDLER, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_EXECUTE_HANDLER, retval); } } } @@ -1235,22 +1251,23 @@ START_TEST( rpc ) static unsigned char np_address[] = "."; BOOL firewall_enabled = is_firewall_enabled(); + test_UuidEqual(); + test_UuidFromString(); + test_UuidCreate(); + test_UuidCreateSequential(); + test_DceErrorInqTextA(); + test_I_RpcMapWin32Status(); + test_RpcStringBindingParseA(); + test_RpcExceptionFilter(); + if (firewall_enabled && !is_process_elevated()) { skip("no privileges, skipping tests to avoid firewall dialog\n"); return; } - UuidConversionAndComparison(); - TestDceErrorInqText(); test_towers(); - test_I_RpcMapWin32Status(); - test_RpcStringBindingParseA(); - test_RpcExceptionFilter("I_RpcExceptionFilter"); - test_RpcExceptionFilter("RpcExceptionFilter"); test_RpcStringBindingFromBinding(); - test_UuidCreate(); - test_UuidCreateSequential(); test_RpcBindingFree(); test_RpcIfInqId(); test_RpcServerInqDefaultPrincName();

1 0

Zebediah Figura : server: Do not signal completion if the async failed synchronously.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 4a73fbbd4059a950a1cb976087b0ec29712cad90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a73fbbd4059a950a1cb9760… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Sep 12 16:07:53 2021 -0500 server: Do not signal completion if the async failed synchronously. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 14 +++++++------- server/async.c | 39 ++++++++++++++++++++++---------------- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 49498a5e0e8..bd34e37e176 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -729,7 +729,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) todo_wine ok(io.Status == 0xdeadf00d, "got %#x\n", io.Status); todo_wine ok(io.Information == 0xdeadf00d, "got size %Iu\n", io.Information); ret = WaitForSingleObject(event, 0); - todo_wine ok(ret == WAIT_TIMEOUT, "got %d\n", ret); + ok(ret == WAIT_TIMEOUT, "got %d\n", ret); } else { @@ -753,7 +753,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ret = NtRemoveIoCompletion(port, &key, &value, &io, &zero); if (!params->pending && NT_ERROR(params->iosb_status)) { - todo_wine ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); } else { @@ -781,7 +781,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) todo_wine ok(io.Status == 0xdeadf00d, "got %#x\n", io.Status); todo_wine ok(io.Information == 0xdeadf00d, "got size %Iu\n", io.Information); ret = WaitForSingleObject(event, 0); - todo_wine ok(ret == WAIT_TIMEOUT, "got %d\n", ret); + ok(ret == WAIT_TIMEOUT, "got %d\n", ret); } else { @@ -813,7 +813,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) todo_wine ok(io.Status == 0xdeadf00d, "got %#x\n", io.Status); todo_wine ok(io.Information == 0xdeadf00d, "got size %Iu\n", io.Information); ret = WaitForSingleObject(file, 0); - todo_wine ok(ret == WAIT_TIMEOUT, "got %d\n", ret); + ok(ret == WAIT_TIMEOUT, "got %d\n", ret); } else { @@ -849,7 +849,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) todo_wine ok(io.Status == 0xdeadf00d, "got %#x\n", io.Status); todo_wine ok(io.Information == 0xdeadf00d, "got size %Iu\n", io.Information); ret = WaitForSingleObject(event, 0); - todo_wine ok(ret == WAIT_TIMEOUT, "got %d\n", ret); + ok(ret == WAIT_TIMEOUT, "got %d\n", ret); } else { @@ -932,8 +932,8 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ret = SleepEx(0, TRUE); if (!params->pending && NT_ERROR(params->iosb_status)) { - todo_wine ok(!ret, "got %d\n", ret); - todo_wine ok(!got_return_status_apc, "got %u APC calls\n", got_return_status_apc); + ok(!ret, "got %d\n", ret); + ok(!got_return_status_apc, "got %u APC calls\n", got_return_status_apc); } else { diff --git a/server/async.c b/server/async.c index df30ae3c7da..7cffd24a18b 100644 --- a/server/async.c +++ b/server/async.c @@ -465,25 +465,32 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota async->terminated = 1; if (async->iosb) async->iosb->status = status; - if (async->data.apc) + /* don't signal completion if the async failed synchronously + * this can happen if the initial status was unknown (i.e. for device files) + * note that we check the IOSB status here, not the initial status */ + if (async->pending || !NT_ERROR( status )) { - apc_call_t data; - memset( &data, 0, sizeof(data) ); - data.type = APC_USER; - data.user.func = async->data.apc; - data.user.args[0] = async->data.apc_context; - data.user.args[1] = async->data.iosb; - data.user.args[2] = 0; - thread_queue_apc( NULL, async->thread, NULL, &data ); - } - else if (async->data.apc_context && (async->pending || - !(async->comp_flags & FILE_SKIP_COMPLETION_PORT_ON_SUCCESS))) - { - add_async_completion( async, async->data.apc_context, status, total ); + if (async->data.apc) + { + apc_call_t data; + memset( &data, 0, sizeof(data) ); + data.type = APC_USER; + data.user.func = async->data.apc; + data.user.args[0] = async->data.apc_context; + data.user.args[1] = async->data.iosb; + data.user.args[2] = 0; + thread_queue_apc( NULL, async->thread, NULL, &data ); + } + else if (async->data.apc_context && (async->pending || + !(async->comp_flags & FILE_SKIP_COMPLETION_PORT_ON_SUCCESS))) + { + add_async_completion( async, async->data.apc_context, status, total ); + } + + if (async->event) set_event( async->event ); + else if (async->fd) set_fd_signaled( async->fd, 1 ); } - if (async->event) set_event( async->event ); - else if (async->fd) set_fd_signaled( async->fd, 1 ); if (!async->signaled) { async->signaled = 1;

1 0