December 2018 - Wine-Devel - list.winehq.org

Re: widl: Set name return value (passed by reference) in the alias case alias case in get_user_type.
by Alexandre Julliard Nov. 22, 2020

Nov. 22, 2020

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > So, I admit I don't really know this code, but looking at it (triggered > by a warning issued by GCC development versions), I noticed that this > variable passed by reference is not initialized here. It's initialized when we return a type, and it doesn't need to be initialized on NULL return. The code is correct, but you could probably set the variable to NULL in the caller to silence the warning. -- Alexandre Julliard julliard(a)winehq.org

2 1

Error handling in RpcBindingVectorFree (dlls/rpcrt4/rpc_binding.c)
by Gerald Pfeifer Nov. 22, 2020

Nov. 22, 2020

Looking at RPC_STATUS WINAPI RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ) { RPC_STATUS status; ULONG c; TRACE("(%p)\n", BindingVector); for (c=0; c<(*BindingVector)->Count; c++) { status = RpcBindingFree(&(*BindingVector)->BindingH[c]); } HeapFree(GetProcessHeap(), 0, *BindingVector); *BindingVector = NULL; return RPC_S_OK; } we currently always ignore the outcome of RpcBindingFree and return RPC_S_OK. However, there is one case where RpcBindingFree returns something different (which is if *Binding is null when RPC_S_INVALID_BINDING is returned). What is the proper way of handling this? Just keeping the code as is and removing the unused status variable? Breaking the loop once RpcBindingFree returns something different from RPC_S_OK? Continuing and returning the first / the last status different from RPC_S_OK? Gerald

1 1

[PATCH] vbscript: Treat tokens after a '.' as identifier
by Brendan McGrath Feb. 15, 2019

Feb. 15, 2019

