wine-commits October 2014

wine-commits@winehq.org

2 participants
397 discussions

Bruno Jesus : wininet: Add more tests to InternetGetConnectedStateEx.
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: wine Branch: master Commit: 3beee00a99e7b9145239433b49cdabc9eb64fb82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3beee00a99e7b9145239433b4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 19:36:47 2014 -0200 wininet: Add more tests to InternetGetConnectedStateEx. --- dlls/wininet/tests/internet.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 688f786..fc965e2 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1556,6 +1556,12 @@ todo_wine sz = strlen(buffer); ok(sz > 0, "Expected a connection name\n"); + flags = 0; + res = pInternetGetConnectedStateExA(&flags, NULL, sizeof(buffer), 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + /* no space for complete string this time */ buffer[0] = 0; flags = 0; @@ -1566,11 +1572,34 @@ todo_wine buffer[0] = 0; flags = 0; + res = pInternetGetConnectedStateExA(&flags, buffer, sz / 2, 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + ok(sz / 2 - 1 == strlen(buffer), "Expected %u bytes, got %u\n", sz / 2 - 1, lstrlenA(buffer)); + + buffer[0] = 0; + flags = 0; res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); ok(strlen(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenA(buffer)); + + buffer[0] = 0; + flags = 0; + res = pInternetGetConnectedStateExA(&flags, buffer, 2, 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + ok(strlen(buffer) == 1, "Expected 1 byte, got %u\n", lstrlenA(buffer)); + + flags = 0; + buffer[0] = 0xDE; + res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); +todo_wine + ok(strlen(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenA(buffer)); } static void test_InternetGetConnectedStateExW(void) @@ -1623,6 +1652,12 @@ todo_wine sz = lstrlenW(buffer); ok(sz > 0, "Expected a connection name\n"); + flags = 0; + res = pInternetGetConnectedStateExW(&flags, NULL, sizeof(buffer) / sizeof(buffer[0]), 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + /* no space for complete string this time */ buffer[0] = 0; flags = 0; @@ -1633,11 +1668,34 @@ todo_wine buffer[0] = 0; flags = 0; + res = pInternetGetConnectedStateExW(&flags, buffer, sz / 2, 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + ok(sz / 2 - 1 == lstrlenW(buffer), "Expected %u bytes, got %u\n", sz / 2 - 1, lstrlenW(buffer)); + + buffer[0] = 0; + flags = 0; res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); todo_wine ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); ok(lstrlenW(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + + buffer[0] = 0; + flags = 0; + res = pInternetGetConnectedStateExW(&flags, buffer, 2, 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + ok(lstrlenW(buffer) == 1, "Expected 1 byte, got %u\n", lstrlenW(buffer)); + + buffer[0] = 0xDEAD; + flags = 0; + res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); +todo_wine + ok(lstrlenW(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenW(buffer)); } /* ############################### */

1 0

Jonathan Vollebregt : reg/tests: Test key formats.
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: wine Branch: master Commit: f8445249a61f07c29a6089391b77bdb1a88178df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8445249a61f07c29a6089391… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Fri Oct 24 20:48:36 2014 +0200 reg/tests: Test key formats. --- programs/reg/tests/reg.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 3ba1e3a..3de6f70 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -102,6 +102,29 @@ static void test_add(void) err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + run_reg_exe("reg add \\HKCU\\" KEY_BASE "\\keytest0 /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add \\\\HKCU\\" KEY_BASE "\\keytest1 /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest2\\\\ /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), + "got exit code %u\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest3\\ /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3", 0, KEY_READ, &hkey); + ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); + RegCloseKey(hkey); + + run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest4 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4", 0, KEY_READ, &hkey); + ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); + RegCloseKey(hkey); + + err = RegDeleteTreeA(HKEY_CURRENT_USER, KEY_BASE); + ok(r == REG_EXIT_SUCCESS, "got exit code %d\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Bruno Jesus : msi: Remove duplicate if condition.
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: wine Branch: master Commit: 8f79f5f54b03bcc0bd3208fa6e7fdbc3b1c1f2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f79f5f54b03bcc0bd3208fa6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 15:09:27 2014 -0200 msi: Remove duplicate if condition. --- dlls/msi/msi.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 70a8134..433776d 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1762,10 +1762,6 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, datakey = patch; szProperty = szInstalled; } - else if (!strcmpW( szProperty, INSTALLPROPERTY_LOCALPACKAGEW )) - { - datakey = udpatch; - } else if (!strcmpW( szProperty, INSTALLPROPERTY_UNINSTALLABLEW ) || !strcmpW( szProperty, INSTALLPROPERTY_PATCHSTATEW ) || !strcmpW( szProperty, INSTALLPROPERTY_DISPLAYNAMEW ) ||

1 0

Mathew Hodson : patches: Prevent the green color of OK testbot jobs from being overridden.
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: tools Branch: master Commit: 36a6dc3793d969cf9f515ddbc5de8dc01390d0e0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=36a6dc3793d969cf9f515ddb… Author: Mathew Hodson <mathew.hodson(a)gmail.com> Date: Sun Oct 26 22:28:27 2014 -0400 patches: Prevent the green color of OK testbot jobs from being overridden. --- patches/patches.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/patches.css b/patches/patches.css index f988f11..745ec75 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -149,7 +149,6 @@ tr.odd { background-color: #f8e8e8; } .nil, .nil :link, .nil :visited { color: blue; font-weight: bold; } .pending, .pending :link, .pending :visited { color: blue; } .committed, .committed :link, .committed :visited { color: green; } -.testbot, .testbot :link, .testbot :visited { color: green; } .depend, .depend :link, .depend :visited { color: #e08000; } .superseded, .superseded :link, .superseded :visited { color: #e08000; } .sequence, .sequence :link, .sequence :visited { color: #e08000; } @@ -163,4 +162,5 @@ tr.odd { background-color: #f8e8e8; } .rejected, .rejected :link, .rejected :visited { color: red; } .split, .split :link, .split :visited { color: red; } .testfail, .testfail :link, .testfail :visited { color: red; } +.testbot, .testbot :link, .testbot :visited { color: green; } .botfail, .botfail :link, .botfail :visited { color: red; }

1 0

André Hentschel : Add WWN 378
by Jeremy Newman 25 Oct '14

25 Oct '14

Module: website Branch: master Commit: a2bcdfadf492def2e3e6f45dc2c7ae2773c7616c URL: http://source.winehq.org/git/website.git/?a=commit;h=a2bcdfadf492def2e3e6f4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Oct 25 00:13:06 2014 +0200 Add WWN 378 --- news/de/2014102401.xml | 10 + news/en/2014102401.xml | 10 + wwn/en/wn20141024_378.xml | 636 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 656 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=a2bcdfadf492def2e3…

1 0

Jeremy Newman : add some additional information
by Jeremy Newman 24 Oct '14

24 Oct '14

Module: website Branch: master Commit: d177101c72ea74ced5a1a34380fc1f2c063351ea URL: http://source.winehq.org/git/website.git/?a=commit;h=d177101c72ea74ced5a1a3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 24 09:05:01 2014 -0500 add some additional information * font used in logo, and where the svg version of the logo is * the codebase needs php 5.3 or higher --- README | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/README b/README index 6419b54..6cb89bb 100644 --- a/README +++ b/README @@ -6,10 +6,10 @@ by Jeremy Newman <jnewman(a)codeweavers.com> Installation Requirements: * Apache 2.0 or higher * mod_rewrite enabled in Apache config - * PHP 5.0 or higher + * PHP 5.3 or higher -Setting Up. --------------- +Setting Up: +----------------------------------------------------------------------- 1. cp include/htaccess.sample .htaccess 2. edit .htaccess * change Rewritebase to the subdir path from the root of your website. @@ -21,8 +21,8 @@ Setting Up. 5. cp include/globals.conf.sample include/globals.conf 6. edit include/globals.conf -Templates. --------------- +Templates: +----------------------------------------------------------------------- For any path in your website, create a .template file in templates/en/ For example, http://www.example.com/winehq_org/new_page is templates/en/new_page.template @@ -39,3 +39,10 @@ You can also add global vars to include/globals.conf and they will be availbe as {$config_[key]} where [key] is the name you defined in globals.conf +Notes: +----------------------------------------------------------------------- + + * The font used in the WineHQ logo is: Ocean Sans Pro + * A SVG version of the logo is available at: + http://ftp.winehq.org/pub/wine/logos/wine_logo.svg +

1 0

Nikolay Sivov : dwrite: Implement custom font collections.
by Alexandre Julliard 24 Oct '14

24 Oct '14

Module: wine Branch: master Commit: fbf2557cd7f518977b30d0da338de6d37cb92642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf2557cd7f518977b30d0da3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 24 11:43:21 2014 +0400 dwrite: Implement custom font collections. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 346 +++++++++++++++++++++++++++++++++++-------- dlls/dwrite/main.c | 24 ++- 3 files changed, 311 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fbf2557cd7f518977b30d…

1 0

Nikolay Sivov : dwrite: Pass raw NAME table pointer to table reading code.
by Alexandre Julliard 24 Oct '14

24 Oct '14

Module: wine Branch: master Commit: 35e9b6d85d055b1ed195a2bde790c1a69a74d054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e9b6d85d055b1ed195a2bde… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 24 11:42:35 2014 +0400 dwrite: Pass raw NAME table pointer to table reading code. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 21 +++++++++++++++++---- dlls/dwrite/main.c | 39 +++++++++++++++++++++------------------ dlls/dwrite/opentype.c | 15 +++------------ dlls/dwrite/tests/font.c | 6 ++---- 5 files changed, 44 insertions(+), 39 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 02601fb..faf1b0a 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -113,7 +113,7 @@ extern HRESULT opentype_get_font_table(IDWriteFontFileStream*,DWRITE_FONT_FACE_T extern void opentype_cmap_get_glyphindex(void*,UINT32,UINT16*) DECLSPEC_HIDDEN; extern HRESULT opentype_cmap_get_unicode_ranges(void*,UINT32,DWRITE_UNICODE_RANGE*,UINT32*) DECLSPEC_HIDDEN; extern VOID get_font_properties(LPCVOID os2, LPCVOID head, LPCVOID post, DWRITE_FONT_METRICS *metrics, DWRITE_FONT_STRETCH *stretch, DWRITE_FONT_WEIGHT *weight, DWRITE_FONT_STYLE *style) DECLSPEC_HIDDEN; -extern HRESULT opentype_get_font_strings_from_id(IDWriteFontFace2*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_font_strings_from_id(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT bidi_computelevels(const WCHAR*,UINT32,UINT8,UINT8*,UINT8*) DECLSPEC_HIDDEN; extern WCHAR bidi_get_mirrored_char(WCHAR) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index fcdfdb5..217f772 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_OS2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') #define MS_POST_TAG DWRITE_MAKE_OPENTYPE_TAG('p','o','s','t') #define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') +#define MS_NAME_TAG DWRITE_MAKE_OPENTYPE_TAG('n','a','m','e') struct dwrite_fontface_data { LONG ref; @@ -986,14 +987,26 @@ static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont2 *iface, if (!data->info_strings[stringid]) { IDWriteFontFace2 *fontface; + const void *table_data; + BOOL table_exists; + void *context; + UINT32 size; hr = get_fontface_from_font(This, &fontface); if (FAILED(hr)) return hr; - hr = opentype_get_font_strings_from_id(fontface, stringid, &data->info_strings[stringid]); - if (FAILED(hr) || !data->info_strings[stringid]) - return hr; + table_exists = FALSE; + hr = IDWriteFontFace2_TryGetFontTable(fontface, MS_NAME_TAG, &table_data, &size, &context, &table_exists); + if (FAILED(hr) || !table_exists) + WARN("no NAME table found.\n"); + + if (table_exists) { + hr = opentype_get_font_strings_from_id(table_data, stringid, &data->info_strings[stringid]); + if (FAILED(hr) || !data->info_strings[stringid]) + return hr; + IDWriteFontFace2_ReleaseFontTable(fontface, context); + } } hr = clone_localizedstring(data->info_strings[stringid], strings); @@ -1001,7 +1014,7 @@ static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont2 *iface, return hr; *exists = TRUE; - return hr; + return S_OK; } static DWRITE_FONT_SIMULATIONS WINAPI dwritefont_GetSimulations(IDWriteFont2 *iface) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 4c549d6..d844e7f 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -361,33 +361,36 @@ HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, return S_OK; } -HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) -{ - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - struct localizedstrings *New; +HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **ret) + { + struct localizedstrings *strings, *strings_clone; int i; - *strings = NULL; + *ret = NULL; + + if (!iface) + return S_FALSE; - New = heap_alloc(sizeof(struct localizedstrings)); - if (!New) return E_OUTOFMEMORY; + strings = impl_from_IDWriteLocalizedStrings(iface); + strings_clone = heap_alloc(sizeof(struct localizedstrings)); + if (!strings_clone) return E_OUTOFMEMORY; - New->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; - New->ref = 1; - New->count = This->count; - New->data = heap_alloc(sizeof(struct localizedpair) * New->count); - if (!New->data) { - heap_free(New); + strings_clone->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; + strings_clone->ref = 1; + strings_clone->count = strings->count; + strings_clone->data = heap_alloc(sizeof(struct localizedpair) * strings_clone->count); + if (!strings_clone->data) { + heap_free(strings_clone); return E_OUTOFMEMORY; } - for (i = 0; i < New->count; i++) + for (i = 0; i < strings_clone->count; i++) { - New->data[i].locale = heap_strdupW(This->data[i].locale); - New->data[i].string = heap_strdupW(This->data[i].string); + strings_clone->data[i].locale = heap_strdupW(strings->data[i].locale); + strings_clone->data[i].string = heap_strdupW(strings->data[i].string); } - New->alloc = New->count; + strings_clone->alloc = strings_clone->count; - *strings = &New->IDWriteLocalizedStrings_iface; + *ret = &strings_clone->IDWriteLocalizedStrings_iface; return S_OK; } diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index ed08899..c007b35 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -26,7 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_TTCF_TAG DWRITE_MAKE_OPENTYPE_TAG('t','t','c','f') #define MS_OTTO_TAG DWRITE_MAKE_OPENTYPE_TAG('O','T','T','O') -#define MS_NAME_TAG DWRITE_MAKE_OPENTYPE_TAG('n','a','m','e') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -615,24 +614,18 @@ VOID get_font_properties(LPCVOID os2, LPCVOID head, LPCVOID post, DWRITE_FONT_ME } } -HRESULT opentype_get_font_strings_from_id(IDWriteFontFace2 *fontface, DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **strings) +HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **strings) { - const void *table_data = NULL; - void *name_context = NULL; const TT_NAME_V0 *header; BYTE *storage_area = 0; - BOOL exists = FALSE; USHORT count = 0; UINT16 name_id; - UINT32 size; + BOOL exists; HRESULT hr; int i; - hr = IDWriteFontFace2_TryGetFontTable(fontface, MS_NAME_TAG, &table_data, &size, &name_context, &exists); - if (FAILED(hr) || !exists) { - FIXME("failed to get NAME table\n"); + if (!table_data) return E_FAIL; - } hr = create_localizedstrings(strings); if (FAILED(hr)) return hr; @@ -727,8 +720,6 @@ HRESULT opentype_get_font_strings_from_id(IDWriteFontFace2 *fontface, DWRITE_INF } } - IDWriteFontFace2_ReleaseFontTable(fontface, name_context); - if (!exists) { IDWriteLocalizedStrings_Release(*strings); *strings = NULL; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index baba6c2..3830bc9 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1521,10 +1521,9 @@ static void test_GetInformationalStrings(void) exists = FALSE; strings = NULL; hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &strings, &exists); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(exists == TRUE, "got %d\n", exists); -} + exists = TRUE; strings = NULL; hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_NONE, &strings, &exists); @@ -1534,10 +1533,9 @@ todo_wine { /* strings instance is not reused */ strings2 = NULL; hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &strings2, &exists); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine ok(strings2 != strings, "got %p, %p\n", strings2, strings); -} if (strings) IDWriteLocalizedStrings_Release(strings);

1 0

Nikolay Sivov : dwrite: Use helpers to search through loaders lists.
by Alexandre Julliard 24 Oct '14

24 Oct '14

Module: wine Branch: master Commit: 2300602586b8e1ff75a0c6d7773955b668437c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2300602586b8e1ff75a0c6d77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 24 11:41:46 2014 +0400 dwrite: Use helpers to search through loaders lists. --- dlls/dwrite/main.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 57e0038..4c549d6 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -495,6 +495,20 @@ static struct fileloader *factory_get_file_loader(struct dwritefactory *factory, return found; } +static struct collectionloader *factory_get_collection_loader(struct dwritefactory *factory, IDWriteFontCollectionLoader *loader) +{ + struct collectionloader *entry, *found = NULL; + + LIST_FOR_EACH_ENTRY(entry, &factory->collection_loaders, struct collectionloader, entry) { + if (entry->loader == loader) { + found = entry; + break; + } + } + + return found; +} + static HRESULT WINAPI dwritefactory_QueryInterface(IDWriteFactory *iface, REFIID riid, void **obj) { struct dwritefactory *This = impl_from_IDWriteFactory(iface); @@ -575,10 +589,8 @@ static HRESULT WINAPI dwritefactory_RegisterFontCollectionLoader(IDWriteFactory if (!loader) return E_INVALIDARG; - LIST_FOR_EACH_ENTRY(entry, &This->collection_loaders, struct collectionloader, entry) { - if (entry->loader == loader) - return DWRITE_E_ALREADYREGISTERED; - } + if (factory_get_collection_loader(This, loader)) + return DWRITE_E_ALREADYREGISTERED; entry = heap_alloc(sizeof(*entry)); if (!entry) @@ -595,20 +607,14 @@ static HRESULT WINAPI dwritefactory_UnregisterFontCollectionLoader(IDWriteFactor IDWriteFontCollectionLoader *loader) { struct dwritefactory *This = impl_from_IDWriteFactory(iface); - struct collectionloader *entry, *found = NULL; + struct collectionloader *found; TRACE("(%p)->(%p)\n", This, loader); if (!loader) return E_INVALIDARG; - LIST_FOR_EACH_ENTRY(entry, &This->collection_loaders, struct collectionloader, entry) { - if (entry->loader == loader) { - found = entry; - break; - } - } - + found = factory_get_collection_loader(This, loader); if (!found) return E_INVALIDARG; @@ -784,10 +790,8 @@ static HRESULT WINAPI dwritefactory_RegisterFontFileLoader(IDWriteFactory *iface if (!loader) return E_INVALIDARG; - LIST_FOR_EACH_ENTRY(entry, &This->file_loaders, struct fileloader, entry) { - if (entry->loader == loader) - return DWRITE_E_ALREADYREGISTERED; - } + if (factory_get_file_loader(This, loader)) + return DWRITE_E_ALREADYREGISTERED; entry = heap_alloc(sizeof(*entry)); if (!entry)

1 0

Nikolay Sivov : dwrite: Cache fontface instances at factory level.
by Alexandre Julliard 24 Oct '14

24 Oct '14

Module: wine Branch: master Commit: 42882f7f75df1ac00ff721407e9a828c6dab121b URL: http://source.winehq.org/git/wine.git/?a=commit;h=42882f7f75df1ac00ff721407… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 24 11:40:06 2014 +0400 dwrite: Cache fontface instances at factory level. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 124 ++++++++++++++++++++-------------------- dlls/dwrite/main.c | 132 ++++++++++++++++++++++++++++++++++++++----- dlls/dwrite/tests/font.c | 14 +++-- 4 files changed, 189 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42882f7f75df1ac00ff72…

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2014