September 2015 - Wine-commits

Bruno Jesus : ws2_32: Try harder to get the host name address in getaddrinfo.
by Alexandre Julliard 08 Sep '15

08 Sep '15

Module: wine Branch: master Commit: 18a02d8f41013aa8bf3cdd03750eb706ce52e58c URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a02d8f41013aa8bf3cdd037… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 8 11:14:32 2015 +0800 ws2_32: Try harder to get the host name address in getaddrinfo. --- dlls/ws2_32/socket.c | 18 +++++++++++----- dlls/ws2_32/tests/sock.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ca82ec9..5cf3e0f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5996,7 +5996,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr struct addrinfo *unixaires = NULL; int result; struct addrinfo unixhints, *punixhints = NULL; - char *hostname = NULL; + char *hostname; const char *node; *res = NULL; @@ -6006,13 +6006,13 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr return WSAHOST_NOT_FOUND; } + hostname = get_hostname(); + if (!hostname) return WSA_NOT_ENOUGH_MEMORY; + if (!nodename) node = NULL; else if (!nodename[0]) - { - node = hostname = get_hostname(); - if (!node) return WSA_NOT_ENOUGH_MEMORY; - } + node = hostname; else node = nodename; @@ -6056,6 +6056,14 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr /* getaddrinfo(3) is thread safe, no need to wrap in CS */ result = getaddrinfo(node, servname, punixhints, &unixaires); + if (result && !strcmp(hostname, node)) + { + /* If it didn't work it means the host name IP is not in /etc/hosts, try again + * by sending a NULL host and avoid sending a NULL servname too because that + * is invalid */ + ERR_(winediag)("Failed to resolve your host name IP\n"); + result = getaddrinfo(NULL, servname ? servname : "0", punixhints, &unixaires); + } TRACE("%s, %s %p -> %p %d\n", debugstr_a(nodename), debugstr_a(servname), hints, res, result); HeapFree(GetProcessHeap(), 0, hostname); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2d14496..03e1627 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6313,6 +6313,8 @@ static void test_GetAddrInfoW(void) static const WCHAR zero[] = {'0',0}; int i, ret; ADDRINFOW *result, *result2, *p, hint; + WCHAR name[256]; + DWORD size = sizeof(name); if (!pGetAddrInfoW || !pFreeAddrInfoW) { @@ -6320,6 +6322,8 @@ static void test_GetAddrInfoW(void) return; } memset(&hint, 0, sizeof(ADDRINFOW)); + name[0] = 0; + GetComputerNameExW( ComputerNamePhysicalDnsHostname, name, &size ); result = (ADDRINFOW *)0xdeadbeef; WSASetLastError(0xdeadbeef); @@ -6395,6 +6399,30 @@ static void test_GetAddrInfoW(void) ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); pFreeAddrInfoW(result); + /* try to get information from the computer name, result is the same + * as if requesting with an empty host name. */ + ret = pGetAddrInfoW(name, NULL, NULL, &result); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + + ret = pGetAddrInfoW(empty, NULL, NULL, &result2); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + compare_addrinfow(result, result2); + pFreeAddrInfoW(result); + pFreeAddrInfoW(result2); + + ret = pGetAddrInfoW(name, empty, NULL, &result); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + + ret = pGetAddrInfoW(empty, empty, NULL, &result2); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + compare_addrinfow(result, result2); + pFreeAddrInfoW(result); + pFreeAddrInfoW(result2); + result = (ADDRINFOW *)0xdeadbeef; WSASetLastError(0xdeadbeef); ret = pGetAddrInfoW(NULL, NULL, NULL, &result); @@ -6475,6 +6503,8 @@ static void test_getaddrinfo(void) { int i, ret; ADDRINFOA *result, *result2, *p, hint; + CHAR name[256]; + DWORD size = sizeof(name); if (!pgetaddrinfo || !pfreeaddrinfo) { @@ -6482,6 +6512,7 @@ static void test_getaddrinfo(void) return; } memset(&hint, 0, sizeof(ADDRINFOA)); + GetComputerNameExA( ComputerNamePhysicalDnsHostname, name, &size ); result = (ADDRINFOA *)0xdeadbeef; WSASetLastError(0xdeadbeef); @@ -6558,6 +6589,30 @@ static void test_getaddrinfo(void) ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); pfreeaddrinfo(result); + /* try to get information from the computer name, result is the same + * as if requesting with an empty host name. */ + ret = pgetaddrinfo(name, NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + + ret = pgetaddrinfo("", NULL, NULL, &result2); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + compare_addrinfo(result, result2); + pfreeaddrinfo(result); + pfreeaddrinfo(result2); + + ret = pgetaddrinfo(name, "", NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + + ret = pgetaddrinfo("", "", NULL, &result2); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + compare_addrinfo(result, result2); + pfreeaddrinfo(result); + pfreeaddrinfo(result2); + result = (ADDRINFOA *)0xdeadbeef; WSASetLastError(0xdeadbeef); ret = pgetaddrinfo("nxdomain.codeweavers.com", NULL, NULL, &result);

1 0

Gerald Pfeifer : gdi32: Avoid two cases of shift overflow in get_glyph_indices.
by Alexandre Julliard 08 Sep '15

08 Sep '15

Module: wine Branch: master Commit: 775de7922ef363d665b1cb19dc7c00269779030d URL: http://source.winehq.org/git/wine.git/?a=commit;h=775de7922ef363d665b1cb19d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Sep 7 23:52:55 2015 +0200 gdi32: Avoid two cases of shift overflow in get_glyph_indices. --- dlls/gdi32/tests/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 3757a8d..6b0da1f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2391,12 +2391,12 @@ static BOOL get_glyph_indices(INT charset, UINT code_page, WORD *idx, UINT count if (charset == SYMBOL_CHARSET) { ok(strcmp("Arial", name), "face name should NOT be Arial\n"); - ok(fs.fsCsb[0] & (1 << 31), "symbol encoding should be available\n"); + ok(fs.fsCsb[0] & (1u << 31), "symbol encoding should be available\n"); } else { ok(!strcmp("Arial", name), "face name should be Arial, not %s\n", name); - ok(!(fs.fsCsb[0] & (1 << 31)), "symbol encoding should NOT be available\n"); + ok(!(fs.fsCsb[0] & (1u << 31)), "symbol encoding should NOT be available\n"); } if (!TranslateCharsetInfo((DWORD *)(INT_PTR)cs, &csi, TCI_SRCCHARSET))

1 0

Gerald Pfeifer : mshtml: Adjust NS_ERROR_GENERATE_FAILURE to avoid shift overflow.
by Alexandre Julliard 08 Sep '15

08 Sep '15

Module: wine Branch: master Commit: a0da827d61640e91302d96492ce5f0ce9f06948a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0da827d61640e91302d96492… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Sep 7 23:51:57 2015 +0200 mshtml: Adjust NS_ERROR_GENERATE_FAILURE to avoid shift overflow. --- dlls/mshtml/mshtml_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 58ef423..55375d4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -40,7 +40,7 @@ #include "nsiface.h" #define NS_ERROR_GENERATE_FAILURE(module,code) \ - ((nsresult) (((UINT32)(1<<31)) | ((UINT32)(module+0x45)<<16) | ((UINT32)(code)))) + ((nsresult) (((UINT32)(1u<<31)) | ((UINT32)(module+0x45)<<16) | ((UINT32)(code)))) #define NS_OK ((nsresult)0x00000000L) #define NS_ERROR_FAILURE ((nsresult)0x80004005L)

1 0

Nikolay Sivov : dwrite: Return stub IDWriteFontList from GetMatchingFonts( ).
by Alexandre Julliard 08 Sep '15

08 Sep '15

Module: wine Branch: master Commit: 6dd9cdca4b2cae8aba317b1f8fb374dcf5e15481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd9cdca4b2cae8aba317b1f8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 8 11:40:25 2015 +0300 dwrite: Return stub IDWriteFontList from GetMatchingFonts(). --- dlls/dwrite/font.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 102 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a181395..4689075 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -94,6 +94,11 @@ struct dwrite_font_data { BOOL oblique_sim_tested : 1; }; +struct dwrite_fontlist { + IDWriteFontList IDWriteFontList_iface; + LONG ref; +}; + struct dwrite_fontfamily_data { LONG ref; @@ -241,6 +246,11 @@ static inline struct dwrite_colorglyphenum *impl_from_IDWriteColorGlyphRunEnumer return CONTAINING_RECORD(iface, struct dwrite_colorglyphenum, IDWriteColorGlyphRunEnumerator_iface); } +static inline struct dwrite_fontlist *impl_from_IDWriteFontList(IDWriteFontList *iface) +{ + return CONTAINING_RECORD(iface, struct dwrite_fontlist, IDWriteFontList_iface); +} + static inline const char *debugstr_tag(UINT32 tag) { return wine_dbg_sprintf("%c%c%c%c", tag & 0xff, (tag >> 8) & 0xff, (tag >> 16) & 0xff, tag >> 24); @@ -1447,6 +1457,83 @@ static HRESULT create_font(struct dwrite_font_data *data, IDWriteFontFamily *fam return S_OK; } +/* IDWriteFontList */ +static HRESULT WINAPI dwritefontlist_QueryInterface(IDWriteFontList *iface, REFIID riid, void **obj) +{ + struct dwrite_fontlist *This = impl_from_IDWriteFontList(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IDWriteFontList) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IDWriteFontList_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dwritefontlist_AddRef(IDWriteFontList *iface) +{ + struct dwrite_fontlist *This = impl_from_IDWriteFontList(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI dwritefontlist_Release(IDWriteFontList *iface) +{ + struct dwrite_fontlist *This = impl_from_IDWriteFontList(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI dwritefontlist_GetFontCollection(IDWriteFontList *iface, IDWriteFontCollection **collection) +{ + struct dwrite_fontlist *This = impl_from_IDWriteFontList(iface); + + FIXME("(%p)->(%p): stub\n", This, collection); + + return E_NOTIMPL; +} + +static UINT32 WINAPI dwritefontlist_GetFontCount(IDWriteFontList *iface) +{ + struct dwrite_fontlist *This = impl_from_IDWriteFontList(iface); + FIXME("(%p): stub\n", This); + return 0; +} + +static HRESULT WINAPI dwritefontlist_GetFont(IDWriteFontList *iface, UINT32 index, IDWriteFont **font) +{ + struct dwrite_fontlist *This = impl_from_IDWriteFontList(iface); + + FIXME("(%p)->(%u %p): stub\n", This, index, font); + + *font = NULL; + + return E_NOTIMPL; +} + +static const IDWriteFontListVtbl dwritefontlistvtbl = { + dwritefontlist_QueryInterface, + dwritefontlist_AddRef, + dwritefontlist_Release, + dwritefontlist_GetFontCollection, + dwritefontlist_GetFontCount, + dwritefontlist_GetFont +}; + static HRESULT WINAPI dwritefontfamily_QueryInterface(IDWriteFontFamily *iface, REFIID riid, void **obj) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); @@ -1598,11 +1685,23 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i } static HRESULT WINAPI dwritefontfamily_GetMatchingFonts(IDWriteFontFamily *iface, DWRITE_FONT_WEIGHT weight, - DWRITE_FONT_STRETCH stretch, DWRITE_FONT_STYLE style, IDWriteFontList **fonts) + DWRITE_FONT_STRETCH stretch, DWRITE_FONT_STYLE style, IDWriteFontList **ret) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); - FIXME("(%p)->(%d %d %d %p): stub\n", This, weight, stretch, style, fonts); - return E_NOTIMPL; + struct dwrite_fontlist *fonts; + + TRACE("(%p)->(%d %d %d %p)\n", This, weight, stretch, style, ret); + + *ret = NULL; + + fonts = heap_alloc(sizeof(*fonts)); + if (!fonts) + return E_OUTOFMEMORY; + fonts->IDWriteFontList_iface.lpVtbl = &dwritefontlistvtbl; + fonts->ref = 1; + + *ret = &fonts->IDWriteFontList_iface; + return S_OK; } static const IDWriteFontFamilyVtbl fontfamilyvtbl = {

1 0

Nikolay Sivov : dwrite: Track face styles added to a family.
by Alexandre Julliard 08 Sep '15

08 Sep '15

Module: wine Branch: master Commit: 42a99a8de596f8f399038cb956bea78bd0f3dc4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=42a99a8de596f8f399038cb95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 8 11:40:54 2015 +0300 dwrite: Track face styles added to a family. --- dlls/dwrite/font.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4689075..2129094 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -107,6 +107,9 @@ struct dwrite_fontfamily_data { struct dwrite_font_data **fonts; UINT32 font_count; UINT32 font_alloc; + BOOL has_normal_face : 1; + BOOL has_oblique_face : 1; + BOOL has_italic_face : 1; }; struct dwrite_fontcollection { @@ -1936,6 +1939,12 @@ static HRESULT fontfamily_add_font(struct dwrite_fontfamily_data *family_data, s family_data->fonts[family_data->font_count] = font_data; family_data->font_count++; + if (font_data->style == DWRITE_FONT_STYLE_NORMAL) + family_data->has_normal_face = TRUE; + else if (font_data->style == DWRITE_FONT_STYLE_OBLIQUE) + family_data->has_oblique_face = TRUE; + else + family_data->has_italic_face = TRUE; return S_OK; } @@ -2815,6 +2824,9 @@ static HRESULT init_fontfamily_data(IDWriteLocalizedStrings *familyname, struct data->ref = 1; data->font_count = 0; data->font_alloc = 2; + data->has_normal_face = FALSE; + data->has_oblique_face = FALSE; + data->has_italic_face = FALSE; data->fonts = heap_alloc(sizeof(*data->fonts)*data->font_alloc); if (!data->fonts) {

1 0

Nikolay Sivov : dwrite: Implement GetFont() for matching list.
by Alexandre Julliard 08 Sep '15

08 Sep '15

Module: wine Branch: master Commit: 9c198982174d30e7fc933aeb526d8e508ba39940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c198982174d30e7fc933aeb5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 8 11:41:28 2015 +0300 dwrite: Implement GetFont() for matching list. --- dlls/dwrite/font.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 89 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 2129094..aea35c9 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -97,6 +97,10 @@ struct dwrite_font_data { struct dwrite_fontlist { IDWriteFontList IDWriteFontList_iface; LONG ref; + + IDWriteFontFamily *family; + struct dwrite_font_data **fonts; + UINT32 font_count; }; struct dwrite_fontfamily_data { @@ -1495,6 +1499,11 @@ static ULONG WINAPI dwritefontlist_Release(IDWriteFontList *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) { + UINT32 i; + + for (i = 0; i < This->font_count; i++) + release_font_data(This->fonts[i]); + IDWriteFontFamily_Release(This->family); heap_free(This); } @@ -1513,19 +1522,25 @@ static HRESULT WINAPI dwritefontlist_GetFontCollection(IDWriteFontList *iface, I static UINT32 WINAPI dwritefontlist_GetFontCount(IDWriteFontList *iface) { struct dwrite_fontlist *This = impl_from_IDWriteFontList(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return This->font_count; } static HRESULT WINAPI dwritefontlist_GetFont(IDWriteFontList *iface, UINT32 index, IDWriteFont **font) { struct dwrite_fontlist *This = impl_from_IDWriteFontList(iface); - FIXME("(%p)->(%u %p): stub\n", This, index, font); + TRACE("(%p)->(%u %p)\n", This, index, font); *font = NULL; - return E_NOTIMPL; + if (This->font_count == 0) + return S_FALSE; + + if (index >= This->font_count) + return E_INVALIDARG; + + return create_font(This->fonts[index], This->family, font); } static const IDWriteFontListVtbl dwritefontlistvtbl = { @@ -1687,11 +1702,48 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i return create_font(match, iface, font); } +typedef BOOL (*matching_filter_func)(const struct dwrite_font_data*); + +static BOOL is_font_acceptable_for_normal(const struct dwrite_font_data *font) +{ + return font->style == DWRITE_FONT_STYLE_NORMAL || font->style == DWRITE_FONT_STYLE_ITALIC; +} + +static BOOL is_font_acceptable_for_oblique_italic(const struct dwrite_font_data *font) +{ + return font->style == DWRITE_FONT_STYLE_OBLIQUE || font->style == DWRITE_FONT_STYLE_ITALIC; +} + +static void matchingfonts_sort(struct dwrite_fontlist *fonts, const struct dwrite_font_propvec *req) +{ + UINT32 b = fonts->font_count - 1, j, t; + + while (1) { + t = b; + + for (j = 0; j < b; j++) { + if (is_better_font_match(&fonts->fonts[j+1]->propvec, &fonts->fonts[j]->propvec, req)) { + struct dwrite_font_data *s = fonts->fonts[j]; + fonts->fonts[j] = fonts->fonts[j+1]; + fonts->fonts[j+1] = s; + t = j; + } + } + + if (t == b) + break; + b = t; + }; +} + static HRESULT WINAPI dwritefontfamily_GetMatchingFonts(IDWriteFontFamily *iface, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STRETCH stretch, DWRITE_FONT_STYLE style, IDWriteFontList **ret) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); + matching_filter_func func = NULL; + struct dwrite_font_propvec req; struct dwrite_fontlist *fonts; + UINT32 i; TRACE("(%p)->(%d %d %d %p)\n", This, weight, stretch, style, ret); @@ -1700,8 +1752,41 @@ static HRESULT WINAPI dwritefontfamily_GetMatchingFonts(IDWriteFontFamily *iface fonts = heap_alloc(sizeof(*fonts)); if (!fonts) return E_OUTOFMEMORY; + + /* Allocate as many as family has, not all of them will be necessary used. */ + fonts->fonts = heap_alloc(sizeof(*fonts->fonts) * This->data->font_count); + if (!fonts->fonts) { + heap_free(fonts); + return E_OUTOFMEMORY; + } + fonts->IDWriteFontList_iface.lpVtbl = &dwritefontlistvtbl; fonts->ref = 1; + fonts->family = iface; + IDWriteFontFamily_AddRef(fonts->family); + fonts->font_count = 0; + + /* Normal style accepts Normal or Italic, Oblique and Italic - both Oblique and Italic styles */ + if (style == DWRITE_FONT_STYLE_NORMAL) { + if (This->data->has_normal_face || This->data->has_italic_face) + func = is_font_acceptable_for_normal; + } + else /* requested oblique or italic */ { + if (This->data->has_oblique_face || This->data->has_italic_face) + func = is_font_acceptable_for_oblique_italic; + } + + for (i = 0; i < This->data->font_count; i++) { + if (!func || func(This->data->fonts[i])) { + fonts->fonts[fonts->font_count] = This->data->fonts[i]; + InterlockedIncrement(&This->data->fonts[i]->ref); + fonts->font_count++; + } + } + + /* now potential matches are sorted using same criteria GetFirstMatchingFont uses */ + init_font_prop_vec(weight, stretch, style, &req); + matchingfonts_sort(fonts, &req); *ret = &fonts->IDWriteFontList_iface; return S_OK;

1 0

Nikolay Sivov : dwrite: Implement GetFontCollection() for matching list.
by Alexandre Julliard 08 Sep '15

08 Sep '15

Module: wine Branch: master Commit: b55e599a4d1f4c8055f802c4e3109d3337e0a42e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b55e599a4d1f4c8055f802c4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 8 11:41:59 2015 +0300 dwrite: Implement GetFontCollection() for matching list. --- dlls/dwrite/font.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index aea35c9..6a46a1a 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1513,10 +1513,7 @@ static ULONG WINAPI dwritefontlist_Release(IDWriteFontList *iface) static HRESULT WINAPI dwritefontlist_GetFontCollection(IDWriteFontList *iface, IDWriteFontCollection **collection) { struct dwrite_fontlist *This = impl_from_IDWriteFontList(iface); - - FIXME("(%p)->(%p): stub\n", This, collection); - - return E_NOTIMPL; + return IDWriteFontFamily_GetFontCollection(This->family, collection); } static UINT32 WINAPI dwritefontlist_GetFontCount(IDWriteFontList *iface)

1 0

Stefan Dösinger : d3d9/tests: Test D3DBACKBUFFER_TYPE.
by Alexandre Julliard 08 Sep '15

08 Sep '15

Module: wine Branch: master Commit: 2e8e2da5ee22779eb77e04bc851ccbfb83749d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e8e2da5ee22779eb77e04bc8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 8 10:24:48 2015 +0200 d3d9/tests: Test D3DBACKBUFFER_TYPE. --- dlls/d3d9/tests/device.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c41a5e6..3bf0ff2 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1053,7 +1053,7 @@ static void test_swapchain(void) IDirect3DSwapChain9 *swapchain2; IDirect3DSwapChain9 *swapchain3; IDirect3DSwapChain9 *swapchainX; - IDirect3DSurface9 *backbuffer; + IDirect3DSurface9 *backbuffer, *stereo_buffer; D3DPRESENT_PARAMETERS d3dpp; IDirect3DDevice9 *device; IDirect3D9 *d3d; @@ -1103,6 +1103,33 @@ static void test_swapchain(void) ok(backbuffer != NULL, "The back buffer is NULL\n"); if(backbuffer) IDirect3DSurface9_Release(backbuffer); + /* The back buffer type value is ignored. */ + hr = IDirect3DSwapChain9_GetBackBuffer(swapchain0, 0, D3DBACKBUFFER_TYPE_LEFT, &stereo_buffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer, hr %#x.\n", hr); + ok(stereo_buffer == backbuffer, "Expected left back buffer = %p, got %p.\n", backbuffer, stereo_buffer); + IDirect3DSurface9_Release(stereo_buffer); + hr = IDirect3DSwapChain9_GetBackBuffer(swapchain0, 0, D3DBACKBUFFER_TYPE_RIGHT, &stereo_buffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer, hr %#x.\n", hr); + ok(stereo_buffer == backbuffer, "Expected right back buffer = %p, got %p.\n", backbuffer, stereo_buffer); + IDirect3DSurface9_Release(stereo_buffer); + hr = IDirect3DSwapChain9_GetBackBuffer(swapchain0, 0, (D3DBACKBUFFER_TYPE)0xdeadbeef, &stereo_buffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer, hr %#x.\n", hr); + ok(stereo_buffer == backbuffer, "Expected unknown buffer = %p, got %p.\n", backbuffer, stereo_buffer); + IDirect3DSurface9_Release(stereo_buffer); + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_LEFT, &stereo_buffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer, hr %#x.\n", hr); + ok(stereo_buffer == backbuffer, "Expected left back buffer = %p, got %p.\n", backbuffer, stereo_buffer); + IDirect3DSurface9_Release(stereo_buffer); + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_RIGHT, &stereo_buffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer, hr %#x.\n", hr); + ok(stereo_buffer == backbuffer, "Expected right back buffer = %p, got %p.\n", backbuffer, stereo_buffer); + IDirect3DSurface9_Release(stereo_buffer); + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, (D3DBACKBUFFER_TYPE)0xdeadbeef, &stereo_buffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer, hr %#x.\n", hr); + ok(stereo_buffer == backbuffer, "Expected unknown buffer = %p, got %p.\n", backbuffer, stereo_buffer); + IDirect3DSurface9_Release(stereo_buffer); + /* Try to get a nonexistent swapchain */ hr = IDirect3DDevice9_GetSwapChain(device, 1, &swapchainX); ok(hr == D3DERR_INVALIDCALL, "GetSwapChain on an nonexistent swapchain returned (%08x)\n", hr);

1 0

Stefan Dösinger : d3d8/tests: Test D3DBACKBUFFER_TYPE.
by Alexandre Julliard 08 Sep '15

08 Sep '15

Module: wine Branch: master Commit: 9d29be28006fa8befa8dcee7cdab76f2dcab24c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d29be28006fa8befa8dcee7c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 7 23:50:33 2015 +0200 d3d8/tests: Test D3DBACKBUFFER_TYPE. --- dlls/d3d8/tests/device.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 47326b5..cb7f5e1 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -257,7 +257,7 @@ static void test_swapchain(void) IDirect3DSwapChain8 *swapchain1; IDirect3DSwapChain8 *swapchain2; IDirect3DSwapChain8 *swapchain3; - IDirect3DSurface8 *backbuffer; + IDirect3DSurface8 *backbuffer, *stereo_buffer; D3DPRESENT_PARAMETERS d3dpp; IDirect3DDevice8 *device; IDirect3D8 *d3d; @@ -286,6 +286,24 @@ static void test_swapchain(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); ok(!backbuffer, "The back buffer pointer is %p, expected NULL.\n", backbuffer); + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + IDirect3DSurface8_Release(backbuffer); + + /* The back buffer type value is ignored. */ + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_LEFT, &stereo_buffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer, hr %#x.\n", hr); + ok(stereo_buffer == backbuffer, "Expected left back buffer = %p, got %p.\n", backbuffer, stereo_buffer); + IDirect3DSurface8_Release(stereo_buffer); + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_RIGHT, &stereo_buffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer, hr %#x.\n", hr); + ok(stereo_buffer == backbuffer, "Expected right back buffer = %p, got %p.\n", backbuffer, stereo_buffer); + IDirect3DSurface8_Release(stereo_buffer); + hr = IDirect3DDevice8_GetBackBuffer(device, 0, (D3DBACKBUFFER_TYPE)0xdeadbeef, &stereo_buffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer, hr %#x.\n", hr); + ok(stereo_buffer == backbuffer, "Expected unknown buffer = %p, got %p.\n", backbuffer, stereo_buffer); + IDirect3DSurface8_Release(stereo_buffer); + memset(&d3dpp, 0, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; @@ -315,6 +333,20 @@ static void test_swapchain(void) ok(backbuffer != NULL && backbuffer != (void *) 0xdeadbeef, "The back buffer is %p\n", backbuffer); if(backbuffer && backbuffer != (void *) 0xdeadbeef) IDirect3DSurface8_Release(backbuffer); + /* The back buffer type value is ignored. */ + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain3, 0, D3DBACKBUFFER_TYPE_LEFT, &stereo_buffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer, hr %#x.\n", hr); + ok(stereo_buffer == backbuffer, "Expected left back buffer = %p, got %p.\n", backbuffer, stereo_buffer); + IDirect3DSurface8_Release(stereo_buffer); + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain3, 0, D3DBACKBUFFER_TYPE_RIGHT, &stereo_buffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer, hr %#x.\n", hr); + ok(stereo_buffer == backbuffer, "Expected right back buffer = %p, got %p.\n", backbuffer, stereo_buffer); + IDirect3DSurface8_Release(stereo_buffer); + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain3, 0, (D3DBACKBUFFER_TYPE)0xdeadbeef, &stereo_buffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer, hr %#x.\n", hr); + ok(stereo_buffer == backbuffer, "Expected unknown buffer = %p, got %p.\n", backbuffer, stereo_buffer); + IDirect3DSurface8_Release(stereo_buffer); + backbuffer = (void *) 0xdeadbeef; hr = IDirect3DSwapChain8_GetBackBuffer(swapchain3, 1, 0, &backbuffer); ok(SUCCEEDED(hr), "Failed to get the 2nd back buffer (%#08x)\n", hr);

1 0

Stefan Dösinger : wined3d: Remove wined3d_backbuffer_type.
by Alexandre Julliard 08 Sep '15

08 Sep '15

Module: wine Branch: master Commit: 2936e4ac54b14cc09c5b20b06b17fdb0545374b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2936e4ac54b14cc09c5b20b06… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 7 23:50:34 2015 +0200 wined3d: Remove wined3d_backbuffer_type. --- dlls/d3d8/device.c | 5 +++-- dlls/d3d8/swapchain.c | 5 +++-- dlls/d3d9/device.c | 5 +++-- dlls/d3d9/swapchain.c | 5 +++-- dlls/dxgi/swapchain.c | 6 ++---- dlls/wined3d/swapchain.c | 6 +++--- include/wine/wined3d.h | 9 +-------- 7 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 455c764..e899b34 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -732,6 +732,8 @@ static HRESULT WINAPI d3d8_device_GetBackBuffer(IDirect3DDevice8 *iface, TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", iface, backbuffer_idx, backbuffer_type, backbuffer); + /* backbuffer_type is ignored by native. */ + /* No need to check for backbuffer == NULL, Windows crashes in that case. */ wined3d_mutex_lock(); if (!(swapchain = wined3d_device_get_swapchain(device->wined3d_device, 0))) @@ -741,8 +743,7 @@ static HRESULT WINAPI d3d8_device_GetBackBuffer(IDirect3DDevice8 *iface, return D3DERR_INVALIDCALL; } - if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain, - backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type))) + if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain, backbuffer_idx))) { wined3d_mutex_unlock(); *backbuffer = NULL; diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 70b7fb0..8efdd0a 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -120,6 +120,8 @@ static HRESULT WINAPI d3d8_swapchain_GetBackBuffer(IDirect3DSwapChain8 *iface, TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", iface, backbuffer_idx, backbuffer_type, backbuffer); + /* backbuffer_type is ignored by native. */ + if (!backbuffer) { WARN("The output pointer is NULL, returning D3DERR_INVALIDCALL.\n"); @@ -127,8 +129,7 @@ static HRESULT WINAPI d3d8_swapchain_GetBackBuffer(IDirect3DSwapChain8 *iface, } wined3d_mutex_lock(); - if ((wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, - backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type))) + if ((wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, backbuffer_idx))) { wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); surface_impl = wined3d_resource_get_parent(wined3d_resource); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 01a6d9e..3a0376d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -754,6 +754,8 @@ static HRESULT WINAPI d3d9_device_GetBackBuffer(IDirect3DDevice9Ex *iface, UINT TRACE("iface %p, swapchain %u, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", iface, swapchain, backbuffer_idx, backbuffer_type, backbuffer); + /* backbuffer_type is ignored by native. */ + /* No need to check for backbuffer == NULL, Windows crashes in that case. */ wined3d_mutex_lock(); @@ -764,8 +766,7 @@ static HRESULT WINAPI d3d9_device_GetBackBuffer(IDirect3DDevice9Ex *iface, UINT return D3DERR_INVALIDCALL; } - if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(wined3d_swapchain, - backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type))) + if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(wined3d_swapchain, backbuffer_idx))) { wined3d_mutex_unlock(); *backbuffer = NULL; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index b26a482..c995afb 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -160,6 +160,8 @@ static HRESULT WINAPI d3d9_swapchain_GetBackBuffer(IDirect3DSwapChain9Ex *iface, TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", iface, backbuffer_idx, backbuffer_type, backbuffer); + /* backbuffer_type is ignored by native. */ + if (!backbuffer) { WARN("The output pointer is NULL, returning D3DERR_INVALIDCALL.\n"); @@ -167,8 +169,7 @@ static HRESULT WINAPI d3d9_swapchain_GetBackBuffer(IDirect3DSwapChain9Ex *iface, } wined3d_mutex_lock(); - if ((wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, - backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type))) + if ((wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, backbuffer_idx))) { wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); surface_impl = wined3d_resource_get_parent(wined3d_resource); diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 10ae26d..366bdb9 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -152,8 +152,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface, EnterCriticalSection(&dxgi_cs); - if (!(texture = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain, - buffer_idx, WINED3D_BACKBUFFER_TYPE_MONO))) + if (!(texture = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain, buffer_idx))) { LeaveCriticalSection(&dxgi_cs); return DXGI_ERROR_INVALID_CALL; @@ -235,8 +234,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_ResizeBuffers(IDXGISwapChain *if wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); for (i = 0; i < wined3d_desc.backbuffer_count; ++i) { - texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, - i, WINED3D_BACKBUFFER_TYPE_MONO); + texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, i); parent = wined3d_texture_get_parent(texture); IUnknown_AddRef(parent); if (IUnknown_Release(parent)) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8fb9f6a..b37bbb9 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -178,10 +178,10 @@ HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapc } struct wined3d_texture * CDECL wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, - UINT back_buffer_idx, enum wined3d_backbuffer_type type) + UINT back_buffer_idx) { - TRACE("swapchain %p, back_buffer_idx %u, type %#x.\n", - swapchain, back_buffer_idx, type); + TRACE("swapchain %p, back_buffer_idx %u.\n", + swapchain, back_buffer_idx); /* Return invalid if there is no backbuffer array, otherwise it will * crash when ddraw is used (there swapchain->back_buffers is always diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9c77cfe..7d4e5a0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -503,13 +503,6 @@ enum wined3d_patch_edge_style WINED3D_PATCH_EDGE_CONTINUOUS = 1, }; -enum wined3d_backbuffer_type -{ - WINED3D_BACKBUFFER_TYPE_MONO = 0, - WINED3D_BACKBUFFER_TYPE_LEFT = 1, - WINED3D_BACKBUFFER_TYPE_RIGHT = 2, -}; - enum wined3d_swap_effect { WINED3D_SWAP_EFFECT_DISCARD = 1, @@ -2512,7 +2505,7 @@ HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, struct w void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); ULONG __cdecl wined3d_swapchain_decref(struct wined3d_swapchain *swapchain); struct wined3d_texture * __cdecl wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, - UINT backbuffer_idx, enum wined3d_backbuffer_type backbuffer_type); + UINT backbuffer_idx); struct wined3d_device * __cdecl wined3d_swapchain_get_device(const struct wined3d_swapchain *swapchain); HRESULT __cdecl wined3d_swapchain_get_display_mode(const struct wined3d_swapchain *swapchain, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation);

1 0