November 2014 - Wine-Commits

Nikolay Sivov : dwrite: Implement ConvertFontToLOGFONT().
by Alexandre Julliard Nov. 7, 2014

Nov. 7, 2014

Module: wine Branch: master Commit: a8ad62aa51f8da1e86dd05a41186322467079210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ad62aa51f8da1e86dd05a41… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 7 13:17:38 2014 +0300 dwrite: Implement ConvertFontToLOGFONT(). --- dlls/dwrite/dwrite_private.h | 3 ++- dlls/dwrite/font.c | 22 ++++++++++++++---- dlls/dwrite/gdiinterop.c | 50 ++++++++++++++++++++++++++++++++++++++-- dlls/dwrite/main.c | 2 +- dlls/dwrite/tests/font.c | 55 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index b606d23..57983ed 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -106,7 +106,8 @@ extern HRESULT get_textanalyzer(IDWriteTextAnalyzer**) DECLSPEC_HIDDEN; extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN; extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; extern HRESULT create_fontface(DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2**) DECLSPEC_HIDDEN; -extern HRESULT create_font_collection(IDWriteFactory*,IDWriteFontFileEnumerator*,IDWriteFontCollection**) DECLSPEC_HIDDEN; +extern HRESULT create_font_collection(IDWriteFactory*,IDWriteFontFileEnumerator*,BOOL,IDWriteFontCollection**) DECLSPEC_HIDDEN; +extern BOOL is_system_collection(IDWriteFontCollection*) DECLSPEC_HIDDEN; /* Opentype font table functions */ extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 36d333f..8bb39fa 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') #define MS_NAME_TAG DWRITE_MAKE_OPENTYPE_TAG('n','a','m','e') +static const IID IID_issystemcollection = {0x14d88047,0x331f,0x4cd3,{0xbc,0xa8,0x3e,0x67,0x99,0xaf,0x34,0x75}}; + struct dwrite_font_data { LONG ref; @@ -66,6 +68,7 @@ struct dwrite_fontcollection { struct dwrite_fontfamily_data **family_data; UINT32 family_count; UINT32 family_alloc; + BOOL is_system; }; struct dwrite_fontfamily { @@ -1190,6 +1193,12 @@ static HRESULT create_fontfamily(struct dwrite_fontfamily_data *data, IDWriteFon return S_OK; } +BOOL is_system_collection(IDWriteFontCollection *collection) +{ + void *obj; + return IDWriteFontCollection_QueryInterface(collection, &IID_issystemcollection, (void**)&obj) == S_OK; +} + static HRESULT WINAPI dwritefontcollection_QueryInterface(IDWriteFontCollection *iface, REFIID riid, void **obj) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); @@ -1204,6 +1213,10 @@ static HRESULT WINAPI dwritefontcollection_QueryInterface(IDWriteFontCollection } *obj = NULL; + + if (This->is_system && IsEqualIID(riid, &IID_issystemcollection)) + return S_OK; + return E_NOINTERFACE; } @@ -1413,12 +1426,13 @@ static HRESULT fontcollection_add_family(struct dwrite_fontcollection *collectio return S_OK; } -static HRESULT init_font_collection(struct dwrite_fontcollection *collection) +static HRESULT init_font_collection(struct dwrite_fontcollection *collection, BOOL is_system) { collection->IDWriteFontCollection_iface.lpVtbl = &fontcollectionvtbl; collection->ref = 1; collection->family_count = 0; collection->family_alloc = 2; + collection->is_system = is_system; collection->family_data = heap_alloc(sizeof(*collection->family_data)*2); if (!collection->family_data) @@ -1506,7 +1520,7 @@ static HRESULT init_fontfamily_data(IDWriteLocalizedStrings *familyname, struct return S_OK; } -HRESULT create_font_collection(IDWriteFactory* factory, IDWriteFontFileEnumerator *enumerator, IDWriteFontCollection **ret) +HRESULT create_font_collection(IDWriteFactory* factory, IDWriteFontFileEnumerator *enumerator, BOOL is_system, IDWriteFontCollection **ret) { struct dwrite_fontcollection *collection; BOOL current = FALSE; @@ -1517,7 +1531,7 @@ HRESULT create_font_collection(IDWriteFactory* factory, IDWriteFontFileEnumerato collection = heap_alloc(sizeof(struct dwrite_fontcollection)); if (!collection) return E_OUTOFMEMORY; - hr = init_font_collection(collection); + hr = init_font_collection(collection, is_system); if (FAILED(hr)) { heap_free(collection); return hr; @@ -1765,7 +1779,7 @@ HRESULT get_system_fontcollection(IDWriteFactory *factory, IDWriteFontCollection return hr; TRACE("building system font collection for factory %p\n", factory); - hr = create_font_collection(factory, enumerator, collection); + hr = create_font_collection(factory, enumerator, TRUE, collection); IDWriteFontFileEnumerator_Release(enumerator); return hr; } diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index b099e52..3715bf0 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -326,8 +326,54 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop *iface, IDWriteFont *font, LOGFONTW *logfont, BOOL *is_systemfont) { struct gdiinterop *This = impl_from_IDWriteGdiInterop(iface); - FIXME("(%p)->(%p %p %p): stub\n", This, font, logfont, is_systemfont); - return E_NOTIMPL; + static const WCHAR enusW[] = {'e','n','-','u','s',0}; + DWRITE_FONT_SIMULATIONS simulations; + IDWriteFontCollection *collection; + IDWriteLocalizedStrings *name; + IDWriteFontFamily *family; + DWRITE_FONT_STYLE style; + UINT32 index; + BOOL exists; + HRESULT hr; + + TRACE("(%p)->(%p %p %p)\n", This, font, logfont, is_systemfont); + + *is_systemfont = FALSE; + + if (!font) + return E_INVALIDARG; + + hr = IDWriteFont_GetFontFamily(font, &family); + if (FAILED(hr)) + return hr; + + hr = IDWriteFontFamily_GetFontCollection(family, &collection); + IDWriteFontFamily_Release(family); + if (FAILED(hr)) + return hr; + + *is_systemfont = is_system_collection(collection); + IDWriteFontCollection_Release(collection); + + simulations = IDWriteFont_GetSimulations(font); + style = IDWriteFont_GetStyle(font); + + logfont->lfCharSet = DEFAULT_CHARSET; + logfont->lfWeight = IDWriteFont_GetWeight(font); + logfont->lfItalic = style == DWRITE_FONT_STYLE_ITALIC || (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE); + logfont->lfOutPrecision = OUT_OUTLINE_PRECIS; + logfont->lfFaceName[0] = 0; + + exists = FALSE; + hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &name, &exists); + if (FAILED(hr) || !exists) + return hr; + + IDWriteLocalizedStrings_FindLocaleName(name, enusW, &index, &exists); + IDWriteLocalizedStrings_GetString(name, index, logfont->lfFaceName, sizeof(logfont->lfFaceName)/sizeof(WCHAR)); + IDWriteLocalizedStrings_Release(name); + + return S_OK; } static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop *iface, diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 023ae4f..2868c3b 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -631,7 +631,7 @@ static HRESULT WINAPI dwritefactory_CreateCustomFontCollection(IDWriteFactory *i if (FAILED(hr)) return hr; - hr = create_font_collection(iface, enumerator, collection); + hr = create_font_collection(iface, enumerator, FALSE, collection); IDWriteFontFileEnumerator_Release(enumerator); return hr; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d7e61e5..60d0d44 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2266,6 +2266,60 @@ todo_wine DeleteFileW(test_fontfile); } +static void test_ConvertFontToLOGFONT(void) +{ + IDWriteFactory *factory, *factory2; + IDWriteFontCollection *collection; + IDWriteGdiInterop *interop; + IDWriteFontFamily *family; + IDWriteFont *font; + LOGFONTW logfont; + BOOL system; + HRESULT hr; + + factory = create_factory(); + factory2 = create_factory(); + + interop = NULL; + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_GetSystemFontCollection(factory2, &collection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontCollection_GetFontFamily(collection, 0, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (0) { /* crashes on native */ + IDWriteGdiInterop_ConvertFontToLOGFONT(interop, NULL, NULL, NULL); + IDWriteGdiInterop_ConvertFontToLOGFONT(interop, NULL, &logfont, NULL); + IDWriteGdiInterop_ConvertFontToLOGFONT(interop, font, NULL, &system); +} + system = TRUE; + hr = IDWriteGdiInterop_ConvertFontToLOGFONT(interop, NULL, &logfont, &system); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(!system, "got %d\n", system); + + system = FALSE; + memset(&logfont, 0, sizeof(logfont)); + hr = IDWriteGdiInterop_ConvertFontToLOGFONT(interop, font, &logfont, &system); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(system, "got %d\n", system); + ok(logfont.lfFaceName[0] != 0, "got face name %s\n", wine_dbgstr_w(logfont.lfFaceName)); + + IDWriteFactory_Release(factory2); + + IDWriteFontCollection_Release(collection); + IDWriteFontFamily_Release(family); + IDWriteFont_Release(font); + IDWriteGdiInterop_Release(interop); + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -2296,6 +2350,7 @@ START_TEST(font) test_GetSimulations(); test_GetFaceNames(); test_TryGetFontTable(); + test_ConvertFontToLOGFONT(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Added a basic test for TryGetFontTable().
by Alexandre Julliard Nov. 7, 2014