Currently, a vbscript using an identifier that is also a keyword fails with a parser error. For example: Set oLocator = CreateObject("Wbemscripting.SWbemLocator") Set oReg = oLocator.ConnectServer("", "root\default", "", "").Get("StdRegProv") results in: 0009:fixme:vbscript:parse_script parser failed around L"efault\", \"\", \"\").Get(\"StdRegProv\")\n" The 'Get' method here causes the parser error as it is also a vbscript keyword. This patch treats any token after a '.' as an identifier. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46318 Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- I _think_ this patch is OK - but I don't have a lot of experience with vbscript. There may be a scenario where a keyword can immediately follow a '.'. I've also created the bug linked above (where this patch is proposed). dlls/vbscript/lex.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 571854db58e..0d27c2423c7 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -412,7 +412,10 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) return parse_numeric_literal(ctx, lval); if(isalphaW(c)) { - int ret = check_keywords(ctx); + int ret = 0; + + if(ctx->last_token != '.') + ret = check_keywords(ctx); if(!ret) return parse_identifier(ctx, lval); if(ret != tREM) -- 2.17.1

2 7

[RFC PATCH 5/9] wined3d: Support adapter LUID via SetupAPI.
by Zhiyi Zhang Jan. 30, 2019

Jan. 30, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 4 +-- dlls/wined3d/Makefile.in | 2 +- dlls/wined3d/directx.c | 66 +++++++++++++++++++++++++++------- dlls/wined3d/wined3d_main.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 58 insertions(+), 18 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 02cf744be3..b42b76186c 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -777,7 +777,7 @@ static void test_adapter_luid(void) ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); /* Older versions of WARP aren't enumerated by IDXGIFactory_EnumAdapters(). */ - todo_wine ok(found_adapter_count == 1 || broken(is_null_luid_adapter), + ok(found_adapter_count == 1 || broken(is_null_luid_adapter), "Found %u adapters for LUID %08x:%08x.\n", found_adapter_count, device_adapter_desc.AdapterLuid.HighPart, device_adapter_desc.AdapterLuid.LowPart); @@ -796,7 +796,7 @@ static void test_adapter_luid(void) hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid, &IID_IDXGIAdapter, (void **)&adapter); - todo_wine ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr); if (SUCCEEDED(hr)) { hr = IDXGIAdapter_GetDesc(adapter, &desc); diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 39fed381d9..9f95ace137 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -1,6 +1,6 @@ MODULE = wined3d.dll IMPORTLIB = wined3d -IMPORTS = opengl32 user32 gdi32 advapi32 +IMPORTS = opengl32 user32 gdi32 advapi32 setupapi C_SRCS = \ adapter_gl.c \ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 544c76ed5c..ee7b75a38c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -26,6 +26,10 @@ #include "wined3d_private.h" #include "winternl.h" +#include "initguid.h" +#include "devguid.h" +#include "devpkey.h" +#include "setupapi.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); @@ -43,6 +47,8 @@ enum wined3d_driver_model /* The d3d device ID */ static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } }; +DEFINE_DEVPROPKEY(DEVPROPKEY_DISPLAY_ADAPTER_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + /********************************************************** * Utility functions follow **********************************************************/ @@ -100,6 +106,7 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) { wined3d_adapter_cleanup(&wined3d->adapters[i]); } + heap_free(wined3d->adapters); heap_free(wined3d); } @@ -739,6 +746,7 @@ HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned in return hr; memcpy(desc->device_name, adapter->device_name, sizeof(desc->device_name)); + SetRect(&desc->desktop_rect, 0, 0, mode.width, mode.height); OffsetRect(&desc->desktop_rect, adapter->monitor_position.x, adapter->monitor_position.y); /* FIXME: We should get this from EnumDisplayDevices() when the adapters @@ -2529,18 +2537,12 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o adapter->ordinal = ordinal; display_device.cb = sizeof(display_device); - EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); + /* FIXME: EnumDisplayDevicesW is a stub. It doesn't support multiple displays and adapters. + * Use the first device name for now. */ + EnumDisplayDevicesW(NULL, 0, &display_device, 0); TRACE("Display device: %s.\n", debugstr_w(display_device.DeviceName)); strcpyW(adapter->device_name, display_device.DeviceName); - if (!AllocateLocallyUniqueId(&adapter->luid)) - { - ERR("Failed to set adapter LUID (%#x).\n", GetLastError()); - return FALSE; - } - TRACE("Allocated LUID %08x:%08x for adapter %p.\n", - adapter->luid.HighPart, adapter->luid.LowPart, adapter); - adapter->formats = NULL; if (wined3d_creation_flags & WINED3D_NO3D) @@ -2557,17 +2559,55 @@ const struct wined3d_parent_ops wined3d_null_parent_ops = HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) { + HDEVINFO devinfo; + SP_DEVINFO_DATA devinfo_data = {sizeof(SP_DEVINFO_DATA)}; + DEVPROPTYPE property_type; + UINT i = 0, adapter_count = 0; + BOOL ret = E_FAIL; + wined3d->ref = 1; wined3d->flags = flags; TRACE("Initialising adapters.\n"); - if (!wined3d_adapter_init(&wined3d->adapters[0], 0, flags)) + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, DIGCF_PRESENT); + if (devinfo == INVALID_HANDLE_VALUE) { - WARN("Failed to initialise adapter.\n"); + ERR("Failed to get adapter list.\n"); return E_FAIL; } - wined3d->adapter_count = 1; - return WINED3D_OK; + while (SetupDiEnumDeviceInfo(devinfo, i++, &devinfo_data)) + adapter_count++; + + wined3d->adapters = heap_alloc_zero(sizeof(struct wined3d_adapter) * adapter_count); + if (!wined3d->adapters) + { + ret = E_OUTOFMEMORY; + goto fail; + } + + for (i = 0; SetupDiEnumDeviceInfo(devinfo, i, &devinfo_data); ++i) + { + property_type = DEVPROP_TYPE_UINT64; + if (!SetupDiGetDevicePropertyW(devinfo, &devinfo_data, &DEVPROPKEY_DISPLAY_ADAPTER_LUID, &property_type, + (BYTE *)&wined3d->adapters[i].luid, sizeof(LUID), NULL, 0)) + { + WARN("Failed to get adapter %u luid.\n", i); + goto fail; + } + + if (!wined3d_adapter_init(&wined3d->adapters[i], i, flags)) + { + WARN("Failed to initialise adapter %u.\n", i); + goto fail; + } + } + + wined3d->adapter_count = adapter_count; + + ret = WINED3D_OK; +fail: + SetupDiDestroyDeviceInfoList(devinfo); + return ret; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index ca83d0ae0d..c6d10e97bf 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -97,7 +97,7 @@ struct wined3d * CDECL wined3d_create(DWORD flags) struct wined3d *object; HRESULT hr; - if (!(object = heap_alloc_zero(FIELD_OFFSET(struct wined3d, adapters[1])))) + if (!(object = heap_alloc_zero(sizeof(struct wined3d)))) { ERR("Failed to allocate wined3d object memory.\n"); return NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6e39db4fa8..8190327cce 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2840,7 +2840,7 @@ struct wined3d LONG ref; DWORD flags; UINT adapter_count; - struct wined3d_adapter adapters[1]; + struct wined3d_adapter *adapters; }; HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) DECLSPEC_HIDDEN; -- 2.19.2

5 10

[RFC PATCH 2/9] setupapi: Implement SetupDiSetDevicePropertyW.
by Zhiyi Zhang Jan. 27, 2019

Jan. 27, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 139 ++++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/tests/devinst.c | 194 +++++++++++++++++++++++++++++++++- include/setupapi.h | 2 + 4 files changed, 335 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 55746562c8..556bba4684 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -327,6 +327,28 @@ static WCHAR *get_refstr_key_path(struct device_iface *iface) return path; } +static BOOL is_valid_property_type(DEVPROPTYPE prop_type) +{ + DWORD type = prop_type & DEVPROP_MASK_TYPE; + DWORD typemod = prop_type & DEVPROP_MASK_TYPEMOD; + + if (type > MAX_DEVPROP_TYPE) + return FALSE; + if (typemod > MAX_DEVPROP_TYPEMOD) + return FALSE; + + if (typemod == DEVPROP_TYPEMOD_ARRAY + && (type == DEVPROP_TYPE_EMPTY || type == DEVPROP_TYPE_NULL || type == DEVPROP_TYPE_STRING + || type == DEVPROP_TYPE_SECURITY_DESCRIPTOR_STRING)) + return FALSE; + + if (typemod == DEVPROP_TYPEMOD_LIST + && !(type == DEVPROP_TYPE_STRING || type == DEVPROP_TYPE_SECURITY_DESCRIPTOR_STRING)) + return FALSE; + + return TRUE; +} + static LPWSTR SETUPDI_CreateSymbolicLinkPath(LPCWSTR instanceId, const GUID *InterfaceClassGuid, LPCWSTR ReferenceString) { @@ -3343,6 +3365,123 @@ BOOL WINAPI SetupDiSetDeviceInstallParamsW( return TRUE; } +BOOL WINAPI SetupDiSetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA devinfo_data, const DEVPROPKEY *key, + DEVPROPTYPE type, const BYTE *buffer, DWORD size, DWORD flags) +{ + static const WCHAR propertiesW[] = {'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 0}; + static const WCHAR formatW[] = {'\\', '%', '0', '4', 'X', 0}; + struct device *device; + HKEY properties_hkey, property_hkey; + WCHAR property_hkey_path[44]; + LSTATUS ls; + + TRACE("%p %p %p %#x %p %d %#x\n", devinfo, devinfo_data, key, type, buffer, size, flags); + + if (!(device = get_device(devinfo, devinfo_data))) + return FALSE; + + if (!key || !is_valid_property_type(type) + || (buffer && !size && !(type == DEVPROP_TYPE_EMPTY || type == DEVPROP_TYPE_NULL)) + || (buffer && size && (type == DEVPROP_TYPE_EMPTY || type == DEVPROP_TYPE_NULL))) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + if (size && !buffer) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (flags) + { + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + + if (key->pid < 2) + { + SetLastError(ERROR_INVALID_REG_PROPERTY); + return FALSE; + } + + ls = RegCreateKeyExW(device->key, propertiesW, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &properties_hkey, NULL); + if (ls) + { + SetLastError(ls); + return FALSE; + } + + SETUPDI_GuidToString(&key->fmtid, property_hkey_path); + sprintfW(property_hkey_path + 38, formatW, key->pid); + + if (type == DEVPROP_TYPE_EMPTY) + { + if (RegDeleteKeyW(properties_hkey, property_hkey_path)) + { + RegCloseKey(properties_hkey); + SetLastError(ERROR_NOT_FOUND); + return FALSE; + } + else + { + RegCloseKey(properties_hkey); + SetLastError(NO_ERROR); + return TRUE; + } + } + else if (type == DEVPROP_TYPE_NULL) + { + if (RegOpenKeyW(properties_hkey, property_hkey_path, &property_hkey)) + { + RegCloseKey(properties_hkey); + SetLastError(ERROR_NOT_FOUND); + return FALSE; + } + + if (RegDeleteValueW(property_hkey, NULL)) + { + RegCloseKey(property_hkey); + RegCloseKey(properties_hkey); + SetLastError(ERROR_NOT_FOUND); + return FALSE; + } + else + { + RegCloseKey(property_hkey); + RegCloseKey(properties_hkey); + SetLastError(NO_ERROR); + return TRUE; + } + } + else + { + if ((ls = RegCreateKeyExW(properties_hkey, property_hkey_path, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, + &property_hkey, NULL))) + { + RegCloseKey(properties_hkey); + SetLastError(ls); + return FALSE; + } + + if ((ls = RegSetValueExW(property_hkey, NULL, 0, 0xffff0000 | (0xffff & type), buffer, size))) + { + RegCloseKey(property_hkey); + RegCloseKey(properties_hkey); + SetLastError(ls); + return FALSE; + } + else + { + RegCloseKey(property_hkey); + RegCloseKey(properties_hkey); + SetLastError(NO_ERROR); + return TRUE; + } + } +} + static HKEY SETUPDI_OpenDevKey(struct device *device, REGSAM samDesired) { HKEY enumKey, key = INVALID_HANDLE_VALUE; diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index eb2dab204d..fb44298292 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -475,7 +475,7 @@ @ stdcall SetupDiSetDeviceInstallParamsW(ptr ptr ptr) @ stub SetupDiSetDeviceInterfaceDefault @ stub SetupDiSetDeviceInterfacePropertyW -@ stub SetupDiSetDevicePropertyW +@ stdcall SetupDiSetDevicePropertyW(ptr ptr ptr long ptr long long) @ stdcall SetupDiSetDeviceRegistryPropertyA(ptr ptr long ptr long) @ stdcall SetupDiSetDeviceRegistryPropertyW(ptr ptr long ptr long) @ stub SetupDiSetDriverInstallParamsA diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index bfffcb9c32..274c28745c 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -26,7 +26,8 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" -#include "guiddef.h" +#include "initguid.h" +#include "devpkey.h" #include "setupapi.h" #include "cfgmgr32.h" @@ -37,6 +38,8 @@ static GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; static GUID guid2 = {0x6a55b5a5, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; +BOOL (WINAPI *pSetupDiSetDevicePropertyW)(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE, const BYTE *, DWORD, DWORD); + static LSTATUS devinst_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) { LONG ret; @@ -408,6 +411,194 @@ static void test_device_info(void) SetupDiDestroyDeviceInfoList(set); } +static void test_device_property(void) +{ + static const WCHAR valueW[] = {'d', 'e', 'a', 'd', 'b', 'e', 'e', 'f', 0}; + HMODULE hmod; + HDEVINFO set; + SP_DEVINFO_DATA device = {sizeof(device)}; + DEVPROPKEY key; + DWORD err; + BOOL ret; + + hmod = LoadLibraryA("setupapi.dll"); + pSetupDiSetDevicePropertyW = (void *)GetProcAddress(hmod, "SetupDiSetDevicePropertyW"); + + if (!pSetupDiSetDevicePropertyW) + { + win_skip("SetupDiSetDevicePropertyW() are only available on vista+, skipping tests.\n"); + FreeLibrary(hmod); + return; + } + + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + /* SetupDiSetDevicePropertyW */ + /* #1 Null device info list */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(NULL, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_HANDLE, "Expect last error %#x, got %#x\n", ERROR_INVALID_HANDLE, err); + + /* #2 Null device */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, NULL, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_PARAMETER, "Expect last error %#x, got %#x\n", ERROR_INVALID_PARAMETER, err); + + /* #3 Null property key pointer */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device, NULL, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_DATA, "Expect last error %#x, got %#x\n", ERROR_INVALID_DATA, err); + + /* #4 Invalid property key type */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, 0xffff, (const BYTE *)valueW, sizeof(valueW), 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_DATA, "Expect last error %#x, got %#x\n", ERROR_INVALID_DATA, err); + + /* #5 Null buffer pointer */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, NULL, sizeof(valueW), 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_USER_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INVALID_USER_BUFFER, err); + + /* #6 Zero buffer size */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, 0, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_DATA, "Expect last error %#x, got %#x\n", ERROR_INVALID_DATA, err); + + /* #7 Flags not zero */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 1); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_FLAGS, "Expect last error %#x, got %#x\n", ERROR_INVALID_FLAGS, err); + + /* #8 Invalid key pid */ + key.fmtid = DEVPKEY_Device_FriendlyName.fmtid; + key.pid = 0; + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device, &key, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + err = GetLastError(); + /* Failure on win8+ */ + if(0) ok(ret, "Expect success\n"); + ok(err == ERROR_INVALID_REG_PROPERTY || broken(err == NO_ERROR), "Expect last error %#x, got %#x\n", ERROR_INVALID_REG_PROPERTY, err); + + /* #9 Normal */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + + /* #10 Delete property with buffer not null and size not zero */ + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_EMPTY, (const BYTE *)valueW, sizeof(valueW), 0); + err = GetLastError(); + /* Failure on win8+ */ + if(0) ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_DATA || broken(err == NO_ERROR), "Expect last error %#x, got %#x\n", ERROR_INVALID_DATA, err); + + /* #11 Delete property with buffer not null */ + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_EMPTY, (const BYTE *)valueW, 0, 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + + /* #12 Delete property with size not zero */ + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_EMPTY, NULL, sizeof(valueW), 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_USER_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INVALID_USER_BUFFER, err); + + /* #13 Delete property */ + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_EMPTY, NULL, 0, 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + + /* #14 Delete non-existent property */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_EMPTY, NULL, 0, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_NOT_FOUND, "Expect last error %#x, got %#x\n", ERROR_NOT_FOUND, err); + + /* #15 Delete property value with buffer not null and size not zero */ + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_NULL, (const BYTE *)valueW, sizeof(valueW), 0); + err = GetLastError(); + /* Failure on win8+ */ + if(0) ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_DATA || broken(err == NO_ERROR), "Expect last error %#x, got %#x\n", ERROR_INVALID_DATA, err); + + /* #16 Delete property value with buffer not null */ + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_NULL, (const BYTE *)valueW, 0, 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + + /* #17 Delete property value with size not zero */ + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_NULL, NULL, sizeof(valueW), 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_USER_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INVALID_USER_BUFFER, err); + + /* #18 Delete property value */ + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_NULL, NULL, 0, 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + + /* #19 Delete non-existent property value */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_NULL, NULL, 0, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_NOT_FOUND, "Expect last error %#x, got %#x\n", ERROR_NOT_FOUND, err); + + ret = SetupDiRemoveDevice(set, &device); + ok(ret, "Got unexpected error %#x.\n", GetLastError()); + + SetupDiDestroyDeviceInfoList(set); + FreeLibrary(hmod); +} + static void test_get_device_instance_id(void) { BOOL ret; @@ -1366,6 +1557,7 @@ START_TEST(devinst) test_open_class_key(); test_install_class(); test_device_info(); + test_device_property(); test_get_device_instance_id(); test_register_device_info(); test_device_iface(); diff --git a/include/setupapi.h b/include/setupapi.h index 76e255cc44..4491617d8a 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1634,6 +1634,8 @@ BOOL WINAPI SetupDiSetDeviceInterfaceDefault(HDEVINFO, PSP_DEVICE_INTERFACE_ BOOL WINAPI SetupDiSetDeviceInstallParamsA(HDEVINFO, PSP_DEVINFO_DATA, PSP_DEVINSTALL_PARAMS_A); BOOL WINAPI SetupDiSetDeviceInstallParamsW(HDEVINFO, PSP_DEVINFO_DATA, PSP_DEVINSTALL_PARAMS_W); #define SetupDiSetDeviceInstallParams WINELIB_NAME_AW(SetupDiSetDeviceInstallParams) +BOOL WINAPI SetupDiSetDevicePropertyW(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE, const BYTE *, DWORD, DWORD); +#define SetupDiSetDeviceProperty WINELIB_NAME_AW(SetupDiSetDeviceProperty) /* note: A function doesn't exist */ BOOL WINAPI SetupDiSetDeviceRegistryPropertyA(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD); BOOL WINAPI SetupDiSetDeviceRegistryPropertyW(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD); #define SetupDiSetDeviceRegistryProperty WINELIB_NAME_AW(SetupDiSetDeviceRegistryProperty) -- 2.19.2

2 4

[PATCH v2 1/2] kernelbase/tests: Relax tests for WaitOnAddress().
by Zebediah Figura Jan. 26, 2019

Jan. 26, 2019

Application should be expected to handle spurious wakeups, which the following implementation will give in WakeByAddressSingle(). Avoid testing that WakeByAddressSingle() only wakes one thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernelbase/tests/sync.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/kernelbase/tests/sync.c b/dlls/kernelbase/tests/sync.c index 99cbbc43bc..7a335d1af8 100644 --- a/dlls/kernelbase/tests/sync.c +++ b/dlls/kernelbase/tests/sync.c @@ -31,19 +31,23 @@ static void (WINAPI *pWakeByAddressAll)(void *); static void (WINAPI *pWakeByAddressSingle)(void *); static LONG64 address; -static LONG64 compare; static DWORD WINAPI test_WaitOnAddress_func(void *arg) { BOOL ret = FALSE; - DWORD gle; - while (address == compare) + LONG64 compare; + + do { - SetLastError(0xdeadbeef); - ret = pWaitOnAddress(&address, &compare, sizeof(compare), INFINITE); - gle = GetLastError(); - ok(gle == 0xdeadbeef || broken(gle == ERROR_SUCCESS) /* Win 8 */, "got %d\n", gle); - } - ok(ret, "got %d\n", ret); + while (!(compare = address)) + { + SetLastError(0xdeadbeef); + ret = pWaitOnAddress(&address, &compare, sizeof(compare), INFINITE); + ok(ret, "wait failed\n"); + ok(GetLastError() == 0xdeadbeef || broken(GetLastError() == ERROR_SUCCESS) /* Win 8 */, + "got error %d\n", GetLastError()); + } + } while (InterlockedCompareExchange64(&address, compare - 1, compare) != compare); + return 0; } @@ -51,6 +55,7 @@ static void test_WaitOnAddress(void) { DWORD gle, val, nthreads; HANDLE threads[8]; + LONG64 compare; BOOL ret; int i; @@ -135,31 +140,28 @@ static void test_WaitOnAddress(void) /* WakeByAddressAll */ address = 0; - compare = 0; for (i = 0; i < ARRAY_SIZE(threads); i++) threads[i] = CreateThread(NULL, 0, test_WaitOnAddress_func, NULL, 0, NULL); Sleep(100); - address = ~0; + address = ARRAY_SIZE(threads); pWakeByAddressAll(&address); val = WaitForMultipleObjects(ARRAY_SIZE(threads), threads, TRUE, 5000); ok(val == WAIT_OBJECT_0, "got %d\n", val); for (i = 0; i < ARRAY_SIZE(threads); i++) CloseHandle(threads[i]); + ok(!address, "got unexpected value %s\n", wine_dbgstr_longlong(address)); /* WakeByAddressSingle */ address = 0; for (i = 0; i < ARRAY_SIZE(threads); i++) - threads[i] = CreateThread(NULL, 0, test_WaitOnAddress_func, NULL, 0, NULL); + threads[i] = CreateThread(NULL, 0, test_WaitOnAddress_func, NULL, 0, NULL); Sleep(100); - address = 1; nthreads = ARRAY_SIZE(threads); + address = ARRAY_SIZE(threads); while (nthreads) { - val = WaitForMultipleObjects(nthreads, threads, FALSE, 0); - ok(val == STATUS_TIMEOUT, "got %u\n", val); - pWakeByAddressSingle(&address); val = WaitForMultipleObjects(nthreads, threads, FALSE, 2000); ok(val < WAIT_OBJECT_0 + nthreads, "got %u\n", val); @@ -167,7 +169,7 @@ static void test_WaitOnAddress(void) memmove(&threads[val], &threads[val+1], (nthreads - val - 1) * sizeof(threads[0])); nthreads--; } - + ok(!address, "got unexpected value %s\n", wine_dbgstr_longlong(address)); } START_TEST(sync) -- 2.14.1

3 4

[RFC PATCH 3/9] setupapi: Implement SetupDiGetDevicePropertyW.
by Zhiyi Zhang Jan. 23, 2019

Jan. 23, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 69 ++++++++++++- dlls/setupapi/tests/devinst.c | 181 +++++++++++++++++++++++++++++++++- 2 files changed, 244 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 556bba4684..2a71b59518 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3848,9 +3848,70 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO info_set, PSP_DEVINFO_DATA info_d const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, DWORD prop_buff_size, DWORD *required_size, DWORD flags) { - FIXME("%p, %p, %p, %p, %p, %d, %p, 0x%08x stub\n", info_set, info_data, prop_key, - prop_type, prop_buff, prop_buff_size, required_size, flags); + static const WCHAR formatW[] = {'\\', '%', '0', '4', 'X', 0}; + WCHAR property_hkey_path[55] = {'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\\'}; + DWORD reg_key_type; + DWORD value_size; + LSTATUS ls; + struct device *device; - SetLastError(ERROR_NOT_FOUND); - return FALSE; + TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", info_set, info_data, prop_key, prop_type, prop_buff, prop_buff_size, + required_size, flags); + + if (!(device = get_device(info_set, info_data))) + return FALSE; + + if (!prop_key) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + if (!prop_type || (!prop_buff && prop_buff_size)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (flags) + { + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + + SETUPDI_GuidToString(&prop_key->fmtid, property_hkey_path + 11); + sprintfW(property_hkey_path + 49, formatW, prop_key->pid); + + value_size = prop_buff_size; + ls = RegGetValueW(device->key, property_hkey_path, NULL, RRF_RT_ANY, &reg_key_type, prop_buff, &value_size); + + switch (ls) + { + case ERROR_FILE_NOT_FOUND: + *prop_type = DEVPROP_TYPE_EMPTY; + if (required_size) + *required_size = 0; + SetLastError(ERROR_NOT_FOUND); + return FALSE; + default: + *prop_type = 0xffff & reg_key_type; + if (required_size) + *required_size = value_size; + + if (prop_buff_size < value_size) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + else if (ls == ERROR_UNSUPPORTED_TYPE) + { + SetLastError(NO_ERROR); + return TRUE; + } + else + { + SetLastError(ls); + return FALSE; + } + } } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 274c28745c..6928415c76 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -39,6 +39,7 @@ static GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0 static GUID guid2 = {0x6a55b5a5, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; BOOL (WINAPI *pSetupDiSetDevicePropertyW)(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE, const BYTE *, DWORD, DWORD); +BOOL (WINAPI *pSetupDiGetDevicePropertyW)(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE *, BYTE *, DWORD, DWORD *, DWORD); static LSTATUS devinst_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) { @@ -418,15 +419,19 @@ static void test_device_property(void) HDEVINFO set; SP_DEVINFO_DATA device = {sizeof(device)}; DEVPROPKEY key; + DEVPROPTYPE type; + DWORD size; + BYTE buffer[256]; DWORD err; BOOL ret; hmod = LoadLibraryA("setupapi.dll"); pSetupDiSetDevicePropertyW = (void *)GetProcAddress(hmod, "SetupDiSetDevicePropertyW"); + pSetupDiGetDevicePropertyW = (void *)GetProcAddress(hmod, "SetupDiGetDevicePropertyW"); - if (!pSetupDiSetDevicePropertyW) + if (!pSetupDiSetDevicePropertyW || !pSetupDiGetDevicePropertyW) { - win_skip("SetupDiSetDevicePropertyW() are only available on vista+, skipping tests.\n"); + win_skip("SetupDi{Set,Get}DevicePropertyW() are only available on vista+, skipping tests.\n"); FreeLibrary(hmod); return; } @@ -592,6 +597,178 @@ static void test_device_property(void) ok(!ret, "Expect failure\n"); ok(err == ERROR_NOT_FOUND, "Expect last error %#x, got %#x\n", ERROR_NOT_FOUND, err); + + /* SetupDiGetDevicePropertyW */ + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + + /* #1 Null device info list */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(NULL, &device, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_HANDLE, "Expect last error %#x, got %#x\n", ERROR_INVALID_HANDLE, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #2 Null device */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, NULL, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_PARAMETER, "Expect last error %#x, got %#x\n", ERROR_INVALID_PARAMETER, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #3 Null property key */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device, NULL, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_DATA, "Expect last error %#x, got %#x\n", ERROR_INVALID_DATA, err); + /* Type unchanged on win8+ */ + ok(type == DEVPROP_TYPE_STRING || type == DEVPROP_TYPE_EMPTY, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #4 Null property type */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, NULL, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_USER_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INVALID_USER_BUFFER, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #5 Null buffer */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, &type, NULL, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_USER_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INVALID_USER_BUFFER, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #6 Null buffer with zero size and wrong type */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_UINT64; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, &type, NULL, 0, &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INSUFFICIENT_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INSUFFICIENT_BUFFER, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + + /* #7 Zero buffer size */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, &type, buffer, 0, &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INSUFFICIENT_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INSUFFICIENT_BUFFER, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + + /* #8 Null required size */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), NULL, 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + + /* #9 Flags not zero */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), &size, 1); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_FLAGS, "Expect last error %#x, got %#x\n", ERROR_INVALID_FLAGS, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #10 Non-existent property key */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_HardwareIds, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_NOT_FOUND, "Expect last error %#x, got %#x\n", ERROR_NOT_FOUND, err); + /* Type unchanged on win8+ */ + ok(type == DEVPROP_TYPE_EMPTY || broken(type == DEVPROP_TYPE_STRING), "Expect type %#x, got %#x\n", DEVPROP_TYPE_EMPTY, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #11 Wrong property key type */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_UINT64; + size = 0; + memset(buffer, 0, sizeof(buffer)); + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + ok(!lstrcmpW((WCHAR *)buffer, valueW), "Expect buffer %s, got %s\n", wine_dbgstr_w(valueW), wine_dbgstr_w((WCHAR *)buffer)); + + /* #12 Get null property value */ + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_NULL, NULL, 0, 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_NOT_FOUND, "Expect last error %#x, got %#x\n", ERROR_NOT_FOUND, err); + /* Type unchanged on win8+ */ + ok(type == DEVPROP_TYPE_EMPTY || broken(type == DEVPROP_TYPE_STRING), "Expect type %#x, got %#x\n", DEVPROP_TYPE_EMPTY, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #13 Insufficient buffer size */ + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(valueW) - 1, &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INSUFFICIENT_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INSUFFICIENT_BUFFER, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + + /* #14 Normal */ + ret = pSetupDiSetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + memset(buffer, 0, sizeof(buffer)); + ret = pSetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + ok(!lstrcmpW((WCHAR *)buffer, valueW), "Expect buffer %s, got %s\n", wine_dbgstr_w(valueW), wine_dbgstr_w((WCHAR *)buffer)); + ret = SetupDiRemoveDevice(set, &device); ok(ret, "Got unexpected error %#x.\n", GetLastError()); -- 2.19.2

2 2

[PATCH v2] systray: Hide systray for fullscreen games
by Hamish Claxton Jan. 3, 2019

Jan. 3, 2019

This patch fixes a bug where if using the Wine virtual desktop, changing resolutions in a fullscreen game would cause the systray to be drawn over the game window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40828 Signed-off-by: Hamish Claxton <hamishclaxton(a)gmail.com> --- v2: Properly do the resolution checks programs/explorer/systray.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 3d36f74e16..893a9dadda 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -780,7 +780,11 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_DISPLAYCHANGE: if (hide_systray || (!nb_displayed && !enable_shell)) do_hide_systray(); - else do_show_systray(); + else { + if ( !( GetSystemMetrics( SM_CXFULLSCREEN ) >= GetSystemMetrics( SM_CXSCREEN ) + && GetSystemMetrics( SM_CYFULLSCREEN ) >= GetSystemMetrics( SM_CYSCREEN ) ) ) + do_show_systray(); + } break; case WM_TIMER: -- 2.20.1

4 5

Introducing Myself.
by Denil Verghese Jan. 3, 2019

Jan. 3, 2019

Hi, I myself Denil C Verghese, doing a degree in Bachelors of Technology. I'm here because of two reasons. Foremost, I would like to be part of this endeavor. I could go on saying why I liked this community, but it would make this mail long. Second, I want to be an intern as a part of GSoC 2019. I've joined the IRC Channels #winehackers and #winehq as @dcv. I've gone through this guide <https://wiki.winehq.org/Summer_Of_Code/> and other developer guides. Submitted a small patch(a very small one! 😋). I would like to know where should I focus like, developing new features or solving bugs. I'm ready to resolve any mistakes that I may make. Hoping that I would get some guidance on how to be a part in this. Thank You, Denil C Verghese

2 1

[PATCH 2/2] po: Updated Sinhala translation.
by Isira Seneviratne Jan. 3, 2019

Jan. 3, 2019

2 2

[PATCH 1/2] po: Updated French translation.
by Isira Seneviratne Jan. 3, 2019

Jan. 3, 2019

3 2

[PATCH 2/2] comctl32/listview: Add FIXMEs for LVM_MOVEITEMTOGROUP and LVM_MOVEGROUP messages
by Isira Seneviratne Dec. 30, 2018

Dec. 30, 2018

3 2

[PATCH 1/9] comctl32/button: Use assignment instead of CopyRect
by Gabriel Ivăncescu Dec. 30, 2018

Dec. 30, 2018

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- These notes apply to the entire patch series (but each patch is independent). Since patch 156187 was rejected and the reason for lack of including CopyRect in that patch was "it makes no sense. A straight assignment should be used instead", this patch series will do just that, and replace the remaining CopyRect calls with straight assignments (and some NULL checks where needed). To avoid redundant NULL checks, they have been added only to the rects that can actually be NULL. dlls/comctl32/button.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 56a4730..46e85a9 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1362,9 +1362,9 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la } heap_free(text); - CopyRect(labelRc, &labelRect); - CopyRect(imageRc, &imageRect); - CopyRect(textRc, &textRect); + *labelRc = labelRect; + if (imageRc) *imageRc = imageRect; + if (textRc) *textRc = textRect; return dtStyle; } -- 2.19.1

