September 2015 - Wine-Commits

Hugh McMaster : regsvr32: /n and /u /n should be handled as invalid flags.
by Alexandre Julliard Sept. 2, 2015

Sept. 2, 2015

Module: wine Branch: master Commit: b09e98da785a1da44f5a74a2ce426baa62d74ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09e98da785a1da44f5a74a2c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Sep 2 15:32:07 2015 +1000 regsvr32: /n and /u /n should be handled as invalid flags. --- programs/regsvr32/regsvr32.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 8d1ab17..f75825b 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -272,6 +272,9 @@ int wmain(int argc, WCHAR* argv[]) } } + if (!CallInstall && !CallRegister) /* flags: /n or /u /n */ + return 1; + for (i = 1; i < argc; i++) { if (argv[i])

1 0

Nikolay Sivov : dwrite: Force reported English family/ face names to resolved values.
by Alexandre Julliard Sept. 1, 2015

Sept. 1, 2015

Module: wine Branch: master Commit: a22d5ed9489bb38bcb1ffd75a21cb2f0f0275e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a22d5ed9489bb38bcb1ffd75a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 1 12:09:24 2015 +0300 dwrite: Force reported English family/face names to resolved values. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 32 ++++++++++++++++++++++---------- dlls/dwrite/main.c | 17 ++++++++++++++++- 3 files changed, 39 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index a7b8c46..70aadcc 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -122,6 +122,7 @@ extern void release_gdiinterop(IDWriteGdiInterop*) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; extern HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; +extern void set_en_localizedstring(IDWriteLocalizedStrings*,const WCHAR*) DECLSPEC_HIDDEN; extern HRESULT get_system_fontcollection(IDWriteFactory2*,IDWriteFontCollection**) DECLSPEC_HIDDEN; extern HRESULT get_eudc_fontcollection(IDWriteFactory2*,IDWriteFontCollection**) DECLSPEC_HIDDEN; extern HRESULT get_textanalyzer(IDWriteTextAnalyzer**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 63ad277..928222d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1985,7 +1985,8 @@ static int trim_spaces(WCHAR *in, WCHAR *ret) struct name_token { struct list entry; const WCHAR *ptr; - INT len; + INT len; /* token length */ + INT fulllen; /* full length including following separators */ }; static inline BOOL is_name_separator_char(WCHAR ch) @@ -2406,7 +2407,7 @@ static inline void font_name_token_to_str(const struct name_token *name, WCHAR * strW[name->len] = 0; } -static void font_apply_differentiation_rules(struct dwrite_font_data *font, WCHAR *familyW, WCHAR *faceW) +static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHAR *familyW, WCHAR *faceW) { static const WCHAR bookW[] = {'B','o','o','k',0}; static const WCHAR normalW[] = {'N','o','r','m','a','l',0}; @@ -2473,15 +2474,19 @@ static void font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA struct name_token *token = heap_alloc(sizeof(*token)); token->ptr = ptr; token->len = 0; + token->fulllen = 0; while (*ptr && !is_name_separator_char(*ptr)) { token->len++; + token->fulllen++; ptr++; } /* skip separators */ - while (is_name_separator_char(*ptr)) + while (is_name_separator_char(*ptr)) { + token->fulllen++; ptr++; + } list_add_head(&tokens, &token->entry); } @@ -2526,19 +2531,22 @@ static void font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA /* get final combined string from what's left in token list, list is released */ ptrW = finalW; - *ptrW = 0; LIST_FOR_EACH_ENTRY_SAFE_REV(token, token2, &tokens, struct name_token, entry) { - if (*finalW) - *(ptrW++) = ' '; - memcpy(ptrW, token->ptr, token->len * sizeof(WCHAR)); - ptrW += token->len; + int len; + list_remove(&token->entry); + + /* don't include last separator */ + len = list_empty(&tokens) ? token->len : token->fulllen; + memcpy(ptrW, token->ptr, len * sizeof(WCHAR)); + ptrW += len; + heap_free(token); } *ptrW = 0; if (!strcmpW(familyW, finalW)) - return; + return FALSE; /* construct face name */ strcpyW(familyW, finalW); @@ -2620,6 +2628,7 @@ static void font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA } TRACE("resolved family %s, face %s\n", debugstr_w(familyW), debugstr_w(faceW)); + return TRUE; } static HRESULT init_font_data(IDWriteFactory2 *factory, IDWriteFontFile *file, DWRITE_FONT_FACE_TYPE face_type, UINT32 face_index, @@ -2670,7 +2679,10 @@ static HRESULT init_font_data(IDWriteFactory2 *factory, IDWriteFontFile *file, D fontstrings_get_en_string(*family_name, familyW, sizeof(familyW)/sizeof(WCHAR)); fontstrings_get_en_string(data->names, faceW, sizeof(faceW)/sizeof(WCHAR)); - font_apply_differentiation_rules(data, familyW, faceW); + if (font_apply_differentiation_rules(data, familyW, faceW)) { + set_en_localizedstring(*family_name, familyW); + set_en_localizedstring(data->names, faceW); + } init_font_prop_vec(data->weight, data->stretch, data->style, &data->propvec); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 01a4012..ce4299c 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -438,7 +438,7 @@ HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, } HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **ret) - { +{ struct localizedstrings *strings, *strings_clone; int i; @@ -471,6 +471,21 @@ HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedSt return S_OK; } +void set_en_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *string) +{ + static const WCHAR enusW[] = {'e','n','-','U','S',0}; + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + UINT32 i; + + for (i = 0; i < This->count; i++) { + if (!strcmpiW(This->data[i].locale, enusW)) { + heap_free(This->data[i].string); + This->data[i].string = heap_strdupW(string); + break; + } + } +} + struct collectionloader { struct list entry;

1 0

Nikolay Sivov : gdi32: Added GetFontRealizationInfo() export.
by Alexandre Julliard Sept. 1, 2015

Sept. 1, 2015

Module: wine Branch: master Commit: 7889b17425d77f92af40bd53f80870ac024ed492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7889b17425d77f92af40bd53f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 29 19:54:17 2015 +0300 gdi32: Added GetFontRealizationInfo() export. --- dlls/gdi32/dibdrv/dc.c | 4 ++-- dlls/gdi32/driver.c | 12 ++++++------ dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/font.c | 46 +++++++++++++++++++++++++++++++++++++++------- dlls/gdi32/freetype.c | 18 ++++++++++++------ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/gdi_private.h | 10 ++++++---- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/path.c | 2 +- dlls/gdi32/tests/font.c | 2 ++ dlls/winemac.drv/gdi.c | 2 +- dlls/wineps.drv/init.c | 2 +- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/xrender.c | 2 +- include/wine/gdi_driver.h | 4 ++-- 15 files changed, 77 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7889b17425d77f92af40b…

1 0

Józef Kucia : d3d11/tests: Port test_create_texture3d () from d3d10core.
by Alexandre Julliard Sept. 1, 2015

Sept. 1, 2015

Module: wine Branch: master Commit: 0fcfb8a08231de80eaa61ad79bc014c576315005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fcfb8a08231de80eaa61ad79… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 1 00:27:37 2015 +0200 d3d11/tests: Port test_create_texture3d() from d3d10core. --- dlls/d3d11/tests/d3d11.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6cb1516..6a9d710 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -409,10 +409,90 @@ static void test_texture2d_interfaces(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_texture3d(void) +{ + ULONG refcount, expected_refcount; + D3D11_SUBRESOURCE_DATA data = {0}; + ID3D11Device *device, *tmp; + D3D11_TEXTURE3D_DESC desc; + ID3D11Texture3D *texture; + IDXGISurface *surface; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create ID3D11Device, skipping tests.\n"); + return; + } + + desc.Width = 64; + desc.Height = 64; + desc.Depth = 64; + desc.MipLevels = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = D3D11_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture3D(device, &desc, &data, &texture); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D11Device_CreateTexture3D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 3d texture, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11Texture3D_GetDevice(texture, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D11Device_Release(tmp); + + hr = ID3D11Texture3D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(FAILED(hr), "Texture should not implement IDXGISurface.\n"); + ID3D11Texture3D_Release(texture); + + desc.MipLevels = 0; + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D11Device_CreateTexture3D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 3d texture, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11Texture3D_GetDevice(texture, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D11Device_Release(tmp); + + ID3D11Texture3D_GetDesc(texture, &desc); + ok(desc.Width == 64, "Got unexpected Width %u.\n", desc.Width); + ok(desc.Height == 64, "Got unexpected Height %u.\n", desc.Height); + ok(desc.Depth == 64, "Got unexpected Depth %u.\n", desc.Depth); + ok(desc.MipLevels == 7, "Got unexpected MipLevels %u.\n", desc.MipLevels); + ok(desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected Format %#x.\n", desc.Format); + ok(desc.Usage == D3D11_USAGE_DEFAULT, "Got unexpected Usage %u.\n", desc.Usage); + ok(desc.BindFlags == D3D11_BIND_RENDER_TARGET, "Got unexpected BindFlags %u.\n", desc.BindFlags); + ok(desc.CPUAccessFlags == 0, "Got unexpected CPUAccessFlags %u.\n", desc.CPUAccessFlags); + ok(desc.MiscFlags == 0, "Got unexpected MiscFlags %u.\n", desc.MiscFlags); + + hr = ID3D11Texture3D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(FAILED(hr), "Texture should not implement IDXGISurface.\n"); + ID3D11Texture3D_Release(texture); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); test_device_interfaces(); test_create_texture2d(); test_texture2d_interfaces(); + test_create_texture3d(); }