Nov. 7, 2014

Module: wine Branch: master Commit: a714f0fe75fd6a4f8df2623e0910586f6a44a7e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a714f0fe75fd6a4f8df2623e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 6 23:23:26 2014 +0300 dwrite: Added a basic test for TryGetFontTable(). --- dlls/dwrite/tests/font.c | 93 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 78 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e884940..d7e61e5 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -26,6 +26,12 @@ #include "wine/test.h" +#define MS_MAKE_TAG(ch0, ch1, ch2, ch3) \ + ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ + ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) + +#define MS_CMAP_TAG MS_MAKE_TAG('c','m','a','p') + #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) @@ -48,6 +54,7 @@ static inline BOOL heap_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } +static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; static const WCHAR blahW[] = {'B','l','a','h','!',0}; @@ -1673,23 +1680,13 @@ if (face2) IDWriteFactory_Release(factory); } -static void test_CreateFontFileReference(void) +static void create_testfontfile(const WCHAR *filename) { DWORD written; HANDLE file; HRSRC res; void *ptr; - HRESULT hr; - WCHAR font_name[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; - IDWriteFontFile *ffile = NULL; - BOOL support = 1; - DWRITE_FONT_FILE_TYPE type = 1; - DWRITE_FONT_FACE_TYPE face = 1; - UINT32 count = 1; - IDWriteFontFace *fface = NULL; - IDWriteFactory *factory; - - file = CreateFileW(font_name, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + file = CreateFileW(filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); ok( file != INVALID_HANDLE_VALUE, "file creation failed\n" ); res = FindResourceA(GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(1), (LPCSTR)RT_RCDATA); @@ -1698,13 +1695,30 @@ static void test_CreateFontFileReference(void) WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); CloseHandle( file ); +} +static void test_CreateFontFileReference(void) +{ + HRESULT hr; + IDWriteFontFile *ffile = NULL; + BOOL support; + DWRITE_FONT_FILE_TYPE type; + DWRITE_FONT_FACE_TYPE face; + UINT32 count; + IDWriteFontFace *fface = NULL; + IDWriteFactory *factory; + + create_testfontfile(test_fontfile); factory = create_factory(); - hr = IDWriteFactory_CreateFontFileReference(factory, font_name, NULL, &ffile); + hr = IDWriteFactory_CreateFontFileReference(factory, test_fontfile, NULL, &ffile); ok(hr == S_OK, "got 0x%08x\n",hr); - IDWriteFontFile_Analyze(ffile, &support, &type, &face, &count); + support = FALSE; + type = DWRITE_FONT_FILE_TYPE_UNKNOWN; + face = DWRITE_FONT_FACE_TYPE_CFF; + count = 0; + hr = IDWriteFontFile_Analyze(ffile, &support, &type, &face, &count); ok(hr == S_OK, "got 0x%08x\n", hr); ok(support == TRUE, "got %i\n", support); ok(type == DWRITE_FONT_FILE_TYPE_TRUETYPE, "got %i\n", type); @@ -1718,7 +1732,7 @@ static void test_CreateFontFileReference(void) IDWriteFontFile_Release(ffile); IDWriteFactory_Release(factory); - DeleteFileW(font_name); + DeleteFileW(test_fontfile); } static void test_shared_isolated(void) @@ -2204,6 +2218,54 @@ static void test_GetFaceNames(void) IDWriteFactory_Release(factory); } +static void test_TryGetFontTable(void) +{ + const void *table, *table2; + IDWriteFontFace *fontface; + void *context, *context2; + IDWriteFactory *factory; + IDWriteFontFile *file; + BOOL exists; + UINT32 size; + HRESULT hr; + + create_testfontfile(test_fontfile); + + factory = create_factory(); + + hr = IDWriteFactory_CreateFontFileReference(factory, test_fontfile, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n",hr); + + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_TRUETYPE, 1, &file, 0, 0, &fontface); + ok(hr == S_OK, "got 0x%08x\n",hr); + + exists = FALSE; + context = (void*)0xdeadbeef; + table = NULL; + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_CMAP_TAG, &table, &size, &context, &exists); + ok(hr == S_OK, "got 0x%08x\n",hr); + ok(exists == TRUE, "got %d\n", exists); +todo_wine + ok(context == NULL && table != NULL, "cmap: context %p, table %p\n", context, table); + + exists = FALSE; + context2 = (void*)0xdeadbeef; + table2 = NULL; + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_CMAP_TAG, &table2, &size, &context2, &exists); + ok(hr == S_OK, "got 0x%08x\n",hr); + ok(exists == TRUE, "got %d\n", exists); +todo_wine + ok(context2 == context && table2 == table, "cmap: context2 %p, table2 %p\n", context2, table2); + + IDWriteFontFace_ReleaseFontTable(fontface, context2); + IDWriteFontFace_ReleaseFontTable(fontface, context); + + IDWriteFontFace_Release(fontface); + IDWriteFontFile_Release(file); + IDWriteFactory_Release(factory); + DeleteFileW(test_fontfile); +} + START_TEST(font) { IDWriteFactory *factory; @@ -2233,6 +2295,7 @@ START_TEST(font) test_CreateFontFaceFromHdc(); test_GetSimulations(); test_GetFaceNames(); + test_TryGetFontTable(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Implement GetMetrics() for DWRITE_FONT_METRICS1.
by Alexandre Julliard Nov. 7, 2014