4 19

[PATCH 1/2] comctl32/listview: Implement LVM_ISGROUPVIEWENABLED message handling
by Isira Seneviratne Dec. 30, 2018

Dec. 30, 2018

2 1

issue with DPI awareness
by Kimball Thurston Dec. 29, 2018

Dec. 29, 2018

All - I'm attempting to fix my own bug report ( https://bugs.winehq.org/show_bug.cgi?id=45917) but need someone who knows this code better to comment. If one sets the process-level DPI awareness to unaware (DPI_AWARENESS_UNAWARE) (which is what battle.net does), then the mouse selection (at least) ends up not working, resulting in a scaled / shifted mouse selection (when you click on something, an item up and to the left will be selected based on the distance from top left, and scale of dpi) - it's easiest to see if the window is exactly in the upper left corner of the screen. An easy way to see this is set your HCU\Control Panel\Desktop\LogPixels to 161 (the dpi of my 4k monitor), I also have my windows version at 10, then add SetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE ); as the first line of WinMain for something (I am using programs/regedit/main.c because I know it has child windows, although I don't believe that is the issue currently, but started w/ that idea). I presume the same would happen if the dpi awareness were in the app manifest. When I look at the coordinates of the mouse as they flow through process_mouse_message in dlls/user32/message.c, the WINPOS_WindowFromPoint calls find an hwnd, and then the modification point_phys_to_win_dpi seems plausible. However, the hittest value from WindowFromPoint does not work (returns HTNOWHERE when it shouldn't). And then the ScreenToClient that happens when the mouse is in the client area overly shifts the mouse position before it is put into the lParam of the event. A common theme of both the hittest and the ScreenToClient is the client_rect. Printing out the values, it appears like the client_rect is in monitor_dpi instead of window dpi, at least for the application top level window, or there's a disconnect because there's a boundary where the desktop window is in per_monitor, but the app is in unaware. At this point, if someone could take a look, and advise me whether the various window rects should be in monitor dpi or in window dpi, then I can try to track down what needs to change where to make that work, unless by reading the above it's obvious to someone who knows this code better than I? I don't have a windows machine to run tests on to validate, but am happy to try to help write the code if someone can suggest a good type of conformance test. thank you in advance, Kimball

1 0

[PATCH] po: Update Finnish translation
by Lauri Kenttä Dec. 29, 2018

