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

Zhiyi Zhang : dxgi: Search all adapters for the containing output of a swapchain.
by Alexandre Julliard May 11, 2020

May 11, 2020

Module: wine Branch: master Commit: 5886f4dee5cbde9e9bab5e0e0bc5dc66fb715a15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5886f4dee5cbde9e9bab5e0e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun May 10 23:12:42 2020 +0800 dxgi: Search all adapters for the containing output of a swapchain. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 82 +++++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 39 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f57183879d..81ba50942a 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -111,11 +111,13 @@ BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) return TRUE; } -static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, IDXGIOutput **dxgi_output) +static HRESULT dxgi_get_output_from_window(IDXGIFactory *factory, HWND window, + IDXGIOutput **dxgi_output) { + unsigned int adapter_idx, output_idx; DXGI_OUTPUT_DESC desc; + IDXGIAdapter *adapter; IDXGIOutput *output; - unsigned int index; HMONITOR monitor; HRESULT hr; @@ -125,25 +127,32 @@ static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, I return DXGI_ERROR_INVALID_CALL; } - index = 0; - while ((hr = IDXGIAdapter_EnumOutputs(adapter, index, &output)) == S_OK) + for (adapter_idx = 0; SUCCEEDED(hr = IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); + ++adapter_idx) { - if (FAILED(hr = IDXGIOutput_GetDesc(output, &desc))) + for (output_idx = 0; SUCCEEDED(hr = IDXGIAdapter_EnumOutputs(adapter, output_idx, + &output)); ++output_idx) { - WARN("Failed to get output desc %u, hr %#x.\n", index, hr); - ++index; - continue; - } + if (FAILED(hr = IDXGIOutput_GetDesc(output, &desc))) + { + WARN("Adapter %u output %u: Failed to get output desc, hr %#x.\n", adapter_idx, + output_idx, hr); + IDXGIOutput_Release(output); + continue; + } - if (desc.Monitor == monitor) - { - *dxgi_output = output; - return S_OK; - } + if (desc.Monitor == monitor) + { + *dxgi_output = output; + IDXGIAdapter_Release(adapter); + return S_OK; + } - IDXGIOutput_Release(output); - ++index; + IDXGIOutput_Release(output); + } + IDXGIAdapter_Release(adapter); } + if (hr != DXGI_ERROR_NOT_FOUND) WARN("Failed to enumerate outputs, hr %#x.\n", hr); @@ -582,9 +591,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - IDXGIAdapter *adapter; - IDXGIDevice *device; - HRESULT hr; + HWND window; TRACE("iface %p, output %p.\n", iface, output); @@ -594,24 +601,14 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapCh return S_OK; } - if (SUCCEEDED(hr = d3d11_swapchain_GetDevice(iface, &IID_IDXGIDevice, (void **)&device))) - { - hr = IDXGIDevice_GetAdapter(device, &adapter); - IDXGIDevice_Release(device); - } - - if (SUCCEEDED(hr)) - { - HWND hwnd = d3d11_swapchain_get_hwnd(swapchain); - hr = dxgi_get_output_from_window(adapter, hwnd, output); - IDXGIAdapter_Release(adapter); - } - else + if (!swapchain->factory) { - WARN("Failed to get adapter, hr %#x.\n", hr); + ERR("Implicit swapchain does not store a reference to factory.\n"); + return E_NOINTERFACE; } - return hr; + window = d3d11_swapchain_get_hwnd(swapchain); + return dxgi_get_output_from_window(swapchain->factory, window, output); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFrameStatistics(IDXGISwapChain1 *iface, @@ -2423,6 +2420,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapCh { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); IUnknown *device_parent; + IDXGIFactory *factory; IDXGIAdapter *adapter; HRESULT hr; @@ -2436,16 +2434,22 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapCh device_parent = vkd3d_get_device_parent(swapchain->device); - if (SUCCEEDED(hr = IUnknown_QueryInterface(device_parent, &IID_IDXGIAdapter, (void **)&adapter))) + if (FAILED(hr = IUnknown_QueryInterface(device_parent, &IID_IDXGIAdapter, (void **)&adapter))) { - hr = dxgi_get_output_from_window(adapter, swapchain->window, output); - IDXGIAdapter_Release(adapter); + WARN("Failed to get adapter, hr %#x.\n", hr); + return hr; } - else + + if (FAILED(hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory))) { - WARN("Failed to get adapter, hr %#x.\n", hr); + WARN("Failed to get factory, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + return hr; } + hr = dxgi_get_output_from_window(factory, swapchain->window, output); + IDXGIFactory_Release(factory); + IDXGIAdapter_Release(adapter); return hr; }

1 0

Nikolay Sivov : dxgi: Translate DXGI_USAGE_UNORDERED_ACCESS to corresponding wined3d bind flag.
by Alexandre Julliard May 11, 2020

May 11, 2020

Module: wine Branch: master Commit: 0bfc64b0f1bb3c35439b6204834718c44d9b01a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bfc64b0f1bb3c35439b6204… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 9 17:28:03 2020 +0300 dxgi: Translate DXGI_USAGE_UNORDERED_ACCESS to corresponding wined3d bind flag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/dxgi/utils.c | 4 ++- 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a9f9b71570..dd00be1e8c 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -44,6 +44,10 @@ static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECK static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *desc); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); +static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, + D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context); + static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; @@ -624,6 +628,39 @@ success: return dxgi_device; } +static IDXGIDevice *create_d3d11_device(void) +{ + static const D3D_FEATURE_LEVEL feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + }; + unsigned int feature_level_count = ARRAY_SIZE(feature_level); + IDXGIDevice *device = NULL; + ID3D11Device *d3d_device; + HRESULT hr; + + if (!pD3D11CreateDevice) + return NULL; + + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + if (FAILED(hr)) + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + if (FAILED(hr)) + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + + if (SUCCEEDED(hr)) + { + hr = ID3D11Device_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&device); + ok(SUCCEEDED(hr), "Created device does not implement IDXGIDevice.\n"); + ID3D11Device_Release(d3d_device); + } + + return device; +} + static ID3D12Device *create_d3d12_device(void) { IDXGIAdapter *adapter; @@ -1079,6 +1116,7 @@ static void test_check_interface_support(void) static void test_create_surface(void) { + ID3D11Texture2D *texture2d; DXGI_SURFACE_DESC desc; IDXGISurface *surface; IDXGIDevice *device; @@ -1109,6 +1147,40 @@ static void test_create_surface(void) IDXGISurface_Release(surface); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + /* DXGI_USAGE_UNORDERED_ACCESS */ + if (!(device = create_d3d11_device())) + { + skip("Failed to create D3D11 device.\n"); + return; + } + + surface = NULL; + hr = IDXGIDevice_CreateSurface(device, &desc, 1, DXGI_USAGE_UNORDERED_ACCESS, NULL, &surface); + ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#x\n", hr); + + if (surface) + { + ID3D11UnorderedAccessView *uav; + ID3D11Device *d3d_device; + + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture2d); + ok(SUCCEEDED(hr), "Failed to get texture interface, hr %#x.\n", hr); + + ID3D11Texture2D_GetDevice(texture2d, &d3d_device); + + hr = ID3D11Device_CreateUnorderedAccessView(d3d_device, (ID3D11Resource *)texture2d, NULL, &uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + ID3D11UnorderedAccessView_Release(uav); + + ID3D11Device_Release(d3d_device); + ID3D11Texture2D_Release(texture2d); + + IDXGISurface_Release(surface); + } + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } static void test_parents(void) @@ -6624,7 +6696,7 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) START_TEST(dxgi) { - HMODULE dxgi_module, d3d12_module, gdi32_module; + HMODULE dxgi_module, d3d11_module, d3d12_module, gdi32_module; BOOL enable_debug_layer = FALSE; unsigned int argc, i; ID3D12Debug *debug; @@ -6639,6 +6711,9 @@ START_TEST(dxgi) pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32_module, "D3DKMTCloseAdapter"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32_module, "D3DKMTOpenAdapterFromGdiDisplayName"); + d3d11_module = LoadLibraryA("d3d11.dll"); + pD3D11CreateDevice = (void *)GetProcAddress(d3d11_module, "D3D11CreateDevice"); + registry_mode.dmSize = sizeof(registry_mode); ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index aece3a6af1..a32c7ee129 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -503,8 +503,10 @@ unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE dxgi_usage) wined3d_bind_flags |= WINED3D_BIND_SHADER_RESOURCE; if (dxgi_usage & DXGI_USAGE_RENDER_TARGET_OUTPUT) wined3d_bind_flags |= WINED3D_BIND_RENDER_TARGET; + if (dxgi_usage & DXGI_USAGE_UNORDERED_ACCESS) + wined3d_bind_flags |= WINED3D_BIND_UNORDERED_ACCESS; - dxgi_usage &= ~(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT); + dxgi_usage &= ~(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_UNORDERED_ACCESS); if (dxgi_usage) FIXME("Unhandled DXGI usage %#x.\n", dxgi_usage); return wined3d_bind_flags;

1 0

Zebediah Figura : include: Add dpfilter.h.
by Alexandre Julliard May 11, 2020

May 11, 2020

Module: wine Branch: master Commit: a0ef11ab6e0000e863171f35052284d7d2b19136 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0ef11ab6e0000e863171f35… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 11 00:11:01 2020 -0500 include: Add dpfilter.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/dpfilter.h | 188 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 189 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 8aa61021d2..07ab7b7e8f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -226,6 +226,7 @@ SOURCES = \ docobjectservice.idl \ downloadmgr.idl \ dpaddr.h \ + dpfilter.h \ dplay.h \ dplay8.h \ dplobby.h \ diff --git a/include/dpfilter.h b/include/dpfilter.h new file mode 100644 index 0000000000..5b09dc9c23 --- /dev/null +++ b/include/dpfilter.h @@ -0,0 +1,188 @@ +/* + * Copyright (C) 2020 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 __WINE_DPFILTER_H +#define __WINE_DPFILTER_H + +#define DPFLTR_ERROR_LEVEL 0 +#define DPFLTR_WARNING_LEVEL 1 +#define DPFLTR_TRACE_LEVEL 2 +#define DPFLTR_INFO_LEVEL 3 +#define DPFLTR_MASK 0x8000000 + +typedef enum _DPFLTR_TYPE +{ + DPFLTR_SYSTEM_ID = 0, + DPFLTR_SMSS_ID = 1, + DPFLTR_SETUP_ID = 2, + DPFLTR_NTFS_ID = 3, + DPFLTR_FSTUB_ID = 4, + DPFLTR_CRASHDUMP_ID = 5, + DPFLTR_CDAUDIO_ID = 6, + DPFLTR_CDROM_ID = 7, + DPFLTR_CLASSPNP_ID = 8, + DPFLTR_DISK_ID = 9, + DPFLTR_REDBOOK_ID = 10, + DPFLTR_STORPROP_ID = 11, + DPFLTR_SCSIPORT_ID = 12, + DPFLTR_SCSIMINIPORT_ID = 13, + DPFLTR_CONFIG_ID = 14, + DPFLTR_I8042PRT_ID = 15, + DPFLTR_SERMOUSE_ID = 16, + DPFLTR_LSERMOUS_ID = 17, + DPFLTR_KBDHID_ID = 18, + DPFLTR_MOUHID_ID = 19, + DPFLTR_KBDCLASS_ID = 20, + DPFLTR_MOUCLASS_ID = 21, + DPFLTR_TWOTRACK_ID = 22, + DPFLTR_WMILIB_ID = 23, + DPFLTR_ACPI_ID = 24, + DPFLTR_AMLI_ID = 25, + DPFLTR_HALIA64_ID = 26, + DPFLTR_VIDEO_ID = 27, + DPFLTR_SVCHOST_ID = 28, + DPFLTR_VIDEOPRT_ID = 29, + DPFLTR_TCPIP_ID = 30, + DPFLTR_DMSYNTH_ID = 31, + DPFLTR_NTOSPNP_ID = 32, + DPFLTR_FASTFAT_ID = 33, + DPFLTR_SAMSS_ID = 34, + DPFLTR_PNPMGR_ID = 35, + DPFLTR_NETAPI_ID = 36, + DPFLTR_SCSERVER_ID = 37, + DPFLTR_SCCLIENT_ID = 38, + DPFLTR_SERIAL_ID = 39, + DPFLTR_SERENUM_ID = 40, + DPFLTR_UHCD_ID = 41, + DPFLTR_RPCPROXY_ID = 42, + DPFLTR_AUTOCHK_ID = 43, + DPFLTR_DCOMSS_ID = 44, + DPFLTR_UNIMODEM_ID = 45, + DPFLTR_SIS_ID = 46, + DPFLTR_FLTMGR_ID = 47, + DPFLTR_WMICORE_ID = 48, + DPFLTR_BURNENG_ID = 49, + DPFLTR_IMAPI_ID = 50, + DPFLTR_SXS_ID = 51, + DPFLTR_FUSION_ID = 52, + DPFLTR_IDLETASK_ID = 53, + DPFLTR_SOFTPCI_ID = 54, + DPFLTR_TAPE_ID = 55, + DPFLTR_MCHGR_ID = 56, + DPFLTR_IDEP_ID = 57, + DPFLTR_PCIIDE_ID = 58, + DPFLTR_FLOPPY_ID = 59, + DPFLTR_FDC_ID = 60, + DPFLTR_TERMSRV_ID = 61, + DPFLTR_W32TIME_ID = 62, + DPFLTR_PREFETCHER_ID = 63, + DPFLTR_RSFILTER_ID = 64, + DPFLTR_FCPORT_ID = 65, + DPFLTR_PCI_ID = 66, + DPFLTR_DMIO_ID = 67, + DPFLTR_DMCONFIG_ID = 68, + DPFLTR_DMADMIN_ID = 69, + DPFLTR_WSOCKTRANSPORT_ID = 70, + DPFLTR_VSS_ID = 71, + DPFLTR_PNPMEM_ID = 72, + DPFLTR_PROCESSOR_ID = 73, + DPFLTR_DMSERVER_ID = 74, + DPFLTR_SR_ID = 75, + DPFLTR_INFINIBAND_ID = 76, + DPFLTR_IHVDRIVER_ID = 77, + DPFLTR_IHVVIDEO_ID = 78, + DPFLTR_IHVAUDIO_ID = 79, + DPFLTR_IHVNETWORK_ID = 80, + DPFLTR_IHVSTREAMING_ID = 81, + DPFLTR_IHVBUS_ID = 82, + DPFLTR_HPS_ID = 83, + DPFLTR_RTLTHREADPOOL_ID = 84, + DPFLTR_LDR_ID = 85, + DPFLTR_TCPIP6_ID = 86, + DPFLTR_ISAPNP_ID = 87, + DPFLTR_SHPC_ID = 88, + DPFLTR_STORPORT_ID = 89, + DPFLTR_STORMINIPORT_ID = 90, + DPFLTR_PRINTSPOOLER_ID = 91, + DPFLTR_VSSDYNDISK_ID = 92, + DPFLTR_VERIFIER_ID = 93, + DPFLTR_VDS_ID = 94, + DPFLTR_VDSBAS_ID = 95, + DPFLTR_VDSDYN_ID = 96, + DPFLTR_VDSDYNDR_ID = 97, + DPFLTR_VDSLDR_ID = 98, + DPFLTR_VDSUTIL_ID = 99, + DPFLTR_DFRGIFC_ID = 100, + DPFLTR_DEFAULT_ID = 101, + DPFLTR_MM_ID = 102, + DPFLTR_DFSC_ID = 103, + DPFLTR_WOW64_ID = 104, + DPFLTR_ALPC_ID = 105, + DPFLTR_WDI_ID = 106, + DPFLTR_PERFLIB_ID = 107, + DPFLTR_KTM_ID = 108, + DPFLTR_IOSTRESS_ID = 109, + DPFLTR_HEAP_ID = 110, + DPFLTR_WHEA_ID = 111, + DPFLTR_USERGDI_ID = 112, + DPFLTR_MMCSS_ID = 113, + DPFLTR_TPM_ID = 114, + DPFLTR_THREADORDER_ID = 115, + DPFLTR_ENVIRON_ID = 116, + DPFLTR_EMS_ID = 117, + DPFLTR_WDT_ID = 118, + DPFLTR_FVEVOL_ID = 119, + DPFLTR_NDIS_ID = 120, + DPFLTR_NVCTRACE_ID = 121, + DPFLTR_LUAFV_ID = 122, + DPFLTR_APPCOMPAT_ID = 123, + DPFLTR_USBSTOR_ID = 124, + DPFLTR_SBP2PORT_ID = 125, + DPFLTR_COVERAGE_ID = 126, + DPFLTR_CACHEMGR_ID = 127, + DPFLTR_MOUNTMGR_ID = 128, + DPFLTR_CFR_ID = 129, + DPFLTR_TXF_ID = 130, + DPFLTR_KSECDD_ID = 131, + DPFLTR_FLTREGRESS_ID = 132, + DPFLTR_MPIO_ID = 133, + DPFLTR_MSDSM_ID = 134, + DPFLTR_UDFS_ID = 135, + DPFLTR_PSHED_ID = 136, + DPFLTR_STORVSP_ID = 137, + DPFLTR_LSASS_ID = 138, + DPFLTR_SSPICLI_ID = 139, + DPFLTR_CNG_ID = 140, + DPFLTR_EXFAT_ID = 141, + DPFLTR_FILETRACE_ID = 142, + DPFLTR_XSAVE_ID = 143, + DPFLTR_SE_ID = 144, + DPFLTR_DRIVEEXTENDER_ID = 145, + DPFLTR_POWER_ID = 146, + DPFLTR_CRASHDUMPXHCI_ID = 147, + DPFLTR_GPIO_ID = 148, + DPFLTR_REFS_ID = 149, + DPFLTR_WER_ID = 150, + DPFLTR_CAPIMG_ID = 151, + DPFLTR_VPCI_ID = 152, + DPFLTR_STORAGECLASSMEMORY_ID = 153, + DPFLTR_FSLIB_ID = 154, + DPFLTR_ENDOFTABLE_ID +} DPFLTR_TYPE; + +#endif

1 0

Vincent Povirk : joy.cpl: Add a description.
by Alexandre Julliard May 11, 2020

May 11, 2020

Module: wine Branch: master Commit: 41e9ba8210b3fa7fd8c7b804a00632c35990581a URL: https://source.winehq.org/git/wine.git/?a=commit;h=41e9ba8210b3fa7fd8c7b804… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun May 10 21:28:53 2020 -0500 joy.cpl: Add a description. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/joy.rc | 1 + po/ar.po | 28 ++++++++++++++++------------ po/ast.po | 28 ++++++++++++++++------------ po/bg.po | 28 ++++++++++++++++------------ po/ca.po | 28 ++++++++++++++++------------ po/cs.po | 28 ++++++++++++++++------------ po/da.po | 28 ++++++++++++++++------------ po/de.po | 28 ++++++++++++++++------------ po/el.po | 28 ++++++++++++++++------------ po/en.po | 28 ++++++++++++++++------------ po/en_US.po | 28 ++++++++++++++++------------ po/eo.po | 28 ++++++++++++++++------------ po/es.po | 28 ++++++++++++++++------------ po/fa.po | 28 ++++++++++++++++------------ po/fi.po | 28 ++++++++++++++++------------ po/fr.po | 28 ++++++++++++++++------------ po/he.po | 28 ++++++++++++++++------------ po/hi.po | 28 ++++++++++++++++------------ po/hr.po | 28 ++++++++++++++++------------ po/hu.po | 28 ++++++++++++++++------------ po/it.po | 28 ++++++++++++++++------------ po/ja.po | 28 ++++++++++++++++------------ po/ko.po | 28 ++++++++++++++++------------ po/lt.po | 28 ++++++++++++++++------------ po/ml.po | 28 ++++++++++++++++------------ po/nb_NO.po | 28 ++++++++++++++++------------ po/nl.po | 28 ++++++++++++++++------------ po/or.po | 28 ++++++++++++++++------------ po/pa.po | 28 ++++++++++++++++------------ po/pl.po | 28 ++++++++++++++++------------ po/pt_BR.po | 28 ++++++++++++++++------------ po/pt_PT.po | 28 ++++++++++++++++------------ po/rm.po | 28 ++++++++++++++++------------ po/ro.po | 28 ++++++++++++++++------------ po/ru.po | 28 ++++++++++++++++------------ po/si.po | 28 ++++++++++++++++------------ po/sk.po | 28 ++++++++++++++++------------ po/sl.po | 28 ++++++++++++++++------------ po/sr_RS(a)cyrillic.po | 28 ++++++++++++++++------------ po/sr_RS(a)latin.po | 28 ++++++++++++++++------------ po/sv.po | 28 ++++++++++++++++------------ po/ta.po | 28 ++++++++++++++++------------ po/te.po | 28 ++++++++++++++++------------ po/th.po | 28 ++++++++++++++++------------ po/tr.po | 28 ++++++++++++++++------------ po/uk.po | 28 ++++++++++++++++------------ po/wa.po | 28 ++++++++++++++++------------ po/wine.pot | 28 ++++++++++++++++------------ po/zh_CN.po | 28 ++++++++++++++++------------ po/zh_TW.po | 28 ++++++++++++++++------------ 50 files changed, 785 insertions(+), 588 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=41e9ba8210b3fa7fd8c7…

1 0

Louis Lenders : iphlpapi: Add stub for NotifyRouteChange2.
by Alexandre Julliard May 11, 2020

May 11, 2020

Module: wine Branch: master Commit: 62b89ad0a5be0e12e2798b5b3cf25f6029b01be6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62b89ad0a5be0e12e2798b5b… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri May 8 17:59:23 2020 +0200 iphlpapi: Add stub for NotifyRouteChange2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48775 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 12 ++++++++++++ include/netioapi.h | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index c5857f2831..ded265f571 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -236,7 +236,7 @@ @ stdcall NotifyAddrChange( ptr ptr ) @ stdcall NotifyIpInterfaceChange( long ptr ptr long ptr ) @ stdcall NotifyRouteChange( ptr ptr ) -#@ stub NotifyRouteChange2 +@ stdcall NotifyRouteChange2( long ptr ptr long ptr ) @ stub NotifyRouteChangeEx #@ stub NotifyStableUnicastIpAddressTable #@ stub NotifyTeredoPortChange diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index e3ce21c44b..e65eff82e2 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2817,6 +2817,18 @@ DWORD WINAPI NotifyIpInterfaceChange(ADDRESS_FAMILY family, PIPINTERFACE_CHANGE_ return NO_ERROR; } +/****************************************************************** + * NotifyRouteChange2 (IPHLPAPI.@) + */ +DWORD WINAPI NotifyRouteChange2(ADDRESS_FAMILY family, PIPFORWARD_CHANGE_CALLBACK callback, VOID* context, + BOOLEAN init_notify, HANDLE* handle) +{ + FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): stub\n", + family, callback, context, init_notify, handle); + if (handle) *handle = NULL; + return NO_ERROR; +} + /****************************************************************** * NotifyRouteChange (IPHLPAPI.@) diff --git a/include/netioapi.h b/include/netioapi.h index a41bae0968..7238d527ad 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -236,6 +236,8 @@ typedef VOID (WINAPI *PIPINTERFACE_CHANGE_CALLBACK)(PVOID, PMIB_IPINTERFACE_ROW, typedef VOID (WINAPI *PUNICAST_IPADDRESS_CHANGE_CALLBACK)(PVOID, PMIB_UNICASTIPADDRESS_ROW, MIB_NOTIFICATION_TYPE); +typedef VOID (WINAPI *PIPFORWARD_CHANGE_CALLBACK)(VOID*,MIB_IPFORWARD_ROW2*,MIB_NOTIFICATION_TYPE); + DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID*,NET_LUID*); DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX,NET_LUID*); DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID*,GUID*);

1 0

Alexandre Julliard : ntdll/tests: Enable RtlDowncaseUnicodeString() test.
by Alexandre Julliard May 11, 2020

May 11, 2020

Module: wine Branch: master Commit: 80451671178a8eef6e793964140c009358721436 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80451671178a8eef6e793964… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 11 13:34:55 2020 +0200 ntdll/tests: Enable RtlDowncaseUnicodeString() test. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtlstr.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index cd95ec3a48..1df51ab690 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -693,6 +693,7 @@ static void test_RtlDowncaseUnicodeString(void) case 0x19d: lower_ch = 0x272; break; case 0x19f: lower_ch = 0x275; break; case 0x1a9: lower_ch = 0x283; break; + case 0x1a6: lower_ch = 0x280; break; case 0x1ae: lower_ch = 0x288; break; case 0x1b1: lower_ch = 0x28a; break; case 0x1b2: lower_ch = 0x28b; break; @@ -701,6 +702,16 @@ static void test_RtlDowncaseUnicodeString(void) case 0x1c7: lower_ch = 0x1c9; break; case 0x1ca: lower_ch = 0x1cc; break; case 0x1f1: lower_ch = 0x1f3; break; + case 0x1f6: lower_ch = 0x195; break; + case 0x1f7: lower_ch = 0x1bf; break; + case 0x220: lower_ch = 0x19e; break; + case 0x23a: lower_ch = 0x2c65; break; + case 0x23d: lower_ch = 0x19a; break; + case 0x23e: lower_ch = 0x2c66; break; + case 0x243: lower_ch = 0x180; break; + case 0x244: lower_ch = 0x289; break; + case 0x245: lower_ch = 0x28c; break; + case 0x37f: lower_ch = 0x3f3; break; case 0x386: lower_ch = 0x3ac; break; case 0x388: lower_ch = 0x3ad; break; case 0x389: lower_ch = 0x3ae; break; @@ -708,6 +719,11 @@ static void test_RtlDowncaseUnicodeString(void) case 0x38c: lower_ch = 0x3cc; break; case 0x38e: lower_ch = 0x3cd; break; case 0x38f: lower_ch = 0x3ce; break; + case 0x3cf: lower_ch = 0x3d7; break; + case 0x3f9: lower_ch = 0x3f2; break; + case 0x3fd: lower_ch = 0x37b; break; + case 0x3fe: lower_ch = 0x37c; break; + case 0x3ff: lower_ch = 0x37d; break; default: lower_ch = ch; break; } /* switch */ } @@ -730,7 +746,8 @@ static void test_RtlDowncaseUnicodeString(void) pRtlDowncaseUnicodeString(&result_str, &source_str, 0); for (i = 0; i <= 1024; i++) { - ok(result_str.Buffer[i] == lower_str.Buffer[i] || result_str.Buffer[i] == source_str.Buffer[i] + 1, + ok(result_str.Buffer[i] == lower_str.Buffer[i] || result_str.Buffer[i] == source_str.Buffer[i] + 1 || + broken( result_str.Buffer[i] == source_str.Buffer[i] ), "RtlDowncaseUnicodeString works wrong: '%c'[=0x%x] is converted to '%c'[=0x%x], expected: '%c'[=0x%x]\n", source_str.Buffer[i], source_str.Buffer[i], result_str.Buffer[i], result_str.Buffer[i], @@ -2621,10 +2638,7 @@ START_TEST(rtlstr) test_RtlCompareUnicodeString(); test_RtlUpcaseUnicodeChar(); test_RtlUpcaseUnicodeString(); - if(0) - { - test_RtlDowncaseUnicodeString(); - } + test_RtlDowncaseUnicodeString(); test_RtlHashUnicodeString(); test_RtlUnicodeToUTF8N(); test_RtlUTF8ToUnicodeN();

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard May 11, 2020

May 11, 2020

Module: wine Branch: master Commit: 98ad00db6b0997fd94842d1165338759fe049494 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98ad00db6b0997fd94842d11… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 10 20:03:24 2020 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 178 +++++++++++++++++++-------------------------------------------- 1 file changed, 53 insertions(+), 125 deletions(-) diff --git a/po/ja.po b/po/ja.po index b59fce996a..dbb78e2ca0 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-11-29 22:03+0900\n" +"PO-Revision-Date: 2020-05-10 19:59+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -3702,17 +3702,15 @@ msgstr "'@'を期待していました" #: jscript.rc:75 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript コンパイルエラー" #: jscript.rc:76 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript 実行時エラー" #: jscript.rc:77 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "不明なエラー" +msgstr "未知の実行時エラー" #: jscript.rc:54 msgid "Number expected" @@ -3760,7 +3758,7 @@ msgstr "正規表現に構文誤りがあります" #: jscript.rc:63 msgid "Exception thrown and not caught" -msgstr "" +msgstr "例外が送出されましたが捕捉されませんでした" #: jscript.rc:65 msgid "URI to be encoded contains invalid characters" @@ -6839,10 +6837,8 @@ msgid "Sink has not been finalized.\n" msgstr "シンクは確定されていません。\n" #: mferror.mc:732 -#, fuzzy -#| msgid "Sink was already stopped.\n" msgid "Clock was stopped\n" -msgstr "シンクはすでに停止していました。\n" +msgstr "クロックは停止されていました\n" #: mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7221,10 +7217,8 @@ msgid "Clock state was already set.\n" msgstr "クロックの状態は設定済みでした。\n" #: mferror.mc:725 -#, fuzzy -#| msgid "Clock is not available.\n" msgid "Clock is not simple\n" -msgstr "クロックは利用可能ではありません。\n" +msgstr "クロックが単純ではありません\n" #: mpr.rc:35 wininet.rc:37 msgid "Enter Network Password" @@ -8319,206 +8313,160 @@ msgid "Off" msgstr "Off" #: version.rc:56 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "ビデオ" +msgstr "プロバイダ" #: version.rc:59 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "形式を選択してください:" +msgstr "接続したいデータを選択してください:" #: version.rc:66 -#, fuzzy -#| msgid "Connections" msgid "Connection" msgstr "接続" #: version.rc:69 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Specify the following to connect to ODBC data:" -msgstr "形式を選択してください:" +msgstr "ODBC データに接続するため以下を指定してください:" #: version.rc:70 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. データソース:" #: version.rc:71 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "名前を入力しましょう" +msgstr "利用するデータソース名(&D)" #: version.rc:74 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "リセットされた接続" +msgstr "利用する接続文字列(&C)" #: version.rc:75 -#, fuzzy -#| msgid "Connections" msgid "&Connection string:" -msgstr "接続" +msgstr "接続文字列:" #: version.rc:77 -#, fuzzy -#| msgid "A&dd..." msgid "B&uild..." -msgstr "追加(&D)..." +msgstr "構築(&U)..." #: version.rc:78 msgid "2. Enter information to log on to the server" -msgstr "" +msgstr "2. サーバにログオンするための情報" #: version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" -msgstr "ユーザ名(&U):" +msgstr "ユーザ名(&N):" #: version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "空白(&B)" +msgstr "空のパスワード(&B)" #: version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "パスワードが違います。\n" +msgstr "パスワードを保存する(&S)" #: version.rc:85 msgid "3. Enter the &initial catalog to use:" -msgstr "" +msgstr "3. 最初に利用するカタログ(&I):" #: version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "リセットされた接続" +msgstr "接続をテスト(&T)" #: version.rc:92 winemine.rc:65 msgid "Advanced" msgstr "中級" #: version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "ネットワーク共有" +msgstr "ネットワーク設定" #: version.rc:96 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "不正な偽装レベルです。\n" +msgstr "偽装レベル(&I):" #: version.rc:98 msgid "P&rotection level:" -msgstr "" +msgstr "保護レベル(&R):" #: version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "接続済み" +msgstr "接続:" #: version.rc:103 -#, fuzzy -#| msgid "seconds" msgid "seconds." msgstr "秒" #: version.rc:104 -#, fuzzy -#| msgid "Success" msgid "A&ccess:" -msgstr "成功" +msgstr "アクセス(&C):" #: version.rc:110 -#, fuzzy -#| msgid "&All" msgid "All" -msgstr "すべて(&A)" +msgstr "すべて" #: version.rc:114 msgid "" "These are the initialization properties for this type of data. To edit a " "value, select a property, then choose Edit Value below." msgstr "" +"このデータ型には初期プロパティがあります。値を編集するには、プロパティを選ん" +"でから、下にある[値の編集]を選択してください。" #: version.rc:115 -#, fuzzy -#| msgid "&Edit..." msgid "&Edit Value..." -msgstr "編集(&E)..." +msgstr "値の編集(&E)..." #: version.rc:49 -#, fuzzy -#| msgid "Properties" msgid "Data Link Error" -msgstr "プロパティ" +msgstr "データリンクエラー" #: version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "ファイルを選択してください。" +msgstr "プロバイダを選択してください。" #: version.rc:51 msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." msgstr "" +"プロバイダが有効ではありません。当該プロバイダが正しくインストールされている" +"か確かめてください。" #: version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "プロパティ" +msgstr "データリンクプロパティ" #: version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "OLE DB プロバイダ" #: version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "待機中" +msgstr "読み取り" #: version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "付属文書:" +msgstr "読み書き" #: version.rc:43 msgid "Share Deny None" -msgstr "" +msgstr "共有(拒否なし)" #: version.rc:44 msgid "Share Deny Read" -msgstr "" +msgstr "共有(読取拒否)" #: version.rc:45 msgid "Share Deny Write" -msgstr "" +msgstr "共有(書込拒否)" #: version.rc:46 msgid "Share Exclusive" -msgstr "" +msgstr "共有の排他制御" #: version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "I/O 書き込み" +msgstr "書き込み" #: oledlg.rc:55 msgid "Insert Object" @@ -9710,16 +9658,12 @@ msgid "Cape Verde Daylight Time" msgstr "カーボベルデ夏時間" #: tzres.rc:120 -#, fuzzy -#| msgid "Hawaiian Standard Time" msgid "Haiti Standard Time" -msgstr "ハワイ標準時" +msgstr "ハイチ標準時" #: tzres.rc:121 -#, fuzzy -#| msgid "Hawaiian Daylight Time" msgid "Haiti Daylight Time" -msgstr "ハワイ夏時間" +msgstr "ハイチ夏時間" #: tzres.rc:78 msgid "Central European Standard Time" @@ -9930,16 +9874,12 @@ msgid "Argentina Daylight Time" msgstr "アルゼンチン夏時間" #: tzres.rc:142 -#, fuzzy -#| msgid "Mauritius Standard Time" msgid "Marquesas Standard Time" -msgstr "モーリシャス標準時" +msgstr "マルキーズ標準時" #: tzres.rc:143 -#, fuzzy -#| msgid "Mauritius Daylight Time" msgid "Marquesas Daylight Time" -msgstr "モーリシャス夏時間" +msgstr "マルキーズ夏時間" #: tzres.rc:156 msgid "Myanmar Standard Time" @@ -10314,16 +10254,12 @@ msgid "Venezuela Daylight Time" msgstr "ベネズエラ夏時間" #: tzres.rc:60 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Bougainville Standard Time" -msgstr "山地標準時" +msgstr "ブーゲンビル標準時" #: tzres.rc:61 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Bougainville Daylight Time" -msgstr "山地夏時間" +msgstr "ブーゲンビル夏時間" #: tzres.rc:122 msgid "Hawaiian Standard Time" @@ -10350,16 +10286,12 @@ msgid "New Zealand Daylight Time" msgstr "ニュージーランド夏時間" #: tzres.rc:34 -#, fuzzy -#| msgid "Argentina Standard Time" msgid "Aleutian Standard Time" -msgstr "アルゼンチン標準時" +msgstr "アリューシャン標準時" #: tzres.rc:35 -#, fuzzy -#| msgid "Argentina Daylight Time" msgid "Aleutian Daylight Time" -msgstr "アルゼンチン夏時間" +msgstr "アリューシャン夏時間" #: tzres.rc:74 msgid "Central Brazilian Standard Time" @@ -10442,16 +10374,12 @@ msgid "Korea Daylight Time" msgstr "韓国 (夏時間)" #: tzres.rc:86 -#, fuzzy -#| msgid "Easter Island Standard Time" msgid "Chatham Islands Standard Time" -msgstr "イースター島標準時" +msgstr "チャタム諸島標準時" #: tzres.rc:87 -#, fuzzy -#| msgid "Easter Island Daylight Time" msgid "Chatham Islands Daylight Time" -msgstr "イースター島夏時間" +msgstr "チャタム諸島夏時間" #: tzres.rc:92 msgid "E. Africa Standard Time"

1 0

Gijs Vermeulen : advpack: Extract inf file before installing in ExecuteCab().
by Alexandre Julliard May 11, 2020

May 11, 2020

Module: wine Branch: master Commit: 90ddc58a86736971478bd4353237c4723992c3a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90ddc58a86736971478bd435… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon May 11 00:10:57 2020 +0200 advpack: Extract inf file before installing in ExecuteCab(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29806 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/install.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 70dc4d74aa..d82de9c361 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -677,8 +677,15 @@ HRESULT WINAPI ExecuteCabW(HWND hwnd, CABINFOW* pCab, LPVOID pReserved) ZeroMemory(&info, sizeof(ADVInfo)); - if (pCab->pszCab && *pCab->pszCab) - FIXME("Cab archive not extracted!\n"); + if ((pCab->pszCab && *pCab->pszCab) && (pCab->pszInf && *pCab->pszInf) && *pCab->szSrcPath) + { + TRACE("pszCab: %s, pszInf: %s, szSrcPath: %s\n", debugstr_w(pCab->pszCab), debugstr_w(pCab->pszInf), + debugstr_w(pCab->szSrcPath)); + + hr = ExtractFilesW(pCab->pszCab, pCab->szSrcPath, 0, pCab->pszInf, NULL, 0); + if (FAILED(hr)) + ERR("Failed to extract .inf file!\n"); + } hr = install_init(pCab->pszInf, pCab->pszSection, pCab->szSrcPath, pCab->dwFlags, &info); if (hr != S_OK)

1 0

Julian Rüger : German translation for release 5.8.
by Alexandre Julliard May 11, 2020

May 11, 2020

Module: website Branch: master Commit: 7ed6cbec7deb080423ee8c40358baadab2b64844 URL: https://source.winehq.org/git/website.git/?a=commit;h=7ed6cbec7deb080423ee8… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon May 11 15:59:33 2020 +0200 German translation for release 5.8. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020050801.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2020050801.xml b/news/de/2020050801.xml new file mode 100644 index 00000000..eb5885f9 --- /dev/null +++ b/news/de/2020050801.xml @@ -0,0 +1,17 @@ +<news> +<date>8. Mai 2020</date> +<title>Wine 5.8 freigegeben</title> +<body> + Die Entwicklungsversion 5.8 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.8">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von Plug&Play-Gerätebenachrichtigungen.</li> + <li>Weitere Unterstützung, mit Clang im MSVC-Modus zu bauen.</li> + <li>Fortschritt des WineD3D-Vulkan-Backends.</li> + <li>Anfängliche Implementierung eines GIF-Encoders.</li> + <li>Aktualisierung der Vulkan-Spezifikationen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.8.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 5.8
by Alexandre Julliard May 8, 2020

May 8, 2020

Module: website Branch: master Commit: 25ab236be6ab22d1c04edd92890b95dbdd7bab2a URL: https://source.winehq.org/git/website.git/?a=commit;h=25ab236be6ab22d1c04ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 8 22:20:46 2020 +0200 Wine release 5.8 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020050801.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2020050801.xml b/news/en/2020050801.xml new file mode 100644 index 00000000..4cd4340c --- /dev/null +++ b/news/en/2020050801.xml @@ -0,0 +1,17 @@ +<news> +<date>May 8, 2020</date> +<title>Wine 5.8 Released</title> +<body> + The Wine development release 5.8 is now available. + <a href="{$root}/announce/5.8">What's new</a> in this release: +<ul> + <li>Support for Plug & Play device notifications.</li> + <li>More support for building with Clang in MSVC mode.</li> + <li>Still more progress on the WineD3D Vulkan backend.</li> + <li>Initial implementation of a GIF encoder.</li> + <li>Vulkan spec update.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.8.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0