November 2014 - Wine-commits

Nikolay Sivov : dwrite: Fix setting oblique simulation on font creation.
by Alexandre Julliard 05 Nov '14

05 Nov '14

Module: wine Branch: master Commit: c0796ecb4940825d717dc320cbdf188cfe82ac8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0796ecb4940825d717dc320c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 4 18:31:31 2014 +0300 dwrite: Fix setting oblique simulation on font creation. --- dlls/dwrite/font.c | 4 ++-- dlls/dwrite/tests/font.c | 16 +++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c9edd91..165e395 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -698,7 +698,7 @@ HRESULT convert_fontface_to_logfont(IDWriteFontFace *face, LOGFONTW *logfont) logfont->lfCharSet = DEFAULT_CHARSET; logfont->lfWeight = weight; - logfont->lfItalic = style == DWRITE_FONT_STYLE_ITALIC || (simulations | DWRITE_FONT_SIMULATIONS_OBLIQUE); + logfont->lfItalic = style == DWRITE_FONT_STYLE_ITALIC || (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE); logfont->lfOutPrecision = OUT_OUTLINE_PRECIS; /* TODO: set facename */ @@ -1120,7 +1120,7 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i DWRITE_FONT_SIMULATIONS simulations = DWRITE_FONT_SIMULATIONS_NONE; if (((style == DWRITE_FONT_STYLE_ITALIC) || (style == DWRITE_FONT_STYLE_OBLIQUE)) && - This->data->fonts[found]->style == DWRITE_FONT_STYLE_ITALIC) { + This->data->fonts[found]->style == DWRITE_FONT_STYLE_NORMAL) { simulations = DWRITE_FONT_SIMULATIONS_OBLIQUE; } return create_font(This->data->fonts[found], iface, simulations, font); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 890bb2c..a93ee33 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1126,6 +1126,7 @@ static void test_system_fontcollection(void) static void test_ConvertFontFaceToLOGFONT(void) { + DWRITE_FONT_SIMULATIONS sim; IDWriteGdiInterop *interop; IDWriteFontFace *fontface; IDWriteFactory *factory; @@ -1154,6 +1155,13 @@ static void test_ConvertFontFaceToLOGFONT(void) hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); + + sim = IDWriteFont_GetSimulations(font); + ok(sim == DWRITE_FONT_SIMULATIONS_OBLIQUE, "sim %d\n", sim); + + sim = IDWriteFontFace_GetSimulations(fontface); + ok(sim == DWRITE_FONT_SIMULATIONS_OBLIQUE, "sim %d\n", sim); + IDWriteFont_Release(font); if (0) /* crashes on native */ @@ -1830,7 +1838,6 @@ static void test_GetFirstMatchingFont(void) ok(hr == S_OK, "got 0x%08x\n", hr); simulations = IDWriteFont_GetSimulations(font); -todo_wine ok(simulations == DWRITE_FONT_SIMULATIONS_OBLIQUE, "%d\n", simulations); IDWriteFont_Release(font); @@ -2009,12 +2016,10 @@ static void test_GetSimulations(void) ok(hr == S_OK, "got 0x%08x\n", hr); simulations = IDWriteFont_GetSimulations(font); -todo_wine ok(simulations == DWRITE_FONT_SIMULATIONS_OBLIQUE, "got %d\n", simulations); hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); simulations = IDWriteFontFace_GetSimulations(fontface); -todo_wine ok(simulations == DWRITE_FONT_SIMULATIONS_OBLIQUE, "got %d\n", simulations); IDWriteFontFace_Release(fontface); IDWriteFont_Release(font); @@ -2030,11 +2035,12 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); simulations = IDWriteFont_GetSimulations(font); - ok(simulations == 0, "got %d\n", simulations); + ok(simulations == DWRITE_FONT_SIMULATIONS_NONE, "got %d\n", simulations); hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); simulations = IDWriteFontFace_GetSimulations(fontface); - ok(simulations == 0, "got %d\n", simulations); +todo_wine + ok(simulations == DWRITE_FONT_SIMULATIONS_NONE, "got %d\n", simulations); IDWriteFontFace_Release(fontface); IDWriteFont_Release(font);

1 0

Nikolay Sivov : dwrite: Fix compiler warning regarding unsigned type of enum member.
by Alexandre Julliard 05 Nov '14

05 Nov '14