Nov. 7, 2014

Module: wine Branch: master Commit: 6ce8cc149eb36f6daa649965a70806ddc0cd2b7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce8cc149eb36f6daa649965a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 6 11:49:06 2014 +0300 dwrite: Implement GetMetrics() for DWRITE_FONT_METRICS1. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 21 +++++++------- dlls/dwrite/opentype.c | 18 ++++++++++-- dlls/dwrite/tests/font.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ include/dwrite_1.idl | 2 +- 5 files changed, 96 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ce8cc149eb36f6daa649…

1 0

Michael Stefaniuc : shell32: Simplify check for empty string (PVS-Studio).
by Alexandre Julliard Nov. 7, 2014

Nov. 7, 2014

Module: wine Branch: master Commit: 5d43ef68ce7fa61b074866fac9f7787c6e0bbdbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d43ef68ce7fa61b074866fac… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 7 10:22:01 2014 +0100 shell32: Simplify check for empty string (PVS-Studio). --- dlls/shell32/shellord.c | 2 +- dlls/shell32/tests/ebrowser.c | 2 +- dlls/shell32/tests/shlfolder.c | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 56c9fe9..914dc5a 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -947,7 +947,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) /* buffer size looks good */ ptr += 12; /* get to string */ len = bufused - (ptr-buffer); /* get length of buf remaining */ - if ((lstrlenA(ptr) > 0) && (lstrlenA(ptr) <= len-1)) { + if (ptr[0] && (lstrlenA(ptr) <= len-1)) { /* appears to be good string */ lstrcpyA(old_lnk_name, link_dir); PathAppendA(old_lnk_name, ptr); diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 1936cf9..4c255a1 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -1381,7 +1381,7 @@ static void test_navigation(void) ok(pSHCreateShellItem != NULL, "pSHCreateShellItem unexpectedly missing.\n"); GetCurrentDirectoryW(MAX_PATH, current_path); - if(!lstrlenW(current_path)) + if(!current_path[0]) { skip("Failed to create test-directory.\n"); return; diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index fc37443..1b457bb 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -81,7 +81,7 @@ static WCHAR *make_wstr(const char *str) WCHAR *ret; int len; - if(!str || strlen(str) == 0) + if (!str || !str[0]) return NULL; len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); @@ -2203,7 +2203,7 @@ static void test_SHCreateShellItem(void) return; } - if (!lstrlenA(curdirA)) + if (!curdirA[0]) { win_skip("GetCurrentDirectoryA returned empty string, skipping test_SHCreateShellItem\n"); return; @@ -2780,7 +2780,7 @@ static void test_ShellItemCompare(void) } GetCurrentDirectoryW(MAX_PATH, curdirW); - if(!lstrlenW(curdirW)) + if (!curdirW[0]) { skip("Failed to get current directory, skipping.\n"); return; @@ -4387,7 +4387,7 @@ static void test_GetUIObject(void) } GetCurrentDirectoryW(MAX_PATH, path); - if(!lstrlenW(path)) + if (!path[0]) { skip("GetCurrentDirectoryW returned an empty string.\n"); return; @@ -4989,8 +4989,8 @@ static void test_SHChangeNotify(BOOL test_new_delivery) exp_data->missing_events = exp_data->notify_count; SHChangeNotify(exp_data->signal, SHCNF_PATHA | SHCNF_FLUSH, - strlen(exp_data->path_1) > 0 ? exp_data->path_1 : NULL, - strlen(exp_data->path_2) > 0 ? exp_data->path_2 : NULL); + exp_data->path_1[0] ? exp_data->path_1 : NULL, + exp_data->path_2[0] ? exp_data->path_2 : NULL); do_events(); ok(exp_data->missing_events == 0, "%s: Expected wndproc to be called\n", exp_data->id); @@ -5045,7 +5045,7 @@ static void test_SHCreateDefaultContextMenu(void) } GetCurrentDirectoryW(MAX_PATH, path); - if(!lstrlenW(path)) + if (!path[0]) { skip("GetCurrentDirectoryW returned an empty string.\n"); return;

1 0

Jonathan Vollebregt : advapi32/tests: Fix bad cleanup in test_reg_create_key.
by Alexandre Julliard Nov. 7, 2014

Nov. 7, 2014

Module: wine Branch: master Commit: 495b97f05be9462cc34e0b9df582de474eddd229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=495b97f05be9462cc34e0b9df… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Thu Nov 6 19:03:54 2014 +0100 advapi32/tests: Fix bad cleanup in test_reg_create_key. --- dlls/advapi32/tests/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 3aff541..23eafab 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1219,7 +1219,7 @@ static void test_reg_create_key(void) ok(ret == ERROR_BAD_PATHNAME, "expected ERROR_BAD_PATHNAME, got %d\n", ret); else { ok(!ret, "RegCreateKeyExA failed with error %d\n", ret); - RegDeleteKeyA(hkey1, NULL); + RegDeleteKeyA(hkey1, ""); RegCloseKey(hkey1); }

1 0

Nikolay Sivov : dwrite: Respond to IID_IDWriteTextLayout1 too.
by Alexandre Julliard Nov. 7, 2014

Nov. 7, 2014

Module: wine Branch: master Commit: 49c8e98f74d748e9b4ed9c623c2727618bdfd4cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c8e98f74d748e9b4ed9c623… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 7 09:25:33 2014 +0300 dwrite: Respond to IID_IDWriteTextLayout1 too. --- dlls/dwrite/layout.c | 1 + dlls/dwrite/tests/layout.c | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 86ddf3c..6d8145d 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -525,6 +525,7 @@ static HRESULT WINAPI dwritetextlayout_QueryInterface(IDWriteTextLayout2 *iface, TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IDWriteTextLayout2) || + IsEqualIID(riid, &IID_IDWriteTextLayout1) || IsEqualIID(riid, &IID_IDWriteTextLayout) || IsEqualIID(riid, &IID_IDWriteTextFormat) || IsEqualIID(riid, &IID_IUnknown)) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 0975ee8..bf872f0 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1,7 +1,7 @@ /* * Text layout/format tests * - * Copyright 2012 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -309,7 +309,9 @@ static IDWriteTextRenderer testrenderer = { &testrenderervtbl }; static void test_CreateTextLayout(void) { static const WCHAR strW[] = {'s','t','r','i','n','g',0}; + IDWriteTextLayout2 *layout2; IDWriteTextLayout *layout; + IDWriteTextFormat *format; HRESULT hr; hr = IDWriteFactory_CreateTextLayout(factory, NULL, 0, NULL, 0.0, 0.0, &layout); @@ -326,6 +328,42 @@ static void test_CreateTextLayout(void) hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, NULL, 1000.0, 1000.0, &layout); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); + if (hr == S_OK) { + IDWriteTextLayout1 *layout1; + IDWriteTextFormat1 *format1; + + hr = IDWriteTextLayout2_QueryInterface(layout2, &IID_IDWriteTextLayout1, (void**)&layout1); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout1_Release(layout1); + + hr = IDWriteTextLayout2_QueryInterface(layout2, &IID_IDWriteTextFormat1, (void**)&format1); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +if (hr == S_OK) + IDWriteTextFormat1_Release(format1); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextFormat1, (void**)&format1); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +if (hr == S_OK) + IDWriteTextFormat1_Release(format1); + + IDWriteTextLayout2_Release(layout2); + } + else + win_skip("IDWriteTextLayout2 is not supported.\n"); + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); } static void test_CreateGdiCompatibleTextLayout(void)

1 0

Alex Henrie : kernel32/tests: Add UTF-7 implicit termination tests.
by Alexandre Julliard Nov. 7, 2014

Nov. 7, 2014

Module: wine Branch: master Commit: 0f93668637355a64932601ae5f294df761034038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f93668637355a64932601ae5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 6 23:32:02 2014 -0700 kernel32/tests: Add UTF-7 implicit termination tests. --- dlls/kernel32/tests/codepage.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 292e950..6e89533 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -592,6 +592,59 @@ static void test_utf7_decoding(void) "i=0x%02x: expected output=%s, got output=%s\n", i, wine_dbgstr_wn(expected, expected_len + 1), wine_dbgstr_wn(output, expected_len + 1)); } + + /* test which one-byte characters terminate a sequence + * also test whether the unfinished byte pair is discarded or not */ + for (i = 0; i < 256; i++) + { + sprintf(input, "+B%c+AAA", i); + + memset(output, 0x23, sizeof(output) - sizeof(WCHAR)); + output[sizeof(output) / sizeof(WCHAR) - 1] = 0; + + len = MultiByteToWideChar(CP_UTF7, 0, input, 8, output, sizeof(output) / sizeof(WCHAR) - 1); + + if (i == '-') + { + /* explicitly terminates */ + expected_len = 2; + expected[0] = 0; + expected[1] = 0; + } + else if (i <= 0x7F) + { + if (base64_decoding_table[i] != -1) + { + /* absorbs the character into the base64 sequence */ + expected_len = 3; + expected[0] = 0x0400 | (base64_decoding_table[i] << 4) | 0x000F; + expected[1] = 0x8000; + expected[2] = 0; + } + else + { + /* implicitly terminates and discards the unfinished byte pair */ + expected_len = 3; + expected[0] = i; + expected[1] = 0; + expected[2] = 0; + } + } + else + { + /* implicitly terminates but does not the discard unfinished byte pair */ + expected_len = 3; + expected[0] = i; + expected[1] = 0x0400; + expected[2] = 0; + } + expected[expected_len] = 0x2323; + + ok(len == expected_len, "i=0x%02x: expected len=%i, got len=%i\n", i, expected_len, len); + ok(memcmp(output, expected, (expected_len + 1) * sizeof(WCHAR)) == 0, + "i=0x%02x: expected output=%s, got output=%s\n", + i, wine_dbgstr_wn(expected, expected_len + 1), wine_dbgstr_wn(output, expected_len + 1)); + } } static void test_undefined_byte_char(void)