Dec. 29, 2018

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 416 ++++++++++++++++++++++++++----------------------------- 1 file changed, 198 insertions(+), 218 deletions(-) diff --git a/po/fi.po b/po/fi.po index 9220a656bc..2dc9e7d974 100644 --- a/po/fi.po +++ b/po/fi.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: 2018-08-31 07:27+0200\n" +"PO-Revision-Date: 2018-12-30 02:40+0200\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: Finnish\n" "Language: fi\n" @@ -9052,811 +9052,791 @@ msgstr "Valitse lähde" #: tzres.rc:82 msgid "China Standard Time" -msgstr "" +msgstr "Kiinan normaaliaika" #: tzres.rc:83 msgid "China Daylight Time" -msgstr "" +msgstr "Kiinan kesäaika" #: tzres.rc:160 msgid "North Asia Standard Time" -msgstr "" +msgstr "Pohjois-Aasian normaaliaika" #: tzres.rc:161 msgid "North Asia Daylight Time" -msgstr "" +msgstr "Pohjois-Aasian kesäaika" #: tzres.rc:104 msgid "Georgian Standard Time" -msgstr "" +msgstr "Georgian normaaliaika" #: tzres.rc:105 msgid "Georgian Daylight Time" -msgstr "" +msgstr "Georgian kesäaika" #: tzres.rc:152 msgid "Nepal Standard Time" -msgstr "" +msgstr "Nepalin normaaliaika" #: tzres.rc:153 msgid "Nepal Daylight Time" -msgstr "" +msgstr "Nepalin kesäaika" #: tzres.rc:60 msgid "Cape Verde Standard Time" -msgstr "" +msgstr "Kap Verden normaaliaika" #: tzres.rc:61 msgid "Cape Verde Daylight Time" -msgstr "" +msgstr "Kap Verden kesäaika" #: tzres.rc:74 -#, fuzzy -#| msgid "Central European" msgid "Central European Standard Time" -msgstr "Keskieurooppalainen" +msgstr "Keski-Euroopan normaaliaika" #: tzres.rc:75 -#, fuzzy -#| msgid "Central European" msgid "Central European Daylight Time" -msgstr "Keskieurooppalainen" +msgstr "Keski-Euroopan kesäaika" #: tzres.rc:140 msgid "Morocco Standard Time" -msgstr "" +msgstr "Marokon normaaliaika" #: tzres.rc:141 msgid "Morocco Daylight Time" -msgstr "" +msgstr "Marokon kesäaika" #: tzres.rc:72 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Standard Time" -msgstr "Keskieurooppalainen" +msgstr "Keski-Euroopan normaaliaika" #: tzres.rc:73 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Daylight Time" -msgstr "Keskieurooppalainen" +msgstr "Keski-Euroopan kesäaika" #: tzres.rc:118 msgid "Iran Standard Time" -msgstr "" +msgstr "Iranin normaaliaika" #: tzres.rc:119 msgid "Iran Daylight Time" -msgstr "" +msgstr "Iranin kesäaika" #: tzres.rc:150 msgid "Namibia Standard Time" -msgstr "" +msgstr "Namibian normaaliaika" #: tzres.rc:151 msgid "Namibia Daylight Time" -msgstr "" +msgstr "Namibian kesäaika" #: tzres.rc:200 msgid "Tonga Standard Time" -msgstr "" +msgstr "Tongan normaaliaika" #: tzres.rc:201 msgid "Tonga Daylight Time" -msgstr "" +msgstr "Tongan kesäaika" #: tzres.rc:144 msgid "Mountain Standard Time (Mexico)" -msgstr "" +msgstr "Kalliovuorten normaaliaika (Meksiko)" #: tzres.rc:145 msgid "Mountain Daylight Time (Mexico)" -msgstr "" +msgstr "Kalliovuorten kesäaika (Meksiko)" #: tzres.rc:106 -#, fuzzy -#| msgid "&Standard bar" msgid "GMT Standard Time" -msgstr "&Peruspalkki" +msgstr "GMT-normaaliaika" #: tzres.rc:107 msgid "GMT Daylight Time" -msgstr "" +msgstr "GMT-kesäaika" #: tzres.rc:68 msgid "Central Asia Standard Time" -msgstr "" +msgstr "Keski-Aasian normaaliaika" #: tzres.rc:69 msgid "Central Asia Daylight Time" -msgstr "" +msgstr "Keski-Aasian kesäaika" #: tzres.rc:38 msgid "Arabic Standard Time" -msgstr "" +msgstr "Arabian normaaliaika" #: tzres.rc:39 msgid "Arabic Daylight Time" -msgstr "" +msgstr "Arabian kesäaika" #: tzres.rc:132 msgid "Magadan Standard Time" -msgstr "" +msgstr "Magadanin normaaliaika" #: tzres.rc:133 msgid "Magadan Daylight Time" -msgstr "" +msgstr "Magadanin kesäaika" #: tzres.rc:156 msgid "Newfoundland Standard Time" -msgstr "" +msgstr "Newfoundlandin normaaliaika" #: tzres.rc:157 msgid "Newfoundland Daylight Time" -msgstr "" +msgstr "Newfoundlandin kesäaika" #: tzres.rc:224 msgid "West Pacific Standard Time" -msgstr "" +msgstr "Länsi-Tyynenmeren normaaliaika" #: tzres.rc:225 msgid "West Pacific Daylight Time" -msgstr "" +msgstr "Länsi-Tyynenmeren kesäaika" #: tzres.rc:164 msgid "Pacific Standard Time" -msgstr "" +msgstr "Tyynenmeren normaaliaika" #: tzres.rc:165 msgid "Pacific Daylight Time" -msgstr "" +msgstr "Tyynenmeren kesäaika" #: tzres.rc:48 msgid "Azerbaijan Standard Time" -msgstr "" +msgstr "Azerbaidžanin normaaliaika" #: tzres.rc:49 msgid "Azerbaijan Daylight Time" -msgstr "" +msgstr "Azerbaidžanin kesäaika" #: tzres.rc:182 msgid "Samoa Standard Time" -msgstr "" +msgstr "Samoan normaaliaika" #: tzres.rc:183 msgid "Samoa Daylight Time" -msgstr "" +msgstr "Samoan kesäaika" #: tzres.rc:124 msgid "Kaliningrad Standard Time" -msgstr "" +msgstr "Kaliningradin normaaliaika" #: tzres.rc:125 msgid "Kaliningrad Daylight Time" -msgstr "" +msgstr "Kaliningradin kesäaika" #: tzres.rc:166 msgid "Pacific Standard Time (Mexico)" -msgstr "" +msgstr "Tyynenmeren normaaliaika (Meksiko)" #: tzres.rc:167 msgid "Pacific Daylight Time (Mexico)" -msgstr "" +msgstr "Tyynenmeren kesäaika (Meksiko)" #: tzres.rc:136 msgid "Middle East Standard Time" -msgstr "" +msgstr "Lähi-idän normaaliaika" #: tzres.rc:137 msgid "Middle East Daylight Time" -msgstr "" +msgstr "Lähi-idän kesäaika" #: tzres.rc:198 msgid "Tokyo Standard Time" -msgstr "" +msgstr "Tokion normaaliaika" #: tzres.rc:199 msgid "Tokyo Daylight Time" -msgstr "" +msgstr "Tokion kesäaika" #: tzres.rc:130 msgid "Line Islands Standard Time" -msgstr "" +msgstr "Linesaarten normaaliaika" #: tzres.rc:131 msgid "Line Islands Daylight Time" -msgstr "" +msgstr "Linesaarten kesäaika" #: tzres.rc:122 msgid "Jordan Standard Time" -msgstr "" +msgstr "Jordanian normaaliaika" #: tzres.rc:123 msgid "Jordan Daylight Time" -msgstr "" +msgstr "Jordanian kesäaika" #: tzres.rc:78 msgid "Central Standard Time" -msgstr "" +msgstr "Keskinen normaaliaika" #: tzres.rc:79 msgid "Central Daylight Time" -msgstr "" +msgstr "Keskinen kesäaika" #: tzres.rc:50 msgid "Azores Standard Time" -msgstr "" +msgstr "Azorien normaaliaika" #: tzres.rc:51 msgid "Azores Daylight Time" -msgstr "" +msgstr "Azorien kesäaika" #: tzres.rc:158 msgid "North Asia East Standard Time" -msgstr "" +msgstr "Itäisen Pohjois-Aasian normaaliaika" #: tzres.rc:159 msgid "North Asia East Daylight Time" -msgstr "" +msgstr "Itäisen Pohjois-Aasian kesäaika" #: tzres.rc:40 msgid "Argentina Standard Time" -msgstr "" +msgstr "Argentiinan normaaliaika" #: tzres.rc:41 msgid "Argentina Daylight Time" -msgstr "" +msgstr "Argentiinan kesäaika" #: tzres.rc:146 msgid "Myanmar Standard Time" -msgstr "" +msgstr "Myanmarin normaaliaika" #: tzres.rc:147 msgid "Myanmar Daylight Time" -msgstr "" +msgstr "Myanmarin kesäaika" #: tzres.rc:210 tzres.rc:211 msgid "Coordinated Universal Time" -msgstr "" +msgstr "UTC-aika" #: tzres.rc:116 msgid "India Standard Time" -msgstr "" +msgstr "Intian normaaliaika" #: tzres.rc:117 msgid "India Daylight Time" -msgstr "" +msgstr "Intian kesäaika" #: tzres.rc:112 -#, fuzzy -#| msgid "&Standard bar" msgid "GTB Standard Time" -msgstr "&Peruspalkki" +msgstr "GT-normaaliaika" #: tzres.rc:113 msgid "GTB Daylight Time" -msgstr "" +msgstr "GT-kesäaika" #: tzres.rc:202 msgid "Turkey Standard Time" -msgstr "" +msgstr "Turkin normaaliaika" #: tzres.rc:203 msgid "Turkey Daylight Time" -msgstr "" +msgstr "Turkin kesäaika" #: tzres.rc:100 msgid "Fiji Standard Time" -msgstr "" +msgstr "Fidžin normaaliaika" #: tzres.rc:101 msgid "Fiji Daylight Time" -msgstr "" +msgstr "Fidžin kesäaika" #: tzres.rc:58 msgid "Canada Central Standard Time" -msgstr "" +msgstr "Kanadan keskinen normaaliaika" #: tzres.rc:59 msgid "Canada Central Daylight Time" -msgstr "" +msgstr "Kanadan keskinen kesäaika" #: tzres.rc:194 msgid "Taipei Standard Time" -msgstr "" +msgstr "Taipein normaaliaika" #: tzres.rc:195 msgid "Taipei Daylight Time" -msgstr "" +msgstr "Taipein kesäaika" #: tzres.rc:220 msgid "W. Europe Standard Time" -msgstr "" +msgstr "Länsi-Euroopan normaaliaika" #: tzres.rc:221 msgid "W. Europe Daylight Time" -msgstr "" +msgstr "Länsi-Euroopan kesäaika" #: tzres.rc:138 msgid "Montevideo Standard Time" -msgstr "" +msgstr "Montevideon normaaliaika" #: tzres.rc:139 msgid "Montevideo Daylight Time" -msgstr "" +msgstr "Montevideon kesäaika" #: tzres.rc:168 msgid "Pakistan Standard Time" -msgstr "" +msgstr "Pakistanin normaaliaika" #: tzres.rc:169 msgid "Pakistan Daylight Time" -msgstr "" +msgstr "Pakistanin kesäaika" #: tzres.rc:62 msgid "Caucasus Standard Time" -msgstr "" +msgstr "Kaukasuksen normaaliaika" #: tzres.rc:63 msgid "Caucasus Daylight Time" -msgstr "" +msgstr "Kaukasuksen kesäaika" #: tzres.rc:46 msgid "AUS Eastern Standard Time" -msgstr "" +msgstr "Australian itäinen normaaliaika" #: tzres.rc:47 msgid "AUS Eastern Daylight Time" -msgstr "" +msgstr "Australian itäinen kesäaika" #: tzres.rc:148 msgid "N. Central Asia Standard Time" -msgstr "" +msgstr "Pohjoisen Keski-Aasian normaaliaika" #: tzres.rc:149 msgid "N. Central Asia Daylight Time" -msgstr "" +msgstr "Pohjoisen Keski-Aasian kesäaika" #: tzres.rc:94 msgid "Eastern Standard Time" -msgstr "" +msgstr "Itäinen normaaliaika" #: tzres.rc:95 msgid "Eastern Daylight Time" -msgstr "" +msgstr "Itäinen kesäaika" #: tzres.rc:80 msgid "Central Standard Time (Mexico)" -msgstr "" +msgstr "Keskinen normaaliaika (Meksiko)" #: tzres.rc:81 msgid "Central Daylight Time (Mexico)" -msgstr "" +msgstr "Keskinen kesäaika (Meksiko)" #: tzres.rc:42 msgid "Atlantic Standard Time" -msgstr "" +msgstr "Atlantin normaaliaika" #: tzres.rc:43 msgid "Atlantic Daylight Time" -msgstr "" +msgstr "Atlantin kesäaika" #: tzres.rc:142 msgid "Mountain Standard Time" -msgstr "" +msgstr "Kalliovuorten normaaliaika" #: tzres.rc:143 msgid "Mountain Daylight Time" -msgstr "" +msgstr "Kalliovuorten kesäaika" #: tzres.rc:206 msgid "US Eastern Standard Time" -msgstr "" +msgstr "Itäinen normaaliaika (USA)" #: tzres.rc:207 msgid "US Eastern Daylight Time" -msgstr "" +msgstr "Itäinen kesäaika (USA)" #: tzres.rc:196 msgid "Tasmania Standard Time" -msgstr "" +msgstr "Tasmanian normaaliaika" #: tzres.rc:197 msgid "Tasmania Daylight Time" -msgstr "" +msgstr "Tasmanian kesäaika" #: tzres.rc:66 msgid "Central America Standard Time" -msgstr "" +msgstr "Keski-Amerikan normaaliaika" #: tzres.rc:67 msgid "Central America Daylight Time" -msgstr "" +msgstr "Keski-Amerikan kesäaika" #: tzres.rc:208 msgid "US Mountain Standard Time" -msgstr "" +msgstr "Kalliovuorten normaaliaika (USA)" #: tzres.rc:209 msgid "US Mountain Daylight Time" -msgstr "" +msgstr "Kalliovuorten kesäaika (USA)" #: tzres.rc:188 msgid "South Africa Standard Time" -msgstr "" +msgstr "Etelä-Afrikan normaaliaika" #: tzres.rc:189 msgid "South Africa Daylight Time" -msgstr "" +msgstr "Etelä-Afrikan kesäaika" #: tzres.rc:64 msgid "Cen. Australia Standard Time" -msgstr "" +msgstr "Keski-Australian normaaliaika" #: tzres.rc:65 msgid "Cen. Australia Daylight Time" -msgstr "" +msgstr "Keski-Australian kesäaika" #: tzres.rc:190 msgid "Sri Lanka Standard Time" -msgstr "" +msgstr "Sri Lankan normaaliaika" #: tzres.rc:191 msgid "Sri Lanka Daylight Time" -msgstr "" +msgstr "Sri Lankan kesäaika" #: tzres.rc:30 msgid "Afghanistan Standard Time" -msgstr "" +msgstr "Afganistanin normaaliaika" #: tzres.rc:31 msgid "Afghanistan Daylight Time" -msgstr "" +msgstr "Afganistanin kesäaika" #: tzres.rc:226 msgid "Yakutsk Standard Time" -msgstr "" +msgstr "Jakutskin normaaliaika" #: tzres.rc:227 msgid "Yakutsk Daylight Time" -msgstr "" +msgstr "Jakutskin kesäaika" #: tzres.rc:176 msgid "SA Eastern Standard Time" -msgstr "" +msgstr "Etelä-Amerikan itäinen normaaliaika" #: tzres.rc:177 msgid "SA Eastern Daylight Time" -msgstr "" +msgstr "Etelä-Amerikan itäinen kesäaika" #: tzres.rc:34 msgid "Arab Standard Time" -msgstr "" +msgstr "Saudi-Arabian normaaliaika" #: tzres.rc:35 msgid "Arab Daylight Time" -msgstr "" +msgstr "Saudi-Arabian kesäaika" #: tzres.rc:36 msgid "Arabian Standard Time" -msgstr "" +msgstr "Arabian normaaliaika" #: tzres.rc:37 msgid "Arabian Daylight Time" -msgstr "" +msgstr "Arabian kesäaika" #: tzres.rc:174 msgid "Russian Standard Time" -msgstr "" +msgstr "Venäjän normaaliaika" #: tzres.rc:175 msgid "Russian Daylight Time" -msgstr "" +msgstr "Venäjän kesäaika" #: tzres.rc:172 msgid "Romance Standard Time" -msgstr "" +msgstr "Romaaninen normaaliaika" #: tzres.rc:173 msgid "Romance Daylight Time" -msgstr "" +msgstr "Romaaninen kesäaika" #: tzres.rc:98 msgid "Ekaterinburg Standard Time" -msgstr "" +msgstr "Jekaterinburgin normaaliaika" #: tzres.rc:99 msgid "Ekaterinburg Daylight Time" -msgstr "" +msgstr "Jekaterinburgin kesäaika" #: tzres.rc:192 msgid "Syria Standard Time" -msgstr "" +msgstr "Syyrian normaaliaika" #: tzres.rc:193 msgid "Syria Daylight Time" -msgstr "" +msgstr "Syyrian kesäaika" #: tzres.rc:44 msgid "AUS Central Standard Time" -msgstr "" +msgstr "Australian keskinen normaaliaika" #: tzres.rc:45 msgid "AUS Central Daylight Time" -msgstr "" +msgstr "Australian keskinen kesäaika" #: tzres.rc:110 msgid "Greenwich Standard Time" -msgstr "" +msgstr "Greenwichin normaaliaika" #: tzres.rc:111 msgid "Greenwich Daylight Time" -msgstr "" +msgstr "Greenwichin kesäaika" #: tzres.rc:204 msgid "Ulaanbaatar Standard Time" -msgstr "" +msgstr "Ulaanbaatarin normaaliaika" #: tzres.rc:205 msgid "Ulaanbaatar Daylight Time" -msgstr "" +msgstr "Ulaanbaatarin kesäaika" #: tzres.rc:120 msgid "Israel Standard Time" -msgstr "" +msgstr "Israelin normaaliaika" #: tzres.rc:121 msgid "Israel Daylight Time" -msgstr "" +msgstr "Israelin kesäaika" #: tzres.rc:54 msgid "Bangladesh Standard Time" -msgstr "" +msgstr "Bangladeshin normaaliaika" #: tzres.rc:55 msgid "Bangladesh Daylight Time" -msgstr "" +msgstr "Bangladeshin kesäaika" #: tzres.rc:178 msgid "SA Pacific Standard Time" -msgstr "" +msgstr "Etelä-Amerikan Tyynenmeren normaaliaika" #: tzres.rc:179 msgid "SA Pacific Daylight Time" -msgstr "" +msgstr "Etelä-Amerikan Tyynenmeren kesäaika" #: tzres.rc:222 msgid "West Asia Standard Time" -msgstr "" +msgstr "Länsi-Aasian normaaliaika" #: tzres.rc:223 msgid "West Asia Daylight Time" -msgstr "" +msgstr "Länsi-Aasian kesäaika" #: tzres.rc:32 msgid "Alaskan Standard Time" -msgstr "" +msgstr "Alaskan normaaliaika" #: tzres.rc:33 msgid "Alaskan Daylight Time" -msgstr "" +msgstr "Alaskan kesäaika" #: tzres.rc:170 msgid "Paraguay Standard Time" -msgstr "" +msgstr "Paraguayn normaaliaika" #: tzres.rc:171 msgid "Paraguay Daylight Time" -msgstr "" +msgstr "Paraguayn kesäaika" #: tzres.rc:84 -#, fuzzy -#| msgid "Date and time" msgid "Dateline Standard Time" -msgstr "Päivämäärä ja aika" +msgstr "Päivämäärärajan normaaliaika" #: tzres.rc:85 msgid "Dateline Daylight Time" -msgstr "" +msgstr "Päivämäärärajan kesäaika" #: tzres.rc:128 msgid "Libya Standard Time" -msgstr "" +msgstr "Libyan normaaliaika" #: tzres.rc:129 msgid "Libya Daylight Time" -msgstr "" +msgstr "Libyan kesäaika" #: tzres.rc:52 msgid "Bahia Standard Time" -msgstr "" +msgstr "Bahian normaaliaika" #: tzres.rc:53 msgid "Bahia Daylight Time" -msgstr "" +msgstr "Bahian kesäaika" #: tzres.rc:212 msgid "Venezuela Standard Time" -msgstr "" +msgstr "Venezuelan normaaliaika" #: tzres.rc:213 msgid "Venezuela Daylight Time" -msgstr "" +msgstr "Venezuelan kesäaika" #: tzres.rc:114 msgid "Hawaiian Standard Time" -msgstr "" +msgstr "Havaijin normaaliaika" #: tzres.rc:115 msgid "Hawaiian Daylight Time" -msgstr "" +msgstr "Havaijin kesäaika" #: tzres.rc:184 msgid "SE Asia Standard Time" -msgstr "" +msgstr "Kaakkois-Aasian normaaliaika" #: tzres.rc:185 msgid "SE Asia Daylight Time" -msgstr "" +msgstr "Kaakkois-Aasian kesäaika" #: tzres.rc:154 msgid "New Zealand Standard Time" -msgstr "" +msgstr "Uuden-Seelannin normaaliaika" #: tzres.rc:155 msgid "New Zealand Daylight Time" -msgstr "" +msgstr "Uuden-Seelannin kesäaika" #: tzres.rc:70 msgid "Central Brazilian Standard Time" -msgstr "" +msgstr "Keski-Brasilian normaaliaika" #: tzres.rc:71 msgid "Central Brazilian Daylight Time" -msgstr "" +msgstr "Keski-Brasilian kesäaika" #: tzres.rc:56 msgid "Belarus Standard Time" -msgstr "" +msgstr "Valko-Venäjän normaaliaika" #: tzres.rc:57 msgid "Belarus Daylight Time" -msgstr "" +msgstr "Valko-Venäjän kesäaika" #: tzres.rc:180 msgid "SA Western Standard Time" -msgstr "" +msgstr "Etelä-Amerikan läntinen normaaliaika" #: tzres.rc:181 msgid "SA Western Daylight Time" -msgstr "" +msgstr "Etelä-Amerikan läntinen kesäaika" #: tzres.rc:108 msgid "Greenland Standard Time" -msgstr "" +msgstr "Grönlannin normaaliaika" #: tzres.rc:109 msgid "Greenland Daylight Time" -msgstr "" +msgstr "Grönlannin kesäaika" #: tzres.rc:92 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Standard Time" -msgstr "Päivämäärä ja aika" +msgstr "Pääsiäissaarten normaaliaika" #: tzres.rc:93 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Daylight Time" -msgstr "Päivämäärä ja aika" +msgstr "Pääsiäissaarten kesäaika" #: tzres.rc:96 msgid "Egypt Standard Time" -msgstr "" +msgstr "Egyptin normaaliaika" #: tzres.rc:97 msgid "Egypt Daylight Time" -msgstr "" +msgstr "Egyptin kesäaika" #: tzres.rc:134 msgid "Mauritius Standard Time" -msgstr "" +msgstr "Mauritiuksen normaaliaika" #: tzres.rc:135 msgid "Mauritius Daylight Time" -msgstr "" +msgstr "Mauritiuksen kesäaika" #: tzres.rc:214 msgid "Vladivostok Standard Time" -msgstr "" +msgstr "Vladivostokin normaaliaika" #: tzres.rc:215 msgid "Vladivostok Daylight Time" -msgstr "" +msgstr "Vladivostokin kesäaika" #: tzres.rc:186 msgid "Singapore Standard Time" -msgstr "" +msgstr "Singaporen normaaliaika" #: tzres.rc:187 msgid "Singapore Daylight Time" -msgstr "" +msgstr "Singaporen kesäaika" #: tzres.rc:126 msgid "Korea Standard Time" -msgstr "" +msgstr "Korean normaaliaika" #: tzres.rc:127 msgid "Korea Daylight Time" -msgstr "" +msgstr "Korean kesäaika" #: tzres.rc:86 msgid "E. Africa Standard Time" -msgstr "" +msgstr "Itä-Afrikan normaaliaika" #: tzres.rc:87 msgid "E. Africa Daylight Time" -msgstr "" +msgstr "Itä-Afrikan kesäaika" #: tzres.rc:102 -#, fuzzy -#| msgid "&Standard bar" msgid "FLE Standard Time" -msgstr "&Peruspalkki" +msgstr "Suomen normaaliaika" #: tzres.rc:103 msgid "FLE Daylight Time" -msgstr "" +msgstr "Suomen kesäaika" #: tzres.rc:90 msgid "E. South America Standard Time" -msgstr "" +msgstr "Itäisen Etelä-Amerikan normaaliaika" #: tzres.rc:91 msgid "E. South America Daylight Time" -msgstr "" +msgstr "Itäisen Etelä-Amerikan kesäaika" #: tzres.rc:76 msgid "Central Pacific Standard Time" -msgstr "" +msgstr "Keski-Tyynenmeren normaaliaika" #: tzres.rc:77 msgid "Central Pacific Daylight Time" -msgstr "" +msgstr "Keski-Tyynenmeren kesäaika" #: tzres.rc:218 msgid "W. Central Africa Standard Time" -msgstr "" +msgstr "Läntisen Keski-Afrikan normaaliaika" #: tzres.rc:219 msgid "W. Central Africa Daylight Time" -msgstr "" +msgstr "Läntisen Keski-Afrikan kesäaika" #: tzres.rc:162 msgid "Pacific SA Standard Time" -msgstr "" +msgstr "Tyynenmeren Etelä-Amerikan normaaliaika" #: tzres.rc:163 msgid "Pacific SA Daylight Time" -msgstr "" +msgstr "Tyynenmeren Etelä-Amerikan kesäaika" #: tzres.rc:88 msgid "E. Australia Standard Time" -msgstr "" +msgstr "Itä-Australian normaaliaika" #: tzres.rc:89 msgid "E. Australia Daylight Time" -msgstr "" +msgstr "Itä-Australian kesäaika" #: tzres.rc:216 msgid "W. Australia Standard Time" -msgstr "" +msgstr "Länsi-Australian normaaliaika" #: tzres.rc:217 msgid "W. Australia Daylight Time" -msgstr "" +msgstr "Länsi-Australian kesäaika" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" -- 2.20.1