Module: wine Branch: master Commit: 16aa4f1faa3757ff51a543ce8b0d9b0ad45a3a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16aa4f1faa3757ff51a543ce8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 4 18:50:57 2014 +0300 dwrite: Fix compiler warning regarding unsigned type of enum member. --- dlls/dwrite/analyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 46cf3b5..82e9fa5 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1223,7 +1223,7 @@ HRESULT create_numbersubstitution(DWRITE_NUMBER_SUBSTITUTION_METHOD method, cons *ret = NULL; - if (method < DWRITE_NUMBER_SUBSTITUTION_METHOD_FROM_CULTURE || method > DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL) + if ((UINT32)method > DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL) return E_INVALIDARG; if (method != DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE && !IsValidLocaleName(locale))

1 0

Nikolay Sivov : dwrite: Implement GetFaceNames().
by Alexandre Julliard 05 Nov '14

05 Nov '14

Module: wine Branch: master Commit: ad69c7bf6d574e75456c0d92ee200ce2ecab7eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad69c7bf6d574e75456c0d92e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 4 22:53:19 2014 +0300 dwrite: Implement GetFaceNames(). --- dlls/dwrite/font.c | 52 ++++++++++++++++++++++++++++++++++++++---- dlls/dwrite/tests/font.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 165e395..95fbdc6 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -85,7 +85,7 @@ struct dwrite_font { IDWriteFontFamily *family; - DWRITE_FONT_SIMULATIONS simulations; + USHORT simulations; struct dwrite_font_data *data; }; @@ -111,7 +111,7 @@ struct dwrite_fontface { UINT32 file_count; UINT32 index; - DWRITE_FONT_SIMULATIONS simulations; + USHORT simulations; DWRITE_FONT_FACE_TYPE type; struct dwrite_fonttable cmap; @@ -812,9 +812,53 @@ static BOOL WINAPI dwritefont_IsSymbolFont(IDWriteFont2 *iface) static HRESULT WINAPI dwritefont_GetFaceNames(IDWriteFont2 *iface, IDWriteLocalizedStrings **names) { + static const WCHAR boldobliqueW[] = {'B','o','l','d',' ','O','b','l','i','q','u','e',0}; + static const WCHAR obliqueW[] = {'O','b','l','i','q','u','e',0}; + static const WCHAR boldW[] = {'B','o','l','d',0}; + static const WCHAR enusW[] = {'e','n','-','u','s',0}; + struct dwrite_font *This = impl_from_IDWriteFont2(iface); - FIXME("(%p)->(%p): stub\n", This, names); - return E_NOTIMPL; + IDWriteLocalizedStrings *strings; + const WCHAR *name; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, names); + + *names = NULL; + + if (This->simulations == DWRITE_FONT_SIMULATIONS_NONE) { + BOOL exists; + return IDWriteFont2_GetInformationalStrings(iface, DWRITE_INFORMATIONAL_STRING_WIN32_SUBFAMILY_NAMES, + names, &exists); + } + + switch (This->simulations) { + case DWRITE_FONT_SIMULATIONS_BOLD|DWRITE_FONT_SIMULATIONS_OBLIQUE: + name = boldobliqueW; + break; + case DWRITE_FONT_SIMULATIONS_BOLD: + name = boldW; + break; + case DWRITE_FONT_SIMULATIONS_OBLIQUE: + name = obliqueW; + break; + default: + ERR("unknown simulations %d\n", This->simulations); + return E_FAIL; + } + + hr = create_localizedstrings(&strings); + if (FAILED(hr)) return hr; + + hr = add_localizedstring(strings, enusW, name); + if (FAILED(hr)) { + IDWriteLocalizedStrings_Release(strings); + return hr; + } + + *names = strings; + + return S_OK; } static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont2 *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index a93ee33..dec90fe 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2048,6 +2048,64 @@ todo_wine IDWriteFactory_Release(factory); } +static void test_GetFaceNames(void) +{ + static const WCHAR obliqueW[] = {'O','b','l','i','q','u','e',0}; + static const WCHAR enusW[] = {'e','n','-','u','s',0}; + IDWriteLocalizedStrings *strings, *strings2; + IDWriteGdiInterop *interop; + IDWriteFactory *factory; + IDWriteFont *font; + LOGFONTW logfont; + WCHAR buffW[255]; + UINT32 count; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + logfont.lfItalic = 1; + lstrcpyW(logfont.lfFaceName, tahomaW); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_GetFaceNames(font, &strings); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_GetFaceNames(font, &strings2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(strings != strings2, "got %p, %p\n", strings2, strings); + IDWriteLocalizedStrings_Release(strings2); + + count = IDWriteLocalizedStrings_GetCount(strings); + ok(count == 1, "got %d\n", count); + + /* for simulated faces names are also simulated */ + buffW[0] = 0; + hr = IDWriteLocalizedStrings_GetLocaleName(strings, 0, buffW, sizeof(buffW)/sizeof(WCHAR)); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); +} + + buffW[0] = 0; + hr = IDWriteLocalizedStrings_GetString(strings, 0, buffW, sizeof(buffW)/sizeof(WCHAR)); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, obliqueW), "got %s\n", wine_dbgstr_w(buffW)); + IDWriteLocalizedStrings_Release(strings); + + IDWriteFont_Release(font); + IDWriteGdiInterop_Release(interop); + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -2076,6 +2134,7 @@ START_TEST(font) test_GetGdiInterop(); test_CreateFontFaceFromHdc(); test_GetSimulations(); + test_GetFaceNames(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Remove null checks for family and collection pointers, those are always set now.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 9045ab7f33ff6304e348fe43c8df1caae3213ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9045ab7f33ff6304e348fe43c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 4 16:37:10 2014 +0300 dwrite: Remove null checks for family and collection pointers, those are always set now. --- dlls/dwrite/font.c | 105 +++++++++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 55 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ed0a760..c9edd91 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -127,8 +127,6 @@ struct dwrite_fontfile { IDWriteFontFileStream *stream; }; -static HRESULT create_fontfamily_from_data(struct dwrite_fontfamily_data *data, IDWriteFontCollection *collection, IDWriteFontFamily **family); -static HRESULT create_font_from_data(struct dwrite_font_data*,IDWriteFontFamily*,DWRITE_FONT_SIMULATIONS,IDWriteFont**); static HRESULT get_filestream_from_file(IDWriteFontFile*,IDWriteFontFileStream**); static inline struct dwrite_fontface *impl_from_IDWriteFontFace2(IDWriteFontFace2 *iface) @@ -766,7 +764,7 @@ static ULONG WINAPI dwritefont_Release(IDWriteFont2 *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) { - if (This->family) IDWriteFontFamily_Release(This->family); + IDWriteFontFamily_Release(This->family); release_font_data(This->data); heap_free(This); } @@ -982,6 +980,28 @@ static const IDWriteFont2Vtbl dwritefontvtbl = { dwritefont2_IsColorFont }; +static HRESULT create_font(struct dwrite_font_data *data, IDWriteFontFamily *family, DWRITE_FONT_SIMULATIONS simulations, + IDWriteFont **font) +{ + struct dwrite_font *This; + *font = NULL; + + This = heap_alloc(sizeof(struct dwrite_font)); + if (!This) return E_OUTOFMEMORY; + + This->IDWriteFont2_iface.lpVtbl = &dwritefontvtbl; + This->ref = 1; + This->family = family; + IDWriteFontFamily_AddRef(family); + This->simulations = simulations; + This->data = data; + InterlockedIncrement(&This->data->ref); + + *font = (IDWriteFont*)&This->IDWriteFont2_iface; + + return S_OK; +} + static HRESULT WINAPI dwritefontfamily_QueryInterface(IDWriteFontFamily *iface, REFIID riid, void **obj) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); @@ -1017,8 +1037,7 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily *iface) if (!ref) { - if (This->collection) - IDWriteFontCollection_Release(This->collection); + IDWriteFontCollection_Release(This->collection); _free_fontfamily_data(This->data); heap_free(This); } @@ -1057,7 +1076,7 @@ static HRESULT WINAPI dwritefontfamily_GetFont(IDWriteFontFamily *iface, UINT32 if (index >= This->data->font_count) return E_INVALIDARG; - return create_font_from_data(This->data->fonts[index], iface, DWRITE_FONT_SIMULATIONS_NONE, font); + return create_font(This->data->fonts[index], iface, DWRITE_FONT_SIMULATIONS_NONE, font); } static HRESULT WINAPI dwritefontfamily_GetFamilyNames(IDWriteFontFamily *iface, IDWriteLocalizedStrings **names) @@ -1104,7 +1123,7 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i This->data->fonts[found]->style == DWRITE_FONT_STYLE_ITALIC) { simulations = DWRITE_FONT_SIMULATIONS_OBLIQUE; } - return create_font_from_data(This->data->fonts[found], iface, simulations, font); + return create_font(This->data->fonts[found], iface, simulations, font); } else { *font = NULL; @@ -1132,6 +1151,27 @@ static const IDWriteFontFamilyVtbl fontfamilyvtbl = { dwritefontfamily_GetMatchingFonts }; +static HRESULT create_fontfamily(struct dwrite_fontfamily_data *data, IDWriteFontCollection *collection, IDWriteFontFamily **family) +{ + struct dwrite_fontfamily *This; + + *family = NULL; + + This = heap_alloc(sizeof(struct dwrite_fontfamily)); + if (!This) return E_OUTOFMEMORY; + + This->IDWriteFontFamily_iface.lpVtbl = &fontfamilyvtbl; + This->ref = 1; + This->collection = collection; + IDWriteFontCollection_AddRef(collection); + This->data = data; + InterlockedIncrement(&This->data->ref); + + *family = &This->IDWriteFontFamily_iface; + + return S_OK; +} + static HRESULT WINAPI dwritefontcollection_QueryInterface(IDWriteFontCollection *iface, REFIID riid, void **obj) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); @@ -1192,7 +1232,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection * return E_FAIL; } - return create_fontfamily_from_data(This->family_data[index], iface, family); + return create_fontfamily(This->family_data[index], iface, family); } static HRESULT collection_find_family(struct dwrite_fontcollection *collection, const WCHAR *name, UINT32 *index, BOOL *exists) @@ -1262,12 +1302,12 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec if (!found_font) return E_INVALIDARG; - hr = create_fontfamily_from_data(found_family, iface, &family); + hr = create_fontfamily(found_family, iface, &family); if (FAILED(hr)) return hr; simulations = IDWriteFontFace_GetSimulations(face); - hr = create_font_from_data(found_font, family, simulations, font); + hr = create_font(found_font, family, simulations, font); IDWriteFontFamily_Release(family); return hr; } @@ -1680,51 +1720,6 @@ HRESULT get_system_fontcollection(IDWriteFactory *factory, IDWriteFontCollection return hr; } -static HRESULT create_fontfamily_from_data(struct dwrite_fontfamily_data *data, IDWriteFontCollection *collection, IDWriteFontFamily **family) -{ - struct dwrite_fontfamily *This; - - *family = NULL; - - This = heap_alloc(sizeof(struct dwrite_fontfamily)); - if (!This) return E_OUTOFMEMORY; - - This->IDWriteFontFamily_iface.lpVtbl = &fontfamilyvtbl; - This->ref = 1; - This->collection = collection; - if (collection) - IDWriteFontCollection_AddRef(collection); - This->data = data; - InterlockedIncrement(&This->data->ref); - - *family = &This->IDWriteFontFamily_iface; - - return S_OK; -} - -static HRESULT create_font_from_data(struct dwrite_font_data *data, IDWriteFontFamily *family, DWRITE_FONT_SIMULATIONS simulations, - IDWriteFont **font) -{ - struct dwrite_font *This; - *font = NULL; - - This = heap_alloc(sizeof(struct dwrite_font)); - if (!This) return E_OUTOFMEMORY; - - This->IDWriteFont2_iface.lpVtbl = &dwritefontvtbl; - This->ref = 1; - This->family = family; - if (family) - IDWriteFontFamily_AddRef(family); - This->simulations = simulations; - This->data = data; - InterlockedIncrement(&This->data->ref); - - *font = (IDWriteFont*)&This->IDWriteFont2_iface; - - return S_OK; -} - static HRESULT WINAPI dwritefontfile_QueryInterface(IDWriteFontFile *iface, REFIID riid, void **obj) { struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface);