1 0

Alex Henrie : kernel32/tests: Add UTF-7 stray + sign removal tests.
by Alexandre Julliard Nov. 7, 2014

Nov. 7, 2014

Module: wine Branch: master Commit: 14f41641bbc78e46e1c28131667f5f7d40afcfdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f41641bbc78e46e1c281316… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 6 23:32:01 2014 -0700 kernel32/tests: Add UTF-7 stray + sign removal tests. --- dlls/kernel32/tests/codepage.c | 68 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 147989b..292e950 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -527,6 +527,73 @@ static void test_utf7_encoding(void) } } +static void test_utf7_decoding(void) +{ + char input[32]; + WCHAR output[32], expected[32]; + int i, len, expected_len; + + static const signed char base64_decoding_table[] = + { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00-0x0F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10-0x1F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, /* 0x20-0x2F */ + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, /* 0x30-0x3F */ + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, /* 0x40-0x4F */ + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, /* 0x50-0x5F */ + -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, /* 0x60-0x6F */ + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1 /* 0x70-0x7F */ + }; + + if (MultiByteToWideChar(CP_UTF7, 0, "foobar", -1, NULL, 0) == 0 && + GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("UTF-7 decoding not implemented\n"); + return; + } + + /* test which one-byte characters remove stray + signs */ + for (i = 0; i < 256; i++) + { + sprintf(input, "+%c+AAA", i); + + memset(output, 0x23, sizeof(output) - sizeof(WCHAR)); + output[sizeof(output) / sizeof(WCHAR) - 1] = 0; + + len = MultiByteToWideChar(CP_UTF7, 0, input, 7, output, sizeof(output) / sizeof(WCHAR) - 1); + + if (i == '-') + { + /* removes the - sign */ + expected_len = 3; + expected[0] = 0x002B; + expected[1] = 0; + expected[2] = 0; + } + else if (i <= 0x7F && base64_decoding_table[i] != -1) + { + /* absorbs the character into the base64 sequence */ + expected_len = 2; + expected[0] = (base64_decoding_table[i] << 10) | 0x03E0; + expected[1] = 0; + } + else + { + /* removes the + sign */ + expected_len = 3; + expected[0] = i; + expected[1] = 0; + expected[2] = 0; + } + expected[expected_len] = 0x2323; + + ok(len == expected_len, "i=0x%02x: expected len=%i, got len=%i\n", i, expected_len, len); + ok(memcmp(output, expected, (expected_len + 1) * sizeof(WCHAR)) == 0, + "i=0x%02x: expected output=%s, got output=%s\n", + i, wine_dbgstr_wn(expected, expected_len + 1), wine_dbgstr_wn(output, expected_len + 1)); + } +} + static void test_undefined_byte_char(void) { static const struct tag_testset { @@ -734,6 +801,7 @@ START_TEST(codepage) test_string_conversion(&bUsedDefaultChar); test_utf7_encoding(); + test_utf7_decoding(); test_undefined_byte_char(); test_threadcp();

1 0

Jonathan Vollebregt : advapi32/tests: Add trailing slashes tests for RegOpen/CreateKey.
by Alexandre Julliard Nov. 7, 2014

Nov. 7, 2014

Module: wine Branch: master Commit: 2e78a2c921cb3d92d116ecd72985784d488031f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e78a2c921cb3d92d116ecd72… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Thu Nov 6 19:03:53 2014 +0100 advapi32/tests: Add trailing slashes tests for RegOpen/CreateKey. --- dlls/advapi32/tests/registry.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 382d8cc..3aff541 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -953,6 +953,11 @@ static void test_reg_open_key(void) ok(hkResult != NULL, "hkResult != NULL\n"); RegCloseKey(hkResult); + /* trailing slashes */ + ret = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test\\\\", &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + RegCloseKey(hkResult); + /* open nonexistent key * check that hkResult is set to NULL */ @@ -1218,6 +1223,12 @@ static void test_reg_create_key(void) RegCloseKey(hkey1); } + /* trailing backslash characters */ + ret = RegCreateKeyExA(hkey_main, "Subkey4\\\\", 0, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL); + ok(ret == ERROR_SUCCESS, "RegCreateKeyExA failed with error %d\n", ret); + RegDeleteKeyA(hkey1, ""); + RegCloseKey(hkey1); + /* WOW64 flags - open an existing key */ hkey1 = NULL; ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, KEY_READ|KEY_WOW64_32KEY, NULL, &hkey1, NULL);

1 0

Sebastian Lackner : krnl386.exe16: Fix incorrect interpretation of SIB byte when parsing x86 opcode.
by Alexandre Julliard Nov. 7, 2014

Nov. 7, 2014

Module: wine Branch: master Commit: 8035f90f3b5b4dab85d1c458d7675aba636ea4b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8035f90f3b5b4dab85d1c458d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Nov 7 05:19:58 2014 +0100 krnl386.exe16: Fix incorrect interpretation of SIB byte when parsing x86 opcode. --- dlls/krnl386.exe16/instr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/instr.c b/dlls/krnl386.exe16/instr.c index 459885d..b44bd55 100644 --- a/dlls/krnl386.exe16/instr.c +++ b/dlls/krnl386.exe16/instr.c @@ -194,7 +194,7 @@ static BYTE *INSTR_GetOperandAddr( CONTEXT *context, BYTE *instr, GET_VAL( &sib, BYTE ); rm = sib & 7; ss = sib >> 6; - switch(sib >> 3) + switch((sib >> 3) & 7) { case 0: index = context->Eax; break; case 1: index = context->Ecx; break;

1 0