1 0

Fwd: [PATCH] systray: Hide systray for fullscreen games
by Hamish Claxton Dec. 29, 2018

Dec. 29, 2018

Hi Fabian, In my testing, both SM_CXSCREEN and SM_CYSCREEN both return an int value that you can print out and check manually. I did this when initially figuring out what was going wrong. If you're unhappy, I could try comparing against the desktop windows dimensions instead. Or do you mean I should use the GetSystemMetrics() function? Either way, I thought the simplest method would be to just compare against those values. I should mention though, that before applying this patch/fix, every game I tested had the issue, and afterwards did not have the issue. Here's a video I uploaded to demonstrate the issue: https://mega.nz/embed#!YU8GRKTS!nK2JGVs6EzAhu1bs-KtH1lajx6y3XRakTFNZUYNyTwo Tested on both Wine and Wine Staging 4.0 rc4. Thanks in Advance, Hamish

2 2

[PATCH] systray: Hide systray for fullscreen games
by Hamish Claxton Dec. 29, 2018

Dec. 29, 2018

This patch fixes a bug where if using the Wine virtual desktop, changing resolutions in a fullscreen game would cause the systray to be drawn over the game window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40828 Signed-off-by: Hamish Claxton <hamishclaxton(a)gmail.com> --- programs/explorer/systray.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 3d36f74e16..781da2dec5 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -780,7 +780,13 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_DISPLAYCHANGE: if (hide_systray || (!nb_displayed && !enable_shell)) do_hide_systray(); - else do_show_systray(); + else { + RECT window; + GetWindowRect( GetForegroundWindow(), &window ); + + if ( !( window.right >= SM_CXSCREEN && window.bottom >= SM_CYSCREEN ) ) + do_show_systray(); + } break; case WM_TIMER: -- 2.20.1

2 1

[PATCH 04/11] mfplat: Implement IMFAttributes::{SetItem,GetItem}.
by Jactry Zeng Dec. 29, 2018

Dec. 29, 2018

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 142 ++++++++++++++++++++++++++++++++-- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 69 +++++++++++++++++ 3 files changed, 207 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c7c346512f..6e056b3609 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -35,6 +35,7 @@ #include "wine/heap.h" #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -448,10 +449,19 @@ HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG sr return E_NOTIMPL; } +struct mfattribute +{ + struct list entry; + GUID key; + PROPVARIANT value; +}; + typedef struct _mfattributes { IMFAttributes IMFAttributes_iface; LONG ref; + CRITICAL_SECTION lock; + struct list attributes; } mfattributes; static inline mfattributes *impl_from_IMFAttributes(IMFAttributes *iface) @@ -491,6 +501,8 @@ static ULONG WINAPI mfattributes_AddRef(IMFAttributes *iface) return ref; } +static void free_attribute_object(mfattributes *object); + static ULONG WINAPI mfattributes_Release(IMFAttributes *iface) { mfattributes *This = impl_from_IMFAttributes(iface); @@ -500,19 +512,50 @@ static ULONG WINAPI mfattributes_Release(IMFAttributes *iface) if (!ref) { + free_attribute_object(This); HeapFree(GetProcessHeap(), 0, This); } return ref; } +static HRESULT mfattributes_getitem(mfattributes *object, REFGUID key, PROPVARIANT *value, BOOL verify_type) +{ + struct mfattribute *attribute, *attribute2; + HRESULT hres; + + EnterCriticalSection(&object->lock); + + LIST_FOR_EACH_ENTRY_SAFE(attribute, attribute2, &object->attributes, struct mfattribute, entry) + { + if(IsEqualGUID(key, &attribute->key)) + { + if(verify_type && ((value->vt && attribute->value.vt != value->vt) || + (value->vt == VT_UNKNOWN && !attribute->value.punkVal))) + hres = MF_E_INVALIDTYPE; + else + { + PropVariantCopy(value, &attribute->value); + hres = S_OK; + } + break; + } + else + hres = MF_E_ATTRIBUTENOTFOUND; + } + + LeaveCriticalSection(&object->lock); + + return hres; +} + static HRESULT WINAPI mfattributes_GetItem(IMFAttributes *iface, REFGUID key, PROPVARIANT *value) { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + return mfattributes_getitem(This, key, value, FALSE); } static HRESULT WINAPI mfattributes_GetItemType(IMFAttributes *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) @@ -645,13 +688,71 @@ static HRESULT WINAPI mfattributes_GetUnknown(IMFAttributes *iface, REFGUID key, return E_NOTIMPL; } -static HRESULT WINAPI mfattributes_SetItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT Value) +static HRESULT mfattribute_setitem(mfattributes *object, REFGUID key, REFPROPVARIANT value) +{ + struct mfattribute *attribute, *attribute2, *new_attribute = NULL; + + EnterCriticalSection(&object->lock); + + LIST_FOR_EACH_ENTRY_SAFE(attribute, attribute2, &object->attributes, struct mfattribute, entry) + if(IsEqualGUID(key, &attribute->key)) + { + new_attribute = attribute; + PropVariantClear(&new_attribute->value); + break; + } + + if(!new_attribute) + { + new_attribute = heap_alloc(sizeof(struct mfattribute)); + if(!new_attribute) + { + LeaveCriticalSection(&object->lock); + return E_OUTOFMEMORY; + } + new_attribute->key = *key; + list_add_tail(&object->attributes, &new_attribute->entry); + } + PropVariantCopy(&new_attribute->value, value); + + LeaveCriticalSection(&object->lock); + + return S_OK; + } + +static BOOL is_type_valid(DWORD type) +{ + switch(type) + { + case MF_ATTRIBUTE_UINT32: + case MF_ATTRIBUTE_UINT64: + case MF_ATTRIBUTE_DOUBLE: + case MF_ATTRIBUTE_GUID: + case MF_ATTRIBUTE_STRING: + case MF_ATTRIBUTE_BLOB: + case MF_ATTRIBUTE_IUNKNOWN: + return TRUE; + default: + return FALSE; + } +} + +static HRESULT WINAPI mfattributes_SetItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT value) { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %s, %p\n", This, debugstr_guid(key), Value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + if(!is_type_valid(value->vt)) + { + PROPVARIANT empty_value; + + PropVariantClear(&empty_value); + mfattribute_setitem(This, key, &empty_value); + return MF_E_INVALIDTYPE; + } + else + return mfattribute_setitem(This, key, value); } static HRESULT WINAPI mfattributes_DeleteItem(IMFAttributes *iface, REFGUID key) @@ -824,6 +925,31 @@ static void init_attribute_object(mfattributes *object, UINT32 size) { object->ref = 1; object->IMFAttributes_iface.lpVtbl = &mfattributes_vtbl; + InitializeCriticalSection(&object->lock); + object->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IMFAttributes.lock"); + list_init(&object->attributes); +} + +static void free_attribute_object(mfattributes *object) +{ + EnterCriticalSection(&object->lock); + + if (!list_empty(&object->attributes)) + { + struct mfattribute *attribute, *attribute2; + + LIST_FOR_EACH_ENTRY_SAFE(attribute, attribute2, &object->attributes, struct mfattribute, entry) + { + PropVariantClear(&attribute->value); + list_remove(&attribute->entry); + heap_free(attribute); + } + } + + LeaveCriticalSection(&object->lock); + + object->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&object->lock); } /*********************************************************************** @@ -901,6 +1027,7 @@ static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) if (!ref) { + free_attribute_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -1368,6 +1495,7 @@ static ULONG WINAPI mfpresentationdescriptor_Release(IMFPresentationDescriptor * if (!ref) { + free_attribute_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -2064,6 +2192,7 @@ static ULONG WINAPI mediatype_Release(IMFMediaType *iface) if (!ref) { + free_attribute_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -2426,6 +2555,7 @@ static ULONG WINAPI mfmediaevent_Release(IMFMediaEvent *iface) if (!ref) { + free_attribute_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -2940,6 +3070,7 @@ static ULONG WINAPI mfdescriptor_Release(IMFStreamDescriptor *iface) if (!ref) { + free_attribute_object(&This->attributes); heap_free(This); } @@ -3437,6 +3568,7 @@ static ULONG WINAPI mfsample_Release(IMFSample *iface) if (!ref) { + free_attribute_object(&This->attributes); heap_free(This); } diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index 07cf328ad2..e80a3b7cfc 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat +IMPORTS = ole32 mfplat propsys C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3fa59f4816..fff424e798 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -33,6 +33,7 @@ #include "mfidl.h" #include "mferror.h" #include "mfreadwrite.h" +#include "propvarutil.h" #include "wine/test.h" @@ -693,6 +694,73 @@ static void test_MFSample(void) IMFSample_Release(sample); } +static void test_IMFAttributes_item(void) +{ + IMFAttributes *attributes; + HRESULT hr; + PROPVARIANT propvar, ret_propvar; + + hr = MFCreateAttributes(&attributes, 2); + ok(hr == S_OK, "MFCreateAttributes failed: 0x%08x.\n", hr); + + PropVariantInit(&propvar); + propvar.vt = MF_ATTRIBUTE_UINT32; + U(propvar).ulVal = 123; + hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID1, &propvar); + ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_UINT32; + U(ret_propvar).ulVal = 0xdeadbeef; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "Returned wrong property: (vt: %x, ulVal: %d).\n", + ret_propvar.vt, U(ret_propvar).ulVal); + PropVariantClear(&ret_propvar); + + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_STRING; + U(ret_propvar).pwszVal = NULL; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "Returned wrong property: (vt: %x, ulVal: %d).\n", + ret_propvar.vt, U(ret_propvar).ulVal); + PropVariantClear(&ret_propvar); + + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = MF_ATTRIBUTE_UINT64; + U(propvar).uhVal.QuadPart = 65536; + hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID1, &propvar); + ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_UINT32; + U(ret_propvar).ulVal = 0xdeadbeef; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "Returned wrong property: (vt: %x, ulVal: %d).\n", + ret_propvar.vt, U(ret_propvar).ulVal); + PropVariantClear(&ret_propvar); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_I4; + U(propvar).lVal = 123; + hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID2, &propvar); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_SetItem should failed: 0x%08x.\n", hr); + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_UINT32; + U(ret_propvar).lVal = 0xdeadbeef; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID2, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + PropVariantClear(&propvar); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "Returned wrong property: (vt: %x, ulVal: %d).\n", + ret_propvar.vt, U(ret_propvar).ulVal); + PropVariantClear(&ret_propvar); + + IMFAttributes_Release(attributes); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -708,6 +776,7 @@ START_TEST(mfplat) test_MFCreateMFByteStreamOnStream(); test_MFCreateMemoryBuffer(); test_source_resolver(); + test_IMFAttributes_item(); CoUninitialize(); } -- 2.19.2