1 0

Nikolay Sivov : dwrite/tests: Some tests for custom font collections.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 1ef30feba8c0e62c9d09b9b1b31c4ac6ec5c1f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef30feba8c0e62c9d09b9b1b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 4 16:37:57 2014 +0300 dwrite/tests: Some tests for custom font collections. --- dlls/dwrite/tests/font.c | 319 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 318 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ef30feba8c0e62c9d09b…

1 0

Guillaume Charifi : oleaut32: Implement TLB dependencies lookup in resources.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 9e4590ff671f7357c7574599ca163fed5e180661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e4590ff671f7357c7574599c… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Sat Nov 1 08:47:44 2014 +0100 oleaut32: Implement TLB dependencies lookup in resources. --- dlls/oleaut32/tests/typelib.c | 2 +- dlls/oleaut32/typelib.c | 70 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 62 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 728185a..45a56ea 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -5594,7 +5594,7 @@ static void test_dep(void) { ok(hr == S_OK, "got: %x\n", hr); hr = ITypeInfo_GetRefTypeInfo(ptInfo, refType, &ptInfoExt); - todo_wine ok(hr == S_OK || broken(hr == TYPE_E_CANTLOADLIBRARY) /* win 2000 */, "got: %x\n", hr); + ok(hr == S_OK || broken(hr == TYPE_E_CANTLOADLIBRARY) /* win 2000 */, "got: %x\n", hr); ITypeInfo_Release(ptInfo); if(ptInfoExt) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 00f5043..9d0d5d0 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7572,6 +7572,45 @@ static HRESULT ITypeInfoImpl_GetDispatchRefTypeInfo( ITypeInfo *iface, return E_FAIL; } +struct search_res_tlb_params +{ + const GUID *guid; + ITypeLib *pTLib; +}; + +static BOOL CALLBACK search_res_tlb(HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszName, LONG_PTR lParam) +{ + struct search_res_tlb_params *params = (LPVOID)lParam; + static const WCHAR formatW[] = {'\\','%','d',0}; + WCHAR szPath[MAX_PATH+1]; + ITypeLib *pTLib = NULL; + HRESULT ret; + DWORD len; + + if (IS_INTRESOURCE(lpszName) == FALSE) + return TRUE; + + if (!(len = GetModuleFileNameW(hModule, szPath, MAX_PATH))) + return TRUE; + + if (snprintfW(szPath + len, sizeof(szPath)/sizeof(WCHAR) - len, formatW, LOWORD(lpszName)) < 0) + return TRUE; + + ret = LoadTypeLibEx(szPath, REGKIND_NONE, &pTLib); + if (SUCCEEDED(ret)) + { + ITypeLibImpl *impl = impl_from_ITypeLib(pTLib); + if (IsEqualGUID(params->guid, impl->guid)) + { + params->pTLib = pTLib; + return FALSE; /* stop enumeration */ + } + ITypeLib_Release(pTLib); + } + + return TRUE; +} + /* ITypeInfo::GetRefTypeInfo * * If a type description references other type descriptions, it retrieves @@ -7665,20 +7704,33 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ITypeLib_AddRef(pTLib); result = S_OK; } else { + static const WCHAR TYPELIBW[] = {'T','Y','P','E','L','I','B',0}; + struct search_res_tlb_params params; BSTR libnam; TRACE("typeinfo in imported typelib that isn't already loaded\n"); - result = query_typelib_path(TLB_get_guid_null(ref_type->pImpTLInfo->guid), - ref_type->pImpTLInfo->wVersionMajor, - ref_type->pImpTLInfo->wVersionMinor, - This->pTypeLib->syskind, - ref_type->pImpTLInfo->lcid, &libnam, TRUE); - if(FAILED(result)) - libnam = SysAllocString(ref_type->pImpTLInfo->name); + /* Search in resource table */ + params.guid = TLB_get_guid_null(ref_type->pImpTLInfo->guid); + params.pTLib = NULL; + EnumResourceNamesW(NULL, TYPELIBW, search_res_tlb, (LONG_PTR)&params); + pTLib = params.pTLib; + result = S_OK; - result = LoadTypeLib(libnam, &pTLib); - SysFreeString(libnam); + if (!pTLib) + { + /* Search on disk */ + result = query_typelib_path(TLB_get_guid_null(ref_type->pImpTLInfo->guid), + ref_type->pImpTLInfo->wVersionMajor, + ref_type->pImpTLInfo->wVersionMinor, + This->pTypeLib->syskind, + ref_type->pImpTLInfo->lcid, &libnam, TRUE); + if (FAILED(result)) + libnam = SysAllocString(ref_type->pImpTLInfo->name); + + result = LoadTypeLib(libnam, &pTLib); + SysFreeString(libnam); + } if(SUCCEEDED(result)) { ref_type->pImpTLInfo->pImpTypeLib = impl_from_ITypeLib(pTLib);

1 0

Sebastian Lackner : winealsa.drv: Avoid endless loop if registry keys are not accessible.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: ef1aad985ddf2c4d2cfe38e4b8f4cc3d35d138da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef1aad985ddf2c4d2cfe38e4b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 4 04:54:56 2014 +0100 winealsa.drv: Avoid endless loop if registry keys are not accessible. --- dlls/winealsa.drv/mmdevdrv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index a4c02bf..5f623c0 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -719,7 +719,7 @@ static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EData GUID reg_guid; key_name_size = sizeof(key_name)/sizeof(WCHAR); - if(RegEnumKeyExW(devices_key, i, key_name, &key_name_size, NULL, + if(RegEnumKeyExW(devices_key, i++, key_name, &key_name_size, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) break; @@ -753,8 +753,6 @@ static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EData } RegCloseKey(key); - - ++i; } RegCloseKey(devices_key);

1 0

Sebastian Lackner : kernel32: Implement FindFirstFileExW level FindExInfoBasic.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 91f2bdd05289f3d25753906574e9a80046c07231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f2bdd05289f3d2575390657… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 4 06:55:27 2014 +0100 kernel32: Implement FindFirstFileExW level FindExInfoBasic. --- dlls/kernel32/file.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 4a6fc13..006db1c 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -57,6 +57,7 @@ typedef struct HANDLE handle; /* handle to directory */ CRITICAL_SECTION cs; /* crit section protecting this structure */ FINDEX_SEARCH_OPS search_op; /* Flags passed to FindFirst. */ + FINDEX_INFO_LEVELS level; /* Level passed to FindFirst */ UNICODE_STRING mask; /* file mask */ UNICODE_STRING path; /* NT path used to open the directory */ BOOL is_root; /* is directory the root of the drive? */ @@ -1875,7 +1876,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, SetLastError( ERROR_INVALID_PARAMETER ); return INVALID_HANDLE_VALUE; } - if (level != FindExInfoStandard) + if (level != FindExInfoStandard && level != FindExInfoBasic) { FIXME("info level %d not implemented\n", level ); SetLastError( ERROR_INVALID_PARAMETER ); @@ -1979,6 +1980,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, info->data_size = 0; info->data = NULL; info->search_op = search_op; + info->level = level; if (device) { @@ -2141,8 +2143,14 @@ BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data ) memcpy( data->cFileName, dir_info->FileName, dir_info->FileNameLength ); data->cFileName[dir_info->FileNameLength/sizeof(WCHAR)] = 0; - memcpy( data->cAlternateFileName, dir_info->ShortName, dir_info->ShortNameLength ); - data->cAlternateFileName[dir_info->ShortNameLength/sizeof(WCHAR)] = 0; + + if (info->level != FindExInfoBasic) + { + memcpy( data->cAlternateFileName, dir_info->ShortName, dir_info->ShortNameLength ); + data->cAlternateFileName[dir_info->ShortNameLength/sizeof(WCHAR)] = 0; + } + else + data->cAlternateFileName[0] = 0; TRACE("returning %s (%s)\n", debugstr_w(data->cFileName), debugstr_w(data->cAlternateFileName) );

1 0

Sebastian Lackner : kernel32/tests: Add tests for FindFirstFileExW level FindExInfoBasic.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: a10a4538b7958c7b4f0b333795e40ada1577f316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a10a4538b7958c7b4f0b33379… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 4 06:55:45 2014 +0100 kernel32/tests: Add tests for FindFirstFileExW level FindExInfoBasic. --- dlls/kernel32/tests/file.c | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0973efe..3a30fc2 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2562,7 +2562,7 @@ static void test_FindNextFileA(void) ok ( err == ERROR_NO_MORE_FILES, "GetLastError should return ERROR_NO_MORE_FILES\n"); } -static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops, DWORD flags) +static void test_FindFirstFileExA(FINDEX_INFO_LEVELS level, FINDEX_SEARCH_OPS search_ops, DWORD flags) { WIN32_FIND_DATAA search_results; HANDLE handle; @@ -2574,12 +2574,15 @@ static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops, DWORD flags) return; } + trace("Running FindFirstFileExA tests with level=%d, search_ops=%d, flags=%u\n", + level, search_ops, flags); + CreateDirectoryA("test-dir", NULL); _lclose(_lcreat("test-dir\\file1", 0)); _lclose(_lcreat("test-dir\\file2", 0)); CreateDirectoryA("test-dir\\dir1", NULL); SetLastError(0xdeadbeef); - handle = pFindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, search_ops, NULL, flags); + handle = pFindFirstFileExA("test-dir\\*", level, &search_results, search_ops, NULL, flags); if (handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("FindFirstFileExA is not implemented\n"); @@ -2590,16 +2593,26 @@ static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops, DWORD flags) win_skip("FindFirstFileExA flag FIND_FIRST_EX_LARGE_FETCH not supported, skipping test\n"); goto cleanup; } - ok(handle != INVALID_HANDLE_VALUE, "FindFirstFile failed (err=%u)\n", GetLastError()); - ok(strcmp(search_results.cFileName, ".") == 0, "First entry should be '.', is %s\n", search_results.cFileName); + if ((level == FindExInfoBasic) && handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_PARAMETER) + { + win_skip("FindFirstFileExA level FindExInfoBasic not supported, skipping test\n"); + goto cleanup; + } #define CHECK_NAME(fn) (strcmp((fn), "file1") == 0 || strcmp((fn), "file2") == 0 || strcmp((fn), "dir1") == 0) +#define CHECK_LEVEL(fn) (level != FindExInfoBasic || !(fn)[0]) + + ok(handle != INVALID_HANDLE_VALUE, "FindFirstFile failed (err=%u)\n", GetLastError()); + ok(strcmp(search_results.cFileName, ".") == 0, "First entry should be '.', is %s\n", search_results.cFileName); + ok(CHECK_LEVEL(search_results.cAlternateFileName), "FindFirstFile unexpectedly returned an alternate filename\n"); ok(FindNextFileA(handle, &search_results), "Fetching second file failed\n"); ok(strcmp(search_results.cFileName, "..") == 0, "Second entry should be '..' is %s\n", search_results.cFileName); + ok(CHECK_LEVEL(search_results.cAlternateFileName), "FindFirstFile unexpectedly returned an alternate filename\n"); ok(FindNextFileA(handle, &search_results), "Fetching third file failed\n"); ok(CHECK_NAME(search_results.cFileName), "Invalid third entry - %s\n", search_results.cFileName); + ok(CHECK_LEVEL(search_results.cAlternateFileName), "FindFirstFile unexpectedly returned an alternate filename\n"); SetLastError(0xdeadbeef); ret = FindNextFileA(handle, &search_results); @@ -2608,26 +2621,31 @@ static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops, DWORD flags) skip("File system supports directory filtering\n"); /* Results from the previous call are not cleared */ ok(strcmp(search_results.cFileName, "dir1") == 0, "Third entry should be 'dir1' is %s\n", search_results.cFileName); + ok(CHECK_LEVEL(search_results.cAlternateFileName), "FindFirstFile unexpectedly returned an alternate filename\n"); + } else { ok(ret, "Fetching fourth file failed\n"); ok(CHECK_NAME(search_results.cFileName), "Invalid fourth entry - %s\n", search_results.cFileName); + ok(CHECK_LEVEL(search_results.cAlternateFileName), "FindFirstFile unexpectedly returned an alternate filename\n"); ok(FindNextFileA(handle, &search_results), "Fetching fifth file failed\n"); ok(CHECK_NAME(search_results.cFileName), "Invalid fifth entry - %s\n", search_results.cFileName); + ok(CHECK_LEVEL(search_results.cAlternateFileName), "FindFirstFile unexpectedly returned an alternate filename\n"); ok(FindNextFileA(handle, &search_results) == FALSE, "Fetching sixth file should fail\n"); } #undef CHECK_NAME +#undef CHECK_LEVEL FindClose( handle ); /* Most Windows systems seem to ignore the FIND_FIRST_EX_CASE_SENSITIVE flag. Unofficial documentation * suggests that there are registry keys and that it might depend on the used filesystem. */ SetLastError(0xdeadbeef); - handle = pFindFirstFileExA("TEST-DIR\\*", FindExInfoStandard, &search_results, search_ops, NULL, flags); + handle = pFindFirstFileExA("TEST-DIR\\*", level, &search_results, search_ops, NULL, flags); if (flags & FIND_FIRST_EX_CASE_SENSITIVE) { ok(handle != INVALID_HANDLE_VALUE || GetLastError() == ERROR_PATH_NOT_FOUND, @@ -4192,13 +4210,15 @@ START_TEST(file) test_MoveFileW(); test_FindFirstFileA(); test_FindNextFileA(); - test_FindFirstFileExA(0, 0); - test_FindFirstFileExA(0, FIND_FIRST_EX_CASE_SENSITIVE); - test_FindFirstFileExA(0, FIND_FIRST_EX_LARGE_FETCH); + test_FindFirstFileExA(FindExInfoStandard, 0, 0); + test_FindFirstFileExA(FindExInfoStandard, 0, FIND_FIRST_EX_CASE_SENSITIVE); + test_FindFirstFileExA(FindExInfoStandard, 0, FIND_FIRST_EX_LARGE_FETCH); + test_FindFirstFileExA(FindExInfoBasic, 0, 0); /* FindExLimitToDirectories is ignored if the file system doesn't support directory filtering */ - test_FindFirstFileExA(FindExSearchLimitToDirectories, 0); - test_FindFirstFileExA(FindExSearchLimitToDirectories, FIND_FIRST_EX_CASE_SENSITIVE); - test_FindFirstFileExA(FindExSearchLimitToDirectories, FIND_FIRST_EX_LARGE_FETCH); + test_FindFirstFileExA(FindExInfoStandard, FindExSearchLimitToDirectories, 0); + test_FindFirstFileExA(FindExInfoStandard, FindExSearchLimitToDirectories, FIND_FIRST_EX_CASE_SENSITIVE); + test_FindFirstFileExA(FindExInfoStandard, FindExSearchLimitToDirectories, FIND_FIRST_EX_LARGE_FETCH); + test_FindFirstFileExA(FindExInfoBasic, FindExSearchLimitToDirectories, 0); test_LockFile(); test_file_sharing(); test_offset_in_overlapped_structure();