1 0

Thomas Faber : netapi32: Correctly reallocate buffer in NetWkstaUserGetInfo.
by Alexandre Julliard Sept. 1, 2015

Sept. 1, 2015

Module: wine Branch: master Commit: 7164fde439211b0b9c66e15cb9db4af41d815d4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7164fde439211b0b9c66e15cb… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Aug 31 20:31:26 2015 +0200 netapi32: Correctly reallocate buffer in NetWkstaUserGetInfo. --- dlls/netapi32/netapi32.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 785a8d6..d7af2e0 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -1627,7 +1627,12 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, (lstrlenW(ui->wkui0_username) + 1) * sizeof(WCHAR), (LPVOID *) bufptr); if (nastatus != NERR_Success) + { + NetApiBufferFree(ui); return nastatus; + } + ui = (PWKSTA_USER_INFO_0) *bufptr; + ui->wkui0_username = (LMSTR) (*bufptr + sizeof(WKSTA_USER_INFO_0)); } break; }

1 0

Zhenbo Li : shell32: Fix return type for helper functions of SHFileOption.
by Alexandre Julliard Sept. 1, 2015

Sept. 1, 2015

Module: wine Branch: master Commit: 637bcd5de91bb1265b58c41af660749cc4d66994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=637bcd5de91bb1265b58c41af… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Aug 31 21:07:32 2015 +0800 shell32: Fix return type for helper functions of SHFileOption. --- dlls/shell32/shlfileop.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 0b096b1..c843dd7 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1180,7 +1180,7 @@ static void create_dest_dirs(LPCWSTR szDestDir) } /* the FO_COPY operation */ -static DWORD copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *flTo) +static int copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *flTo) { DWORD i; const FILE_ENTRY *entryToCopy; @@ -1328,10 +1328,11 @@ static BOOL confirm_delete_list(HWND hWnd, DWORD fFlags, BOOL fTrash, const FILE } /* the FO_DELETE operation */ -static DWORD delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) +static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) { const FILE_ENTRY *fileEntry; - DWORD i, ret; + DWORD i; + int ret; BOOL bTrash; if (!flFrom->dwNumFiles) @@ -1399,7 +1400,7 @@ static void move_to_dir(LPSHFILEOPSTRUCTW lpFileOp, const FILE_ENTRY *feFrom, co } /* the FO_MOVE operation */ -static DWORD move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) +static int move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) { DWORD i; INT mismatched = 0; @@ -1470,7 +1471,7 @@ static DWORD move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, con } /* the FO_RENAME files */ -static DWORD rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) +static int rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) { const FILE_ENTRY *feFrom; const FILE_ENTRY *feTo;

1 0

Józef Kucia : d3d11: Implement d3d11_texture3d_GetDevice().
by Alexandre Julliard Sept. 1, 2015

Sept. 1, 2015

Module: wine Branch: master Commit: fc844029eeab1d622242dd1c5200040c13a14ffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc844029eeab1d622242dd1c5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Sep 1 00:27:34 2015 +0200 d3d11: Implement d3d11_texture3d_GetDevice(). --- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/texture.c | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index c0513a8..c5379ed 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -126,7 +126,7 @@ struct d3d_texture3d struct wined3d_private_store private_store; struct wined3d_texture *wined3d_texture; D3D10_TEXTURE3D_DESC desc; - ID3D10Device1 *device; + ID3D11Device *device; }; HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_device *device, diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index adb7474..55f5d49 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -588,7 +588,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_AddRef(ID3D11Texture3D *iface) if (refcount == 1) { - ID3D10Device1_AddRef(texture->device); + ID3D11Device_AddRef(texture->device); wined3d_mutex_lock(); wined3d_texture_incref(texture->wined3d_texture); wined3d_mutex_unlock(); @@ -614,14 +614,14 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_Release(ID3D11Texture3D *iface) if (!refcount) { - ID3D10Device1 *device = texture->device; + ID3D11Device *device = texture->device; wined3d_mutex_lock(); wined3d_texture_decref(texture->wined3d_texture); wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ - ID3D10Device1_Release(device); + ID3D11Device_Release(device); } return refcount; @@ -629,7 +629,12 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_Release(ID3D11Texture3D *iface) static void STDMETHODCALLTYPE d3d11_texture3d_GetDevice(ID3D11Texture3D *iface, ID3D11Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = texture->device; + ID3D11Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d11_texture3d_GetPrivateData(ID3D11Texture3D *iface, @@ -740,8 +745,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_GetDevice(ID3D10Texture3D *iface, TRACE("iface %p, device %p.\n", iface, device); - *device = (ID3D10Device *)texture->device; - ID3D10Device_AddRef(*device); + ID3D11Device_QueryInterface(texture->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_texture3d_GetPrivateData(ID3D10Texture3D *iface, @@ -917,8 +921,8 @@ HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_device *dev wined3d_mutex_unlock(); texture->desc.MipLevels = levels; - texture->device = &device->ID3D10Device1_iface; - ID3D10Device1_AddRef(texture->device); + texture->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(texture->device); return S_OK; }

1 0

Vincent Povirk : advapi32: RegOpenKeyEx can return special roots when asked for empty subkey.
by Alexandre Julliard Sept. 1, 2015

Sept. 1, 2015

Module: wine Branch: master Commit: 997484964a30d7d1b95aa0456d20710d9941d2df URL: http://source.winehq.org/git/wine.git/?a=commit;h=997484964a30d7d1b95aa0456… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 31 15:29:37 2015 -0500 advapi32: RegOpenKeyEx can return special roots when asked for empty subkey. --- dlls/advapi32/registry.c | 16 ++++++++++++++++ dlls/advapi32/tests/registry.c | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index cf5a1ac..2482b85 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -476,6 +476,14 @@ LSTATUS WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD options, REGSAM acc OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; + if (retkey && (!name || !name[0]) && + (HandleToUlong(hkey) >= HandleToUlong(HKEY_SPECIAL_ROOT_FIRST)) && + (HandleToUlong(hkey) <= HandleToUlong(HKEY_SPECIAL_ROOT_LAST))) + { + *retkey = hkey; + return ERROR_SUCCESS; + } + /* NT+ allows beginning backslash for HKEY_CLASSES_ROOT */ if (HandleToUlong(hkey) == HandleToUlong(HKEY_CLASSES_ROOT) && name && *name == '\\') name++; @@ -520,6 +528,14 @@ LSTATUS WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD options, REGSAM acce STRING nameA; NTSTATUS status; + if (retkey && (!name || !name[0]) && + (HandleToUlong(hkey) >= HandleToUlong(HKEY_SPECIAL_ROOT_FIRST)) && + (HandleToUlong(hkey) <= HandleToUlong(HKEY_SPECIAL_ROOT_LAST))) + { + *retkey = hkey; + return ERROR_SUCCESS; + } + if (!is_version_nt()) access = MAXIMUM_ALLOWED; /* Win95 ignores the access mask */ else { diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index b8b7e1c..a8e783c 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1075,7 +1075,6 @@ static void test_reg_open_key(void) ok(ret == ERROR_INVALID_HANDLE || ret == ERROR_BADKEY, /* Windows 95 returns BADKEY */ "expected ERROR_INVALID_HANDLE or ERROR_BADKEY, got %d\n", ret); ok(hkResult == hkPreserve, "expected hkResult == hkPreserve\n"); - RegCloseKey(hkResult); /* send in NULL hkResult */ ret = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", NULL); @@ -1101,6 +1100,45 @@ static void test_reg_open_key(void) "expected ERROR_SUCCESS, ERROR_BAD_PATHNAME or ERROR_FILE_NOT_FOUND, got %d\n", ret); RegCloseKey(hkResult); + /* NULL or empty subkey of special root */ + hkResult = NULL; + ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, NULL, 0, KEY_QUERY_VALUE, &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult == HKEY_CLASSES_ROOT, "expected hkResult == HKEY_CLASSES_ROOT\n"); + + hkResult = NULL; + ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, "", 0, KEY_QUERY_VALUE, &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult == HKEY_CLASSES_ROOT, "expected hkResult == HKEY_CLASSES_ROOT\n"); + + hkResult = NULL; + ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, "\\", 0, KEY_QUERY_VALUE, &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult != HKEY_CLASSES_ROOT, "expected hkResult to be a new key\n"); + ok(!RegCloseKey(hkResult), "got invalid hkey\n"); + + /* empty subkey of existing handle */ + hkResult = hkPreserve; + ret = RegOpenKeyExA(hkPreserve, "", 0, KEY_QUERY_VALUE, &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult != hkPreserve, "expected hkResult != hkPreserve\n"); + ok(!RegCloseKey(hkResult), "got invalid hkey\n"); + + /* NULL subkey of existing handle */ + hkResult = hkPreserve; + ret = RegOpenKeyExA(hkPreserve, NULL, 0, KEY_QUERY_VALUE, &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult != hkPreserve, "expected hkResult != hkPreserve\n"); + ok(!RegCloseKey(hkResult), "got invalid hkey\n"); + + /* empty subkey of NULL */ + hkResult = hkPreserve; + ret = RegOpenKeyExA(NULL, "", 0, KEY_QUERY_VALUE, &hkResult); + ok(ret == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", ret); + ok(hkResult == hkPreserve, "expected hkResult == hkPreserve\n"); + + RegCloseKey(hkPreserve); + /* WOW64 flags */ hkResult = NULL; ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, KEY_READ|KEY_WOW64_32KEY, &hkResult);

1 0

Thomas Faber : access.idl: Do not use annotation attribute on remote method (MIDL).
by Alexandre Julliard Sept. 1, 2015

Sept. 1, 2015

Module: wine Branch: master Commit: d2d64bd74c9babfedecfb05b66de6fe9a6e7309d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d64bd74c9babfedecfb05b6… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Sep 1 08:52:27 2015 +0200 access.idl: Do not use annotation attribute on remote method (MIDL). --- include/access.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/access.idl b/include/access.idl index eaca1f6..e7beb99 100644 --- a/include/access.idl +++ b/include/access.idl @@ -34,7 +34,7 @@ interface IAccessor : IUnknown [call_as(AddRefAccessor)] HRESULT RemoteAddRefAccessor([in] HACCESSOR hAccessor, - [in, out, unique, annotation("__out_opt")] DBREFCOUNT *pcRefCount, + [in, out, unique] DBREFCOUNT *pcRefCount, [out] IErrorInfo **ppErrorInfoRem); [local]

1 0

Alistair Leslie-Hughes : gdi32/tests: Add enhanced metafile GetPath test.
by Alexandre Julliard Sept. 1, 2015

Sept. 1, 2015

Module: wine Branch: master Commit: 8348c0ebe00752af2afbabc78315f9e07e43ee09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8348c0ebe00752af2afbabc78… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 1 14:00:56 2015 +1000 gdi32/tests: Add enhanced metafile GetPath test. --- dlls/gdi32/tests/metafile.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 1b0d34b..6804a96 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3361,6 +3361,39 @@ static void test_emf_polybezier(void) DeleteEnhMetaFile(hemf); } +static void test_emf_GetPath(void) +{ + HDC hdcMetafile; + HENHMETAFILE hemf; + BOOL ret; + int size; + + SetLastError(0xdeadbeef); + hdcMetafile = CreateEnhMetaFileA(GetDC(0), NULL, NULL, NULL); + ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); + + BeginPath(hdcMetafile); + ret = MoveToEx(hdcMetafile, 50, 50, NULL); + ok( ret, "MoveToEx error %d.\n", GetLastError()); + ret = LineTo(hdcMetafile, 50, 150); + ok( ret, "LineTo error %d.\n", GetLastError()); + ret = LineTo(hdcMetafile, 150, 150); + ok( ret, "LineTo error %d.\n", GetLastError()); + ret = LineTo(hdcMetafile, 150, 50); + ok( ret, "LineTo error %d.\n", GetLastError()); + ret = LineTo(hdcMetafile, 50, 50); + ok( ret, "LineTo error %d.\n", GetLastError()); + EndPath(hdcMetafile); + + size = GetPath(hdcMetafile, NULL, NULL, 0); + todo_wine ok( size == 5, "GetPath returned %d.\n", size); + + hemf = CloseEnhMetaFile(hdcMetafile); + ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + + DeleteEnhMetaFile(hemf); +} + START_TEST(metafile) { init_function_pointers(); @@ -3374,6 +3407,7 @@ START_TEST(metafile) test_emf_ExtTextOut_on_path(); test_emf_clipping(); test_emf_polybezier(); + test_emf_GetPath(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC();

1 0