3 4

[PATCH] ml.po:Support Malayalam Translation
by Denil Verghese Dec. 29, 2018

Dec. 29, 2018

Signed-off-by: Denil Verghese <denilverghese(a)gmail.com> --- po/ml.po | 122 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 63 insertions(+), 59 deletions(-) diff --git a/po/ml.po b/po/ml.po index 005162ca9d..04050a0996 100644 --- a/po/ml.po +++ b/po/ml.po @@ -6,7 +6,7 @@ msgstr "" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" "PO-Revision-Date: N/A\n" -"Last-Translator: Automatically generated\n" +"Last-Translator: Denil C Verghese\n" "Language-Team: Malayalam\n" "Language: ml\n" "MIME-Version: 1.0\n" @@ -15,42 +15,46 @@ msgstr "" #: appwiz.rc:58 msgid "Install/Uninstall" -msgstr "" +msgstr "ഇൻസ്റ്റാൾ/അൺഇൻസ്റ്റാൾ" #: appwiz.rc:61 msgid "" "To install a new program from a floppy disk, CD-ROM drive, or your hard " "drive, click Install." -msgstr "" +msgstr "ഫ്ലോപ്പി ഡിസ്ക്, സിഡി-റോം ഡ്രൈവ്, അല്ലെങ്കിൽ നിങ്ങളുടെ " +"ഹാർഡ് ഡ്രൈവ് എന്നിവയിൽ നിന്നും ഒരു പുതിയ പ്രോഗ്രാം ഇൻസ്റ്റാൾ " +"ചെയ്യാൻ ഇൻസ്റ്റാൾ ചെയ്യുക ക്ലിക്കുചെയ്യുക." #: appwiz.rc:62 msgid "&Install..." -msgstr "" +msgstr "ഇൻസ്റ്റാൾ (&I)" #: appwiz.rc:65 msgid "" "The following software can be automatically removed. To remove a program or " "to modify its installed components, select it from the list and click Modify/" "Remove." -msgstr "" +msgstr "ഇനിപ്പറയുന്ന സോഫ്റ്റ്വെയർ സ്വപ്രേരിതമായി നീക്കംചെയ്യാം. " +"ഒരു പ്രോഗ്രാം നീക്കംചെയ്യാനോ അതിന്റെ ഇൻസ്റ്റാൾ ചെയ്ത ഭാഗങ്ങൾ " +"പരിഷ്ക്കരിക്കുന്നതിന് ലിസ്റ്റിൽ നിന്ന് അത് തിരഞ്ഞെടുത്ത് " +"പരിഷ്ക്കരിക്കുക/നീക്കം ചെയ്യുക ക്ലിക്കുചെയ്യുക." #: appwiz.rc:67 -#, fuzzy msgid "&Support Information" -msgstr "_അക്ഷരസഞ്ചയം..." +msgstr "പിന്തുണ വിവരം (&S)" #: appwiz.rc:68 regedit.rc:133 regedit.rc:232 msgid "&Modify..." -msgstr "" +msgstr "പരിഷ്ക്കരിക്കുക... (&M)" #: appwiz.rc:69 appwiz.rc:45 cryptui.rc:351 msacm32.rc:40 winecfg.rc:200 #: winecfg.rc:237 wordpad.rc:256 msgid "&Remove" -msgstr "" +msgstr "നീക്കംചെയ്യുക (&R)" #: appwiz.rc:75 msgid "Support Information" -msgstr "" +msgstr "പിന്തുണ വിവരം" #: appwiz.rc:78 avifil32.rc:54 comctl32.rc:71 comctl32.rc:55 comdlg32.rc:232 #: comdlg32.rc:262 comdlg32.rc:305 comdlg32.rc:359 comdlg32.rc:398 @@ -68,44 +72,44 @@ msgstr "" #: winemine.rc:73 winemine.rc:84 winemine.rc:98 wordpad.rc:215 wordpad.rc:226 #: wordpad.rc:244 wordpad.rc:257 msgid "OK" -msgstr "" +msgstr "ശരി" #: appwiz.rc:79 msgid "The following information can be used to get technical support for %s:" -msgstr "" +msgstr "%s നുള്ള സാങ്കേതിക പിന്തുണ ലഭിക്കാൻ താഴെ പറയുന്ന " +"വിവരങ്ങൾ ഉപയോഗിക്കാം:" #: appwiz.rc:80 msgid "Publisher:" -msgstr "" +msgstr "പ്രസാധകൻ:" #: appwiz.rc:81 winefile.rc:166 msgid "Version:" -msgstr "" +msgstr "പതിപ്പ്:" #: appwiz.rc:82 msgid "Contact:" -msgstr "" +msgstr "ബന്ധപ്പെടുക:" #: appwiz.rc:83 -#, fuzzy msgid "Support Information:" -msgstr "_അക്ഷരസഞ്ചയം..." +msgstr "പിന്തുണ വിവരം:" #: appwiz.rc:84 msgid "Support Telephone:" -msgstr "" +msgstr "ടെലിഫോൺ പിന്തുണ:" #: appwiz.rc:85 msgid "Readme:" -msgstr "" +msgstr "എന്നെ വായിക്കൂ:" #: appwiz.rc:86 msgid "Product Updates:" -msgstr "" +msgstr "ഉൽപ്പന്ന അപ്ഡേറ്റുകൾ:" #: appwiz.rc:87 msgid "Comments:" -msgstr "" +msgstr "അഭിപ്രായങ്ങൾ:" #: appwiz.rc:100 msgid "Wine Gecko Installer" @@ -124,7 +128,7 @@ msgstr "" #: appwiz.rc:109 appwiz.rc:124 msgid "&Install" -msgstr "" +msgstr "ഇൻസ്റ്റാൾ (&I)" #: appwiz.rc:110 appwiz.rc:125 avifil32.rc:55 browseui.rc:45 comctl32.rc:72 #: comctl32.rc:87 comctl32.rc:56 comdlg32.rc:171 comdlg32.rc:193 @@ -164,17 +168,20 @@ msgstr "" #: appwiz.rc:31 msgid "Add/Remove Programs" -msgstr "" +msgstr "പ്രോഗ്രാമുകൾ ചേർക്കുക/നീക്കംചെയ്യുക" #: appwiz.rc:32 msgid "" "Allows you to install new software, or remove existing software from your " "computer." msgstr "" +"പുതിയ സോഫ്റ്റ്വെയർ ഇൻസ്റ്റാൾ ചെയ്യാൻ അല്ലെങ്കിൽ, നിങ്ങളുടെ " +"കമ്പ്യൂട്ടറിൽ നിന്നും നിലവിലുള്ള സോഫ്റ്റ്വെയർ നീക്കംചെയ്യാൻ " +"നിങ്ങളെ അനുവദിക്കുന്നു." #: appwiz.rc:33 taskmgr.rc:262 winecfg.rc:33 msgid "Applications" -msgstr "" +msgstr "അപ്ലിക്കേഷനുകൾ" #: appwiz.rc:35 msgid "" @@ -184,44 +191,44 @@ msgstr "" #: appwiz.rc:36 msgid "Not specified" -msgstr "" +msgstr "വ്യക്തമാക്കിയിട്ടില്ല" #: appwiz.rc:38 shell32.rc:144 shell32.rc:241 regedit.rc:147 winefile.rc:107 msgid "Name" -msgstr "" +msgstr "പേര്" #: appwiz.rc:39 msgid "Publisher" -msgstr "" +msgstr "പ്രസാധകൻ" #: appwiz.rc:40 cryptui.rc:54 msgid "Version" -msgstr "" +msgstr "പതിപ്പ്" #: appwiz.rc:41 msgid "Installation programs" -msgstr "" +msgstr "ഇൻസ്റ്റലേഷൻ പ്രോഗ്രാമുകൾ" #: appwiz.rc:42 msgid "Programs (*.exe)" -msgstr "" +msgstr "പ്രോഗ്രാമുകൾ (*.exe)" #: appwiz.rc:43 avifil32.rc:33 cryptui.rc:83 shell32.rc:199 notepad.rc:76 #: oleview.rc:103 progman.rc:82 regedit.rc:225 winedbg.rc:43 winhlp32.rc:90 msgid "All files (*.*)" -msgstr "" +msgstr "എല്ലാ ഫയലുകളും (*.*)" #: appwiz.rc:46 msgid "&Modify/Remove" -msgstr "" +msgstr "പരിഷ്ക്കരിക്കുക/നീക്കംചെയ്യുക (&M)" #: appwiz.rc:51 msgid "Downloading..." -msgstr "" +msgstr "ഡൗൺലോഡുചെയ്യുന്നു..." #: appwiz.rc:52 msgid "Installing..." -msgstr "" +msgstr "ഇൻസ്റ്റാൾ ചെയ്യുന്നു..." #: appwiz.rc:53 msgid "" @@ -239,7 +246,7 @@ msgstr "" #: avifil32.rc:48 wordpad.rc:76 msgid "&Options..." -msgstr "" +msgstr "ഓപ്ഷനുകൾ... (&O)" #: avifil32.rc:49 msgid "&Interleave every" @@ -247,32 +254,31 @@ msgstr "" #: avifil32.rc:51 msvfw32.rc:51 msgid "frames" -msgstr "" +msgstr "ഫ്രെയിമുകൾ" #: avifil32.rc:52 -#, fuzzy msgid "Current format:" -msgstr "_അക്ഷരസഞ്ചയം..." +msgstr "നിലവിലെ ഫോർമാറ്റ്:" #: avifil32.rc:30 msgid "Waveform: %s" -msgstr "" +msgstr "തരംഗരൂപം: %s" #: avifil32.rc:31 msgid "Waveform" -msgstr "" +msgstr "തരംഗരൂപം" #: avifil32.rc:32 msgid "All multimedia files" -msgstr "" +msgstr "എല്ലാ മൾട്ടിമീഡിയ ഫയലുകളും" #: avifil32.rc:34 msgid "video" -msgstr "" +msgstr "വീഡിയോ" #: avifil32.rc:35 msgid "audio" -msgstr "" +msgstr "ഓഡിയോ" #: avifil32.rc:36 msgid "Wine AVI-default-filehandler" @@ -284,29 +290,27 @@ msgstr "" #: browseui.rc:28 msgid "Canceling..." -msgstr "" +msgstr "റദ്ദാക്കുന്നു..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "%1!u! %2 ശേഷിക്കുന്നു" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "%1!u! %2 and %3!u! %4 ശേഷിക്കുന്നു" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "_സെക്കന്‍ഡുകള്‍" +msgstr "സെക്കന്‍ഡുകള്‍" #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "മിനിറ്റുകൾ" #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "മണിക്കൂറുകൾ" #: comctl32.rc:68 winefile.rc:157 #, fuzzy @@ -315,11 +319,11 @@ msgstr "വി_വരം" #: comctl32.rc:73 comdlg32.rc:264 msgid "&Apply" -msgstr "" +msgstr "പ്രയോഗിക്കുക (&A)" #: comctl32.rc:74 comctl32.rc:88 comdlg32.rc:307 user32.rc:88 msgid "Help" -msgstr "" +msgstr "സഹായം" #: comctl32.rc:81 msgid "Wizard" @@ -327,7 +331,7 @@ msgstr "" #: comctl32.rc:84 msgid "< &Back" -msgstr "" +msgstr "< തിരികെ (&B)" #: comctl32.rc:85 msgid "&Next >" @@ -335,11 +339,11 @@ msgstr "" #: comctl32.rc:86 msgid "Finish" -msgstr "" +msgstr "പൂർത്തിയാക്കുക" #: comctl32.rc:97 msgid "Customize Toolbar" -msgstr "" +msgstr "ഉപകരണബാർ ഇഷ്ടാനുസൃതമാക്കുക" #: comctl32.rc:100 comctl32.rc:57 cryptui.rc:356 ieframe.rc:43 oleview.rc:83 #: oleview.rc:187 oleview.rc:200 oleview.rc:212 taskmgr.rc:139 @@ -407,16 +411,16 @@ msgstr "" #: comctl32.rc:62 msgid "Hide details" -msgstr "" +msgstr "വിശദാംശങ്ങൾ മറയ്ക്കുക" #: comctl32.rc:63 msgid "See details" -msgstr "" +msgstr "വിശദാംശങ്ങൾ കാണുക" #: comctl32.rc:31 cryptui.rc:235 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180 msgid "Close" -msgstr "" +msgstr "അടയ്ക്കുക" #: comctl32.rc:36 msgid "Today:" -- 2.16.2.windows.1