1 0

Henri Verbeet : wined3d: Make a copy of shader signature string data.
by Alexandre Julliard 04 Nov '14

04 Nov '14

Module: wine Branch: master Commit: 909c5cc6fa3edb5ad1c0709e31f67ba927f686ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=909c5cc6fa3edb5ad1c0709e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 4 08:47:42 2014 +0100 wined3d: Make a copy of shader signature string data. --- dlls/wined3d/shader.c | 33 ++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5ae4abc..230b82c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1603,6 +1603,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe static void shader_cleanup(struct wined3d_shader *shader) { + HeapFree(GetProcessHeap(), 0, shader->signature_strings); shader->device->shader_backend->shader_destroy(shader); HeapFree(GetProcessHeap(), 0, shader->reg_maps.constf); HeapFree(GetProcessHeap(), 0, shader->function); @@ -2011,11 +2012,41 @@ static HRESULT vertexshader_init(struct wined3d_shader *shader, struct wined3d_d if (output_signature) { + struct wined3d_shader_signature_element *e; + SIZE_T total, len; + char *ptr; + + total = 0; for (i = 0; i < output_signature->element_count; ++i) { - struct wined3d_shader_signature_element *e = &output_signature->elements[i]; + e = &output_signature->elements[i]; + len = strlen(e->semantic_name); + if (len >= ~(SIZE_T)0 - total) + { + shader_cleanup(shader); + return E_OUTOFMEMORY; + } + + total += len + 1; + } + + if (!(shader->signature_strings = HeapAlloc(GetProcessHeap(), 0, total))) + { + shader_cleanup(shader); + return E_OUTOFMEMORY; + } + ptr = shader->signature_strings; + + for (i = 0; i < output_signature->element_count; ++i) + { + e = &output_signature->elements[i]; reg_maps->output_registers |= 1 << e->register_idx; shader->output_signature[e->register_idx] = *e; + + len = strlen(e->semantic_name); + memcpy(ptr, e->semantic_name, len + 1); + shader->output_signature[e->register_idx].semantic_name = ptr; + ptr += len + 1; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f4ded4f..e5154d3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2879,6 +2879,7 @@ struct wined3d_shader struct wined3d_shader_signature_element input_signature[max(MAX_ATTRIBS, MAX_REG_INPUT)]; struct wined3d_shader_signature_element output_signature[MAX_REG_OUTPUT]; + char *signature_strings; /* Pointer to the parent device */ struct wined3d_device *device;

1 0