1 0

[PATCH] wininet: Return proper cache path from GetUrlCacheConfigInfo.
by Dmitry Timoshkov Dec. 29, 2018

Dec. 29, 2018

This patch makes an application with built-in internet shop work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/tests/urlcache.c | 53 ++++++++++++++++ dlls/wininet/urlcache.c | 113 +++++++++++++++++++++++++++++++--- 2 files changed, 158 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 3799500489..4794cb0b6e 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -1100,6 +1103,55 @@ static void test_trailing_slash(void) DeleteFileA(filename); } +static void test_GetUrlCacheConfigInfo(void) +{ + INTERNET_CACHE_CONFIG_INFOA info; + struct + { + INTERNET_CACHE_CONFIG_INFOA *info; + DWORD dwStructSize; + DWORD flags; + BOOL ret; + DWORD error; + } td[] = + { +#if 0 /* crashes under Vista */ + { NULL, 0, 0, FALSE, ERROR_INVALID_PARAMETER }, +#endif + { &info, 0, 0, TRUE }, + { &info, sizeof(info) - 1, 0, TRUE }, + { &info, sizeof(info) + 1, 0, TRUE }, + { &info, 0, CACHE_CONFIG_CONTENT_PATHS_FC, TRUE }, + { &info, sizeof(info), CACHE_CONFIG_CONTENT_PATHS_FC, TRUE }, + { &info, 0, CACHE_CONFIG_COOKIES_PATHS_FC, TRUE }, + { &info, sizeof(info), CACHE_CONFIG_COOKIES_PATHS_FC, TRUE }, + { &info, 0, CACHE_CONFIG_HISTORY_PATHS_FC, TRUE }, + { &info, sizeof(info), CACHE_CONFIG_HISTORY_PATHS_FC, TRUE }, + }; + int i; + BOOL ret; + + for (i = 0; i < ARRAY_SIZE(td); i++) + { + if (td[i].info) + { + memset(&info, 0, sizeof(*td[i].info)); + info.dwStructSize = td[i].dwStructSize; + } + + SetLastError(0xdeadbeef); + ret = GetUrlCacheConfigInfoA(td[i].info, NULL, td[i].flags); + ok(ret == td[i].ret, "%d: expected %d, got %d\n", i, td[i].ret, ret); + if (!ret) + ok(GetLastError() == td[i].error, "%d: expected %u, got %u\n", i, td[i].error, GetLastError()); + else + { + ok(info.dwStructSize == td[i].dwStructSize, "got %u\n", info.dwStructSize); + ok(info.u.s.CachePath[0], "%d: got empty path\n", i); + } + } +} + START_TEST(urlcache) { HMODULE hdll; @@ -1124,4 +1176,5 @@ START_TEST(urlcache) test_FindCloseUrlCache(); test_GetDiskInfoA(); test_trailing_slash(); + test_GetUrlCacheConfigInfo(); } diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f26fa3468d..c8d141e3d9 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -23,6 +23,7 @@ */ #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "ws2tcpip.h" @@ -3764,21 +3765,117 @@ BOOL WINAPI SetUrlCacheEntryGroupW(LPCWSTR lpszUrlName, DWORD dwFlags, /*********************************************************************** * GetUrlCacheConfigInfoW (WININET.@) */ -BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW CacheInfo, LPDWORD size, DWORD bitmask) +BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD size, DWORD flags) { - FIXME("(%p, %p, %x)\n", CacheInfo, size, bitmask); - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + cache_container *container; + + FIXME("(%p, %p, %x): semi-stub\n", info, size, flags); + + if (!info) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + info->dwContainer = 0; + info->dwQuota = 0x3e800; + info->dwReserved4 = 0; + info->fPerUser = TRUE; + info->dwSyncMode = 0; + info->dwNumCachePaths = 1; + info->dwNormalUsage = 0; + info->dwExemptUsage = 0; + + info->u.s.CachePath[0] = 0; + info->u.s.dwCacheSize = 0x3e800; /* FIXME */ + + LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) + { + switch (flags & (CACHE_CONFIG_CONTENT_PATHS_FC | CACHE_CONFIG_COOKIES_PATHS_FC | CACHE_CONFIG_HISTORY_PATHS_FC)) + { + case 0: + case CACHE_CONFIG_CONTENT_PATHS_FC: + if (container->default_entry_type == NORMAL_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + case CACHE_CONFIG_COOKIES_PATHS_FC: + if (container->default_entry_type == COOKIE_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + case CACHE_CONFIG_HISTORY_PATHS_FC: + if (container->default_entry_type == URLHISTORY_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + default: + FIXME("flags %08x not handled\n", flags); + break; + } + } + + TRACE("CachePath %s\n", debugstr_w(info->u.s.CachePath)); + + return TRUE; } /*********************************************************************** * GetUrlCacheConfigInfoA (WININET.@) */ -BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA CacheInfo, LPDWORD size, DWORD bitmask) +BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA info, LPDWORD size, DWORD flags) { - FIXME("(%p, %p, %x)\n", CacheInfo, size, bitmask); - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + cache_container *container; + + FIXME("(%p, %p, %x): semi-stub\n", info, size, flags); + + if (!info) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + info->dwContainer = 0; + info->dwQuota = 0x3e800; + info->dwReserved4 = 0; + info->fPerUser = TRUE; + info->dwSyncMode = 0; + info->dwNumCachePaths = 1; + info->dwNormalUsage = 0; + info->dwExemptUsage = 0; + + info->u.s.CachePath[0] = 0; + info->u.s.dwCacheSize = 0x3e800; /* FIXME */ + + LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) + { + switch (flags & (CACHE_CONFIG_CONTENT_PATHS_FC | CACHE_CONFIG_COOKIES_PATHS_FC | CACHE_CONFIG_HISTORY_PATHS_FC)) + { + case 0: + case CACHE_CONFIG_CONTENT_PATHS_FC: + if (container->default_entry_type == NORMAL_CACHE_ENTRY) + WideCharToMultiByte(CP_ACP, 0, container->path, -1, info->u.s.CachePath, MAX_PATH, NULL, NULL); + break; + + case CACHE_CONFIG_COOKIES_PATHS_FC: + if (container->default_entry_type == COOKIE_CACHE_ENTRY) + WideCharToMultiByte(CP_ACP, 0, container->path, -1, info->u.s.CachePath, MAX_PATH, NULL, NULL); + break; + + case CACHE_CONFIG_HISTORY_PATHS_FC: + if (container->default_entry_type == URLHISTORY_CACHE_ENTRY) + WideCharToMultiByte(CP_ACP, 0, container->path, -1, info->u.s.CachePath, MAX_PATH, NULL, NULL); + break; + + default: + FIXME("flags %08x not handled\n", flags); + break; + } + } + + TRACE("CachePath %s\n", debugstr_a(info->u.s.CachePath)); + + return TRUE; } BOOL WINAPI GetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttributes, -- 2.19.2

1 0

[PATCH] kernel32: CreateDirectory shouldn't return ERROR_ACCESS_DENIED for the root of the drive.
by Dmitry Timoshkov Dec. 28, 2018

Dec. 28, 2018

According to the testbot results CreateDirectory("C:\\", NULL) fails with ERROR_ACCESS_DENIED for not administrators. However with UAC enabled and not and administrator account I get ERROR_ALREADY_EXISTS in that case with Windows 7 64-bit running on real hardware. Moreover, Wine doesn't really perform any access checks in that case and blindly assumes that returning STATUS_ACCESS_DENIED is correct behaviour for the drive's root: dlls/ntdll/directory.c,lookup_unix_name(). This patch fixes an application that can't find its data files because after it receives ERROR_ACCESS_DENIED it stops further directory traversing. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/directory.c | 43 +++++++++++++++++++++++++++++++++ dlls/ntdll/directory.c | 3 +-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c index 512dc6d22a..de78c61681 100644 --- a/dlls/kernel32/tests/directory.c +++ b/dlls/kernel32/tests/directory.c @@ -541,10 +541,53 @@ static void test_SetCurrentDirectoryA(void) ok( GetLastError() == ERROR_PATH_NOT_FOUND, "wrong error %d\n", GetLastError() ); } +static void test_CreateDirectory_root(void) +{ + static const WCHAR drive_c_root[] = { 'C',':','\\',0 }; + static const WCHAR drive_c[] = { 'C',':',0 }; + char curdir[MAX_PATH]; + BOOL ret; + + GetCurrentDirectoryA(sizeof(curdir), curdir); + + ret = SetCurrentDirectoryA("C:\\"); + ok(ret, "SetCurrentDirectory error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryA("C:\\", NULL); + ok(!ret, "CreateDirectory should fail\n"); + if (GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("not an administrator\n"); + SetCurrentDirectoryA(curdir); + return; + } + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryA("C:", NULL); + ok(!ret, "CreateDirectory should fail\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryW(drive_c_root, NULL); + ok(!ret, "CreateDirectory should fail\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryW(drive_c, NULL); + ok(!ret, "CreateDirectory should fail\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetCurrentDirectoryA(curdir); +} + START_TEST(directory) { init(); + test_CreateDirectory_root(); + test_GetWindowsDirectoryA(); test_GetWindowsDirectoryW(); diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index c48b9e97ea..2719958f67 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2650,9 +2650,8 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer { if (!stat( unix_name, &st )) { - /* creation fails with STATUS_ACCESS_DENIED for the root of the drive */ if (disposition == FILE_CREATE) - return name_len ? STATUS_OBJECT_NAME_COLLISION : STATUS_ACCESS_DENIED; + return STATUS_OBJECT_NAME_COLLISION; return STATUS_SUCCESS; } } -- 2.19.2

3 13

[PATCH v2] user32/tests: Add some tests for implicit stretch mode in CopyImage().
by Paul Gofman Dec. 28, 2018

Dec. 28, 2018

The test is related to bug https://bugs.winehq.org/show_bug.cgi?id=46375. The values of the colored test result suggest that halftone filter is used for shrinking: each pixel of output 2x2 image has the color value averaged over 4 pixels from input 4x4 image. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: Fixed some typos. dlls/user32/tests/cursoricon.c | 125 +++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 323db82bc3..c598b232a0 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2751,6 +2751,130 @@ static void test_monochrome_icon(void) HeapFree(GetProcessHeap(), 0, icon_data); } +static COLORREF get_color_from_bits(const unsigned char *bits, const BITMAPINFO *bmi, + unsigned int row, unsigned int column) +{ + const BITMAPINFOHEADER *h = &bmi->bmiHeader; + const unsigned char *data; + unsigned int stride; + RGBQUAD color; + + ok(h->biBitCount == 1 || h->biBitCount >= 24, "Unsupported bit count %u.\n", h->biBitCount); + stride = ((h->biBitCount * h->biWidth + 7) / 8 + 3) & ~3; + data = bits + row * stride + column * h->biBitCount / 8; + if (h->biBitCount >= 24) + return RGB(data[2], data[1], data[0]); + + color = bmi->bmiColors[!!(data[0] & (1u << (7 - (column % 8))))]; + return RGB(color.rgbRed, color.rgbGreen, color.rgbBlue); +} + +static void test_CopyImage_StretchMode(void) +{ + static const unsigned char test_bits_24[] = + { + 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, + 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x00, + 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, + }; + static const unsigned char expected_bits_24[] = + { + 0x3f, 0xff, 0x00, 0x3f, 0xff, 0x3f, 0x00, 0x00, + 0x3f, 0xff, 0x7f, 0x00, 0xff, 0x3f, 0x00, 0x00, + }; + static const unsigned char test_bits_1[] = + { + 0x30, 0x0, 0x0, 0x0, + 0x30, 0x0, 0x0, 0x0, + 0x40, 0x0, 0x0, 0x0, + 0xc0, 0x0, 0x0, 0x0, + }; + static const unsigned char expected_bits_1[] = + { + 0x40, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, + }; + + static const struct + { + LONG width, height, output_width, output_height; + WORD bit_count; + const unsigned char *test_bits, *expected_bits; + size_t test_bits_size, result_bits_size; + BOOL todo; + } + tests[] = + { + {4, 4, 2, 2, 24, test_bits_24, expected_bits_24, + sizeof(test_bits_24), sizeof(expected_bits_24), TRUE}, + {4, 4, 2, 2, 1, test_bits_1, expected_bits_1, + sizeof(test_bits_1), sizeof(expected_bits_1), FALSE}, + }; + + HBITMAP bitmap, bitmap_copy; + unsigned char *result_bits; + unsigned int row, column; + unsigned int test_index; + unsigned char *bits; + BITMAPINFO *bmi; + HDC hdc; + int ret; + + bmi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + bmi->bmiColors[1].rgbRed = 0xff; + bmi->bmiColors[1].rgbGreen = 0xff; + bmi->bmiColors[1].rgbBlue = 0xff; + + hdc = GetDC(NULL); + + for (test_index = 0; test_index < ARRAY_SIZE(tests); ++test_index) + { + bmi->bmiHeader.biWidth = tests[test_index].width; + bmi->bmiHeader.biHeight = tests[test_index].height; + bmi->bmiHeader.biBitCount = tests[test_index].bit_count; + + bitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, (void **)&bits, NULL, 0); + ok(bitmap && bits, "CreateDIBSection() failed, result %u.\n", GetLastError()); + memcpy(bits, tests[test_index].test_bits, tests[test_index].test_bits_size); + + bitmap_copy = CopyImage(bitmap, IMAGE_BITMAP, tests[test_index].output_width, + tests[test_index].output_height, LR_CREATEDIBSECTION); + ok(!!bitmap_copy, "CopyImage() failed, result %u.\n", GetLastError()); + + result_bits = HeapAlloc(GetProcessHeap(), 0, tests[test_index].result_bits_size); + + bmi->bmiHeader.biWidth = tests[test_index].output_width; + bmi->bmiHeader.biHeight = tests[test_index].output_height; + ret = GetDIBits(hdc, bitmap_copy, 0, tests[test_index].output_height, + result_bits, bmi, DIB_RGB_COLORS); + ok(ret == tests[test_index].output_height, "Unexpected GetDIBits result %d, GetLastError() %u.\n", + ret, GetLastError()); + + for (row = 0; row < tests[test_index].output_height; ++row) + for (column = 0; column < tests[test_index].output_width; ++column) + { + COLORREF result, expected; + + result = get_color_from_bits(result_bits, bmi, row, column); + expected = get_color_from_bits(tests[test_index].expected_bits, bmi, row, column); + + todo_wine_if(tests[test_index].todo) + ok(result == expected, "Colors do not match, " + "got 0x%06x, expected 0x%06x, test_index %u, row %u, column %u.\n", + result, expected, test_index, row, column); + } + DeleteObject(bitmap); + DeleteObject(bitmap_copy); + HeapFree(GetProcessHeap(), 0, result_bits); + } + ReleaseDC(0, hdc); + HeapFree(GetProcessHeap(), 0, bmi); +} + START_TEST(cursoricon) { pGetCursorInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetCursorInfo" ); @@ -2778,6 +2902,7 @@ START_TEST(cursoricon) test_CopyImage_Bitmap(16); test_CopyImage_Bitmap(24); test_CopyImage_Bitmap(32); + test_CopyImage_StretchMode(); test_initial_cursor(); test_CreateIcon(); test_LoadImage(); -- 2.19.2

1 0

[PATCH] user32/tests: Add some tests for implicit stretch mode in CopyImage().
by Paul Gofman Dec. 28, 2018

Dec. 28, 2018

The test is related to bug https://bugs.winehq.org/show_bug.cgi?id=46375. The values of the colored test result suggest that halftone filter is used for shrinking: each pixel of output 2x2 image has the color value averaged over 4 pixels from input 4x4 image. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/user32/tests/cursoricon.c | 125 +++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 323db82bc3..2f830cac6e 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2751,6 +2751,130 @@ static void test_monochrome_icon(void) HeapFree(GetProcessHeap(), 0, icon_data); } +static COLORREF get_color_from_bits(const unsigned char *bits, const BITMAPINFO *bmi, + unsigned int row, unsigned int column) +{ + const BITMAPINFOHEADER *h = &bmi->bmiHeader; + const unsigned char *data; + unsigned int stride; + RGBQUAD color; + + ok(h->biBitCount == 1 || h->biBitCount >= 24, "Unsupported bit count %u.\n", h->biBitCount); + stride = ((h->biBitCount * h->biWidth + 7) / 8 + 3) & ~3; + data = bits + row * stride + column * h->biBitCount / 8; + if (h->biBitCount >= 24) + return RGB(data[2], data[1], data[0]); + + color = bmi->bmiColors[!!(data[0] & (1u << (7 - (column % 8))))]; + return RGB(color.rgbRed, color.rgbGreen, color.rgbBlue); +} + +static void test_CopyImage_StretchMode(void) +{ + static const unsigned char test_bits_24[] = + { + 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, + 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x00, + 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, + }; + static const unsigned char expected_bits_24[] = + { + 0x3f, 0xff, 0x00, 0x3f, 0xff, 0x3f, 0x00, 0x00, + 0x3f, 0xff, 0x7f, 0x00, 0xff, 0x3f, 0x00, 0x00, + }; + static const unsigned char test_bits_1[] = + { + 0x30, 0x0, 0x0, 0x0, + 0x30, 0x0, 0x0, 0x0, + 0x40, 0x0, 0x0, 0x0, + 0xc0, 0x0, 0x0, 0x0, + }; + static const unsigned char expected_bits_1[] = + { + 0x40, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, + }; + + static const struct + { + LONG width, height, output_width, output_height; + WORD bit_count; + const unsigned char *test_bits, *expected_bits; + size_t test_bits_size, result_bits_size; + BOOL todo; + } + tests[] = + { + {4, 4, 2, 2, 24, test_bits_24, expected_bits_24, + sizeof(test_bits_24), sizeof(expected_bits_24), TRUE}, + {4, 4, 2, 2, 1, test_bits_1, expected_bits_1, + sizeof(test_bits_1), sizeof(expected_bits_1), FALSE}, + }; + + HBITMAP bitmap, bitmap_copy; + unsigned char *result_bits; + unsigned int row, column; + unsigned int test_index; + unsigned char *bits; + BITMAPINFO *bmi; + HDC hdc; + int ret; + + bmi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + bmi->bmiColors[1].rgbRed = 0xff; + bmi->bmiColors[1].rgbGreen = 0xff; + bmi->bmiColors[1].rgbBlue = 0xff; + + hdc = GetDC(NULL); + + for (test_index = 0; test_index < ARRAY_SIZE(tests); ++test_index) + { + bmi->bmiHeader.biWidth = tests[test_index].width; + bmi->bmiHeader.biHeight = tests[test_index].width; + bmi->bmiHeader.biBitCount = tests[test_index].bit_count; + + bitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, (void **)&bits, NULL, 0); + ok(bitmap && bits, "CreateDIBSection() failed, result %u.\n", GetLastError()); + memcpy(bits, tests[test_index].test_bits, tests[test_index].test_bits_size); + + bitmap_copy = CopyImage(bitmap, IMAGE_BITMAP, tests[test_index].output_width, + tests[test_index].output_height, LR_CREATEDIBSECTION); + ok(!!bitmap_copy, "CopyImage() failed, result %u.\n", GetLastError()); + + result_bits = HeapAlloc(GetProcessHeap(), 0, tests[test_index].result_bits_size); + + bmi->bmiHeader.biWidth = tests[test_index].output_width; + bmi->bmiHeader.biHeight = tests[test_index].output_height; + ret = GetDIBits(hdc, bitmap_copy, 0, tests[test_index].output_height, + result_bits, bmi, DIB_RGB_COLORS); + ok(ret == tests[test_index].output_height, "Unexpected GetDIBits result %d, GetLastError() %u.\n", + ret, GetLastError()); + + for (row = 0; row < tests[test_index].output_width; ++row) + for (column = 0; column < tests[test_index].output_height; ++column) + { + COLORREF result, expected; + + result = get_color_from_bits(result_bits, bmi, row, column); + expected = get_color_from_bits(tests[test_index].expected_bits, bmi, row, column); + + todo_wine_if(tests[test_index].todo) + ok(result == expected, "Colors do not match, " + "got 0x%06x, expected 0x%06x, test_index %u, row %u, column %u.\n", + result, expected, test_index, row, column); + } + DeleteObject(bitmap); + DeleteObject(bitmap_copy); + HeapFree(GetProcessHeap(), 0, result_bits); + } + ReleaseDC(0, hdc); + HeapFree(GetProcessHeap(), 0, bmi); +} + START_TEST(cursoricon) { pGetCursorInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetCursorInfo" ); @@ -2778,6 +2902,7 @@ START_TEST(cursoricon) test_CopyImage_Bitmap(16); test_CopyImage_Bitmap(24); test_CopyImage_Bitmap(32); + test_CopyImage_StretchMode(); test_initial_cursor(); test_CreateIcon(); test_LoadImage(); -- 2.19.2

1 0

[PATCH 05/11] mfplat: Implement IMFattributes::{SetUInt32,SetUInt64,GetUInt32,GetUInt64}.
by Jactry Zeng Dec. 28, 2018

Dec. 28, 2018

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/Makefile.in | 2 +- dlls/mfplat/main.c | 39 ++++++++++++++++++++++++++++++-------- dlls/mfplat/tests/mfplat.c | 28 +++++++++++++++++++++++++-- 3 files changed, 58 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index 76843f5f25..9a4e41c430 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplat.dll IMPORTLIB = mfplat -IMPORTS = advapi32 ole32 +IMPORTS = advapi32 ole32 propsys C_SRCS = \ main.c diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 6e056b3609..1d8b110a09 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -31,6 +31,7 @@ #include "mfapi.h" #include "mfidl.h" #include "mferror.h" +#include "propvarutil.h" #include "wine/heap.h" #include "wine/debug.h" @@ -589,19 +590,33 @@ static HRESULT WINAPI mfattributes_Compare(IMFAttributes *iface, IMFAttributes * static HRESULT WINAPI mfattributes_GetUINT32(IMFAttributes *iface, REFGUID key, UINT32 *value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hres; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = MF_ATTRIBUTE_UINT32; + hres = mfattributes_getitem(This, key, &attrval, TRUE); + if(SUCCEEDED(hres)) + hres = PropVariantToUInt32(&attrval, value); + return hres; } static HRESULT WINAPI mfattributes_GetUINT64(IMFAttributes *iface, REFGUID key, UINT64 *value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hres; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = MF_ATTRIBUTE_UINT64; + hres = mfattributes_getitem(This, key, &attrval, TRUE); + if(SUCCEEDED(hres)) + hres = PropVariantToUInt64(&attrval, value); + return hres; } static HRESULT WINAPI mfattributes_GetDouble(IMFAttributes *iface, REFGUID key, double *value) @@ -776,19 +791,27 @@ static HRESULT WINAPI mfattributes_DeleteAllItems(IMFAttributes *iface) static HRESULT WINAPI mfattributes_SetUINT32(IMFAttributes *iface, REFGUID key, UINT32 value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - FIXME("%p, %s, %d\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %d)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = VT_UI4; + attrval.ulVal = value; + return mfattribute_setitem(This, key, &attrval); } static HRESULT WINAPI mfattributes_SetUINT64(IMFAttributes *iface, REFGUID key, UINT64 value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - FIXME("%p, %s, %s\n", This, debugstr_guid(key), wine_dbgstr_longlong(value)); + FIXME("(%p, %s, %s)\n", This, debugstr_guid(key), wine_dbgstr_longlong(value)); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = MF_ATTRIBUTE_UINT64; + attrval.uhVal.QuadPart = value; + return mfattribute_setitem(This, key, &attrval); } static HRESULT WINAPI mfattributes_SetDouble(IMFAttributes *iface, REFGUID key, double value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index fff424e798..7ae87c2fc1 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -413,6 +413,8 @@ static void test_MFCreateAttributes(void) IMFAttributes *attributes; HRESULT hr; UINT32 count; + UINT32 uint32_value; + UINT64 uint64_value; hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -422,13 +424,35 @@ static void test_MFCreateAttributes(void) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(count == 0, "got %d\n", count); - hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 123); + ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: 0x%08x.\n", hr); hr = IMFAttributes_GetCount(attributes, &count); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine ok(count == 1, "got %d\n", count); + uint32_value = 0xdeadbeef; + hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); + ok(hr == S_OK, "IMFAttributes_GetUINT32 failed: 0x%08x.\n", hr); + ok(uint32_value == 123, "got wrong value: %d, expected: 123.\n", uint32_value); + + uint64_value = 0xdeadbeef; + hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_GetUINT64 should fail: 0x%08x.\n", hr); + ok(uint64_value == 0xdeadbeef, "got wrong value: %lld, expected: 0xdeadbeef.\n", uint64_value); + + hr = IMFAttributes_SetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 65536); + ok(hr == S_OK, "IMFAttributes_SetUINT64 failed: 0x%08x.\n", hr); + + hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); + ok(hr == S_OK, "IMFAttributes_GetUINT64 failed: 0x%08x.\n", hr); + ok(uint64_value == 65536, "got wrong value: %lld, expected: 65536.\n", uint64_value); + + uint32_value = 0xdeadbeef; + hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_GetUINT32 should fail: 0x%08x.\n", hr); + ok(uint32_value == 0xdeadbeef, "got wrong value: %d, expected: 0xdeadbeef.\n", uint32_value); + IMFAttributes_Release(attributes); } -- 2.19.2

2 1