October 2014 - Wine-Commits

André Hentschel : urlmon/tests: Clarify ok() condition.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 2bb59197ace6776e03bbc014cabc8fd7b7360615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb59197ace6776e03bbc014c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Oct 25 16:35:31 2014 +0200 urlmon/tests: Clarify ok() condition. --- dlls/urlmon/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 5861127..3d10323 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -764,7 +764,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, } IHttpNegotiate2_Release(http_negotiate2); ok(hres == E_FAIL, "GetRootSecurityId failed: %08x, expected E_FAIL\n", hres); - ok(size == no_callback ? 512 : 13, "size=%d\n", size); + ok(size == (no_callback ? 512 : 13), "size=%d\n", size); if(!no_callback) { SET_EXPECT(QueryService_IHttpSecurity);

1 0

Jonathan Vollebregt : reg/tests: Test key formats.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

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 Oct. 27, 2014

Oct. 27, 2014

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 Oct. 27, 2014

Oct. 27, 2014

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 Oct. 25, 2014

Oct. 25, 2014

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 Oct. 24, 2014

Oct. 24, 2014

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/tests: Fix some test failures.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: fefb947516bbf8982842192270707191346db96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fefb947516bbf898284219227… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 24 11:39:16 2014 +0400 dwrite/tests: Fix some test failures. --- dlls/dwrite/tests/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 77571f0..469be88 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -940,9 +940,9 @@ if (file) { /* local loader is not registered by default */ hr = IDWriteFactory_RegisterFontFileLoader(factory, loader); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK || broken(hr == DWRITE_E_ALREADYREGISTERED), "got 0x%08x\n", hr); hr = IDWriteFactory_UnregisterFontFileLoader(factory, loader); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK || broken(hr == E_INVALIDARG), "got 0x%08x\n", hr); IDWriteFontFileLoader_Release(loader); } ret = TRUE;

1 0

Hao Peng : mlang: Add gbk to Chinese Simplified codepage.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: be089ba2ee647fc5dce6adf1fa1ba44b43e170fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=be089ba2ee647fc5dce6adf1f… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Fri Oct 24 16:07:15 2014 +0800 mlang: Add gbk to Chinese Simplified codepage. --- dlls/mlang/mlang.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index f4a689c..e44e862 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -122,7 +122,13 @@ static const MIME_CP_INFO chinese_simplified_cp[] = MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID_NLS | MIMECONTF_MIME_IE4 | MIMECONTF_MIME_LATEST, - "gb2312", "gb2312", "gb2312" } + "gb2312", "gb2312", "gb2312" }, + { "Chinese Simplified (GBK)", + 936, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL | + MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | + MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID_NLS | + MIMECONTF_MIME_IE4 | MIMECONTF_MIME_LATEST, + "gbk", "gbk", "gbk" } }; static const MIME_CP_INFO chinese_traditional_cp[] = { @@ -953,7 +959,7 @@ HRESULT WINAPI ConvertINetMultiByteToUnicode( *pcDstSize = MultiByteToWideChar(dwEncoding, 0, pSrcStr, *pcSrcSize, NULL, 0); break; } - + if (!*pcDstSize) return E_FAIL; @@ -1344,7 +1350,7 @@ static HRESULT WINAPI MLANGCF_CreateInstance(IClassFactory *iface, IUnknown *pOu IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; LPUNKNOWN punk; - + TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); *ppobj = NULL; @@ -2263,7 +2269,7 @@ static BOOL CALLBACK enum_locales_proc(LPWSTR locale) info->wszLocaleName[0] = 0; GetLocaleInfoW(info->lcid, LOCALE_SLANGUAGE, info->wszLocaleName, MAX_LOCALE_NAME); TRACE("ISO639: %s SLANGUAGE: %s\n", wine_dbgstr_w(info->wszRfc1766), wine_dbgstr_w(info->wszLocaleName)); - + data->total++; return TRUE; @@ -2869,7 +2875,7 @@ static HRESULT WINAPI fnIMultiLanguage3_ConvertStringToUnicodeEx( * * PARAMS * see ConvertStringToUnicode - * dwFlag + * dwFlag * lpFallBack if dwFlag contains MLCONVCHARF_USEDEFCHAR, lpFallBack string used * instead unconvertible characters. *

1 0

Bruno Jesus : iphlpapi: Fix a one counter for two loops error (PVS-Studio) .
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 794d52273efccf5ef6e5ed56783b3f4c7130cc4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=794d52273efccf5ef6e5ed567… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 01:47:02 2014 -0200 iphlpapi: Fix a one counter for two loops error (PVS-Studio). --- dlls/iphlpapi/iphlpapi_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 88db25a..4d18711 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -983,6 +983,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index struct WS_sockaddr_in6 *sa; const IN6_ADDR *addr, *mask; BOOL done = FALSE; + ULONG k; prefix->u.s.Length = sizeof(*prefix); prefix->u.s.Flags = 0; @@ -1000,11 +1001,11 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index sa->sin6_scope_id = 0; prefix->PrefixLength = 0; - for (i = 0; i < 8 && !done; i++) + for (k = 0; k < 8 && !done; k++) { for (j = 0; j < sizeof(WORD) * 8 && !done; j++) { - if (mask->u.Word[i] & 1 << j) prefix->PrefixLength++; + if (mask->u.Word[k] & 1 << j) prefix->PrefixLength++; else done = TRUE; } }

1 0

Bruno Jesus : winecfg: No need to cut a backslash if it does not exist.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: c5aacafeeaa2cf15612fc5318262140cbd92bd56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5aacafeeaa2cf15612fc5318… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 01:37:00 2014 -0200 winecfg: No need to cut a backslash if it does not exist. --- programs/winecfg/appdefaults.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 6106b23..7dd3900 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -377,19 +377,17 @@ static void on_remove_app_click(HWND dialog) { HWND listview = GetDlgItem(dialog, IDC_APP_LISTVIEW); int selection = get_listview_selection(listview); - char *section = keypath(""); /* AppDefaults\\whatever.exe\\ */ LVITEMW item; item.iItem = selection; item.iSubItem = 0; item.mask = LVIF_PARAM; - WINE_TRACE("selection=%d, section=%s\n", selection, section); - + WINE_TRACE("selection=%d\n", selection); + assert( selection != 0 ); /* user cannot click this button when "default settings" is selected */ - section[strlen(section)] = '\0'; /* remove last backslash */ - set_reg_key(config_key, section, NULL, NULL); /* delete the section */ + set_reg_key(config_key, keypath(""), NULL, NULL); /* delete the section */ SendMessageW(listview, LVM_GETITEMW, 0, (LPARAM) &item); HeapFree (GetProcessHeap(), 0, (void*)item.lParam); SendMessageW(listview, LVM_DELETEITEM, selection, 0);

1 0

Amine Khaldi : rpcrt4/tests: Remove unused if3_table and if4_table (Clang) .
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 19254eb4381f075dc4939d527cf9d306076f0355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19254eb4381f075dc4939d527… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Thu Oct 23 19:12:18 2014 +0100 rpcrt4/tests: Remove unused if3_table and if4_table (Clang). --- dlls/rpcrt4/tests/cstub.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index ad723de..de0c224 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -288,12 +288,6 @@ static const MIDL_SERVER_INFO if3_server_info = 0, 0}; - -static const PRPC_STUB_FUNCTION if3_table[] = -{ - if1_fn1_Stub -}; - static CInterfaceStubVtbl if3_stub_vtbl = { { @@ -338,15 +332,6 @@ static const MIDL_SERVER_INFO if4_server_info = 0, 0}; - -static const PRPC_STUB_FUNCTION if4_table[] = -{ - STUB_FORWARDING_FUNCTION, - STUB_FORWARDING_FUNCTION, - STUB_FORWARDING_FUNCTION, - STUB_FORWARDING_FUNCTION, -}; - static CInterfaceStubVtbl if4_stub_vtbl = { {

1 0

Nikolay Sivov : dwrite: Implement custom font collections.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

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 Oct. 24, 2014

Oct. 24, 2014

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: Cache fontface instances at factory level.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

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

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

Oct. 24, 2014

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

Bruno Jesus : wsock32: Clarify cast operation (PVS-Studio).
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 2f38271fde329cbd7eeba09e3bd4e759d0871da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f38271fde329cbd7eeba09e3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 02:10:45 2014 -0200 wsock32: Clarify cast operation (PVS-Studio). --- dlls/wsock32/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c index 416613a..16109e3 100644 --- a/dlls/wsock32/protocol.c +++ b/dlls/wsock32/protocol.c @@ -191,7 +191,7 @@ INT WINAPI EnumProtocolsW(LPINT protocols, LPVOID buffer, LPDWORD buflen) pi[i].dwMessageSize = wsabuf[i].dwMessageSize; memcpy((char *)buffer + string_offset, wsabuf[i].szProtocol, string_size); - pi[i].lpProtocol = (WCHAR *)(char *)buffer + string_offset; + pi[i].lpProtocol = (WCHAR *)((char *)buffer + string_offset); string_offset += string_size; } HeapFree(GetProcessHeap(), 0, wsabuf);

1 0

Alexandre Julliard : iphlpapi: Avoid an uninitialized variable warning.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: c7924e530d87e69ae48fbbe2c1582c934700eb89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7924e530d87e69ae48fbbe2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 24 13:42:37 2014 +0900 iphlpapi: Avoid an uninitialized variable warning. --- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 4d18711..4d66810 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1251,7 +1251,7 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P PIP_ADAPTER_ADDRESSES aa, PULONG buflen) { InterfaceIndexTable *table; - ULONG i, size, dns_server_size, dns_suffix_size, total_size, ret = ERROR_NO_DATA; + ULONG i, size, dns_server_size = 0, dns_suffix_size, total_size, ret = ERROR_NO_DATA; TRACE("(%d, %08x, %p, %p, %p)\n", family, flags, reserved, aa, buflen); @@ -1308,7 +1308,7 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P size = bytes_left -= size; } } - if (!(flags & GAA_FLAG_SKIP_DNS_SERVER) && dns_server_size) + if (dns_server_size) { firstDns = (PIP_ADAPTER_DNS_SERVER_ADDRESS)((BYTE *)first_aa + total_size - dns_server_size - dns_suffix_size); get_dns_server_addresses(firstDns, &dns_server_size);

1 0

Amine Khaldi : d3dxof: Remove unused IDirectXFileObject_Vtbl (Clang).
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: e67beed64db03eaeb98082d61bcb9fd6d7216ccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67beed64db03eaeb98082d61… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Thu Oct 23 19:01:58 2014 +0100 d3dxof: Remove unused IDirectXFileObject_Vtbl (Clang). --- dlls/d3dxof/d3dxof.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 8ca5793..88647cf 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -39,7 +39,6 @@ static const struct IDirectXFileBinaryVtbl IDirectXFileBinary_Vtbl; static const struct IDirectXFileDataVtbl IDirectXFileData_Vtbl; static const struct IDirectXFileDataReferenceVtbl IDirectXFileDataReference_Vtbl; static const struct IDirectXFileEnumObjectVtbl IDirectXFileEnumObject_Vtbl; -static const struct IDirectXFileObjectVtbl IDirectXFileObject_Vtbl; static const struct IDirectXFileSaveObjectVtbl IDirectXFileSaveObject_Vtbl; static HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImpl** ppObj);

1 0

Jonathan Vollebregt : reg/tests: Add REG_DWORD_BIG_ENDIAN tests for reg add.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: d2e6e210ac23cba8e3f82af6cdb31c66d57ad2ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e6e210ac23cba8e3f82af6c… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Thu Oct 23 17:03:53 2014 +0200 reg/tests: Add REG_DWORD_BIG_ENDIAN tests for reg add. --- programs/reg/tests/reg.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 0e5be50..3ba1e3a 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -246,6 +246,14 @@ static void test_add(void) dword = 456; verify_reg(hkey, "DWORD_LE", REG_DWORD_LITTLE_ENDIAN, &dword, sizeof(dword), 0); + /* REG_DWORD_BIG_ENDIAN */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE /t REG_DWORD_BIG_ENDIAN /d 456 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + dword = 456; + verify_reg(hkey, "DWORD_BE", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), TODO_REG_SIZE); + /* REG_DWORD_BIG_ENDIAN is broken in every version of windows. It behaves like + * an ordinary REG_DWORD - that is little endian. GG */ + /* REG_MULTI_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);

1 0

Jonathan Vollebregt : reg/tests: Add negative DWORD tests.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: b2c99522a6927b0ce00a69e1650884a8b90320d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2c99522a6927b0ce00a69e16… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Thu Oct 23 17:03:49 2014 +0200 reg/tests: Add negative DWORD tests. --- programs/reg/tests/reg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 5b79aed..f79c124 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -180,6 +180,11 @@ static void test_add(void) verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), (sizeof(long) > sizeof(DWORD)) ? 0 : TODO_REG_DATA); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword9 /f /d -1", &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 " /t REG_DWORD /v dword10 /f /d -0x1", &r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Jonathan Vollebregt : reg/tests: Add REG_EXPAND_SZ tests for reg add.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 655289382413a8e6050bc99f3b66d7e137abf013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=655289382413a8e6050bc99f3… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Thu Oct 23 17:03:50 2014 +0200 reg/tests: Add REG_EXPAND_SZ tests for reg add. --- programs/reg/tests/reg.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index f79c124..3caf17f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -136,6 +136,27 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "test3", REG_SZ, "", 1, 0); + /* REG_EXPAND_SZ */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d \"dead%PATH%beef\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "expand0", REG_EXPAND_SZ, "dead%PATH%beef", 15, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand1 /t REG_EXpand_sz /d \"dead^%PATH^%beef\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "expand1", REG_EXPAND_SZ, "dead^%PATH^%beef", 17, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /v expand2 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "expand2", REG_EXPAND_SZ, "", 1, TODO_REG_SIZE); + + run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /t REG_EXPAND_SZ /d WineTEST /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "", REG_EXPAND_SZ, "WineTEST", 9, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /v expand3 /f /d \"\"", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "expand3", REG_EXPAND_SZ, "", 1, TODO_REG_SIZE); + /* REG_DWORD */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /f /d 12345678", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */),

1 0

Jonathan Vollebregt : reg/tests: Add REG_MULTI_SZ tests for reg add.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 53a5a837d2dc55c44a21db4b030bdafa8b152d1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=53a5a837d2dc55c44a21db4b0… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Thu Oct 23 17:03:51 2014 +0200 reg/tests: Add REG_MULTI_SZ tests for reg add. --- programs/reg/tests/reg.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 3caf17f..84046c8 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -91,6 +91,7 @@ static void test_add(void) HKEY hkey; LONG err; DWORD r, dword, type, size; + char buffer[22]; run_reg_exe("reg add", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -212,6 +213,46 @@ static void test_add(void) dword = 456; verify_reg(hkey, "DWORD_LE", REG_DWORD_LITTLE_ENDIAN, &dword, sizeof(dword), 0); + /* REG_MULTI_SZ */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + memcpy(buffer, "three\0little\0strings\0", 22); + verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi1 /s \"#\" /d \"three#little#strings\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "multi1", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi2 /d \"\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "multi2", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi3 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "multi3", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"threelittlestrings\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "multi4", REG_MULTI_SZ, "threelittlestrings\0", 20, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi5 /s \"#randomgibberish\" /d \"three#little#strings\" /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi6 /s \"\\0\" /d \"three\\0little\\0strings\" /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi7 /s \"\" /d \"three#little#strings\" /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi8 /s \"#\" /d \"##\" /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi9 /s \"#\" /d \"two##strings\" /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi10 /s \"#\" /d \"#a\" /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi11 /s \"#\" /d \"a#\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + buffer[0]='a'; buffer[1]=0; buffer[2]=0; + verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, TODO_REG_SIZE); + RegCloseKey(hkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Jonathan Vollebregt : reg/tests: Add REG_BINARY tests for reg add.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: 90dcfadf9a685ec95a26398cdeca171919f14d80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90dcfadf9a685ec95a26398cd… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Thu Oct 23 17:03:52 2014 +0200 reg/tests: Add REG_BINARY tests for reg add. --- programs/reg/tests/reg.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 84046c8..0e5be50 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -158,6 +158,39 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); verify_reg(hkey, "expand3", REG_EXPAND_SZ, "", 1, TODO_REG_SIZE); + /* REG_BINARY */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin0 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + verify_reg(hkey, "bin0", REG_BINARY, buffer, 0, 0); + + run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /t REG_BINARY /d deadbeef /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + dword = 0xefbeadde; + verify_reg(hkey, "", REG_BINARY, &dword, sizeof(DWORD), TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin1 /f /d 0xDeAdBeEf", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin2 /f /d x01", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin3 /f /d 01x", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin4 /f /d DeAdBeEf0DD", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + /* Remaining nibble prefixed */ + buffer[0] = 0x0d; buffer[1] = 0xea; buffer[2] = 0xdb; + buffer[3] = 0xee; buffer[4] = 0xf0; buffer[5] = 0xdd; + /* Remaining nibble suffixed on winXP */ + buffer[6] = 0xde; buffer[7] = 0xad; buffer[8] = 0xbe; + buffer[9] = 0xef; buffer[10] = 0x0d; buffer[11] = 0xd0; + size = 6; + err = RegQueryValueExA(hkey, "bin4", NULL, &type, (void *) (buffer+12), &size); + ok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err); + ok(type == REG_BINARY, "got wrong type %u\n", type); + todo_wine ok(size == 6, "got wrong size %u\n", size); + todo_wine ok(memcmp(buffer, buffer+12, 6) == 0 || + broken(memcmp(buffer+6, buffer+12, 6) == 0 /* WinXP */), "got wrong data\n"); + /* REG_DWORD */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /f /d 12345678", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */),

1 0

Jeremy Newman : remove unused counter var
by Jeremy Newman Oct. 23, 2014

Oct. 23, 2014

Module: website Branch: master Commit: 696325e41ae5bfb86866f03aa64295126501c260 URL: http://source.winehq.org/git/website.git/?a=commit;h=696325e41ae5bfb86866f0… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 14:07:52 2014 -0500 remove unused counter var --- include/plugins/announce.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/plugins/announce.php b/include/plugins/announce.php index e14158a..6c61baa 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -21,7 +21,6 @@ $title = ""; if ($arr = file($announce)) { $in_header = 1; - $x = 0; while (list($c,$val) = each($arr)) { if ($c == 0) @@ -50,8 +49,6 @@ if ($arr = file($announce)) "\\1<a href=\"".$config->bug_system."\\2\">\\2</a>", $arr[$c]); } - - $x++; } $announce = join("",$arr);

1 0

Jeremy Newman : set title and mega og
by Jeremy Newman Oct. 23, 2014

Oct. 23, 2014

Module: website Branch: master Commit: 2a501a65e59894c68079ccbfea71d06cb9a21587 URL: http://source.winehq.org/git/website.git/?a=commit;h=2a501a65e59894c68079cc… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 11:24:05 2014 -0500 set title and mega og --- include/plugins/wwn.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/plugins/wwn.php b/include/plugins/wwn.php index e42afcc..45fd48d 100644 --- a/include/plugins/wwn.php +++ b/include/plugins/wwn.php @@ -69,6 +69,9 @@ switch ($_PLUGIN['mode']) case preg_match("/^[0-9]+$/", PAGE_PARAMS): // display single WWN issue echo $wwn->view_issue(PAGE_PARAMS); + // page title + $html->page_title .= " - WWN Issue ".PAGE_PARAMS; + $html->meta_og['title'] = "WWN Issue ".PAGE_PARAMS; break; // end single issue

1 0

Jeremy Newman : set title and open graph
by Jeremy Newman Oct. 23, 2014

Oct. 23, 2014

Module: website Branch: master Commit: b6a5b8b769a84e5b3686d3c4d6e971016ef34b39 URL: http://source.winehq.org/git/website.git/?a=commit;h=b6a5b8b769a84e5b3686d3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 11:18:01 2014 -0500 set title and open graph --- include/plugins/announce.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/plugins/announce.php b/include/plugins/announce.php index 5000fc5..e14158a 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -14,12 +14,19 @@ $ver = PAGE_PARAMS; $tag = ($ver == "latest") ? "master" : "wine-" . urlencode($ver); $announce = $config->git_tree . "/wine.git/" . $tag . ":ANNOUNCE"; +// announce title +$title = ""; + // load announce if ($arr = file($announce)) { $in_header = 1; + $x = 0; while (list($c,$val) = each($arr)) { + if ($c == 0) + $title = $html->encode(trim($arr[$c])); + $arr[$c] = $html->urlify($arr[$c]); if (preg_match("/^--------------------/", $arr[$c])) $in_header = 0; @@ -43,10 +50,14 @@ if ($arr = file($announce)) "\\1<a href=\"".$config->bug_system."\\2\">\\2</a>", $arr[$c]); } + + $x++; } $announce = join("",$arr); // display page + $html->meta_og['title'] = $title; + $html->page_title .= " - {$title}"; echo $html->pre($announce); } else

1 0

Jeremy Newman : set title and open graph
by Jeremy Newman Oct. 23, 2014

Oct. 23, 2014

Module: website Branch: master Commit: 0a206bbdb65e3dc794e7abf3e93df666247bb0eb URL: http://source.winehq.org/git/website.git/?a=commit;h=0a206bbdb65e3dc794e7ab… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 11:17:47 2014 -0500 set title and open graph --- include/plugins/news.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index ec44525..bc9deb7 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -15,6 +15,7 @@ switch (true) { // single issue view case (defined('PAGE_PARAMS') and preg_match("/[0-9]{10}/", PAGE_PARAMS)): + // get data from XML file $item = PAGE_PARAMS . '.xml'; $vars = array(); @@ -22,7 +23,13 @@ switch (true) $vars = get_xml_tags($config->news_xml_path.'/'.$html->lang.'/'.$item, array('date', 'title', 'link', 'body')); else $vars = get_xml_tags($config->news_xml_path.'/'.$config->lang.'/'.$item, array('date', 'title', 'link', 'body')); - + + // set open graph tags + $html->meta_og['title'] = trim($vars['title']); + + // add page title + $html->page_title .= " - {$html->meta_og['title']}"; + // if link defined, use it in title if ($vars['link']) { @@ -33,10 +40,10 @@ switch (true) { $vars['title'] = '<a href="'.$html->_web_root.'/news/'.basename($item, ".xml").'">'.$vars['title'].'</a>'; } - + // replace {$root} $vars['body'] = str_replace("{\$root}", $html->_web_root, $vars['body']); - + // add to news body echo $html->template('base', 'news_row', $vars); echo $html->p($html->ahref("<< Back", "{$html->_web_root}/news")); @@ -44,6 +51,7 @@ switch (true) // RSS view case (defined('PAGE_PARAMS') and PAGE_PARAMS == "rss"): + // get list of news items $news = get_files($config->news_xml_path."/".$config->lang, "xml"); $news = array_reverse ($news);

1 0

Jeremy Newman : home page is og type website
by Jeremy Newman Oct. 23, 2014

Oct. 23, 2014

Module: website Branch: master Commit: 1183320f5ee902ed8977ef1b02b897887d201e6f URL: http://source.winehq.org/git/website.git/?a=commit;h=1183320f5ee902ed8977ef… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 10:57:50 2014 -0500 home page is og type website --- templates/de/home.template | 3 ++- templates/en/home.template | 3 ++- templates/es/home.template | 3 ++- templates/fr/home.template | 3 ++- templates/he/home.template | 3 ++- templates/pl/home.template | 3 ++- templates/pt/home.template | 3 ++- templates/tr/home.template | 3 ++- templates/uk/home.template | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/templates/de/home.template b/templates/de/home.template index 668a41d..6593029 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/en/home.template b/templates/en/home.template index 97d910e..f9f860e 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/es/home.template b/templates/es/home.template index b8a86b6..c58f2fb 100644 --- a/templates/es/home.template +++ b/templates/es/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/fr/home.template b/templates/fr/home.template index fed103b..3615ec5 100644 --- a/templates/fr/home.template +++ b/templates/fr/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/he/home.template b/templates/he/home.template index 1402c37..c758cfc 100644 --- a/templates/he/home.template +++ b/templates/he/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/pl/home.template b/templates/pl/home.template index e6faeb5..770e713 100644 --- a/templates/pl/home.template +++ b/templates/pl/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/pt/home.template b/templates/pt/home.template index 2c430f7..6bf6734 100644 --- a/templates/pt/home.template +++ b/templates/pt/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/tr/home.template b/templates/tr/home.template index 5d42b0f..c254a22 100644 --- a/templates/tr/home.template +++ b/templates/tr/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/uk/home.template b/templates/uk/home.template index 9e83925..54f131b 100644 --- a/templates/uk/home.template +++ b/templates/uk/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left">

1 0

Jeremy Newman : add support for open graph meta tags
by Jeremy Newman Oct. 23, 2014

Oct. 23, 2014

Module: website Branch: master Commit: d8b0a041f5a74da371be41035bd52ee72a34f322 URL: http://source.winehq.org/git/website.git/?a=commit;h=d8b0a041f5a74da371be41… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 10:56:54 2014 -0500 add support for open graph meta tags --- include/html.php | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 6 deletions(-) diff --git a/include/html.php b/include/html.php index be3c02d..a6de7e1 100644 --- a/include/html.php +++ b/include/html.php @@ -17,6 +17,7 @@ class html public $page_style; public $meta_keywords; public $meta_description; + public $meta_og = array(); public $rss_link; public $css_links = array('styles'); public $js_links = array('jquery','utils'); @@ -62,7 +63,7 @@ class html // 404 not found header if ($this->in404) header("HTTP/1.1 404 Not Found"); - + // set meta tags $meta_keywords = ""; $meta_description = ""; @@ -70,7 +71,42 @@ class html $meta_keywords = $this->meta("keywords", $this->meta_keywords); if ($this->meta_description) $meta_description = $this->meta("description", $this->meta_description); - + + // open graph tags + $meta_og = ""; + if (empty($this->in403) and empty($this->in404) and isset($this->meta_og) and is_array($this->meta_og)) + { + // defaults and fallbacks + if (empty($this->meta_og['title']) and !empty($this->page_title)) + $this->meta_og['title'] =& $this->page_title; + if (empty($this->mega_og['site_name'])) + $this->meta_og['site_name'] = $config->site_name; + if (empty($this->meta_og['description']) and !empty($this->meta_description)) + $this->meta_og['description'] = $this->meta_description; + if (empty($this->meta_og['type'])) + $this->meta_og['type'] = 'article'; + + // loop and build meta_og string + foreach ($this->meta_og as $og => $data) + { + if (is_array($data)) + { + foreach ($data as $in_data) + { + if (!empty($meta_og)) + $meta_og .= " "; + $meta_og .= "<meta property=\"og:{$og}\" content=\"{$in_data}\">\n"; + } + } + else + { + if (!empty($meta_og)) + $meta_og .= " "; + $meta_og .= "<meta property=\"og:{$og}\" content=\"{$data}\">\n"; + } + } + } + // rss link if ($this->rss_link) $rss_link = '<link rel="alternate" title="'.$title.'RSS" href="'.$this->rss_link.'" type="application/rss+xml">'; @@ -96,7 +132,7 @@ class html } unset($i); } - + // javascript links $js_links = ""; if (count($this->js_links)) @@ -126,7 +162,7 @@ class html $this->http_header("text/plain"); echo $this->page; break; - + // print view case "print": $this->http_header("text/html"); @@ -140,7 +176,7 @@ class html 1 ); break; - + // regular view default: $this->http_header("text/html"); @@ -152,6 +188,7 @@ class html 'page_blurb' => $this->page_blurb, 'meta_keywords' => &$meta_keywords, 'meta_description' => &$meta_description, + 'meta_og' => &$meta_og, 'css_links' => &$css_links, 'js_links' => &$js_links, 'rss_link' => &$rss_link, @@ -162,7 +199,7 @@ class html 1 ); } - + // cleanup unset($debug_log); } @@ -1409,6 +1446,25 @@ class html unset($arr); } + // set the meta og + if (preg_match('//', $orig)) + { + preg_match_all('//', $orig, $match); + for ($i = 0; $i < count($match[0]); $i++) + { + if ($match[1][$i] == "image") + { + if (empty($this->meta_og['image'])) + $this->meta_og['image'] = array(); + array_push($this->meta_og['image'], $match[2][$i]); + } + else + { + $this->meta_og[$match[1][$i]] = $match[2][$i]; + } + $in = str_replace('', "", $in); + } + } // load nested templates the template if (preg_match('//', $orig))

1 0

Jeremy Newman : include open graph header meta tags
by Jeremy Newman Oct. 23, 2014

Oct. 23, 2014

Module: website Branch: master Commit: 00320277dfdf9a57599e85dc47c67d49de52d018 URL: http://source.winehq.org/git/website.git/?a=commit;h=00320277dfdf9a57599e85… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 10:57:21 2014 -0500 include open graph header meta tags --- templates/de/global/themes/winehq/content.template | 1 + templates/de/global/themes/winehq/content_nobox.template | 1 + templates/en/global/themes/winehq/content.template | 1 + templates/en/global/themes/winehq/content_nobox.template | 1 + templates/fr/global/themes/winehq/content.template | 1 + templates/fr/global/themes/winehq/content_nobox.template | 1 + templates/he/global/themes/winehq/content.template | 1 + templates/he/global/themes/winehq/content_nobox.template | 1 + templates/tr/global/themes/winehq/content.template | 1 + templates/tr/global/themes/winehq/content_nobox.template | 1 + templates/uk/global/themes/winehq/content.template | 1 + templates/uk/global/themes/winehq/content_nobox.template | 1 + 12 files changed, 12 insertions(+) diff --git a/templates/de/global/themes/winehq/content.template b/templates/de/global/themes/winehq/content.template index 18b1d06..d6ad836 100644 --- a/templates/de/global/themes/winehq/content.template +++ b/templates/de/global/themes/winehq/content.template @@ -9,6 +9,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/de/global/themes/winehq/content_nobox.template b/templates/de/global/themes/winehq/content_nobox.template index 06e3f2f..6f14f25 100644 --- a/templates/de/global/themes/winehq/content_nobox.template +++ b/templates/de/global/themes/winehq/content_nobox.template @@ -9,6 +9,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/en/global/themes/winehq/content.template b/templates/en/global/themes/winehq/content.template index 7b9e475..ffdfef2 100644 --- a/templates/en/global/themes/winehq/content.template +++ b/templates/en/global/themes/winehq/content.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/en/global/themes/winehq/content_nobox.template b/templates/en/global/themes/winehq/content_nobox.template index caf82b7..94613c7 100644 --- a/templates/en/global/themes/winehq/content_nobox.template +++ b/templates/en/global/themes/winehq/content_nobox.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/fr/global/themes/winehq/content.template b/templates/fr/global/themes/winehq/content.template index 19e5cdd..f228a4a 100644 --- a/templates/fr/global/themes/winehq/content.template +++ b/templates/fr/global/themes/winehq/content.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/fr/global/themes/winehq/content_nobox.template b/templates/fr/global/themes/winehq/content_nobox.template index d4253eb..94b78a8 100644 --- a/templates/fr/global/themes/winehq/content_nobox.template +++ b/templates/fr/global/themes/winehq/content_nobox.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/he/global/themes/winehq/content.template b/templates/he/global/themes/winehq/content.template index 3f04773..3a4cea4 100644 --- a/templates/he/global/themes/winehq/content.template +++ b/templates/he/global/themes/winehq/content.template @@ -9,6 +9,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/he/global/themes/winehq/content_nobox.template b/templates/he/global/themes/winehq/content_nobox.template index d7461f6..d369604 100644 --- a/templates/he/global/themes/winehq/content_nobox.template +++ b/templates/he/global/themes/winehq/content_nobox.template @@ -9,6 +9,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/tr/global/themes/winehq/content.template b/templates/tr/global/themes/winehq/content.template index 19eea85..a1986f1 100644 --- a/templates/tr/global/themes/winehq/content.template +++ b/templates/tr/global/themes/winehq/content.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/tr/global/themes/winehq/content_nobox.template b/templates/tr/global/themes/winehq/content_nobox.template index dc75406..e4a91f2 100644 --- a/templates/tr/global/themes/winehq/content_nobox.template +++ b/templates/tr/global/themes/winehq/content_nobox.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/uk/global/themes/winehq/content.template b/templates/uk/global/themes/winehq/content.template index eb01060..bb83dd2 100644 --- a/templates/uk/global/themes/winehq/content.template +++ b/templates/uk/global/themes/winehq/content.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/uk/global/themes/winehq/content_nobox.template b/templates/uk/global/themes/winehq/content_nobox.template index 85c0adf..a5854da 100644 --- a/templates/uk/global/themes/winehq/content_nobox.template +++ b/templates/uk/global/themes/winehq/content_nobox.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links}

1 0

Nikolay Sivov : dwrite/tests: Some tests for local font file loader.
by Alexandre Julliard Oct. 23, 2014

Oct. 23, 2014

Module: wine Branch: master Commit: 561ac1d8296a8af90b39565f2c14e34b5792b62c URL: http://source.winehq.org/git/wine.git/?a=commit;h=561ac1d8296a8af90b39565f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 22 16:33:29 2014 +0400 dwrite/tests: Some tests for local font file loader. --- dlls/dwrite/tests/font.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e7827ef..77571f0 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -859,8 +859,13 @@ todo_wine static void test_system_fontcollection(void) { IDWriteFontCollection *collection, *coll2; + IDWriteLocalFontFileLoader *localloader; IDWriteFactory *factory, *factory2; + IDWriteFontFileLoader *loader; IDWriteFontFamily *family; + IDWriteFontFace *fontface; + IDWriteFontFile *file; + IDWriteFont *font; HRESULT hr; UINT32 i; BOOL ret; @@ -904,6 +909,42 @@ static void test_system_fontcollection(void) ok(ret, "got %d\n", ret); ok(i != (UINT32)-1, "got %u\n", i); + /* get back local file loader */ + hr = IDWriteFontCollection_GetFontFamily(collection, i, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFamily_Release(family); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + + i = 1; + file = NULL; + hr = IDWriteFontFace_GetFiles(fontface, &i, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(file != NULL, "got %p\n", file); + +if (file) { + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFile_Release(file); + + hr = IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteLocalFontFileLoader, (void**)&localloader); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteLocalFontFileLoader_Release(localloader); + + /* local loader is not registered by default */ + hr = IDWriteFactory_RegisterFontFileLoader(factory, loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_UnregisterFontFileLoader(factory, loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFileLoader_Release(loader); +} ret = TRUE; i = 0; hr = IDWriteFontCollection_FindFamilyName(collection, blahW, &i, &ret);

1 0

Stefan Dösinger : d3d9/tests: Skip unsupported resources in test_resource_type.
by Alexandre Julliard Oct. 23, 2014

Oct. 23, 2014

Module: wine Branch: master Commit: 6334bf09b7850dc13dd197155a69659a9d2aa598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6334bf09b7850dc13dd197155… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 21:56:37 2014 +0200 d3d9/tests: Skip unsupported resources in test_resource_type. --- dlls/d3d9/tests/device.c | 144 ++++++++++++++++++++++++++--------------------- 1 file changed, 79 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6334bf09b7850dc13dd19…

1 0

Amine Khaldi : kernel32: Remove some unused variables (Clang).
by Alexandre Julliard Oct. 23, 2014

Oct. 23, 2014

Module: wine Branch: master Commit: 810ed5c85a0bccfe35dc7d4c3c7621216e13c9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=810ed5c85a0bccfe35dc7d4c3… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Wed Oct 22 19:10:21 2014 +0100 kernel32: Remove some unused variables (Clang). --- dlls/kernel32/format_msg.c | 2 -- dlls/kernel32/locale.c | 11 ----------- 2 files changed, 13 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index cdbc944..5741713 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -68,8 +68,6 @@ struct format_args * Yes, ANSI strings in win32 resources. Go figure. */ -static const WCHAR FMTWSTR[] = { '%','s',0 }; - /********************************************************************** * load_message (internal) */ diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 730574b..171f14c 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3456,17 +3456,6 @@ static BOOL NLS_GetLanguageGroupName(LGRPID lgrpid, LPWSTR szName, ULONG nameSiz return bRet; } -/* Registry keys for NLS related information */ - -static const WCHAR szCountryListName[] = { - 'M','a','c','h','i','n','e','\\','S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'T','e','l','e','p','h','o','n','y','\\', - 'C','o','u','n','t','r','y',' ','L','i','s','t','\0' -}; - - /* Callback function ptrs for EnumSystemLanguageGroupsA/W */ typedef struct {

1 0

Nikolay Sivov : dwrite/tests: Create separate isolated factory for each test.
by Alexandre Julliard Oct. 23, 2014

Oct. 23, 2014

Module: wine Branch: master Commit: 272964666a9ab6decdc58fc6be4fc247504aad73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=272964666a9ab6decdc58fc6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 22 15:42:30 2014 +0400 dwrite/tests: Create separate isolated factory for each test. --- dlls/dwrite/tests/font.c | 91 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 81 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=272964666a9ab6decdc58…

1 0

Stefan Dösinger : wined3d: Remove texture locations after downloading all subresources.
by Alexandre Julliard Oct. 23, 2014

Oct. 23, 2014

Module: wine Branch: master Commit: aad1997dff990ceeba90ece0d535c7826044a5cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad1997dff990ceeba90ece0d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 21:56:38 2014 +0200 wined3d: Remove texture locations after downloading all subresources. --- dlls/wined3d/surface.c | 1 - dlls/wined3d/texture.c | 1 + dlls/wined3d/volume.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 75f48de..092cbe6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1207,7 +1207,6 @@ static void surface_unload(struct wined3d_resource *resource) surface_load_location(surface, surface->resource.map_binding); surface_invalidate_location(surface, ~surface->resource.map_binding); } - wined3d_texture_force_reload(surface->container); context = context_acquire(device, NULL); gl_info = context->gl_info; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4f962f1..6ecd414 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -979,6 +979,7 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) sub_resource->resource_ops->resource_unload(sub_resource); } + wined3d_texture_force_reload(texture); wined3d_texture_unload_gl_texture(texture); } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 0cbc7d4..58d7321 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -451,7 +451,6 @@ static void volume_unload(struct wined3d_resource *resource) } /* The texture name is managed by the container. */ - wined3d_texture_force_reload(volume->container); volume->flags &= ~WINED3D_VFLAG_CLIENT_STORAGE; resource_unload(resource);

1 0

Stefan Dösinger : d3d8/tests: Skip unsupported resources in test_resource_type.
by Alexandre Julliard Oct. 23, 2014

Oct. 23, 2014

Module: wine Branch: master Commit: 86168c4e908807fc23a33bb99bdd7f59f1312249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86168c4e908807fc23a33bb99… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 21:56:36 2014 +0200 d3d8/tests: Skip unsupported resources in test_resource_type. --- dlls/d3d8/tests/device.c | 138 ++++++++++++++++++++++++++--------------------- 1 file changed, 76 insertions(+), 62 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9ffac8b..5f8f52a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6070,6 +6070,7 @@ static void test_resource_type(void) ULONG refcount; HWND window; HRESULT hr; + D3DCAPS8 caps; window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL); @@ -6083,6 +6084,9 @@ static void test_resource_type(void) return; } + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateImageSurface(device, 4, 4, D3DFMT_X8R8G8B8, &surface); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); @@ -6130,68 +6134,78 @@ static void test_resource_type(void) IDirect3DSurface8_Release(surface); IDirect3DTexture8_Release(texture); - hr = IDirect3DDevice8_CreateCubeTexture(device, 1, 1, 0, D3DFMT_X8R8G8B8, - D3DPOOL_SYSTEMMEM, &cube_texture); - ok(SUCCEEDED(hr), "Failed to create cube texture, hr %#x.\n", hr); - type = IDirect3DCubeTexture8_GetType(cube_texture); - ok(type == D3DRTYPE_CUBETEXTURE, "Expected type D3DRTYPE_CUBETEXTURE, got %u.\n", type); - - hr = IDirect3DCubeTexture8_GetCubeMapSurface(cube_texture, - D3DCUBEMAP_FACE_NEGATIVE_X, 0, &surface); - ok(SUCCEEDED(hr), "Failed to get cube map surface, hr %#x.\n", hr); - hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); - ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", - surface_desc.Type); - hr = IDirect3DCubeTexture8_GetLevelDesc(cube_texture, 0, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); - ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", - surface_desc.Type); - IDirect3DSurface8_Release(surface); - IDirect3DCubeTexture8_Release(cube_texture); - - hr = IDirect3DDevice8_CreateVolumeTexture(device, 2, 4, 8, 4, 0, D3DFMT_X8R8G8B8, - D3DPOOL_SYSTEMMEM, &volume_texture); - type = IDirect3DVolumeTexture8_GetType(volume_texture); - ok(type == D3DRTYPE_VOLUMETEXTURE, "Expected type D3DRTYPE_VOLUMETEXTURE, got %u.\n", type); - - hr = IDirect3DVolumeTexture8_GetVolumeLevel(volume_texture, 0, &volume); - ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); - /* IDirect3DVolume8 is not an IDirect3DResource8 and has no GetType method. */ - hr = IDirect3DVolume8_GetDesc(volume, &volume_desc); - ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); - ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", - volume_desc.Type); - ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); - ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); - ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); - hr = IDirect3DVolumeTexture8_GetLevelDesc(volume_texture, 0, &volume_desc); - ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); - ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", - volume_desc.Type); - ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); - ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); - ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); - IDirect3DVolume8_Release(volume); - - hr = IDirect3DVolumeTexture8_GetVolumeLevel(volume_texture, 2, &volume); - ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); - hr = IDirect3DVolume8_GetDesc(volume, &volume_desc); - ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); - ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", - volume_desc.Type); - ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); - ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); - ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); - hr = IDirect3DVolumeTexture8_GetLevelDesc(volume_texture, 2, &volume_desc); - ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); - ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", - volume_desc.Type); - ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); - ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); - ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); - IDirect3DVolume8_Release(volume); - IDirect3DVolumeTexture8_Release(volume_texture); + if (caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP) + { + hr = IDirect3DDevice8_CreateCubeTexture(device, 1, 1, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &cube_texture); + ok(SUCCEEDED(hr), "Failed to create cube texture, hr %#x.\n", hr); + type = IDirect3DCubeTexture8_GetType(cube_texture); + ok(type == D3DRTYPE_CUBETEXTURE, "Expected type D3DRTYPE_CUBETEXTURE, got %u.\n", type); + + hr = IDirect3DCubeTexture8_GetCubeMapSurface(cube_texture, + D3DCUBEMAP_FACE_NEGATIVE_X, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get cube map surface, hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + hr = IDirect3DCubeTexture8_GetLevelDesc(cube_texture, 0, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + IDirect3DSurface8_Release(surface); + IDirect3DCubeTexture8_Release(cube_texture); + } + else + skip("Cube maps not supported.\n"); + + if (caps.TextureCaps & D3DPTEXTURECAPS_MIPVOLUMEMAP) + { + hr = IDirect3DDevice8_CreateVolumeTexture(device, 2, 4, 8, 4, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &volume_texture); + type = IDirect3DVolumeTexture8_GetType(volume_texture); + ok(type == D3DRTYPE_VOLUMETEXTURE, "Expected type D3DRTYPE_VOLUMETEXTURE, got %u.\n", type); + + hr = IDirect3DVolumeTexture8_GetVolumeLevel(volume_texture, 0, &volume); + ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); + /* IDirect3DVolume8 is not an IDirect3DResource8 and has no GetType method. */ + hr = IDirect3DVolume8_GetDesc(volume, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); + hr = IDirect3DVolumeTexture8_GetLevelDesc(volume_texture, 0, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); + IDirect3DVolume8_Release(volume); + + hr = IDirect3DVolumeTexture8_GetVolumeLevel(volume_texture, 2, &volume); + ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); + hr = IDirect3DVolume8_GetDesc(volume, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); + hr = IDirect3DVolumeTexture8_GetLevelDesc(volume_texture, 2, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); + IDirect3DVolume8_Release(volume); + IDirect3DVolumeTexture8_Release(volume_texture); + } + else + skip("Mipmapped volume maps not supported.\n"); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Jactry Zeng : prntvpt: Add stub dll.
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: 16ab1bdd5f408e7dd4abe76ca841a89d70232d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=16ab1bdd5f408e7dd4abe76ca… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Oct 22 18:48:44 2014 +0800 prntvpt: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/prntvpt/Makefile.in | 4 ++++ dlls/prntvpt/main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/prntvpt/prntvpt.spec | 27 +++++++++++++++++++++++++++ 5 files changed, 77 insertions(+) diff --git a/configure b/configure index a11c3d7..d2bada5 100755 --- a/configure +++ b/configure @@ -1180,6 +1180,7 @@ enable_photometadatahandler enable_pidgen enable_powrprof enable_printui +enable_prntvpt enable_propsys enable_psapi enable_pstorec @@ -17224,6 +17225,7 @@ wine_fn_config_dll photometadatahandler enable_photometadatahandler wine_fn_config_dll pidgen enable_pidgen wine_fn_config_dll powrprof enable_powrprof implib wine_fn_config_dll printui enable_printui +wine_fn_config_dll prntvpt enable_prntvpt wine_fn_config_dll propsys enable_propsys clean,implib wine_fn_config_test dlls/propsys/tests propsys_test wine_fn_config_dll psapi enable_psapi implib diff --git a/configure.ac b/configure.ac index 5ebc2c3..ea016b1 100644 --- a/configure.ac +++ b/configure.ac @@ -3108,6 +3108,7 @@ WINE_CONFIG_DLL(photometadatahandler) WINE_CONFIG_DLL(pidgen) WINE_CONFIG_DLL(powrprof,,[implib]) WINE_CONFIG_DLL(printui) +WINE_CONFIG_DLL(prntvpt) WINE_CONFIG_DLL(propsys,,[clean,implib]) WINE_CONFIG_TEST(dlls/propsys/tests) WINE_CONFIG_DLL(psapi,,[implib]) diff --git a/dlls/prntvpt/Makefile.in b/dlls/prntvpt/Makefile.in new file mode 100644 index 0000000..ce05f50 --- /dev/null +++ b/dlls/prntvpt/Makefile.in @@ -0,0 +1,4 @@ +MODULE = prntvpt.dll + +C_SRCS = \ + main.c diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c new file mode 100644 index 0000000..f5abde9 --- /dev/null +++ b/dlls/prntvpt/main.c @@ -0,0 +1,43 @@ +/* + * Print Ticket Services Module + * + * Copyright 2014 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); + +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) +{ + TRACE("(%p, %d, %p)\n", hinst, reason, reserved); + + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + break; + } + return TRUE; +} diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec new file mode 100644 index 0000000..3f5e329 --- /dev/null +++ b/dlls/prntvpt/prntvpt.spec @@ -0,0 +1,27 @@ +1 stub PTQuerySchemaVersionSupport +2 stub PTOpenProvider +3 stub PTOpenProviderEx +4 stub PTCloseProvider +5 stub BindPTProviderThunk +6 stub PTGetPrintCapabilities +7 stub PTMergeAndValidatePrintTicket +8 stub PTConvertPrintTicketToDevMode +9 stub PTConvertDevModeToPrintTicket +10 stub PTReleaseMemory +11 stub ConvertDevModeToPrintTicketThunk2 +12 stub ConvertDevModeToPrintTicketThunk +13 stub ConvertPrintTicketToDevModeThunk2 +14 stub ConvertPrintTicketToDevModeThunk +15 stub DllCanUnloadNow +16 stub DllGetClassObject +17 stdcall -private DllMain(long long ptr) +18 stub DllRegisterServer +19 stub DllUnregisterServer +20 stub GetDeviceDefaultPrintTicketThunk +21 stub GetDeviceNamespacesThunk +22 stub GetPrintCapabilitiesThunk2 +23 stub GetPrintCapabilitiesThunk +24 stub GetSchemaVersionThunk +25 stub MergeAndValidatePrintTicketThunk2 +26 stub MergeAndValidatePrintTicketThunk +27 stub UnbindPTProviderThunk

1 0

André Hentschel : d3dx9_30: Add stub for D3DXCpuOptimizations.
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: b48e74749de682951320235f13eab4ffc52eb0aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b48e74749de682951320235f1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 21 23:23:34 2014 +0200 d3dx9_30: Add stub for D3DXCpuOptimizations. --- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_30/d3dx9_30_main.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec index 107fad1..54234b2 100644 --- a/dlls/d3dx9_30/d3dx9_30.spec +++ b/dlls/d3dx9_30/d3dx9_30.spec @@ -30,7 +30,7 @@ @ stdcall D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXConcatenateMeshes @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) d3dx9_36.D3DXConvertMeshSubsetToSingleStrip @ stdcall D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) d3dx9_36.D3DXConvertMeshSubsetToStrips -@ stub D3DXCpuOptimizations(long) +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) d3dx9_36.D3DXCreateAnimationController @ stdcall D3DXCreateBox(ptr float float float ptr ptr) d3dx9_36.D3DXCreateBox @ stdcall D3DXCreateBuffer(long ptr) d3dx9_36.D3DXCreateBuffer diff --git a/dlls/d3dx9_30/d3dx9_30_main.c b/dlls/d3dx9_30/d3dx9_30_main.c index 25fd035..81e53f8 100644 --- a/dlls/d3dx9_30/d3dx9_30_main.c +++ b/dlls/d3dx9_30/d3dx9_30_main.c @@ -30,6 +30,9 @@ #include "winuser.h" #include "d3dx9.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); /*********************************************************************** * DllMain. @@ -58,3 +61,17 @@ BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) else return FALSE; } + +typedef enum _D3DX_CPU_OPTIMIZATION +{ + D3DX_NOT_OPTIMIZED = 0, + D3DX_3DNOW_OPTIMIZED = 1, + D3DX_SSE2_OPTIMIZED = 2, + D3DX_SSE_OPTIMIZED = 3 +} D3DX_CPU_OPTIMIZATION; + +D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable) +{ + FIXME("%i - stub\n", enable); + return D3DX_NOT_OPTIMIZED; +}

1 0

Nikolay Sivov : dwrite: Some tests for reused fontface instances.
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: 42e5a32cc3ecb7064c1019d5212520ab2e6a33d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e5a32cc3ecb7064c1019d52… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 22 11:06:15 2014 +0400 dwrite: Some tests for reused fontface instances. --- dlls/dwrite/tests/font.c | 184 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 131 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42e5a32cc3ecb7064c101…

1 0

Nikolay Sivov : dwrite: Remove unused parameter.
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: b4dc4e257ce61b5c3d99eb55499ed5acec478470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4dc4e257ce61b5c3d99eb554… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 21 17:14:31 2014 +0400 dwrite: Remove unused parameter. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 4 ++-- dlls/dwrite/main.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index fad7a21..5ac0852 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -105,7 +105,7 @@ extern HRESULT get_system_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDE extern HRESULT get_textanalyzer(IDWriteTextAnalyzer**) DECLSPEC_HIDDEN; extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN; extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; -extern HRESULT font_create_fontface(IDWriteFactory*,DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2 **) DECLSPEC_HIDDEN; +extern HRESULT font_create_fontface(DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2 **) DECLSPEC_HIDDEN; /* Opentype font table functions */ extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 783b035..2b67543 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -747,7 +747,7 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 if (!font->face) { HRESULT hr = font->is_system ? create_system_fontface(font, &font->face) : - font_create_fontface(NULL, font->data->face_data->type, font->data->face_data->file_count, font->data->face_data->files, + font_create_fontface(font->data->face_data->type, font->data->face_data->file_count, font->data->face_data->files, font->data->face_data->index, font->data->face_data->simulations, &font->face); if (FAILED(hr)) return hr; } @@ -1676,7 +1676,7 @@ HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_ke return S_OK; } -HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace2 **font_face) +HRESULT font_create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace2 **font_face) { int i; struct dwrite_fontface *This; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index bac0c78..3211ee3 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -629,7 +629,7 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory *iface, { struct dwritefactory *This = impl_from_IDWriteFactory(iface); TRACE("(%p)->(%d %u %p %u 0x%x %p)\n", This, facetype, files_number, font_files, index, sim_flags, font_face); - return font_create_fontface(iface, facetype, files_number, font_files, index, sim_flags, (IDWriteFontFace2**)font_face); + return font_create_fontface(facetype, files_number, font_files, index, sim_flags, (IDWriteFontFace2**)font_face); } static HRESULT WINAPI dwritefactory_CreateRenderingParams(IDWriteFactory *iface, IDWriteRenderingParams **params)

1 0

David Heidelberger : winedbg: List Dwarf2 GNU extensions as TODO to workaround spam in debug.
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: 4f18c053d3bce0ec88bbb337e1f0bae7909d90e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f18c053d3bce0ec88bbb337e… Author: David Heidelberger <david.heidelberger(a)ixit.cz> Date: Wed Oct 22 09:23:36 2014 +0200 winedbg: List Dwarf2 GNU extensions as TODO to workaround spam in debug. --- dlls/dbghelp/dwarf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index a89cf11..f1bd6cb 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1467,6 +1467,8 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, case DW_TAG_variable: case DW_TAG_imported_declaration: case DW_TAG_ptr_to_member_type: + case DW_TAG_GNU_template_parameter_pack: + case DW_TAG_GNU_formal_parameter_pack: /* FIXME: some C++ related stuff */ break; default: @@ -1967,6 +1969,8 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, case DW_TAG_template_type_param: case DW_TAG_template_value_param: case DW_TAG_GNU_call_site: + case DW_TAG_GNU_template_parameter_pack: + case DW_TAG_GNU_formal_parameter_pack: /* FIXME: no support in dbghelp's internals so far */ break; default:

1 0

Stefan Dösinger : d3d8/tests: Use create_device in test_swvp_buffer.
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: 94f20a6fff18876ef7c16b3b2c22251cb0ab9176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94f20a6fff18876ef7c16b3b2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 00:22:07 2014 +0200 d3d8/tests: Use create_device in test_swvp_buffer. --- dlls/d3d8/tests/device.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 6caf8b4..9ffac8b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -33,6 +33,7 @@ struct vec3 #define CREATE_DEVICE_FULLSCREEN 0x01 #define CREATE_DEVICE_FPU_PRESERVE 0x02 +#define CREATE_DEVICE_SWVP_ONLY 0x04 struct device_desc { @@ -110,6 +111,8 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons present_parameters.BackBufferHeight = desc->height; present_parameters.hDeviceWindow = desc->device_window; present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); + if (desc->flags & CREATE_DEVICE_SWVP_ONLY) + behavior_flags = D3DCREATE_SOFTWARE_VERTEXPROCESSING; if (desc->flags & CREATE_DEVICE_FPU_PRESERVE) behavior_flags |= D3DCREATE_FPU_PRESERVE; } @@ -123,6 +126,8 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons behavior_flags, &present_parameters, &device))) return device; + if (desc && desc->flags & CREATE_DEVICE_SWVP_ONLY) + return NULL; behavior_flags ^= (D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_SOFTWARE_VERTEXPROCESSING); if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, @@ -4758,7 +4763,7 @@ static void test_swvp_buffer(void) IDirect3DVertexBuffer8 *buffer; static const unsigned int bufsize = 1024; D3DVERTEXBUFFER_DESC desc; - D3DPRESENT_PARAMETERS present_parameters = {0}; + struct device_desc device_desc; struct { float x, y, z; @@ -4769,15 +4774,11 @@ static void test_swvp_buffer(void) d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = window; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferWidth = screen_width; - present_parameters.BackBufferHeight = screen_height; - present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; - present_parameters.EnableAutoDepthStencil = FALSE; - if (FAILED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = CREATE_DEVICE_SWVP_ONLY; + if (!(device = create_device(d3d8, window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); IDirect3D8_Release(d3d8);

1 0

André Hentschel : bcrypt: Add stub for BCryptGetProperty.
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: 574b30b685260278093e2f5d1032d78a04f64480 URL: http://source.winehq.org/git/wine.git/?a=commit;h=574b30b685260278093e2f5d1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 21 22:53:49 2014 +0200 bcrypt: Add stub for BCryptGetProperty. --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 7 +++++++ include/bcrypt.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 83cdbea..18d4d48 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -28,7 +28,7 @@ @ stub BCryptGenerateKeyPair @ stub BCryptGenerateSymmetricKey @ stdcall BCryptGetFipsAlgorithmMode(ptr) -@ stub BCryptGetProperty +@ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) @ stub BCryptHashData @ stub BCryptImportKey @ stub BCryptImportKeyPair diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 35a640a..4663e0f 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -108,3 +108,10 @@ NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *enabled) *enabled = FALSE; return STATUS_SUCCESS; } + +NTSTATUS WINAPI BCryptGetProperty(BCRYPT_HANDLE obj, LPCWSTR prop, UCHAR *buffer, ULONG count, ULONG *res, ULONG flags) +{ + FIXME("%p, %s, %p, %u, %p, %08x - stub\n", obj, wine_dbgstr_w(prop), buffer, count, res, flags); + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/include/bcrypt.h b/include/bcrypt.h index e7e7a59..d9b8cc6 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -48,6 +48,7 @@ typedef struct _BCRYPT_ALGORITHM_IDENTIFIER } BCRYPT_ALGORITHM_IDENTIFIER; typedef PVOID BCRYPT_ALG_HANDLE; +typedef PVOID BCRYPT_HANDLE; #define BCRYPT_RNG_USE_ENTROPY_IN_BUFFER 0x00000001 #define BCRYPT_USE_SYSTEM_PREFERRED_RNG 0x00000002

1 0

Stefan Dösinger : d3d9/tests: Use create_device for test_swvp_buffer.
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: 8633f7f1233f40ea053d8623178e648b0c6db169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8633f7f1233f40ea053d86231… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 00:22:05 2014 +0200 d3d9/tests: Use create_device for test_swvp_buffer. --- dlls/d3d9/tests/device.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index acba77f..9690d41 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -34,6 +34,7 @@ struct vec3 #define CREATE_DEVICE_FULLSCREEN 0x01 #define CREATE_DEVICE_NOWINDOWCHANGES 0x02 #define CREATE_DEVICE_FPU_PRESERVE 0x04 +#define CREATE_DEVICE_SWVP_ONLY 0x08 struct device_desc { @@ -150,6 +151,8 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, cons present_parameters.BackBufferHeight = desc->height; present_parameters.hDeviceWindow = desc->device_window; present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); + if (desc->flags & CREATE_DEVICE_SWVP_ONLY) + behavior_flags = D3DCREATE_SOFTWARE_VERTEXPROCESSING; if (desc->flags & CREATE_DEVICE_NOWINDOWCHANGES) behavior_flags |= D3DCREATE_NOWINDOWCHANGES; if (desc->flags & CREATE_DEVICE_FPU_PRESERVE) @@ -165,6 +168,8 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, cons behavior_flags, &present_parameters, &device))) return device; + if (desc && desc->flags & CREATE_DEVICE_SWVP_ONLY) + return NULL; behavior_flags ^= (D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_SOFTWARE_VERTEXPROCESSING); if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, @@ -7239,7 +7244,7 @@ static void test_swvp_buffer(void) IDirect3DVertexBuffer9 *buffer; static const unsigned int bufsize = 1024; D3DVERTEXBUFFER_DESC desc; - D3DPRESENT_PARAMETERS present_parameters = {0}; + struct device_desc device_desc; struct { float x, y, z; @@ -7250,15 +7255,11 @@ static void test_swvp_buffer(void) d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = window; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferWidth = screen_width; - present_parameters.BackBufferHeight = screen_height; - present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; - present_parameters.EnableAutoDepthStencil = FALSE; - if (FAILED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = CREATE_DEVICE_SWVP_ONLY; + if (!(device = create_device(d3d9, window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); DestroyWindow(window);

1 0

Stefan Dösinger : d3d8/tests: Use create_device for test_fpu_setup.
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: 1ae02b92e099ff10d6f3eaa7c26438922b48c550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae02b92e099ff10d6f3eaa7c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 00:22:06 2014 +0200 d3d8/tests: Use create_device for test_fpu_setup. --- dlls/d3d8/tests/device.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2278c06..6caf8b4 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -32,6 +32,7 @@ struct vec3 }; #define CREATE_DEVICE_FULLSCREEN 0x01 +#define CREATE_DEVICE_FPU_PRESERVE 0x02 struct device_desc { @@ -92,6 +93,7 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice8 *device; + DWORD behavior_flags = D3DCREATE_HARDWARE_VERTEXPROCESSING; present_parameters.BackBufferWidth = 640; present_parameters.BackBufferHeight = 480; @@ -108,17 +110,24 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons present_parameters.BackBufferHeight = desc->height; present_parameters.hDeviceWindow = desc->device_window; present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); + if (desc->flags & CREATE_DEVICE_FPU_PRESERVE) + behavior_flags |= D3DCREATE_FPU_PRESERVE; } if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; + behavior_flags, &present_parameters, &device))) + return device; present_parameters.AutoDepthStencilFormat = D3DFMT_D16; if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; + behavior_flags, &present_parameters, &device))) + return device; + + behavior_flags ^= (D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_SOFTWARE_VERTEXPROCESSING); if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, - D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; + behavior_flags, &present_parameters, &device))) + return device; return NULL; } @@ -2578,7 +2587,7 @@ static inline WORD get_fpu_cw(void) static void test_fpu_setup(void) { #if defined(D3D8_TEST_SET_FPU_CW) && defined(D3D8_TEST_GET_FPU_CW) - D3DPRESENT_PARAMETERS present_parameters; + struct device_desc device_desc; IDirect3DDevice8 *device; D3DDISPLAYMODE d3ddm; IDirect3D8 *d3d8; @@ -2594,21 +2603,18 @@ static void test_fpu_setup(void) hr = IDirect3D8_GetAdapterDisplayMode(d3d8, D3DADAPTER_DEFAULT, &d3ddm); ok(SUCCEEDED(hr), "GetAdapterDisplayMode failed, hr %#x.\n", hr); - memset(&present_parameters, 0, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = window; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferFormat = d3ddm.Format; + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = 0; set_fpu_cw(0xf60); cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); - hr = IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - if (FAILED(hr)) + if (!(device = create_device(d3d8, window, &device_desc))) { - skip("Failed to create a device, hr %#x.\n", hr); + skip("Failed to create a 3D device, skipping test.\n"); set_fpu_cw(0x37f); goto done; } @@ -2624,9 +2630,9 @@ static void test_fpu_setup(void) cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); - hr = IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &present_parameters, &device); - ok(SUCCEEDED(hr), "CreateDevice failed, hr %#x.\n", hr); + device_desc.flags = CREATE_DEVICE_FPU_PRESERVE; + device = create_device(d3d8, window, &device_desc); + ok(!!device, "CreateDevice failed.\n"); cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw);

1 0

Stefan Dösinger : d3d9/tests: Use create_device in test_fpu_setup (v2).
by Alexandre Julliard Oct. 22, 2014

Oct. 22, 2014

Module: wine Branch: master Commit: d5b2e8af394df3abfefd47c3574d9ce953cf3490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b2e8af394df3abfefd47c35… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 00:22:04 2014 +0200 d3d9/tests: Use create_device in test_fpu_setup (v2). --- dlls/d3d9/tests/device.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index a86582b..acba77f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -33,6 +33,7 @@ struct vec3 #define CREATE_DEVICE_FULLSCREEN 0x01 #define CREATE_DEVICE_NOWINDOWCHANGES 0x02 +#define CREATE_DEVICE_FPU_PRESERVE 0x04 struct device_desc { @@ -151,6 +152,8 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, cons present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); if (desc->flags & CREATE_DEVICE_NOWINDOWCHANGES) behavior_flags |= D3DCREATE_NOWINDOWCHANGES; + if (desc->flags & CREATE_DEVICE_FPU_PRESERVE) + behavior_flags |= D3DCREATE_FPU_PRESERVE; } if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, @@ -3586,11 +3589,10 @@ static inline WORD get_fpu_cw(void) static void test_fpu_setup(void) { #if defined(D3D9_TEST_SET_FPU_CW) && defined(D3D9_TEST_GET_FPU_CW) - D3DPRESENT_PARAMETERS present_parameters; + struct device_desc device_desc; IDirect3DDevice9 *device; HWND window = NULL; IDirect3D9 *d3d9; - HRESULT hr; WORD cw; window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_CAPTION, 0, 0, screen_width, screen_height, 0, 0, 0, 0); @@ -3598,20 +3600,18 @@ static void test_fpu_setup(void) d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); - memset(&present_parameters, 0, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = window; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = 0; set_fpu_cw(0xf60); cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - if (FAILED(hr)) + if (!(device = create_device(d3d9, window, &device_desc))) { - skip("Failed to create a device, hr %#x.\n", hr); + skip("Failed to create a 3D device, skipping test.\n"); set_fpu_cw(0x37f); goto done; } @@ -3627,9 +3627,9 @@ static void test_fpu_setup(void) cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &present_parameters, &device); - ok(SUCCEEDED(hr), "CreateDevice failed, hr %#x.\n", hr); + device_desc.flags = CREATE_DEVICE_FPU_PRESERVE; + device = create_device(d3d9, window, &device_desc); + ok(device != NULL, "CreateDevice failed.\n"); cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw);

1 0

Austin English : advapi32: Add a stub for WmiOpenBlock.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: a60fadfad29bcbb564ed01afec8b585e627f9361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60fadfad29bcbb564ed01afe… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Oct 20 11:14:00 2014 -0500 advapi32: Add a stub for WmiOpenBlock. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index f1cae1f..40ae014 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -806,7 +806,7 @@ # @ stub WmiMofEnumerateResourcesW # @ stub WmiNotificationRegistrationA # @ stub WmiNotificationRegistrationW -@ stub WmiOpenBlock +@ stdcall WmiOpenBlock(ptr long ptr) # @ stub WmiOpenTraceWithCursor # @ stub WmiParseTraceEvent # @ stub WmiQueryAllDataA diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index cc10935..988060f 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -997,3 +997,12 @@ ULONG WINAPI EnumerateTraceGuids(PTRACE_GUID_PROPERTIES *propertiesarray, FIXME("%p %d %p: stub\n", propertiesarray, arraycount, guidcount); return ERROR_INVALID_PARAMETER; } + +/****************************************************************************** + * WmiOpenBlock [ADVAPI32.@] + */ +NTSTATUS WINAPI WmiOpenBlock(GUID *guid, ULONG access, PVOID *datablock) +{ + FIXME("%s %d %p: stub\n", debugstr_guid(guid), access, datablock); + return ERROR_SUCCESS; +}

1 0

Catalin Patulea : kernel32: Handle win32 hresult in FormatMessage.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: a5005ed84a8b891b39731de3215e2eda8a1deb0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5005ed84a8b891b39731de32… Author: Catalin Patulea <catalinp(a)google.com> Date: Mon Oct 20 17:55:46 2014 -0400 kernel32: Handle win32 hresult in FormatMessage. --- dlls/kernel32/format_msg.c | 28 ++++++++++++++++++++-------- dlls/kernel32/tests/format_msg.c | 1 - 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index aee7d7a..cdbc944 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -104,6 +104,24 @@ static LPWSTR load_message( HMODULE module, UINT id, WORD lang ) return buffer; } +static LPWSTR search_message( DWORD flags, HMODULE module, UINT id, WORD lang ) +{ + LPWSTR from = NULL; + if (flags & FORMAT_MESSAGE_FROM_HMODULE) + from = load_message( module, id, lang ); + if (!from && (flags & FORMAT_MESSAGE_FROM_SYSTEM)) + { + /* Fold win32 hresult to its embedded error code. */ + if (HRESULT_SEVERITY(id) == SEVERITY_ERROR && + HRESULT_FACILITY(id) == FACILITY_WIN32) + { + id = HRESULT_CODE(id); + } + from = load_message( kernel32_handle, id, lang ); + } + return from; +} + /********************************************************************** * get_arg (internal) */ @@ -492,10 +510,7 @@ DWORD WINAPI FormatMessageA( } else if (dwFlags & (FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM)) { - if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) - from = load_message( (HMODULE)lpSource, dwMessageId, dwLanguageId ); - if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)) - from = load_message( kernel32_handle, dwMessageId, dwLanguageId ); + from = search_message( dwFlags, (HMODULE)lpSource, dwMessageId, dwLanguageId ); if (!from) return 0; } else @@ -592,10 +607,7 @@ DWORD WINAPI FormatMessageW( } else if (dwFlags & (FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM)) { - if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) - from = load_message( (HMODULE)lpSource, dwMessageId, dwLanguageId ); - if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)) - from = load_message( kernel32_handle, dwMessageId, dwLanguageId ); + from = search_message( dwFlags, (HMODULE)lpSource, dwMessageId, dwLanguageId ); if (!from) return 0; } else diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 3e8d96d..4a1ae7d 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -1555,7 +1555,6 @@ static void test_message_from_hmodule(void) /* Test HRESULT. It's not documented but in practice _com_error::ErrorMessage relies on this. */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 0x80070005 /* E_ACCESSDENIED */, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); - todo_wine ok(ret != 0, "FormatMessageA returned 0\n"); /* Test a message string with an insertion without passing any variadic arguments. */

1 0

Nikolay Sivov : dwrite: Implement GetInformationalStrings().
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 04a237fe18cb775bf7545472bea88d6a79e5344e URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a237fe18cb775bf7545472b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 20 21:45:57 2014 +0400 dwrite: Implement GetInformationalStrings(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 45 ++++++++-- dlls/dwrite/opentype.c | 204 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 6 +- 4 files changed, 244 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04a237fe18cb775bf7545…

1 0

Amine Khaldi : strmbase: Remove unused InputPin_Vtbl, OutputPin_Vtbl and impl_BaseInputPin_from_BasePin() (Clang).
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 381bca49e08397a07facbde6843c1cb357c13d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=381bca49e08397a07facbde68… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Mon Oct 20 19:16:35 2014 +0100 strmbase: Remove unused InputPin_Vtbl, OutputPin_Vtbl and impl_BaseInputPin_from_BasePin() (Clang). --- dlls/strmbase/pin.c | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 958fbf8..a9c1928 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -31,8 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); -static const IPinVtbl InputPin_Vtbl; -static const IPinVtbl OutputPin_Vtbl; static const IMemInputPinVtbl MemInputPin_Vtbl; typedef HRESULT (*SendPinFunc)( IPin *to, LPVOID arg ); @@ -555,28 +553,6 @@ HRESULT WINAPI BaseOutputPinImpl_EndFlush(IPin * iface) return E_UNEXPECTED; } -static const IPinVtbl OutputPin_Vtbl = -{ - BaseOutputPinImpl_QueryInterface, - BasePinImpl_AddRef, - BaseOutputPinImpl_Release, - BaseOutputPinImpl_Connect, - BaseOutputPinImpl_ReceiveConnection, - BaseOutputPinImpl_Disconnect, - BasePinImpl_ConnectedTo, - BasePinImpl_ConnectionMediaType, - BasePinImpl_QueryPinInfo, - BasePinImpl_QueryDirection, - BasePinImpl_QueryId, - BasePinImpl_QueryAccept, - BasePinImpl_EnumMediaTypes, - BasePinImpl_QueryInternalConnections, - BaseOutputPinImpl_EndOfStream, - BaseOutputPinImpl_BeginFlush, - BaseOutputPinImpl_EndFlush, - BasePinImpl_NewSegment -}; - HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin *This, IMediaSample ** ppSample, REFERENCE_TIME * tStart, REFERENCE_TIME * tStop, DWORD dwFlags) { HRESULT hr; @@ -861,11 +837,6 @@ static inline BaseInputPin *impl_BaseInputPin_from_IPin( IPin *iface ) return CONTAINING_RECORD(iface, BaseInputPin, pin.IPin_iface); } -static inline BaseInputPin *impl_BaseInputPin_from_BasePin( BasePin *iface ) -{ - return CONTAINING_RECORD(iface, BaseInputPin, pin); -} - HRESULT WINAPI BaseInputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); @@ -1060,28 +1031,6 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, return SendFurther( iface, deliver_newsegment, &args, NULL ); } -static const IPinVtbl InputPin_Vtbl = -{ - BaseInputPinImpl_QueryInterface, - BasePinImpl_AddRef, - BaseInputPinImpl_Release, - BaseInputPinImpl_Connect, - BaseInputPinImpl_ReceiveConnection, - BasePinImpl_Disconnect, - BasePinImpl_ConnectedTo, - BasePinImpl_ConnectionMediaType, - BasePinImpl_QueryPinInfo, - BasePinImpl_QueryDirection, - BasePinImpl_QueryId, - BaseInputPinImpl_QueryAccept, - BasePinImpl_EnumMediaTypes, - BasePinImpl_QueryInternalConnections, - BaseInputPinImpl_EndOfStream, - BaseInputPinImpl_BeginFlush, - BaseInputPinImpl_EndFlush, - BaseInputPinImpl_NewSegment -}; - /*** IMemInputPin implementation ***/ static inline BaseInputPin *impl_from_IMemInputPin( IMemInputPin *iface )

1 0

Sebastian Lackner : kernel32/tests: Add test for GetProcessDEPPolicy.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 19927ee517977addd56a040dc7549976a3a0439b URL: http://source.winehq.org/git/wine.git/?a=commit;h=19927ee517977addd56a040dc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 21 07:43:12 2014 +0200 kernel32/tests: Add test for GetProcessDEPPolicy. --- dlls/kernel32/tests/virtual.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 3 +++ 2 files changed, 43 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 1592b87..40f45ef 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -46,6 +46,7 @@ static DWORD (WINAPI *pNtUnmapViewOfSection)(HANDLE, PVOID); static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG, PVECTORED_EXCEPTION_HANDLER); static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); +static BOOL (WINAPI *pGetProcessDEPPolicy)(HANDLE, LPDWORD, PBOOL); /* ############################### */ @@ -1972,6 +1973,44 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE ); ok( base != NULL, "VirtualAlloc failed %u\n", GetLastError() ); + /* Check result of GetProcessDEPPolicy */ + if (!pGetProcessDEPPolicy) + win_skip( "GetProcessDEPPolicy not supported\n" ); + else + { + BOOL (WINAPI *get_dep_policy)(HANDLE, LPDWORD, PBOOL) = (void *)base; + BOOL policy_permanent = 0xdeadbeef; + DWORD policy_flags = 0xdeadbeef; + + /* GetProcessDEPPolicy crashes on Windows when a NULL pointer is passed. + * Moreover this function has a bug on Windows 8, which has the effect that + * policy_permanent is set to the content of the CL register instead of 0, + * when the policy is not permanent. To detect that we use an assembler + * wrapper to call the function. */ + + memcpy( base, code_atl2, sizeof(code_atl2) ); + *(DWORD *)(base + 6) = (DWORD_PTR)pGetProcessDEPPolicy - (DWORD_PTR)(base + 10); + + success = VirtualProtect( base, size, PAGE_EXECUTE_READWRITE, &old_prot ); + ok( success, "VirtualProtect failed %u\n", GetLastError() ); + + success = get_dep_policy( GetCurrentProcess(), &policy_flags, &policy_permanent ); + todo_wine + ok( success, "GetProcessDEPPolicy failed %u\n", GetLastError() ); + + ret = 0; + if (dep_flags & MEM_EXECUTE_OPTION_DISABLE) + ret |= PROCESS_DEP_ENABLE; + if (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION) + ret |= PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION; + + todo_wine + ok( policy_flags == ret, "expected policy flags %d, got %d\n", ret, policy_flags ); + todo_wine + ok( !policy_permanent || broken(policy_permanent == 0x44), + "expected policy permanent FALSE, got %d\n", policy_permanent ); + } + memcpy( base, code_jmp, sizeof(code_jmp) ); *(DWORD *)(base + 1) = (DWORD_PTR)jmp_test_func - (DWORD_PTR)(base + 5); @@ -3424,6 +3463,7 @@ START_TEST(virtual) pVirtualFreeEx = (void *) GetProcAddress(hkernel32, "VirtualFreeEx"); pGetWriteWatch = (void *) GetProcAddress(hkernel32, "GetWriteWatch"); pResetWriteWatch = (void *) GetProcAddress(hkernel32, "ResetWriteWatch"); + pGetProcessDEPPolicy = (void *)GetProcAddress( hkernel32, "GetProcessDEPPolicy" ); pNtAreMappedFilesTheSame = (void *)GetProcAddress( hntdll, "NtAreMappedFilesTheSame" ); pNtMapViewOfSection = (void *)GetProcAddress( hntdll, "NtMapViewOfSection" ); pNtUnmapViewOfSection = (void *)GetProcAddress( hntdll, "NtUnmapViewOfSection" ); diff --git a/include/winbase.h b/include/winbase.h index edd6ad6..723da26 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1449,6 +1449,9 @@ typedef enum _DEP_SYSTEM_POLICY_TYPE { OptOut = 3 } DEP_SYSTEM_POLICY_TYPE; +#define PROCESS_DEP_ENABLE 1 +#define PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION 2 + /* Event Logging */ #define EVENTLOG_FULL_INFO 0

1 0

Sebastian Lackner : ntdll: Add support for ATL thunk 'POP ecx; POP eax; PUSH ecx; JMP 4(%eax)'.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 1c1e7ed016c129dacc52e5f6432587270c91f681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c1e7ed016c129dacc52e5f64… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 21 06:03:57 2014 +0200 ntdll: Add support for ATL thunk 'POP ecx; POP eax; PUSH ecx; JMP 4(%eax)'. --- dlls/kernel32/tests/virtual.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/signal_i386.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index ae0ede5..1592b87 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1889,6 +1889,23 @@ static inline DWORD send_message_excpt( HWND hWnd, UINT uMsg, WPARAM wParam, LPA return ret; } +static inline DWORD call_proc_excpt( DWORD (CALLBACK *code)(void *), void *arg ) +{ + EXCEPTION_REGISTRATION_RECORD frame; + DWORD ret; + + frame.Handler = execute_fault_seh_handler; + frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; + pNtCurrentTeb()->Tib.ExceptionList = &frame; + + num_guard_page_calls = num_execute_fault_calls = 0; + ret = code( arg ); + + pNtCurrentTeb()->Tib.ExceptionList = frame.Prev; + + return ret; +} + static LRESULT CALLBACK jmp_test_func( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { if (uMsg == WM_USER) @@ -1907,6 +1924,11 @@ static LRESULT CALLBACK atl_test_func( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR return 43; } +static DWORD CALLBACK atl5_test_func( void ) +{ + return 44; +} + static void test_atl_thunk_emulation( ULONG dep_flags ) { static const char code_jmp[] = {0xE9, 0x00, 0x00, 0x00, 0x00}; @@ -1914,6 +1936,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) static const char code_atl2[] = {0xB9, 0x44, 0x33, 0x22, 0x11, 0xE9, 0x00, 0x00, 0x00, 0x00}; static const char code_atl3[] = {0xBA, 0x44, 0x33, 0x22, 0x11, 0xB9, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xE1}; static const char code_atl4[] = {0xB9, 0x44, 0x33, 0x22, 0x11, 0xB8, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xE0}; + static const char code_atl5[] = {0x59, 0x58, 0x51, 0xFF, 0x60, 0x04}; static const char cls_name[] = "atl_thunk_class"; DWORD ret, size, old_prot; ULONG old_flags = MEM_EXECUTE_OPTION_ENABLE; @@ -2133,6 +2156,24 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) else ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + memcpy( base, code_atl5, sizeof(code_atl5) ); + + success = VirtualProtect( base, size, PAGE_READWRITE, &old_prot ); + ok( success, "VirtualProtect failed %u\n", GetLastError() ); + + ret = (DWORD_PTR)atl5_test_func; + ret = call_proc_excpt( (void *)base, &ret - 1 ); + /* FIXME: We don't check the content of the registers EAX/ECX yet */ + ok( ret == 44, "call returned wrong result, expected 44, got %d\n", ret ); + ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); + if ((dep_flags & MEM_EXECUTE_OPTION_DISABLE) && (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION)) + ok( num_execute_fault_calls == 1, "expected one STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + else if (dep_flags & MEM_EXECUTE_OPTION_DISABLE) + ok( num_execute_fault_calls == 0 || broken(num_execute_fault_calls == 1) /* Windows XP */, + "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + else + ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + /* Restore the JMP instruction, set to executable, and then destroy the Window */ memcpy( base, code_jmp, sizeof(code_jmp) ); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index b315e55..13df4bb 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1648,6 +1648,14 @@ union atl_thunk DWORD func; WORD jmp; /* jmp eax */ } t4; + struct + { + DWORD inst1; /* pop ecx + * pop eax + * push ecx + * jmp 4(%eax) */ + WORD inst2; + } t5; }; #include "poppack.h" @@ -1708,6 +1716,26 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) thunk, context->Eip, context->Eax, context->Ecx ); return TRUE; } + else if (thunk_len >= sizeof(thunk_copy.t5) && thunk_copy.t5.inst1 == 0xff515859 && + thunk_copy.t5.inst2 == 0x0460) + { + DWORD func, stack[2]; + if (virtual_uninterrupted_read_memory( (DWORD *)context->Esp, + stack, sizeof(stack) ) == sizeof(stack) && + virtual_uninterrupted_read_memory( (DWORD *)stack[1] + 1, + &func, sizeof(DWORD) ) == sizeof(DWORD) && + virtual_uninterrupted_write_memory( (DWORD *)context->Esp + 1, + &stack[0], sizeof(stack[0]) ) == sizeof(stack[0])) + { + context->Ecx = stack[0]; + context->Eax = stack[1]; + context->Esp = context->Esp + sizeof(DWORD); + context->Eip = func; + TRACE( "emulating ATL thunk type 5 at %p, func=%08x eax=%08x ecx=%08x esp=%08x\n", + thunk, context->Eip, context->Eax, context->Ecx, context->Esp ); + return TRUE; + } + } return FALSE; }

1 0

Sebastian Lackner : ntdll: Add support for ATL thunk 'MOV this,ecx; MOV func,eax; JMP eax'.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: dcd2b0a36695d7b5f17b753f49f1032884677234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcd2b0a36695d7b5f17b753f4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 21 06:02:02 2014 +0200 ntdll: Add support for ATL thunk 'MOV this,ecx; MOV func,eax; JMP eax'. --- dlls/kernel32/tests/virtual.c | 19 +++++++++++++++++++ dlls/ntdll/signal_i386.c | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index a89f1e3..ae0ede5 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1913,6 +1913,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) static const char code_atl1[] = {0xC7, 0x44, 0x24, 0x04, 0x44, 0x33, 0x22, 0x11, 0xE9, 0x00, 0x00, 0x00, 0x00}; static const char code_atl2[] = {0xB9, 0x44, 0x33, 0x22, 0x11, 0xE9, 0x00, 0x00, 0x00, 0x00}; static const char code_atl3[] = {0xBA, 0x44, 0x33, 0x22, 0x11, 0xB9, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xE1}; + static const char code_atl4[] = {0xB9, 0x44, 0x33, 0x22, 0x11, 0xB8, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xE0}; static const char cls_name[] = "atl_thunk_class"; DWORD ret, size, old_prot; ULONG old_flags = MEM_EXECUTE_OPTION_ENABLE; @@ -2114,6 +2115,24 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) else ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + memcpy( base, code_atl4, sizeof(code_atl4) ); + *(DWORD *)(base + 6) = (DWORD_PTR)atl_test_func; + + success = VirtualProtect( base, size, PAGE_READWRITE, &old_prot ); + ok( success, "VirtualProtect failed %u\n", GetLastError() ); + + ret = send_message_excpt( hWnd, WM_USER + 1, 0, 0 ); + /* FIXME: We don't check the content of the registers EAX/ECX yet */ + ok( ret == 43, "call returned wrong result, expected 43, got %d\n", ret ); + ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); + if ((dep_flags & MEM_EXECUTE_OPTION_DISABLE) && (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION)) + ok( num_execute_fault_calls == 1, "expected one STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + else if (dep_flags & MEM_EXECUTE_OPTION_DISABLE) + ok( num_execute_fault_calls == 0 || broken(num_execute_fault_calls == 1) /* Windows XP */, + "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + else + ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + /* Restore the JMP instruction, set to executable, and then destroy the Window */ memcpy( base, code_jmp, sizeof(code_jmp) ); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index e8c6a77..b315e55 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1640,6 +1640,14 @@ union atl_thunk DWORD func; WORD jmp; /* jmp ecx */ } t3; + struct + { + BYTE movl1; /* movl this,ecx */ + DWORD this; + BYTE movl2; /* movl func,eax */ + DWORD func; + WORD jmp; /* jmp eax */ + } t4; }; #include "poppack.h" @@ -1689,6 +1697,17 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) thunk, context->Eip, context->Ecx, context->Edx ); return TRUE; } + else if (thunk_len >= sizeof(thunk_copy.t4) && thunk_copy.t4.movl1 == 0xb9 && + thunk_copy.t4.movl2 == 0xb8 && + thunk_copy.t4.jmp == 0xe0ff) + { + context->Ecx = thunk_copy.t4.this; + context->Eax = thunk_copy.t4.func; + context->Eip = thunk_copy.t4.func; + TRACE( "emulating ATL thunk type 4 at %p, func=%08x eax=%08x ecx=%08x\n", + thunk, context->Eip, context->Eax, context->Ecx ); + return TRUE; + } return FALSE; }

1 0

Sebastian Lackner : ntdll: Add support for ATL thunk 'MOV this,edx; MOV func,ecx; JMP ecx'.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 40472cd3a7e440386a125760a42ea175bed8176e URL: http://source.winehq.org/git/wine.git/?a=commit;h=40472cd3a7e440386a125760a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 21 06:00:20 2014 +0200 ntdll: Add support for ATL thunk 'MOV this,edx; MOV func,ecx; JMP ecx'. --- dlls/kernel32/tests/virtual.c | 16 ++++++++++++++++ dlls/ntdll/signal_i386.c | 19 +++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 5f83ead..a89f1e3 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1912,6 +1912,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) static const char code_jmp[] = {0xE9, 0x00, 0x00, 0x00, 0x00}; static const char code_atl1[] = {0xC7, 0x44, 0x24, 0x04, 0x44, 0x33, 0x22, 0x11, 0xE9, 0x00, 0x00, 0x00, 0x00}; static const char code_atl2[] = {0xB9, 0x44, 0x33, 0x22, 0x11, 0xE9, 0x00, 0x00, 0x00, 0x00}; + static const char code_atl3[] = {0xBA, 0x44, 0x33, 0x22, 0x11, 0xB9, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xE1}; static const char cls_name[] = "atl_thunk_class"; DWORD ret, size, old_prot; ULONG old_flags = MEM_EXECUTE_OPTION_ENABLE; @@ -2098,6 +2099,21 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) else ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + memcpy( base, code_atl3, sizeof(code_atl3) ); + *(DWORD *)(base + 6) = (DWORD_PTR)atl_test_func; + + success = VirtualProtect( base, size, PAGE_READWRITE, &old_prot ); + ok( success, "VirtualProtect failed %u\n", GetLastError() ); + + ret = send_message_excpt( hWnd, WM_USER + 1, 0, 0 ); + /* FIXME: we don't check the content of the registers ECX/EDX yet */ + ok( ret == 43, "call returned wrong result, expected 43, got %d\n", ret ); + ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); + if ((dep_flags & MEM_EXECUTE_OPTION_DISABLE) && (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION)) + ok( num_execute_fault_calls == 1, "expected one STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + else + ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + /* Restore the JMP instruction, set to executable, and then destroy the Window */ memcpy( base, code_jmp, sizeof(code_jmp) ); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index dde4e2d..e8c6a77 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1632,6 +1632,14 @@ union atl_thunk BYTE jmp; /* jmp func */ int func; } t2; + struct + { + BYTE movl1; /* movl this,edx */ + DWORD this; + BYTE movl2; /* movl func,ecx */ + DWORD func; + WORD jmp; /* jmp ecx */ + } t3; }; #include "poppack.h" @@ -1670,6 +1678,17 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) thunk, context->Eip, context->Ecx ); return TRUE; } + else if (thunk_len >= sizeof(thunk_copy.t3) && thunk_copy.t3.movl1 == 0xba && + thunk_copy.t3.movl2 == 0xb9 && + thunk_copy.t3.jmp == 0xe1ff) + { + context->Edx = thunk_copy.t3.this; + context->Ecx = thunk_copy.t3.func; + context->Eip = thunk_copy.t3.func; + TRACE( "emulating ATL thunk type 3 at %p, func=%08x ecx=%08x edx=%08x\n", + thunk, context->Eip, context->Ecx, context->Edx ); + return TRUE; + } return FALSE; }

1 0

Sebastian Lackner : ntdll: Add support for ATL thunk 'MOV this,ecx; JMP func'.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: aab0d25a49ab2c8d67d05e0c16ab6c02d041fd6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab0d25a49ab2c8d67d05e0c1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 21 05:55:27 2014 +0200 ntdll: Add support for ATL thunk 'MOV this,ecx; JMP func'. --- dlls/kernel32/tests/virtual.c | 31 +++++++++++++++++++++---- dlls/ntdll/signal_i386.c | 54 +++++++++++++++++++++++++++++-------------- 2 files changed, 63 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 73b753e..5f83ead 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1882,7 +1882,7 @@ static inline DWORD send_message_excpt( HWND hWnd, UINT uMsg, WPARAM wParam, LPA pNtCurrentTeb()->Tib.ExceptionList = &frame; num_guard_page_calls = num_execute_fault_calls = 0; - ret = SendMessageA( hWnd, WM_USER, 0, 0 ); + ret = SendMessageA( hWnd, uMsg, wParam, lParam ); pNtCurrentTeb()->Tib.ExceptionList = frame.Prev; @@ -1900,14 +1900,18 @@ static LRESULT CALLBACK jmp_test_func( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR static LRESULT CALLBACK atl_test_func( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { DWORD arg = (DWORD)hWnd; - ok( arg == 0x11223344, "arg is 0x%08x instead of 0x11223344\n", arg ); + if (uMsg == WM_USER) + ok( arg == 0x11223344, "arg is 0x%08x instead of 0x11223344\n", arg ); + else + ok( arg != 0x11223344, "arg is unexpectedly 0x11223344\n" ); return 43; } static void test_atl_thunk_emulation( ULONG dep_flags ) { static const char code_jmp[] = {0xE9, 0x00, 0x00, 0x00, 0x00}; - static const char code_atl[] = {0xC7, 0x44, 0x24, 0x04, 0x44, 0x33, 0x22, 0x11, 0xE9, 0x00, 0x00, 0x00, 0x00}; + static const char code_atl1[] = {0xC7, 0x44, 0x24, 0x04, 0x44, 0x33, 0x22, 0x11, 0xE9, 0x00, 0x00, 0x00, 0x00}; + static const char code_atl2[] = {0xB9, 0x44, 0x33, 0x22, 0x11, 0xE9, 0x00, 0x00, 0x00, 0x00}; static const char cls_name[] = "atl_thunk_class"; DWORD ret, size, old_prot; ULONG old_flags = MEM_EXECUTE_OPTION_ENABLE; @@ -2008,7 +2012,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) /* Now test with a proper ATL thunk instruction. */ - memcpy( base, code_atl, sizeof(code_atl) ); + memcpy( base, code_atl1, sizeof(code_atl1) ); *(DWORD *)(base + 9) = (DWORD_PTR)atl_test_func - (DWORD_PTR)(base + 13); success = VirtualProtect( base, size, PAGE_EXECUTE_READWRITE, &old_prot ); @@ -2077,6 +2081,23 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) win_skip( "RtlAddVectoredExceptionHandler or RtlRemoveVectoredExceptionHandler not found\n" ); } + /* Test alternative ATL thunk instructions. */ + + memcpy( base, code_atl2, sizeof(code_atl2) ); + *(DWORD *)(base + 6) = (DWORD_PTR)atl_test_func - (DWORD_PTR)(base + 10); + + success = VirtualProtect( base, size, PAGE_READWRITE, &old_prot ); + ok( success, "VirtualProtect failed %u\n", GetLastError() ); + + ret = send_message_excpt( hWnd, WM_USER + 1, 0, 0 ); + /* FIXME: we don't check the content of the register ECX yet */ + ok( ret == 43, "call returned wrong result, expected 43, got %d\n", ret ); + ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); + if ((dep_flags & MEM_EXECUTE_OPTION_DISABLE) && (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION)) + ok( num_execute_fault_calls == 1, "expected one STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + else + ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + /* Restore the JMP instruction, set to executable, and then destroy the Window */ memcpy( base, code_jmp, sizeof(code_jmp) ); @@ -2194,7 +2215,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) /* Now test with a proper ATL thunk instruction. */ - memcpy( base, code_atl, sizeof(code_atl) ); + memcpy( base, code_atl1, sizeof(code_atl1) ); *(DWORD *)(base + 9) = (DWORD_PTR)atl_test_func - (DWORD_PTR)(base + 13); count = 64; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index f97799c..dde4e2d 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1616,12 +1616,22 @@ static inline BOOL check_invalid_gs( CONTEXT *context ) #include "pshpack1.h" -struct atl_thunk +union atl_thunk { - DWORD movl; /* movl this,4(%esp) */ - DWORD this; - BYTE jmp; /* jmp func */ - int func; + struct + { + DWORD movl; /* movl this,4(%esp) */ + DWORD this; + BYTE jmp; /* jmp func */ + int func; + } t1; + struct + { + BYTE movl; /* movl this,ecx */ + DWORD this; + BYTE jmp; /* jmp func */ + int func; + } t2; }; #include "poppack.h" @@ -1632,26 +1642,36 @@ struct atl_thunk */ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) { - const struct atl_thunk *thunk = (const struct atl_thunk *)rec->ExceptionInformation[1]; - struct atl_thunk thunk_copy; - BOOL ret = FALSE; + const union atl_thunk *thunk = (const union atl_thunk *)rec->ExceptionInformation[1]; + union atl_thunk thunk_copy; + SIZE_T thunk_len; - if (virtual_uninterrupted_read_memory( thunk, &thunk_copy, sizeof(*thunk) ) != sizeof(*thunk)) - return FALSE; + thunk_len = virtual_uninterrupted_read_memory( thunk, &thunk_copy, sizeof(*thunk) ); + if (!thunk_len) return FALSE; - if (thunk_copy.movl == 0x042444c7 && thunk_copy.jmp == 0xe9) + if (thunk_len >= sizeof(thunk_copy.t1) && thunk_copy.t1.movl == 0x042444c7 && + thunk_copy.t1.jmp == 0xe9) { if (virtual_uninterrupted_write_memory( (DWORD *)context->Esp + 1, - &thunk_copy.this, sizeof(DWORD) ) == sizeof(DWORD)) + &thunk_copy.t1.this, sizeof(DWORD) ) == sizeof(DWORD)) { - context->Eip = (DWORD_PTR)(&thunk->func + 1) + thunk_copy.func; - TRACE( "emulating ATL thunk at %p, func=%08x arg=%08x\n", - thunk, context->Eip, thunk_copy.this ); - ret = TRUE; + context->Eip = (DWORD_PTR)(&thunk->t1.func + 1) + thunk_copy.t1.func; + TRACE( "emulating ATL thunk type 1 at %p, func=%08x arg=%08x\n", + thunk, context->Eip, thunk_copy.t1.this ); + return TRUE; } } + else if (thunk_len >= sizeof(thunk_copy.t2) && thunk_copy.t2.movl == 0xb9 && + thunk_copy.t2.jmp == 0xe9) + { + context->Ecx = thunk_copy.t2.this; + context->Eip = (DWORD_PTR)(&thunk->t2.func + 1) + thunk_copy.t2.func; + TRACE( "emulating ATL thunk type 2 at %p, func=%08x ecx=%08x\n", + thunk, context->Eip, context->Ecx ); + return TRUE; + } - return ret; + return FALSE; }

1 0

Hans Leidekker : msi: Support more transform validation flags.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 1e3f15d88c1e878f5c459e642ff2079b05aa5c41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e3f15d88c1e878f5c459e642… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 21 11:29:08 2014 +0200 msi: Support more transform validation flags. --- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 2 +- dlls/msi/patch.c | 215 ++++++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 191 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e3f15d88c1e878f5c459…

1 0

Nikolay Sivov : dwrite: Store registered file loaders in a list.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 177f601889dac6e887564011035f93e7499da828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177f601889dac6e8875640110… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 20 12:53:21 2014 +0400 dwrite: Store registered file loaders in a list. --- dlls/dwrite/main.c | 115 ++++++++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 59 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index cdd27c2..bac0c78 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -398,6 +398,12 @@ struct collectionloader IDWriteFontCollectionLoader *loader; }; +struct fileloader +{ + struct list entry; + IDWriteFontFileLoader *loader; +}; + struct dwritefactory { IDWriteFactory IDWriteFactory_iface; LONG ref; @@ -407,8 +413,7 @@ struct dwritefactory { IDWriteGdiInterop *gdiinterop; struct list collection_loaders; - IDWriteFontFileLoader **file_loaders; - LONG file_loader_count; + struct list file_loaders; }; static inline struct dwritefactory *impl_from_IDWriteFactory(IDWriteFactory *iface) @@ -418,8 +423,8 @@ static inline struct dwritefactory *impl_from_IDWriteFactory(IDWriteFactory *ifa static void release_dwritefactory(struct dwritefactory *factory) { + struct fileloader *fileloader, *fileloader2; struct collectionloader *loader, *loader2; - int i; if (factory->localfontfileloader) IDWriteLocalFontFileLoader_Release(factory->localfontfileloader); @@ -430,10 +435,12 @@ static void release_dwritefactory(struct dwritefactory *factory) heap_free(loader); } - for (i = 0; i < factory->file_loader_count; i++) - if (factory->file_loaders[i]) - IDWriteFontFileLoader_Release(factory->file_loaders[i]); - heap_free(factory->file_loaders); + LIST_FOR_EACH_ENTRY_SAFE(fileloader, fileloader2, &factory->file_loaders, struct fileloader, entry) { + list_remove(&fileloader->entry); + IDWriteFontFileLoader_Release(fileloader->loader); + heap_free(fileloader); + } + if (factory->system_collection) IDWriteFontCollection_Release(factory->system_collection); if (factory->gdiinterop) @@ -449,6 +456,20 @@ static void release_shared_factory(IDWriteFactory *iface) release_dwritefactory(factory); } +static struct fileloader *factory_get_file_loader(struct dwritefactory *factory, IDWriteFontFileLoader *loader) +{ + struct fileloader *entry, *found = NULL; + + LIST_FOR_EACH_ENTRY(entry, &factory->file_loaders, struct fileloader, 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); @@ -592,21 +613,14 @@ static HRESULT WINAPI dwritefactory_CreateFontFileReference(IDWriteFactory *ifac static HRESULT WINAPI dwritefactory_CreateCustomFontFileReference(IDWriteFactory *iface, void const *reference_key, UINT32 key_size, IDWriteFontFileLoader *loader, IDWriteFontFile **font_file) { - int i; struct dwritefactory *This = impl_from_IDWriteFactory(iface); - HRESULT hr; TRACE("(%p)->(%p %u %p %p)\n", This, reference_key, key_size, loader, font_file); - if (loader == NULL) + if (!loader || !factory_get_file_loader(This, loader)) return E_INVALIDARG; - for (i = 0; i < This->file_loader_count; i++) - if (This->file_loaders[i] == loader) break; - if (i == This->file_loader_count) - return E_INVALIDARG; - hr = create_font_file(loader, reference_key, key_size, font_file); - return hr; + return create_font_file(loader, reference_key, key_size, font_file); } static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory *iface, @@ -655,53 +669,47 @@ static HRESULT WINAPI dwritefactory_CreateCustomRenderingParams(IDWriteFactory * static HRESULT WINAPI dwritefactory_RegisterFontFileLoader(IDWriteFactory *iface, IDWriteFontFileLoader *loader) { - int i; struct dwritefactory *This = impl_from_IDWriteFactory(iface); + struct fileloader *entry; + TRACE("(%p)->(%p)\n", This, loader); if (!loader) return E_INVALIDARG; - for (i = 0; i < This->file_loader_count; i++) - if (This->file_loaders[i] == loader) + LIST_FOR_EACH_ENTRY(entry, &This->file_loaders, struct fileloader, entry) { + if (entry->loader == loader) return DWRITE_E_ALREADYREGISTERED; - else if (This->file_loaders[i] == NULL) - break; - - if (i == This->file_loader_count) - { - IDWriteFontFileLoader **new_list = NULL; - int new_count = 0; - - new_count = This->file_loader_count * 2; - new_list = heap_realloc_zero(This->file_loaders, new_count * sizeof(*This->file_loaders)); - - if (!new_list) - return E_OUTOFMEMORY; - else - { - This->file_loader_count = new_count; - This->file_loaders = new_list; - } } + + entry = heap_alloc(sizeof(*entry)); + if (!entry) + return E_OUTOFMEMORY; + + entry->loader = loader; IDWriteFontFileLoader_AddRef(loader); - This->file_loaders[i] = loader; + list_add_tail(&This->file_loaders, &entry->entry); return S_OK; } static HRESULT WINAPI dwritefactory_UnregisterFontFileLoader(IDWriteFactory *iface, IDWriteFontFileLoader *loader) { - int i; struct dwritefactory *This = impl_from_IDWriteFactory(iface); + struct fileloader *found; + TRACE("(%p)->(%p)\n", This, loader); - for (i = 0; i < This->file_loader_count; i++) - if (This->file_loaders[i] == loader) break; - if (i == This->file_loader_count) - return E_INVALIDARG; - IDWriteFontFileLoader_Release(This->file_loaders[i]); - This->file_loaders[i] = NULL; + if (!loader) + return E_INVALIDARG; + + found = factory_get_file_loader(This, loader); + if (!found) + return E_INVALIDARG; + + IDWriteFontFileLoader_Release(found->loader); + list_remove(&found->entry); + heap_free(found); return S_OK; } @@ -875,28 +883,21 @@ static const struct IDWriteFactoryVtbl shareddwritefactoryvtbl = { dwritefactory_CreateGlyphRunAnalysis }; -static HRESULT init_dwritefactory(struct dwritefactory *factory, const struct IDWriteFactoryVtbl *vtbl) +static void init_dwritefactory(struct dwritefactory *factory, const struct IDWriteFactoryVtbl *vtbl) { factory->IDWriteFactory_iface.lpVtbl = vtbl; factory->ref = 1; factory->localfontfileloader = NULL; - factory->file_loader_count = 2; - factory->file_loaders = heap_alloc_zero(sizeof(*factory->file_loaders) * 2); factory->system_collection = NULL; factory->gdiinterop = NULL; list_init(&factory->collection_loaders); - - if (!factory->file_loaders) - return E_OUTOFMEMORY; - - return S_OK; + list_init(&factory->file_loaders); } HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE type, REFIID riid, IUnknown **ret) { struct dwritefactory *factory; - HRESULT hr; TRACE("(%d, %s, %p)\n", type, debugstr_guid(riid), ret); @@ -913,11 +914,7 @@ HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE type, REFIID riid, IUnkno factory = heap_alloc(sizeof(struct dwritefactory)); if (!factory) return E_OUTOFMEMORY; - hr = init_dwritefactory(factory, type == DWRITE_FACTORY_TYPE_SHARED ? &shareddwritefactoryvtbl : &dwritefactoryvtbl); - if (FAILED(hr)) { - heap_free(factory); - return hr; - } + init_dwritefactory(factory, type == DWRITE_FACTORY_TYPE_SHARED ? &shareddwritefactoryvtbl : &dwritefactoryvtbl); if (type == DWRITE_FACTORY_TYPE_SHARED) if (InterlockedCompareExchangePointer((void**)&shared_factory, factory, NULL)) {

1 0

Catalin Patulea : kernel32/tests: Add test for FormatMessage with HRESULT.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: af5982356751a0ad8259d7f63cbbb89044fd233b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5982356751a0ad8259d7f63… Author: Catalin Patulea <catalinp(a)google.com> Date: Mon Oct 20 17:55:45 2014 -0400 kernel32/tests: Add test for FormatMessage with HRESULT. --- dlls/kernel32/tests/format_msg.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index e98e083..3e8d96d 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -1552,6 +1552,12 @@ static void test_message_from_hmodule(void) MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); ok(ret != 0, "FormatMessageA returned 0\n"); + /* Test HRESULT. It's not documented but in practice _com_error::ErrorMessage relies on this. */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 0x80070005 /* E_ACCESSDENIED */, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + todo_wine + ok(ret != 0, "FormatMessageA returned 0\n"); + /* Test a message string with an insertion without passing any variadic arguments. */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 193 /* ERROR_BAD_EXE_FORMAT */, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL);

1 0

Sebastian Lackner : kernel32: Implement GetProcessDEPPolicy.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: d74c9e3ec20dc886ab83f924cd3f5444a52a4c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d74c9e3ec20dc886ab83f924c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 21 07:46:10 2014 +0200 kernel32: Implement GetProcessDEPPolicy. --- dlls/kernel32/process.c | 28 +++++++++++++++++++++++++--- dlls/kernel32/tests/virtual.c | 3 --- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 301c64a..138273b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3942,9 +3942,31 @@ BOOL WINAPI GetNumaAvailableMemoryNode(UCHAR node, PULONGLONG available_bytes) */ BOOL WINAPI GetProcessDEPPolicy(HANDLE process, LPDWORD flags, PBOOL permanent) { - FIXME("(%p %p %p): stub\n", process, flags, permanent); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + NTSTATUS status; + ULONG dep_flags; + + TRACE("(%p %p %p)\n", process, flags, permanent); + + status = NtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, + &dep_flags, sizeof(dep_flags), NULL ); + if (!status) + { + + if (flags) + { + *flags = 0; + if (dep_flags & MEM_EXECUTE_OPTION_DISABLE) + *flags |= PROCESS_DEP_ENABLE; + if (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION) + *flags |= PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION; + } + + if (permanent) + *permanent = (dep_flags & MEM_EXECUTE_OPTION_PERMANENT) != 0; + + } + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; } /********************************************************************** diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 40f45ef..98ef703 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1995,7 +1995,6 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) ok( success, "VirtualProtect failed %u\n", GetLastError() ); success = get_dep_policy( GetCurrentProcess(), &policy_flags, &policy_permanent ); - todo_wine ok( success, "GetProcessDEPPolicy failed %u\n", GetLastError() ); ret = 0; @@ -2004,9 +2003,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) if (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION) ret |= PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION; - todo_wine ok( policy_flags == ret, "expected policy flags %d, got %d\n", ret, policy_flags ); - todo_wine ok( !policy_permanent || broken(policy_permanent == 0x44), "expected policy permanent FALSE, got %d\n", policy_permanent ); }

1 0

Hans Leidekker : secur32/tests: Switch requested protocol from SSL3 to TLS1.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 5a6558b854bc320066d8dfbfa4a7a1d21dc88837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a6558b854bc320066d8dfbfa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 21 11:28:44 2014 +0200 secur32/tests: Switch requested protocol from SSL3 to TLS1. --- dlls/secur32/tests/schannel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index e868b13..97fa0bc 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -533,7 +533,7 @@ static void init_cred(SCHANNEL_CRED *cred) cred->aphMappers = NULL; cred->cSupportedAlgs = 0; cred->palgSupportedAlgs = NULL; - cred->grbitEnabledProtocols = SP_PROT_SSL3_CLIENT; + cred->grbitEnabledProtocols = SP_PROT_TLS1_CLIENT; cred->dwMinimumCipherStrength = 0; cred->dwMaximumCipherStrength = 0; cred->dwSessionLifespan = 0; @@ -685,7 +685,7 @@ static void test_communication(void) ok(status == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", status); if (status != SEC_E_OK) return; - test_supported_protocols(&cred_handle, SP_PROT_SSL3_CLIENT); + test_supported_protocols(&cred_handle, SP_PROT_TLS1_CLIENT); /* Initialize the connection */ init_buffers(&buffers[0], 4, buf_size);

1 0

Stefan Dösinger : d3d8/tests: Update create_device to match d3d9.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: f33aacd4d0397e4a6cfdaef8237a9031334face0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f33aacd4d0397e4a6cfdaef82… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 20 13:08:53 2014 +0200 d3d8/tests: Update create_device to match d3d9. --- dlls/d3d8/tests/device.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 02ec210..2278c06 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -31,12 +31,14 @@ struct vec3 float x, y, z; }; +#define CREATE_DEVICE_FULLSCREEN 0x01 + struct device_desc { HWND device_window; unsigned int width; unsigned int height; - BOOL windowed; + DWORD flags; }; #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) @@ -105,7 +107,7 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons present_parameters.BackBufferWidth = desc->width; present_parameters.BackBufferHeight = desc->height; present_parameters.hDeviceWindow = desc->device_window; - present_parameters.Windowed = desc->windowed; + present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); } if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, @@ -2265,7 +2267,7 @@ static void test_wndproc(void) device_desc.device_window = device_window; device_desc.width = screen_width; device_desc.height = screen_height; - device_desc.windowed = FALSE; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d8, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -2408,7 +2410,7 @@ static void test_wndproc_windowed(void) device_desc.device_window = device_window; device_desc.width = 640; device_desc.height = 480; - device_desc.windowed = TRUE; + device_desc.flags = 0; if (!(device = create_device(d3d8, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -2783,7 +2785,7 @@ static void test_window_style(void) device_desc.device_window = device_window; device_desc.width = screen_width; device_desc.height = screen_height; - device_desc.windowed = FALSE; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d8, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -2988,7 +2990,7 @@ static void test_mode_change(void) device_desc.device_window = device_window; device_desc.width = screen_width; device_desc.height = screen_height; - device_desc.windowed = FALSE; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d8, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -3086,7 +3088,7 @@ static void test_device_window_reset(void) device_desc.device_window = NULL; device_desc.width = screen_width; device_desc.height = screen_height; - device_desc.windowed = FALSE; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d8, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -6353,7 +6355,7 @@ static void test_lost_device(void) device_desc.device_window = window; device_desc.width = screen_width; device_desc.height = screen_height; - device_desc.windowed = FALSE; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d, window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n");

1 0

Nikolay Sivov : dwrite: Store registered collection loaders in a list.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 00e352992e75ad8e9962d273e7a72ee414f667aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=00e352992e75ad8e9962d273e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 20 12:50:27 2014 +0400 dwrite: Store registered collection loaders in a list. --- dlls/dwrite/main.c | 82 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 6ac3852..cdd27c2 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -30,6 +30,7 @@ #include "dwrite_private.h" #include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite); @@ -391,6 +392,12 @@ HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedSt return S_OK; } +struct collectionloader +{ + struct list entry; + IDWriteFontCollectionLoader *loader; +}; + struct dwritefactory { IDWriteFactory IDWriteFactory_iface; LONG ref; @@ -399,8 +406,7 @@ struct dwritefactory { IDWriteFontCollection *system_collection; IDWriteGdiInterop *gdiinterop; - IDWriteFontCollectionLoader **loaders; - LONG loader_count; + struct list collection_loaders; IDWriteFontFileLoader **file_loaders; LONG file_loader_count; }; @@ -412,14 +418,18 @@ static inline struct dwritefactory *impl_from_IDWriteFactory(IDWriteFactory *ifa static void release_dwritefactory(struct dwritefactory *factory) { + struct collectionloader *loader, *loader2; int i; if (factory->localfontfileloader) IDWriteLocalFontFileLoader_Release(factory->localfontfileloader); - for (i = 0; i < factory->loader_count; i++) - if (factory->loaders[i]) - IDWriteFontCollectionLoader_Release(factory->loaders[i]); - heap_free(factory->loaders); + + LIST_FOR_EACH_ENTRY_SAFE(loader, loader2, &factory->collection_loaders, struct collectionloader, entry) { + list_remove(&loader->entry); + IDWriteFontCollectionLoader_Release(loader->loader); + heap_free(loader); + } + for (i = 0; i < factory->file_loader_count; i++) if (factory->file_loaders[i]) IDWriteFontFileLoader_Release(factory->file_loaders[i]); @@ -512,37 +522,25 @@ static HRESULT WINAPI dwritefactory_RegisterFontCollectionLoader(IDWriteFactory IDWriteFontCollectionLoader *loader) { struct dwritefactory *This = impl_from_IDWriteFactory(iface); - int i; + struct collectionloader *entry; TRACE("(%p)->(%p)\n", This, loader); if (!loader) return E_INVALIDARG; - for (i = 0; i < This->loader_count; i++) - if (This->loaders[i] == loader) + LIST_FOR_EACH_ENTRY(entry, &This->collection_loaders, struct collectionloader, entry) { + if (entry->loader == loader) return DWRITE_E_ALREADYREGISTERED; - else if (This->loaders[i] == NULL) - break; - - if (i == This->loader_count) - { - IDWriteFontCollectionLoader **new_list = NULL; - int new_count = 0; + } - new_count = This->loader_count * 2; - new_list = heap_realloc_zero(This->loaders, new_count * sizeof(*This->loaders)); + entry = heap_alloc(sizeof(*entry)); + if (!entry) + return E_OUTOFMEMORY; - if (!new_list) - return E_OUTOFMEMORY; - else - { - This->loader_count = new_count; - This->loaders = new_list; - } - } + entry->loader = loader; IDWriteFontCollectionLoader_AddRef(loader); - This->loaders[i] = loader; + list_add_tail(&This->collection_loaders, &entry->entry); return S_OK; } @@ -551,19 +549,26 @@ static HRESULT WINAPI dwritefactory_UnregisterFontCollectionLoader(IDWriteFactor IDWriteFontCollectionLoader *loader) { struct dwritefactory *This = impl_from_IDWriteFactory(iface); - int i; + struct collectionloader *entry, *found = NULL; TRACE("(%p)->(%p)\n", This, loader); if (!loader) return E_INVALIDARG; - for (i = 0; i < This->loader_count; i++) - if (This->loaders[i] == loader) break; - if (i == This->loader_count) - return E_INVALIDARG; - IDWriteFontCollectionLoader_Release(This->loaders[i]); - This->loaders[i] = NULL; + LIST_FOR_EACH_ENTRY(entry, &This->collection_loaders, struct collectionloader, entry) { + if (entry->loader == loader) { + found = entry; + break; + } + } + + if (!found) + return E_INVALIDARG; + + IDWriteFontCollectionLoader_Release(found->loader); + list_remove(&found->entry); + heap_free(found); return S_OK; } @@ -875,18 +880,15 @@ static HRESULT init_dwritefactory(struct dwritefactory *factory, const struct ID factory->IDWriteFactory_iface.lpVtbl = vtbl; factory->ref = 1; factory->localfontfileloader = NULL; - factory->loader_count = 2; - factory->loaders = heap_alloc_zero(sizeof(*factory->loaders) * 2); factory->file_loader_count = 2; factory->file_loaders = heap_alloc_zero(sizeof(*factory->file_loaders) * 2); factory->system_collection = NULL; factory->gdiinterop = NULL; - if (!factory->loaders || !factory->file_loaders) { - heap_free(factory->loaders); - heap_free(factory->file_loaders); + list_init(&factory->collection_loaders); + + if (!factory->file_loaders) return E_OUTOFMEMORY; - } return S_OK; }

1 0

Stefan Dösinger : d3d9/tests: Add style and size tests for D3DCREATE_NOWINDOWCHANGES.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: ee0733863ee6f754e7a68fa850ac9a46b7601747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee0733863ee6f754e7a68fa85… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 20 13:08:50 2014 +0200 d3d9/tests: Add style and size tests for D3DCREATE_NOWINDOWCHANGES. --- dlls/d3d9/tests/d3d9ex.c | 108 ++++++++++++++++---------- dlls/d3d9/tests/device.c | 198 ++++++++++++++++++++++++++++------------------- 2 files changed, 185 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee0733863ee6f754e7a68…

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.29
by Jeremy Newman Oct. 20, 2014

Oct. 20, 2014

Module: website Branch: master Commit: 85c70956f0f4197c16083f5e09a7e364f0a86706 URL: http://source.winehq.org/git/website.git/?a=commit;h=85c70956f0f4197c16083f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Oct 18 07:33:21 2014 +0200 Polish translation for release 1.7.29 --- news/pl/2014101701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2014101701.xml b/news/pl/2014101701.xml new file mode 100644 index 0000000..2f761f8 --- /dev/null +++ b/news/pl/2014101701.xml @@ -0,0 +1,15 @@ +<news> +<date>Październik 17, 2014</date> +<title>Wydano Wine 1.7.29</title> +<body> +<p> Wydanie rozwojowe Wine 1.7.29 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.7.29">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla kształtowania i odzwierciedlania BiDi w DirectWrite.</li> + <li>Kilka poprawek do obsługi błędów stronnicowania.</li> + <li>Kilka nowych funkcji biblioteki uruchomieniowej C.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +<p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.29.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</p></body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.29
by Jeremy Newman Oct. 20, 2014

Oct. 20, 2014

Module: website Branch: master Commit: c934da6e6a3e5c191eaa73317498a4a2373acbc6 URL: http://source.winehq.org/git/website.git/?a=commit;h=c934da6e6a3e5c191eaa73… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Oct 19 08:36:41 2014 +0200 French translation for release 1.7.29 --- news/fr/2014101701.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2014101701.xml b/news/fr/2014101701.xml new file mode 100644 index 0000000..fcbf019 --- /dev/null +++ b/news/fr/2014101701.xml @@ -0,0 +1,14 @@ +<news> +<date>17 octobre 2014</date> +<title>Sortie de Wine 1.7.29</title> +<body> +<p> La version de développement 1.7.29 de Wine est disponible.</p> +<p> <a href="{$root}/announce/1.7.29">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge du façonnage de texte et de la réflexion BiDi dans DirectWrite.</li> + <li>Quelques correctifs dans la gestion des défauts de pages.</li> + <li>Plusieurs fonctions additionnelles dans le moteur d'exécution C.</li> + <li>Diverses corrections de bugs.</li> +</ul></p> +<p><p>Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.29.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</p></body></news>

1 0

Amine Khaldi : strmbase: Remove unused TransformFilter_Vtbl (Clang).
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: 9a26f0f0d992135d0d7ae77ee1bff8e3d227fa3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a26f0f0d992135d0d7ae77ee… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sat Oct 18 19:53:56 2014 +0100 strmbase: Remove unused TransformFilter_Vtbl (Clang). --- dlls/strmbase/transform.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 0fc7515..4d872be 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -42,7 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n',0}; -static const IBaseFilterVtbl TransformFilter_Vtbl; static const IPinVtbl TransformFilter_InputPin_Vtbl; static const IPinVtbl TransformFilter_OutputPin_Vtbl; static const IQualityControlVtbl TransformFilter_QualityControl_Vtbl; @@ -439,25 +438,6 @@ HRESULT WINAPI TransformFilterImpl_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin return E_NOTIMPL; } -static const IBaseFilterVtbl TransformFilter_Vtbl = -{ - TransformFilterImpl_QueryInterface, - BaseFilterImpl_AddRef, - TransformFilterImpl_Release, - BaseFilterImpl_GetClassID, - TransformFilterImpl_Stop, - TransformFilterImpl_Pause, - TransformFilterImpl_Run, - BaseFilterImpl_GetState, - BaseFilterImpl_SetSyncSource, - BaseFilterImpl_GetSyncSource, - BaseFilterImpl_EnumPins, - TransformFilterImpl_FindPin, - BaseFilterImpl_QueryFilterInfo, - BaseFilterImpl_JoinFilterGraph, - BaseFilterImpl_QueryVendorInfo -}; - static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) { BaseInputPin* This = impl_BaseInputPin_from_IPin(iface);

1 0

Jacek Caban : mshtml: Return S_OK in IHTMLDocument3::recalc.
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: 114f32c8b6000b6770d5f5aeb87bd9313fa9b630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=114f32c8b6000b6770d5f5aeb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 17 16:58:39 2014 +0200 mshtml: Return S_OK in IHTMLDocument3::recalc. --- dlls/mshtml/htmldoc.c | 7 +++++-- dlls/mshtml/tests/dom.c | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index c91298f..0324a6f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1820,8 +1820,11 @@ static HRESULT WINAPI HTMLDocument3_releaseCapture(IHTMLDocument3 *iface) static HRESULT WINAPI HTMLDocument3_recalc(IHTMLDocument3 *iface, VARIANT_BOOL fForce) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - FIXME("(%p)->(%x)\n", This, fForce); - return E_NOTIMPL; + + WARN("(%p)->(%x)\n", This, fForce); + + /* Doing nothing here should be fine for us. */ + return S_OK; } static HRESULT WINAPI HTMLDocument3_createTextNode(IHTMLDocument3 *iface, BSTR text, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5dc9a8f..c1ca092 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7613,6 +7613,9 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem2); IHTMLElement_Release(elem); + hres = IHTMLDocument3_recalc(doc3, VARIANT_TRUE); + ok(hres == S_OK, "recalc failed: %08x\n", hres); + IHTMLDocument3_Release(doc3); elem = get_elem_by_id(doc, "s", TRUE);

1 0

Nikolay Sivov : dwrite: Implement CreateFontFromLOGFONT() on top of system font collection.
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: a088f7d381b822eab7150f5c3f13285fa8dcd5f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a088f7d381b822eab7150f5c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 20 00:25:26 2014 +0400 dwrite: Implement CreateFontFromLOGFONT() on top of system font collection. --- dlls/dwrite/dwrite_private.h | 1 - dlls/dwrite/font.c | 246 +++++++++++++++++++++---------------------- dlls/dwrite/gdiinterop.c | 38 ++++++- dlls/dwrite/tests/font.c | 20 ++-- 4 files changed, 167 insertions(+), 138 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a088f7d381b822eab7150…

1 0

Nikolay Sivov : dwrite: Store factory pointer gdiinterop was created from.
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: ea11f85a94a2aff57d6701e7990f77127ca062a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea11f85a94a2aff57d6701e79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 19 23:57:53 2014 +0400 dwrite: Store factory pointer gdiinterop was created from. --- dlls/dwrite/dwrite_private.h | 3 +- dlls/dwrite/gdiinterop.c | 31 +++++----- dlls/dwrite/main.c | 19 +++++- dlls/dwrite/tests/font.c | 143 ++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 176 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea11f85a94a2aff57d670…

1 0

Piotr Caban : msvcp100: Fix basic_string class definition.
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: 40ef9b2d78a7b02b258e8fe450bf5f175c01fa36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40ef9b2d78a7b02b258e8fe45… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 17 12:07:29 2014 +0200 msvcp100: Fix basic_string class definition. --- dlls/msvcp90/memory.c | 4 ++-- dlls/msvcp90/msvcp90.h | 14 ++++++++++++-- dlls/msvcp90/string.c | 24 ++++++++++++++++-------- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index c5cae50..5d43910 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -111,7 +111,7 @@ void __thiscall MSVCP_allocator_char_destroy(void *this, char *ptr) /* ?max_size@?$allocator(a)D@std@@QBEIXZ */ /* ?max_size@?$allocator(a)D@std@@QEBA_KXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_max_size, 4) -MSVCP_size_t __thiscall MSVCP_allocator_char_max_size(void *this) +MSVCP_size_t __thiscall MSVCP_allocator_char_max_size(const void *this) { return UINT_MAX/sizeof(char); } @@ -208,7 +208,7 @@ void __thiscall MSVCP_allocator_wchar_destroy(void *this, char *ptr) /* ?max_size@?$allocator(a)_W@std@@QBEIXZ */ /* ?max_size@?$allocator(a)_W@std@@QEBA_KXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_max_size, 4) -MSVCP_size_t __thiscall MSVCP_allocator_wchar_max_size(void *this) +MSVCP_size_t __thiscall MSVCP_allocator_wchar_max_size(const void *this) { return UINT_MAX/sizeof(wchar_t); } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 3fb6790..0a60d46 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -74,13 +74,18 @@ extern MSVCP_bool (__thiscall *critical_section_trylock)(critical_section*); #define BUF_SIZE_CHAR 16 typedef struct { +#if _MSVCP_VER <= 90 void *allocator; +#endif union { char buf[BUF_SIZE_CHAR]; char *ptr; } data; MSVCP_size_t size; MSVCP_size_t res; +#if _MSVCP_VER == 100 + char allocator; +#endif } basic_string_char; basic_string_char* __thiscall MSVCP_basic_string_char_ctor(basic_string_char*); @@ -97,13 +102,18 @@ basic_string_char* __thiscall MSVCP_basic_string_char_assign(basic_string_char*, #define BUF_SIZE_WCHAR 8 typedef struct { +#if _MSVCP_VER <= 90 void *allocator; +#endif union { wchar_t buf[BUF_SIZE_WCHAR]; wchar_t *ptr; } data; MSVCP_size_t size; MSVCP_size_t res; +#if _MSVCP_VER == 100 + char allocator; +#endif } basic_string_wchar; basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor(basic_string_wchar*); @@ -117,10 +127,10 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_length(const basic_string_wchar char* __thiscall MSVCP_allocator_char_allocate(void*, MSVCP_size_t); void __thiscall MSVCP_allocator_char_deallocate(void*, char*, MSVCP_size_t); -MSVCP_size_t __thiscall MSVCP_allocator_char_max_size(void*); +MSVCP_size_t __thiscall MSVCP_allocator_char_max_size(const void*); wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void*, MSVCP_size_t); void __thiscall MSVCP_allocator_wchar_deallocate(void*, wchar_t*, MSVCP_size_t); -MSVCP_size_t __thiscall MSVCP_allocator_wchar_max_size(void*); +MSVCP_size_t __thiscall MSVCP_allocator_wchar_max_size(const void*); typedef struct { diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index ce05613..810fb5a 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -29,6 +29,14 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp); +#if _MSVCP_VER <= 90 +#define STRING_ALLOCATOR(this) ((this)->allocator) +#elif _MSVCP_VER == 100 +#define STRING_ALLOCATOR(this) (&(this)->allocator) +#else +#define STRING_ALLOCATOR(this) NULL +#endif + /* size_t_noverify structure */ typedef struct { MSVCP_size_t val; @@ -546,7 +554,7 @@ void __thiscall basic_string_char_tidy(basic_string_char *this, if(new_size > 0) MSVCP_char_traits_char__Copy_s(this->data.buf, BUF_SIZE_CHAR, ptr, new_size); - MSVCP_allocator_char_deallocate(this->allocator, ptr, this->res+1); + MSVCP_allocator_char_deallocate(STRING_ALLOCATOR(this), ptr, this->res+1); } this->res = BUF_SIZE_CHAR-1; @@ -577,9 +585,9 @@ MSVCP_bool __thiscall basic_string_char_grow( if(new_res/3 < this->res/2) new_res = this->res + this->res/2; - ptr = MSVCP_allocator_char_allocate(this->allocator, new_res+1); + ptr = MSVCP_allocator_char_allocate(STRING_ALLOCATOR(this), new_res+1); if(!ptr) - ptr = MSVCP_allocator_char_allocate(this->allocator, new_size+1); + ptr = MSVCP_allocator_char_allocate(STRING_ALLOCATOR(this), new_size+1); else new_size = new_res; if(!ptr) { @@ -988,7 +996,7 @@ DEFINE_THISCALL_WRAPPER(basic_string_char_max_size, 4) MSVCP_size_t __thiscall basic_string_char_max_size(const basic_string_char *this) { TRACE("%p\n", this); - return MSVCP_allocator_char_max_size(this->allocator)-1; + return MSVCP_allocator_char_max_size(STRING_ALLOCATOR(this))-1; } /* ?empty@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE_NXZ */ @@ -2228,7 +2236,7 @@ void __thiscall basic_string_wchar_tidy(basic_string_wchar *this, if(new_size > 0) MSVCP_char_traits_wchar__Copy_s(this->data.buf, BUF_SIZE_WCHAR, ptr, new_size); - MSVCP_allocator_wchar_deallocate(this->allocator, ptr, this->res+1); + MSVCP_allocator_wchar_deallocate(STRING_ALLOCATOR(this), ptr, this->res+1); } this->res = BUF_SIZE_WCHAR-1; @@ -2252,9 +2260,9 @@ MSVCP_bool __thiscall basic_string_wchar_grow( if(new_res/3 < this->res/2) new_res = this->res + this->res/2; - ptr = MSVCP_allocator_wchar_allocate(this->allocator, new_res+1); + ptr = MSVCP_allocator_wchar_allocate(STRING_ALLOCATOR(this), new_res+1); if(!ptr) - ptr = MSVCP_allocator_wchar_allocate(this->allocator, new_size+1); + ptr = MSVCP_allocator_wchar_allocate(STRING_ALLOCATOR(this), new_size+1); else new_size = new_res; if(!ptr) { @@ -2733,7 +2741,7 @@ DEFINE_THISCALL_WRAPPER(basic_string_wchar_max_size, 4) MSVCP_size_t __thiscall basic_string_wchar_max_size(const basic_string_wchar *this) { TRACE("%p\n", this); - return MSVCP_allocator_wchar_max_size(this->allocator)-1; + return MSVCP_allocator_wchar_max_size(STRING_ALLOCATOR(this))-1; } /* ?empty@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE_NXZ */

1 0

Piotr Caban : msvcp100: Add std::iostream_category() implementation.
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: f92766951dabded6bbc9fe1a4857b854b9a6339d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92766951dabded6bbc9fe1a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 17 12:07:23 2014 +0200 msvcp100: Add std::iostream_category() implementation. --- dlls/msvcp100/msvcp100.spec | 4 +- dlls/msvcp90/misc.c | 115 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 1 + dlls/msvcp90/msvcp_main.c | 1 + 4 files changed, 119 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 6cb9b77..0055d79 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2045,8 +2045,8 @@ # extern ?intl@?$moneypunct(a)G$0A@@std@@2_NB # extern ?intl@?$moneypunct(a)_W$00(a)std@@2_NB # extern ?intl@?$moneypunct(a)_W$0A@@std@@2_NB -@ stub -arch=win32 ?iostream_category(a)std@@YAABVerror_category(a)1@XZ -@ stub -arch=win64 ?iostream_category(a)std@@YAAEBVerror_category(a)1@XZ +@ cdecl -arch=win32 ?iostream_category(a)std@@YAABVerror_category(a)1@XZ() std_iostream_category +@ cdecl -arch=win64 ?iostream_category(a)std@@YAAEBVerror_category(a)1@XZ() std_iostream_category @ thiscall -arch=win32 ?ipfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAE_N_N(a)Z(ptr long) basic_istream_char_ipfx @ cdecl -arch=win64 ?ipfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAA_N_N(a)Z(ptr long) basic_istream_char_ipfx @ thiscall -arch=win32 ?ipfx@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAE_N_N(a)Z(ptr long) basic_istream_wchar_ipfx diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index abd53d7..61e43c3 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -478,3 +478,118 @@ critical_section* __cdecl _Mtx_getconcrtcs(_Mtx_t *mtx) return &(*mtx)->cs; } #endif + +#if _MSVCP_VER == 100 +typedef struct { + const vtable_ptr *vtable; +} error_category; + +typedef struct { + error_category base; + const char *type; +} custom_category; +static custom_category iostream_category; + +DEFINE_RTTI_DATA0(error_category, 0, ".?AVerror_category(a)std@@") +DEFINE_RTTI_DATA1(iostream_category, 0, &error_category_rtti_base_descriptor, ".?AV_Iostream_error_category(a)std@@") + +extern const vtable_ptr MSVCP_iostream_category_vtable; + +static void iostream_category_ctor(custom_category *this) +{ + this->base.vtable = &MSVCP_iostream_category_vtable; + this->type = "iostream"; +} + +DEFINE_THISCALL_WRAPPER(custom_category_vector_dtor, 8) +custom_category* __thiscall custom_category_vector_dtor(custom_category *this, unsigned int flags) +{ + TRACE("(%p %x)\n", this, flags); + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + INT_PTR i, *ptr = (INT_PTR *)this-1; + + for(i=*ptr-1; i>=0; i--) + MSVCRT_operator_delete(ptr); + } else { + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + +DEFINE_THISCALL_WRAPPER(custom_category_name, 4) +const char* __thiscall custom_category_name(const custom_category *this) +{ + return this->type; +} + +DEFINE_THISCALL_WRAPPER(custom_category_message, 12) +basic_string_char* __thiscall custom_category_message(const custom_category *this, + basic_string_char *ret, int err) +{ + if(err == 1) return MSVCP_basic_string_char_ctor_cstr(ret, "iostream error"); + return MSVCP_basic_string_char_ctor_cstr(ret, strerror(err)); +} + +DEFINE_THISCALL_WRAPPER(custom_category_default_error_condition, 12) +/*error_condition*/void* __thiscall custom_category_default_error_condition( + custom_category *this, /*error_condition*/void *ret, int code) +{ + FIXME("(%p %p %x) stub\n", this, ret, code); + return NULL; +} + +DEFINE_THISCALL_WRAPPER(custom_category_equivalent, 12) +MSVCP_bool __thiscall custom_category_equivalent(const custom_category *this, + int code, const /*error_condition*/void *condition) +{ + FIXME("(%p %x %p) stub\n", this, code, condition); + return FALSE; +} + +DEFINE_THISCALL_WRAPPER(custom_category_equivalent_code, 12) +MSVCP_bool __thiscall custom_category_equivalent_code(custom_category *this, + const /*error_code*/void *code, int condition) +{ + FIXME("(%p %p %x) stub\n", this, code, condition); + return FALSE; +} + +/* ?iostream_category(a)std@@YAABVerror_category(a)1@XZ */ +/* ?iostream_category(a)std@@YAAEBVerror_category(a)1@XZ */ +const error_category* __cdecl std_iostream_category(void) +{ + TRACE("()\n"); + return &iostream_category.base; +} + +#ifndef __GNUC__ +void __asm_dummy_vtables(void) { +#endif + __ASM_VTABLE(iostream_category, + VTABLE_ADD_FUNC(custom_category_vector_dtor) + VTABLE_ADD_FUNC(custom_category_name) + VTABLE_ADD_FUNC(custom_category_message) + VTABLE_ADD_FUNC(custom_category_default_error_condition) + VTABLE_ADD_FUNC(custom_category_equivalent) + VTABLE_ADD_FUNC(custom_category_equivalent_code)); +#ifndef __GNUC__ +} +#endif +#endif + +void init_misc(void *base) +{ +#ifdef __x86_64__ +#if _MSVCP_VER == 100 + init_error_category_rtti(base); + init_iostream_category_rtti(base); +#endif +#endif + +#if _MSVCP_VER == 100 + iostream_category_ctor(&iostream_category); +#endif +} diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 5062bdc..3fb6790 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -536,6 +536,7 @@ void init_exception(void*); void init_locale(void*); void init_io(void*); void free_io(void); +void init_misc(void*); /* class complex<float> */ typedef struct { diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index edbdd50..13d3ff2 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -127,6 +127,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) init_exception(hinstDLL); init_locale(hinstDLL); init_io(hinstDLL); + init_misc(hinstDLL); break; case DLL_PROCESS_DETACH: if (lpvReserved) break;

1 0

Nikolay Sivov : dwrite: Implement CreateFontFaceFromHdc().
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: cd7c31fe089523ded67bbad2057b450fa54f21b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7c31fe089523ded67bbad20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 20 08:55:39 2014 +0400 dwrite: Implement CreateFontFaceFromHdc(). --- dlls/dwrite/gdiinterop.c | 24 ++++++++++++++++++++++-- dlls/dwrite/tests/Makefile.in | 2 +- dlls/dwrite/tests/font.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 43ab60f..0e2f902 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -334,8 +334,28 @@ static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop *iface, HDC hdc, IDWriteFontFace **fontface) { struct gdiinterop *This = impl_from_IDWriteGdiInterop(iface); - FIXME("(%p)->(%p %p): stub\n", This, hdc, fontface); - return E_NOTIMPL; + IDWriteFont *font; + LOGFONTW logfont; + HFONT hfont; + HRESULT hr; + + TRACE("(%p)->(%p %p)\n", This, hdc, fontface); + + *fontface = NULL; + + hfont = GetCurrentObject(hdc, OBJ_FONT); + if (!hfont) + return E_INVALIDARG; + GetObjectW(hfont, sizeof(logfont), &logfont); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(iface, &logfont, &font); + if (FAILED(hr)) + return hr; + + hr = IDWriteFont_CreateFontFace(font, fontface); + IDWriteFont_Release(font); + + return hr; } static HRESULT WINAPI gdiinterop_CreateBitmapRenderTarget(IDWriteGdiInterop *iface, diff --git a/dlls/dwrite/tests/Makefile.in b/dlls/dwrite/tests/Makefile.in index f1287cd..7fbf9e3 100644 --- a/dlls/dwrite/tests/Makefile.in +++ b/dlls/dwrite/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dwrite.dll -IMPORTS = dwrite gdi32 +IMPORTS = dwrite gdi32 user32 C_SRCS = \ analyzer.c \ diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 1e46b52..1bb7754 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1407,6 +1407,43 @@ static void test_GetGdiInterop(void) IDWriteGdiInterop_Release(interop); } +static void test_CreateFontFaceFromHdc(void) +{ + IDWriteGdiInterop *interop; + IDWriteFontFace *fontface; + HFONT hfont, oldhfont; + LOGFONTW logfont; + HRESULT hr; + HDC hdc; + + interop = NULL; + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, NULL, &fontface); + ok(hr == E_INVALIDARG, "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); + + hfont = CreateFontIndirectW(&logfont); + hdc = CreateCompatibleDC(0); + oldhfont = SelectObject(hdc, hfont); + + fontface = NULL; + hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, hdc, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFace_Release(fontface); + DeleteObject(SelectObject(hdc, oldhfont)); + DeleteDC(hdc); + + IDWriteGdiInterop_Release(interop); +} + START_TEST(font) { HRESULT hr; @@ -1436,6 +1473,7 @@ START_TEST(font) test_GetFirstMatchingFont(); test_GetInformationalStrings(); test_GetGdiInterop(); + test_CreateFontFaceFromHdc(); IDWriteFactory_Release(factory); }

1 0

Julian Rüger : German translation for release 1.7.29
by Jeremy Newman Oct. 17, 2014

Oct. 17, 2014

Module: website Branch: master Commit: fd43bde9ffd3be6e657927ac1d174f97e23192ee URL: http://source.winehq.org/git/website.git/?a=commit;h=fd43bde9ffd3be6e657927… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Oct 17 15:26:46 2014 +0200 German translation for release 1.7.29 --- news/de/2014101701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2014101701.xml b/news/de/2014101701.xml new file mode 100644 index 0000000..af315e9 --- /dev/null +++ b/news/de/2014101701.xml @@ -0,0 +1,15 @@ +<news> +<date>October 17, 2014</date> +<title>Wine 1.7.29 freigegeben</title> +<body> +<p> Die Entwicklungsversion 1.7.29 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.7.29">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Unterstützung von Shaping und BiDi-Mirroring in DirectWrite.</li> + <li>Korrekturen an der Behandlung von Page-faults.</li> + <li>Einige zusätzliche C-Laufzeitfunktionen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.29.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Alexandre Julliard : Wine release 1.7.29
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: website Branch: master Commit: 7573a1442d240adb87b829242a93b43b61184d01 URL: http://source.winehq.org/git/website.git/?a=commit;h=7573a1442d240adb87b829… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 21:04:28 2014 +0900 Wine release 1.7.29 --- news/en/2014101701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2014101701.xml b/news/en/2014101701.xml new file mode 100644 index 0000000..ac3b780 --- /dev/null +++ b/news/en/2014101701.xml @@ -0,0 +1,15 @@ +<news> +<date>October 17, 2014</date> +<title>Wine 1.7.29 Released</title> +<body> +<p> The Wine development release 1.7.29 is now available.</p> +<p> <a href="{$root}/announce/1.7.29">What's new</a> in this release: +<ul> + <li>Support for shaping and BiDi mirroring in DirectWrite.</li> + <li>Some page fault handling fixes.</li> + <li>A few more C runtime functions.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.29.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Tag wine-1.7.29 : Alexandre Julliard : Release 1.7.29
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: refs/tags/wine-1.7.29 Tag: 12a2a11dd8795463cc882df2a96e1e83e6e3041d URL: http://source.winehq.org/git/wine.git/?a=tag;h=12a2a11dd8795463cc882df2a96e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 21:01:42 2014 +0900 Release 1.7.29

1 0

Alexandre Julliard : Release 1.7.29.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 955582c8ce9a40d0a267e561d1af40b6c5805dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=955582c8ce9a40d0a267e561d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 21:01:42 2014 +0900 Release 1.7.29. --- ANNOUNCE | 463 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +-- 4 files changed, 266 insertions(+), 219 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=955582c8ce9a40d0a267e…

1 0

Piotr Caban : user32/tests: Add mouse SendInput tests when mouse events are captured.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 2235c820a954d82434533012a0bf6f6da368cf03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2235c820a954d82434533012a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 14 13:28:18 2014 +0200 user32/tests: Add mouse SendInput tests when mouse events are captured. --- dlls/user32/tests/input.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index e60ee27..f741e78 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1890,6 +1890,56 @@ static void test_Input_mouse(void) ok(!got_button_down, "unexpected WM_LBUTTONDOWN message\n"); ok(!got_button_up, "unexpected WM_LBUTTONUP message\n"); + /* click after SetCapture call */ + SetCapture(button_win); + got_button_down = got_button_up = FALSE; + simulate_click(FALSE, 50, 50); + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_RBUTTONDOWN) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_down = TRUE; + } + else if (msg.message == WM_RBUTTONUP) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_up = TRUE; + break; + } + } + ok(got_button_down, "expected WM_RBUTTONDOWN message\n"); + ok(got_button_up, "expected WM_RBUTTONUP message\n"); + + /* click on child window after SetCapture call */ + hwnd = CreateWindowA("button", "button2", WS_VISIBLE | WS_CHILD, + 0, 0, 100, 100, button_win, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindow failed\n"); + got_button_down = got_button_up = FALSE; + simulate_click(TRUE, 150, 150); + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_LBUTTONDOWN) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_down = TRUE; + } + else if (msg.message == WM_LBUTTONUP) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_up = TRUE; + break; + } + } + ok(got_button_down, "expected WM_LBUTTONDOWN message\n"); + ok(got_button_up, "expected WM_LBUTTONUP message\n"); + DestroyWindow(hwnd); + ok(ReleaseCapture(), "ReleaseCapture failed\n"); + CloseHandle(thread_data.start_event); CloseHandle(thread_data.end_event); DestroyWindow(button_win);

1 0

Piotr Caban : user32: Don' t move mouse hardware messages to other threads queues.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: f747e5c8c982d76e160d67b8f5a1c784585e4c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f747e5c8c982d76e160d67b8f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 14 13:29:06 2014 +0200 user32: Don't move mouse hardware messages to other threads queues. --- dlls/user32/message.c | 15 +++++++-------- server/protocol.def | 1 - server/queue.c | 33 ++++----------------------------- 3 files changed, 11 insertions(+), 38 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index fd82498..b75c7e9 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2266,13 +2266,12 @@ static void send_parent_notify( HWND hwnd, WORD event, WORD idChild, POINT pt ) * Tell the server we have passed the message to the app * (even though we may end up dropping it later on) */ -static void accept_hardware_message( UINT hw_id, BOOL remove, HWND new_hwnd ) +static void accept_hardware_message( UINT hw_id, BOOL remove ) { SERVER_START_REQ( accept_hardware_message ) { req->hw_id = hw_id; req->remove = remove; - req->new_win = wine_server_user_handle( new_hwnd ); if (wine_server_call( req )) FIXME("Failed to reply to MSG_HARDWARE message. Message may not be removed from queue.\n"); } @@ -2460,10 +2459,10 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, { /* skip this message */ HOOK_CallHooks( WH_CBT, HCBT_KEYSKIPPED, LOWORD(msg->wParam), msg->lParam, TRUE ); - accept_hardware_message( hw_id, TRUE, 0 ); + accept_hardware_message( hw_id, TRUE ); return FALSE; } - accept_hardware_message( hw_id, remove, 0 ); + accept_hardware_message( hw_id, remove ); if ( remove && msg->message == WM_KEYDOWN ) if (ImmProcessKey(msg->hwnd, GetKeyboardLayout(0), msg->wParam, msg->lParam, 0) ) @@ -2507,7 +2506,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H if (!msg->hwnd || !WIN_IsCurrentThread( msg->hwnd )) { - accept_hardware_message( hw_id, TRUE, msg->hwnd ); + accept_hardware_message( hw_id, TRUE ); return FALSE; } @@ -2596,7 +2595,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H hook.wHitTestCode = hittest; hook.dwExtraInfo = extra_info; HOOK_CallHooks( WH_CBT, HCBT_CLICKSKIPPED, message, (LPARAM)&hook, TRUE ); - accept_hardware_message( hw_id, TRUE, 0 ); + accept_hardware_message( hw_id, TRUE ); return FALSE; } @@ -2604,11 +2603,11 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H { SendMessageW( msg->hwnd, WM_SETCURSOR, (WPARAM)msg->hwnd, MAKELONG( hittest, msg->message )); - accept_hardware_message( hw_id, TRUE, 0 ); + accept_hardware_message( hw_id, TRUE ); return FALSE; } - accept_hardware_message( hw_id, remove, 0 ); + accept_hardware_message( hw_id, remove ); if (!remove || info.hwndCapture) { diff --git a/server/protocol.def b/server/protocol.def index c9270ea..4854e3d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2156,7 +2156,6 @@ enum message_type @REQ(accept_hardware_message) unsigned int hw_id; /* id of the hardware message */ int remove; /* should we remove the message? */ - user_handle_t new_win; /* new destination window for current message */ @END diff --git a/server/queue.c b/server/queue.c index 71dfc11..5f87203 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1281,7 +1281,7 @@ static void update_input_key_state( struct desktop *desktop, unsigned char *keys /* release the hardware message currently being processed by the given thread */ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_id, - int remove, user_handle_t new_win ) + int remove ) { struct thread_input *input = queue->input; struct message *msg; @@ -1293,7 +1293,7 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i if (&msg->entry == &input->msg_list) return; /* not found */ /* clear the queue bit for that message */ - if (remove || new_win) + if (remove) { struct message *other; int clr_bit; @@ -1308,32 +1308,7 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i } } if (clr_bit) clear_queue_bits( queue, clr_bit ); - } - if (new_win) /* set the new window */ - { - struct thread *owner = get_window_thread( new_win ); - if (owner) - { - msg->win = new_win; - if (owner->queue->input != input) - { - list_remove( &msg->entry ); - if (merge_message( owner->queue->input, msg )) - { - free_message( msg ); - release_object( owner ); - return; - } - list_add_tail( &owner->queue->input->msg_list, &msg->entry ); - } - set_queue_bits( owner->queue, get_hardware_msg_bit( msg )); - remove = 0; - release_object( owner ); - } - } - if (remove) - { update_input_key_state( input->desktop, input->keystate, msg ); list_remove( &msg->entry ); free_message( msg ); @@ -1980,7 +1955,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user data->hw_id = msg->unique_id; set_reply_data( msg->data, msg->data_size ); if (msg->msg == WM_INPUT && (flags & PM_REMOVE)) - release_hardware_message( current->queue, data->hw_id, 1, 0 ); + release_hardware_message( current->queue, data->hw_id, 1 ); return 1; } /* nothing found, clear the hardware queue bits */ @@ -2471,7 +2446,7 @@ DECL_HANDLER(reply_message) DECL_HANDLER(accept_hardware_message) { if (current->queue) - release_hardware_message( current->queue, req->hw_id, req->remove, req->new_win ); + release_hardware_message( current->queue, req->hw_id, req->remove ); else set_error( STATUS_ACCESS_DENIED ); }

1 0

Piotr Caban : server: Send mouse hardware messages to thread owning top-most window.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 3f1bbdcae35fe3841465106f71090445484bf274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1bbdcae35fe3841465106f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 14 13:28:47 2014 +0200 server: Send mouse hardware messages to thread owning top-most window. Also don't limit mouse message scope to top-most window when message comes from SendInput or window that generated the event is minimized/transparent. --- dlls/user32/tests/input.c | 4 ++-- dlls/user32/tests/win.c | 2 +- server/queue.c | 26 +++++++++++++++----------- server/user.h | 3 ++- server/window.c | 34 +++++++++++++++++++++++++++++----- 5 files changed, 49 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index f741e78..3ce0570 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1803,8 +1803,8 @@ static void test_Input_mouse(void) } } ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); - todo_wine ok(got_button_down, "expected WM_RBUTTONDOWN message\n"); - todo_wine ok(got_button_up, "expected WM_RBUTTONUP message\n"); + ok(got_button_down, "expected WM_RBUTTONDOWN message\n"); + ok(got_button_up, "expected WM_RBUTTONUP message\n"); DestroyWindow(static_win); /* click through HTTRANSPARENT top-level window */ diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ad983df..cfc2a02 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7295,7 +7295,7 @@ static void window_from_point_proc(HWND parent) DispatchMessageA(&msg); } ok(got_hittest, "transparent window didn't get WM_NCHITTEST message\n"); - todo_wine ok(got_click, "button under static window didn't get WM_LBUTTONUP\n"); + ok(got_click, "button under static window didn't get WM_LBUTTONUP\n"); ret = WaitForSingleObject(end_event, 5000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", ret); diff --git a/server/queue.c b/server/queue.c index 601629e..71dfc11 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1379,11 +1379,13 @@ found: /* find the window that should receive a given hardware message */ static user_handle_t find_hardware_message_window( struct desktop *desktop, struct thread_input *input, - struct message *msg, unsigned int *msg_code ) + struct message *msg, unsigned int *msg_code, + struct thread **thread ) { struct hardware_msg_data *data = msg->data; user_handle_t win = 0; + *thread = NULL; *msg_code = msg->msg; if (msg->msg == WM_INPUT) { @@ -1397,14 +1399,16 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru if (*msg_code < WM_SYSKEYDOWN) *msg_code += WM_SYSKEYDOWN - WM_KEYDOWN; } } - else /* mouse message */ + else if (!input || !(win = input->capture)) /* mouse message */ { - if (!input || !(win = input->capture)) - { - if (!(win = msg->win) || !is_window_visible( win ) || is_window_transparent( win )) - win = window_from_point( desktop, data->x, data->y ); - } + if (is_window_visible( msg->win ) && !is_window_transparent( msg->win )) win = msg->win; + else win = shallow_window_from_point( desktop, data->x, data->y ); + + *thread = window_thread_from_point( win, data->x, data->y ); } + + if (!*thread) + *thread = get_window_thread( win ); return win; } @@ -1491,8 +1495,8 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg } else input = desktop->foreground_input; - win = find_hardware_message_window( desktop, input, msg, &msg_code ); - if (!win || !(thread = get_window_thread(win))) + win = find_hardware_message_window( desktop, input, msg, &msg_code, &thread ); + if (!win || !thread) { if (input) update_input_key_state( input->desktop, input->keystate, msg ); free_message( msg ); @@ -1928,8 +1932,8 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user struct hardware_msg_data *data = msg->data; ptr = list_next( &input->msg_list, ptr ); - win = find_hardware_message_window( input->desktop, input, msg, &msg_code ); - if (!win || !(win_thread = get_window_thread( win ))) + win = find_hardware_message_window( input->desktop, input, msg, &msg_code, &win_thread ); + if (!win || !win_thread) { /* no window at all, remove it */ update_input_key_state( input->desktop, input->keystate, msg ); diff --git a/server/user.h b/server/user.h index 8535903..08d0959 100644 --- a/server/user.h +++ b/server/user.h @@ -157,7 +157,8 @@ extern int is_window_visible( user_handle_t window ); extern int is_window_transparent( user_handle_t window ); extern int make_window_active( user_handle_t window ); extern struct thread *get_window_thread( user_handle_t handle ); -extern user_handle_t window_from_point( struct desktop *desktop, int x, int y ); +extern user_handle_t shallow_window_from_point( struct desktop *desktop, int x, int y ); +extern struct thread *window_thread_from_point( user_handle_t scope, int x, int y ); extern user_handle_t find_window_to_repaint( user_handle_t parent, struct thread *thread ); extern struct window_class *get_window_class( user_handle_t window ); diff --git a/server/window.c b/server/window.c index 484cd22..9efdd69 100644 --- a/server/window.c +++ b/server/window.c @@ -727,14 +727,38 @@ static int get_window_children_from_point( struct window *parent, int x, int y, return 1; } -/* find window containing point (in absolute coords) */ -user_handle_t window_from_point( struct desktop *desktop, int x, int y ) +/* get handle of root of top-most window containing point */ +user_handle_t shallow_window_from_point( struct desktop *desktop, int x, int y ) { - struct window *ret; + struct window *ptr; if (!desktop->top_window) return 0; - ret = child_window_from_point( desktop->top_window, x, y ); - return ret->handle; + + LIST_FOR_EACH_ENTRY( ptr, &desktop->top_window->children, struct window, entry ) + { + if (!is_point_in_window( ptr, x, y )) continue; /* skip it */ + return ptr->handle; + } + return desktop->top_window->handle; +} + +/* return thread of top-most window containing point (in absolute coords) */ +struct thread *window_thread_from_point( user_handle_t scope, int x, int y ) +{ + struct window *win = get_user_object( scope, USER_WINDOW ); + struct window *ptr; + + if (!win) return NULL; + + for (ptr = win; ptr && !is_desktop_window(ptr); ptr = ptr->parent) + { + x -= ptr->client_rect.left; + y -= ptr->client_rect.top; + } + + ptr = child_window_from_point( win, x, y ); + if (!ptr->thread) return NULL; + return (struct thread *)grab_object( ptr->thread ); } /* return list of all windows containing point (in absolute coords) */

1 0

Piotr Caban : user32/tests: Add mouse SendInput tests.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 65b09537b34fc5b153057a37996c40b8b4f5d8ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b09537b34fc5b153057a379… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 14 13:28:12 2014 +0200 user32/tests: Add mouse SendInput tests. --- dlls/user32/tests/input.c | 253 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 253 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8f24a4c..e60ee27 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1643,6 +1643,258 @@ static void test_key_names(void) ok( bufferW[0] == 0xcccc, "wrong string %s\n", wine_dbgstr_w(bufferW) ); } +static void simulate_click(BOOL left, int x, int y) +{ + INPUT input[2]; + UINT events_no; + + SetCursorPos(x, y); + memset(input, 0, sizeof(input)); + input[0].type = INPUT_MOUSE; + U(input[0]).mi.dx = x; + U(input[0]).mi.dy = y; + U(input[0]).mi.dwFlags = left ? MOUSEEVENTF_LEFTDOWN : MOUSEEVENTF_RIGHTDOWN; + input[1].type = INPUT_MOUSE; + U(input[1]).mi.dx = x; + U(input[1]).mi.dy = y; + U(input[1]).mi.dwFlags = left ? MOUSEEVENTF_LEFTUP : MOUSEEVENTF_RIGHTUP; + events_no = SendInput(2, input, sizeof(input[0])); + ok(events_no == 2, "SendInput returned %d\n", events_no); +} + +static BOOL wait_for_message( MSG *msg ) +{ + BOOL ret; + + for (;;) + { + ret = PeekMessageA(msg, 0, 0, 0, PM_REMOVE); + if (ret) + { + if (msg->message == WM_PAINT) DispatchMessageA(msg); + else break; + } + else if (MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT) == WAIT_TIMEOUT) break; + } + if (!ret) msg->message = 0; + return ret; +} + +static BOOL wait_for_event(HANDLE event, int timeout) +{ + DWORD end_time = GetTickCount() + timeout; + MSG msg; + + do { + if(MsgWaitForMultipleObjects(1, &event, FALSE, timeout, QS_ALLINPUT) == WAIT_OBJECT_0) + return TRUE; + while(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + timeout = end_time - GetTickCount(); + }while(timeout > 0); + + return FALSE; +} + +static WNDPROC def_static_proc; +static DWORD hittest_no; +static LRESULT WINAPI static_hook_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + if (msg == WM_NCHITTEST) + { + /* break infinite hittest loop */ + if(hittest_no > 50) return HTCLIENT; + hittest_no++; + } + + return def_static_proc(hwnd, msg, wp, lp); +} + +struct thread_data +{ + HANDLE start_event; + HANDLE end_event; + HWND win; +}; + +static DWORD WINAPI create_static_win(void *arg) +{ + struct thread_data *thread_data = arg; + HWND win; + + win = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, + 100, 100, 100, 100, 0, NULL, NULL, NULL); + ok(win != 0, "CreateWindow failed\n"); + def_static_proc = (void*)SetWindowLongPtrA(win, + GWLP_WNDPROC, (LONG_PTR)static_hook_proc); + thread_data->win = win; + + SetEvent(thread_data->start_event); + wait_for_event(thread_data->end_event, 5000); + return 0; +} + +static void test_Input_mouse(void) +{ + BOOL got_button_down, got_button_up; + HWND hwnd, button_win, static_win; + struct thread_data thread_data; + HANDLE thread; + DWORD thread_id; + POINT pt; + MSG msg; + + button_win = CreateWindowA("button", "button", WS_VISIBLE | WS_POPUP, + 100, 100, 100, 100, 0, NULL, NULL, NULL); + ok(button_win != 0, "CreateWindow failed\n"); + + pt.x = pt.y = 150; + hwnd = WindowFromPoint(pt); + if (hwnd != button_win) + { + skip("there's another window covering test window\n"); + DestroyWindow(button_win); + return; + } + + /* simple button click test */ + simulate_click(TRUE, 150, 150); + got_button_down = got_button_up = FALSE; + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_LBUTTONDOWN) + { + got_button_down = TRUE; + } + else if (msg.message == WM_LBUTTONUP) + { + got_button_up = TRUE; + break; + } + } + ok(got_button_down, "expected WM_LBUTTONDOWN message\n"); + ok(got_button_up, "expected WM_LBUTTONUP message\n"); + + /* click through HTTRANSPARENT child window */ + static_win = CreateWindowA("static", "static", WS_VISIBLE | WS_CHILD, + 0, 0, 100, 100, button_win, NULL, NULL, NULL); + ok(static_win != 0, "CreateWindow failed\n"); + def_static_proc = (void*)SetWindowLongPtrA(static_win, + GWLP_WNDPROC, (LONG_PTR)static_hook_proc); + simulate_click(FALSE, 150, 150); + hittest_no = 0; + got_button_down = got_button_up = FALSE; + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_RBUTTONDOWN) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_down = TRUE; + } + else if (msg.message == WM_RBUTTONUP) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_up = TRUE; + break; + } + } + ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); + todo_wine ok(got_button_down, "expected WM_RBUTTONDOWN message\n"); + todo_wine ok(got_button_up, "expected WM_RBUTTONUP message\n"); + DestroyWindow(static_win); + + /* click through HTTRANSPARENT top-level window */ + static_win = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, + 100, 100, 100, 100, 0, NULL, NULL, NULL); + ok(static_win != 0, "CreateWindow failed\n"); + def_static_proc = (void*)SetWindowLongPtrA(static_win, + GWLP_WNDPROC, (LONG_PTR)static_hook_proc); + simulate_click(TRUE, 150, 150); + hittest_no = 0; + got_button_down = got_button_up = FALSE; + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_LBUTTONDOWN) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_down = TRUE; + } + else if (msg.message == WM_LBUTTONUP) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_up = TRUE; + break; + } + } + ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); + todo_wine ok(got_button_down, "expected WM_LBUTTONDOWN message\n"); + todo_wine ok(got_button_up, "expected WM_LBUTTONUP message\n"); + DestroyWindow(static_win); + + /* click on HTTRANSPARENT top-level window that belongs to other thread */ + thread_data.start_event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(thread_data.start_event != NULL, "CreateEvent failed\n"); + thread_data.end_event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(thread_data.end_event != NULL, "CreateEvent failed\n"); + thread = CreateThread(NULL, 0, create_static_win, &thread_data, 0, NULL); + ok(thread != NULL, "CreateThread failed\n"); + hittest_no = 0; + got_button_down = got_button_up = FALSE; + WaitForSingleObject(thread_data.start_event, INFINITE); + simulate_click(FALSE, 150, 150); + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_RBUTTONDOWN) + got_button_down = TRUE; + else if (msg.message == WM_RBUTTONUP) + got_button_up = TRUE; + } + SetEvent(thread_data.end_event); + WaitForSingleObject(thread, INFINITE); + ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); + ok(!got_button_down, "unexpected WM_RBUTTONDOWN message\n"); + ok(!got_button_up, "unexpected WM_RBUTTONUP message\n"); + + /* click on HTTRANSPARENT top-level window that belongs to ther thread, + * threads input queues are attached */ + thread = CreateThread(NULL, 0, create_static_win, &thread_data, 0, &thread_id); + ok(thread != NULL, "CreateThread failed\n"); + hittest_no = 0; + got_button_down = got_button_up = FALSE; + WaitForSingleObject(thread_data.start_event, INFINITE); + ok(AttachThreadInput(thread_id, GetCurrentThreadId(), TRUE), + "AttachThreadInput failed\n"); + while (wait_for_message(&msg)) DispatchMessageA(&msg); + SetWindowPos(thread_data.win, button_win, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + simulate_click(TRUE, 150, 150); + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_LBUTTONDOWN) + got_button_down = TRUE; + else if (msg.message == WM_LBUTTONUP) + got_button_up = TRUE; + } + SetEvent(thread_data.end_event); + WaitForSingleObject(thread, INFINITE); + todo_wine ok(hittest_no > 50, "expected loop with WM_NCHITTEST messages\n"); + ok(!got_button_down, "unexpected WM_LBUTTONDOWN message\n"); + ok(!got_button_up, "unexpected WM_LBUTTONUP message\n"); + + CloseHandle(thread_data.start_event); + CloseHandle(thread_data.end_event); + DestroyWindow(button_win); +} + START_TEST(input) { init_function_pointers(); @@ -1652,6 +1904,7 @@ START_TEST(input) test_Input_blackbox(); test_Input_whitebox(); test_Input_unicode(); + test_Input_mouse(); } else win_skip("SendInput is not available\n");

1 0

Stefan Dösinger : d3d9/tests: Port test_window_style to d3d9ex.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 80cbd276e016fedd609f1ece6e398f8f72ce2c78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80cbd276e016fedd609f1ece6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 16 17:07:20 2014 +0200 d3d9/tests: Port test_window_style to d3d9ex. --- dlls/d3d9/tests/d3d9ex.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index a496584..11fe091 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2108,6 +2108,105 @@ done: UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_window_style(void) +{ + RECT focus_rect, fullscreen_rect, r; + LONG device_style, device_exstyle; + LONG focus_style, focus_exstyle; + struct device_desc device_desc; + LONG style; + IDirect3DDevice9Ex *device; + HRESULT hr; + ULONG ref; + static const LONG test_style_flags[] = + { + 0, + WS_VISIBLE + }; + unsigned int i; + + SetRect(&fullscreen_rect, 0, 0, startup_mode.dmPelsWidth, startup_mode.dmPelsHeight); + + for (i = 0; i < sizeof(test_style_flags) / sizeof(*test_style_flags); ++i) + { + focus_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW | test_style_flags[i], + 0, 0, startup_mode.dmPelsWidth / 2, startup_mode.dmPelsHeight / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW | test_style_flags[i], + 0, 0, startup_mode.dmPelsWidth / 2, startup_mode.dmPelsHeight / 2, 0, 0, 0, 0); + + device_style = GetWindowLongA(device_window, GWL_STYLE); + device_exstyle = GetWindowLongA(device_window, GWL_EXSTYLE); + focus_style = GetWindowLongA(focus_window, GWL_STYLE); + focus_exstyle = GetWindowLongA(focus_window, GWL_EXSTYLE); + + GetWindowRect(focus_window, &focus_rect); + + device_desc.device_window = device_window; + device_desc.width = startup_mode.dmPelsWidth; + device_desc.height = startup_mode.dmPelsHeight; + device_desc.windowed = FALSE; + if (!(device = create_device(focus_window, &device_desc))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(device_window); + DestroyWindow(focus_window); + return; + } + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style, "Expected device window style %#x, got %#x.\n", + device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle, "Expected device window extended style %#x, got %#x.\n", + device_exstyle, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", + focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", + focus_exstyle, style); + + GetWindowRect(device_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + GetClientRect(device_window, &r); + todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + GetWindowRect(focus_window, &r); + ok(EqualRect(&r, &focus_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + focus_rect.left, focus_rect.top, focus_rect.right, focus_rect.bottom, + r.left, r.top, r.right, r.bottom); + + hr = reset_device(device, device_window, TRUE); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + if (test_style_flags[i] & WS_VISIBLE) + ok(style == device_style, "Expected device window style %#x, got %#x.\n", + device_style, style); + else + todo_wine ok(style == device_style, "Expected device window style %#x, got %#x.\n", + device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle, "Expected device window extended style %#x, got %#x.\n", + device_exstyle, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", + focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", + focus_exstyle, style); + + ref = IDirect3DDevice9Ex_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + + DestroyWindow(device_window); + DestroyWindow(focus_window); + } +} + START_TEST(d3d9ex) { d3d9_handle = LoadLibraryA("d3d9.dll"); @@ -2141,4 +2240,5 @@ START_TEST(d3d9ex) test_unsupported_shaders(); test_wndproc(); test_wndproc_windowed(); + test_window_style(); }

1 0

Stefan Dösinger : d3d9/tests: Port wndproc tests to d3d9ex.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 5c33ffaf6744475c97d45fb72abc06daeaf43bd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c33ffaf6744475c97d45fb72… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 16 17:07:19 2014 +0200 d3d9/tests: Port wndproc tests to d3d9ex. --- dlls/d3d9/tests/d3d9ex.c | 466 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 466 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c33ffaf6744475c97d45…

1 0

Nikolay Sivov : dwrite: Return on first found glyph.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: e3c514f6d555a4772160b49f1d0e4ee49f92b8f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c514f6d555a4772160b49f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 11:59:55 2014 +0400 dwrite: Return on first found glyph. --- dlls/dwrite/opentype.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index a11b2fb..487f56b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -377,7 +377,7 @@ void opentype_cmap_get_glyphindex(void *data, UINT32 utf32c, UINT16 *pgi) table = (WORD*)(((BYTE*)CMAP_Table) + GET_BE_DWORD(CMAP_Table->tables[i].offset)); type = GET_BE_WORD(*table); TRACE("table type %i\n", type); - /* Break when we find a handled type */ + switch (type) { case OPENTYPE_CMAP_TABLE_SEGMENT_MAPPING: @@ -389,6 +389,8 @@ void opentype_cmap_get_glyphindex(void *data, UINT32 utf32c, UINT16 *pgi) default: TRACE("table type %i unhandled.\n", type); } + + if (*pgi) return; } }

1 0

Nikolay Sivov : dwrite: Added a helper to get IDWriteFontFace from IDWriteFont.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 460363535e331a37c96fc285ee2c7573d7a4fe8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=460363535e331a37c96fc285e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 09:36:13 2014 +0400 dwrite: Added a helper to get IDWriteFontFace from IDWriteFont. --- dlls/dwrite/font.c | 54 ++++++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 0b287ff..9a2c636 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -736,6 +736,21 @@ HRESULT convert_fontface_to_logfont(IDWriteFontFace *face, LOGFONTW *logfont) return S_OK; } +static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace **fontface) +{ + *fontface = NULL; + + if (!font->face) { + HRESULT hr = font->is_system ? create_system_fontface(font, &font->face) : + font_create_fontface(NULL, font->data->face_data->type, font->data->face_data->file_count, font->data->face_data->files, + font->data->face_data->index, font->data->face_data->simulations, &font->face); + if (FAILED(hr)) return hr; + } + + *fontface = font->face; + return S_OK; +} + static HRESULT WINAPI dwritefont_QueryInterface(IDWriteFont2 *iface, REFIID riid, void **obj) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); @@ -861,13 +876,12 @@ static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont2 *iface, UINT32 value, *exists = FALSE; - hr = IDWriteFont2_CreateFontFace(iface, &fontface); + hr = get_fontface_from_font(This, &fontface); if (FAILED(hr)) return hr; index = 0; hr = IDWriteFontFace_GetGlyphIndices(fontface, &value, 1, &index); - IDWriteFontFace_Release(fontface); if (FAILED(hr)) return hr; @@ -878,37 +892,15 @@ static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont2 *iface, UINT32 value, static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont2 *iface, IDWriteFontFace **face) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); + HRESULT hr; - if (This->is_system) - { - TRACE("(%p)->(%p)\n", This, face); - - if (!This->face) - { - HRESULT hr = create_system_fontface(This, &This->face); - if (FAILED(hr)) return hr; - } - - *face = This->face; - IDWriteFontFace_AddRef(*face); - - return S_OK; - } - else - { - TRACE("(%p)->(%p)\n", This, face); + TRACE("(%p)->(%p)\n", This, face); - if (!This->face) - { - HRESULT hr = font_create_fontface(NULL, This->data->face_data->type, This->data->face_data->file_count, This->data->face_data->files, This->data->face_data->index, This->data->face_data->simulations, &This->face); - if (FAILED(hr)) return hr; - } - - *face = This->face; + hr = get_fontface_from_font(This, face); + if (hr == S_OK) IDWriteFontFace_AddRef(*face); - return S_OK; - } + return hr; } static void WINAPI dwritefont1_GetMetrics(IDWriteFont2 *iface, DWRITE_FONT_METRICS1 *metrics) @@ -932,13 +924,11 @@ static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont2 *iface, UINT32 m TRACE("(%p)->(%u %p %p)\n", This, max_count, ranges, count); - hr = IDWriteFont2_CreateFontFace(iface, &fontface); + hr = get_fontface_from_font(This, &fontface); if (FAILED(hr)) return hr; IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); - IDWriteFontFace_Release(fontface); - hr = IDWriteFontFace2_GetUnicodeRanges(fontface2, max_count, ranges, count); IDWriteFontFace2_Release(fontface2);

1 0

Nikolay Sivov : dwrite: Hide BiDi helpers.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 571307edc208ffde43933b6dd05125b6b8b8feb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=571307edc208ffde43933b6dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 09:27:01 2014 +0400 dwrite: Hide BiDi helpers. --- dlls/dwrite/dwrite_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 4c9aeef..4b54a35 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -112,8 +112,8 @@ 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 bidi_computelevels(const WCHAR*,UINT32,UINT8,UINT8*,UINT8*); -extern WCHAR bidi_get_mirrored_char(WCHAR); +extern HRESULT bidi_computelevels(const WCHAR*,UINT32,UINT8,UINT8*,UINT8*) DECLSPEC_HIDDEN; +extern WCHAR bidi_get_mirrored_char(WCHAR) DECLSPEC_HIDDEN; /* Glyph shaping */ enum SCRIPT_JUSTIFY

1 0

YongHao Hu : msvcp90/tests: Add istream::operator>>(float) and double test.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: b94fe44e7957e476962132ccfce9f1f954e725dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b94fe44e7957e476962132ccf… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Tue Oct 14 18:05:01 2014 +0800 msvcp90/tests: Add istream::operator>>(float) and double test. --- dlls/msvcp90/tests/ios.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 470dc37..fd27ce5 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -442,6 +442,7 @@ static void (*__thiscall p_basic_fstream_wchar_vbase_dtor)(basic_fstream_wchar*) /* istream */ static basic_istream_char* (*__thiscall p_basic_istream_char_read_uint64)(basic_istream_char*, unsigned __int64*); +static basic_istream_char* (*__thiscall p_basic_istream_char_read_float)(basic_istream_char*, float*); static basic_istream_char* (*__thiscall p_basic_istream_char_read_double)(basic_istream_char*, double*); static int (*__thiscall p_basic_istream_char_get)(basic_istream_char*); static MSVCP_bool (*__thiscall p_basic_istream_char_ipfx)(basic_istream_char*, MSVCP_bool); @@ -648,6 +649,8 @@ static BOOL init(void) SET(p_basic_istream_char_read_uint64, "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)AEA_K@Z"); + SET(p_basic_istream_char_read_float, + "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)AEAM@Z"); SET(p_basic_istream_char_read_double, "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)AEAN@Z"); SET(p_basic_istream_char_get, @@ -765,6 +768,8 @@ static BOOL init(void) SET(p_basic_istream_char_read_uint64, "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV01(a)AA_K@Z"); + SET(p_basic_istream_char_read_float, + "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV01(a)AAM@Z"); SET(p_basic_istream_char_read_double, "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV01(a)AAN@Z"); SET(p_basic_istream_char_get, @@ -881,6 +886,8 @@ static BOOL init(void) SET(p_basic_istream_char_read_uint64, "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)AA_K@Z"); + SET(p_basic_istream_char_read_float, + "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)AAM@Z"); SET(p_basic_istream_char_read_double, "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)AAN@Z"); SET(p_basic_istream_char_get, @@ -2027,6 +2034,46 @@ static void test_ostream_wchar_print_double(void) call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); } +static void test_istream_read_float(void) +{ + basic_stringstream_char ss; + basic_string_char str; + const char *test_str; + float val, correct_val; + + test_str = "3.14159"; + call_func2(p_basic_string_char_ctor_cstr, &str, test_str); + call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_in, TRUE); + + val = 0; + call_func2(p_basic_istream_char_read_float, &ss.base.base1, &val); + correct_val = 3.14159; + ok(correct_val == val, "wrong val, expected = %g found %g\n", correct_val, val); + + call_func1(p_basic_stringstream_char_vbase_dtor, &ss); + call_func1(p_basic_string_char_dtor, &str); +} + +static void test_istream_read_double(void) +{ + basic_stringstream_char ss; + basic_string_char str; + const char *test_str; + double val, correct_val; + + test_str = "3.14159"; + call_func2(p_basic_string_char_ctor_cstr, &str, test_str); + call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_in, TRUE); + + val = 0; + call_func2(p_basic_istream_char_read_double, &ss.base.base1, &val); + correct_val = 3.14159; + ok(correct_val == val, "wrong val, expected = %g found %g\n", correct_val, val); + + call_func1(p_basic_stringstream_char_vbase_dtor, &ss); + call_func1(p_basic_string_char_dtor, &str); +} + START_TEST(ios) { if(!init()) @@ -2046,6 +2093,8 @@ START_TEST(ios) test_ostream_print_float(); test_ostream_print_double(); test_ostream_wchar_print_double(); + test_istream_read_float(); + test_istream_read_double(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Ken Thomases : wined3d: Fix subtraction of resource size from used adapter memory.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: bd460bca1ccade89400515fa004c5e3204e55d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd460bca1ccade89400515fa0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 16 22:03:22 2014 -0500 wined3d: Fix subtraction of resource size from used adapter memory. Properly negate an unsigned value while promoting it from 32- to 64-bit. --- dlls/wined3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index d40af56..0ab55dc 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -151,7 +151,7 @@ void resource_cleanup(struct wined3d_resource *resource) if (resource->pool == WINED3D_POOL_DEFAULT && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) { TRACE("Decrementing device memory pool by %u.\n", resource->size); - adapter_adjust_memory(resource->device->adapter, 0 - resource->size); + adapter_adjust_memory(resource->device->adapter, (INT64)0 - resource->size); } wined3d_resource_free_sysmem(resource);

1 0

Nikolay Sivov : dwrite: Create IDWriteFontFace2 instance for IDWriteFont.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: d02d35a7b1ed3805390213a19fb5b83082cac1b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d02d35a7b1ed3805390213a19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 09:47:43 2014 +0400 dwrite: Create IDWriteFontFace2 instance for IDWriteFont. --- dlls/dwrite/analyzer.c | 2 -- dlls/dwrite/bidi.c | 1 - dlls/dwrite/dwrite_private.h | 4 +++- dlls/dwrite/font.c | 31 ++++++++++++------------------- dlls/dwrite/gdiinterop.c | 1 - dlls/dwrite/layout.c | 1 - dlls/dwrite/main.c | 4 +--- dlls/dwrite/opentype.c | 1 - dlls/dwrite/shape.c | 1 - 9 files changed, 16 insertions(+), 30 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 1a05335..46cf3b5 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -21,8 +21,6 @@ #define COBJMACROS -#include "dwrite.h" -#include "dwrite_2.h" #include "dwrite_private.h" #include "scripts.h" diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index 8e8daf6..48a7a06 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -48,7 +48,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "dwrite_1.h" #include "dwrite_private.h" WINE_DEFAULT_DEBUG_CHANNEL(bidi); diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 4b54a35..88ca127 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "dwrite_2.h" + #include "wine/debug.h" #include "wine/unicode.h" @@ -103,7 +105,7 @@ extern HRESULT get_system_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDE extern HRESULT get_textanalyzer(IDWriteTextAnalyzer**) DECLSPEC_HIDDEN; extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN; extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; -extern HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace **font_face) DECLSPEC_HIDDEN; +extern HRESULT font_create_fontface(IDWriteFactory*,DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2 **) DECLSPEC_HIDDEN; /* Opentype font table functions */ extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9a2c636..fc13941 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -20,8 +20,6 @@ #define COBJMACROS -#include "dwrite.h" -#include "dwrite_2.h" #include "dwrite_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite); @@ -93,7 +91,7 @@ struct dwrite_font { BOOL is_system; IDWriteFontFamily *family; - IDWriteFontFace *face; + IDWriteFontFace2 *face; struct dwrite_font_data *data; }; @@ -689,7 +687,7 @@ static const IDWriteFontFace2Vtbl dwritefontfacevtbl = { dwritefontface2_GetRecommendedRenderingMode }; -static HRESULT create_system_fontface(struct dwrite_font *font, IDWriteFontFace **face) +static HRESULT create_system_fontface(struct dwrite_font *font, IDWriteFontFace2 **face) { struct dwrite_fontface *This; @@ -722,7 +720,7 @@ static HRESULT create_system_fontface(struct dwrite_font *font, IDWriteFontFace This->logfont.lfWeight = font->data->weight; strcpyW(This->logfont.lfFaceName, font->data->facename); - *face = (IDWriteFontFace*)&This->IDWriteFontFace2_iface; + *face = &This->IDWriteFontFace2_iface; return S_OK; } @@ -736,7 +734,7 @@ HRESULT convert_fontface_to_logfont(IDWriteFontFace *face, LOGFONTW *logfont) return S_OK; } -static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace **fontface) +static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 **fontface) { *fontface = NULL; @@ -788,7 +786,7 @@ static ULONG WINAPI dwritefont_Release(IDWriteFont2 *iface) if (!ref) { - if (This->face) IDWriteFontFace_Release(This->face); + if (This->face) IDWriteFontFace2_Release(This->face); if (This->family) IDWriteFontFamily_Release(This->family); _free_font_data(This->data); heap_free(This); @@ -868,7 +866,7 @@ static void WINAPI dwritefont_GetMetrics(IDWriteFont2 *iface, DWRITE_FONT_METRIC static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont2 *iface, UINT32 value, BOOL *exists) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); - IDWriteFontFace *fontface; + IDWriteFontFace2 *fontface; UINT16 index; HRESULT hr; @@ -881,7 +879,7 @@ static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont2 *iface, UINT32 value, return hr; index = 0; - hr = IDWriteFontFace_GetGlyphIndices(fontface, &value, 1, &index); + hr = IDWriteFontFace2_GetGlyphIndices(fontface, &value, 1, &index); if (FAILED(hr)) return hr; @@ -896,7 +894,7 @@ static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont2 *iface, IDWriteFont TRACE("(%p)->(%p)\n", This, face); - hr = get_fontface_from_font(This, face); + hr = get_fontface_from_font(This, (IDWriteFontFace2**)face); if (hr == S_OK) IDWriteFontFace_AddRef(*face); @@ -918,8 +916,7 @@ static void WINAPI dwritefont1_GetPanose(IDWriteFont2 *iface, DWRITE_PANOSE *pan static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont2 *iface, UINT32 max_count, DWRITE_UNICODE_RANGE *ranges, UINT32 *count) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); - IDWriteFontFace2 *fontface2; - IDWriteFontFace *fontface; + IDWriteFontFace2 *fontface; HRESULT hr; TRACE("(%p)->(%u %p %p)\n", This, max_count, ranges, count); @@ -928,11 +925,7 @@ static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont2 *iface, UINT32 m if (FAILED(hr)) return hr; - IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); - hr = IDWriteFontFace2_GetUnicodeRanges(fontface2, max_count, ranges, count); - IDWriteFontFace2_Release(fontface2); - - return hr; + return IDWriteFontFace2_GetUnicodeRanges(fontface, max_count, ranges, count); } static HRESULT WINAPI dwritefont1_IsMonospacedFont(IDWriteFont2 *iface) @@ -1652,7 +1645,7 @@ HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_ke return S_OK; } -HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace **font_face) +HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace2 **font_face) { int i; struct dwrite_fontface *This; @@ -1706,7 +1699,7 @@ HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facety This->data->simulations = sim_flags; This->is_system = FALSE; - *font_face = (IDWriteFontFace*)&This->IDWriteFontFace2_iface; + *font_face = &This->IDWriteFontFace2_iface; return S_OK; } diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 7c20110..c3c2b11 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -25,7 +25,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "dwrite_1.h" #include "dwrite_private.h" #include "wine/debug.h" diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0afd466..86ddf3c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -25,7 +25,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "dwrite_2.h" #include "dwrite_private.h" #include "wine/list.h" diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 0e0f5c5..50ad539 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -27,8 +27,6 @@ #include "winuser.h" #include "initguid.h" -#include "dwrite.h" -#include "dwrite_2.h" #include "dwrite_private.h" #include "wine/debug.h" @@ -609,7 +607,7 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory *iface, { struct dwritefactory *This = impl_from_IDWriteFactory(iface); TRACE("(%p)->(%d %u %p %u 0x%x %p)\n", This, facetype, files_number, font_files, index, sim_flags, font_face); - return font_create_fontface(iface, facetype, files_number, font_files, index, sim_flags, font_face); + return font_create_fontface(iface, facetype, files_number, font_files, index, sim_flags, (IDWriteFontFace2**)font_face); } static HRESULT WINAPI dwritefactory_CreateRenderingParams(IDWriteFactory *iface, IDWriteRenderingParams **params) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b17e8ac..a11b2fb 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "dwrite_1.h" #include "dwrite_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite); diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index ba306c7..00c9548 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -21,7 +21,6 @@ #define COBJMACROS -#include "dwrite_1.h" #include "dwrite_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite);

1 0

Sebastian Lackner : server: Fix invalid memory access when copying KeyNameInformation data.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: add67b6f8d37122b329f83fa90094ef4a8adf883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=add67b6f8d37122b329f83fa9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 17 06:08:20 2014 +0200 server: Fix invalid memory access when copying KeyNameInformation data. --- server/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/registry.c b/server/registry.c index 4aaaf03..43527df 100644 --- a/server/registry.c +++ b/server/registry.c @@ -950,10 +950,10 @@ static void enum_key( const struct key *key, int index, int info_class, for (k = key; k != root_key; k = k->parent) { pos -= k->namelen; - if (pos < len) memcpy( data + namelen, k->name, + if (pos < len) memcpy( data + pos, k->name, min( k->namelen, len - pos ) ); pos -= sizeof(backslash); - if (pos < len) memcpy( data + namelen, backslash, + if (pos < len) memcpy( data + pos, backslash, min( sizeof(backslash), len - pos ) ); } memcpy( data, root_name, min( sizeof(root_name) - sizeof(backslash), len ) );

1 0

Nikolay Sivov : dwrite: Some tests for IDWriteFontColletion methods.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: bb23664ee98fd99b5e5c99fae973fcdbea9397de URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb23664ee98fd99b5e5c99fae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 17 08:39:41 2014 +0400 dwrite: Some tests for IDWriteFontColletion methods. --- dlls/dwrite/tests/font.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 411b249..3305cdb 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1,7 +1,7 @@ /* * Font related tests * - * Copyright 2012 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1189,6 +1189,93 @@ static void test_GetUnicodeRanges(void) IDWriteFontFace1_Release(fontface1); } +static void test_GetFontFromFontFace(void) +{ + IDWriteFontFace *fontface, *fontface2; + IDWriteFontCollection *collection; + IDWriteFont *font, *font2, *font3; + IDWriteFontFamily *family; + HRESULT hr; + + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontCollection_GetFontFamily(collection, 0, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + font2 = NULL; + hr = IDWriteFontCollection_GetFontFromFontFace(collection, fontface, &font2); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(font2 != font, "got %p, %p\n", font2, font); + + font3 = NULL; + hr = IDWriteFontCollection_GetFontFromFontFace(collection, fontface, &font3); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(font3 != font && font3 != font2, "got %p, %p, %p\n", font3, font2, font); +} + +if (font2) { + hr = IDWriteFont_CreateFontFace(font2, &fontface2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fontface2 == fontface, "got %p, %p\n", fontface2, fontface); + IDWriteFontFace_Release(fontface2); +} + +if (font3) { + hr = IDWriteFont_CreateFontFace(font3, &fontface2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fontface2 == fontface, "got %p, %p\n", fontface2, fontface); + IDWriteFontFace_Release(fontface2); +} + +if (font) + IDWriteFont_Release(font); +if (font2) + IDWriteFont_Release(font2); +if (font3) + IDWriteFont_Release(font3); + IDWriteFontFace_Release(fontface); + IDWriteFontFamily_Release(family); + IDWriteFontCollection_Release(collection); +} + +static void test_GetFirstMatchingFont(void) +{ + IDWriteFontCollection *collection; + IDWriteFont *font, *font2; + IDWriteFontFamily *family; + HRESULT hr; + + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontCollection_GetFontFamily(collection, 0, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(font != font2, "got %p, %p\n", font, font2); + + IDWriteFont_Release(font); + IDWriteFont_Release(font2); + IDWriteFontFamily_Release(family); + IDWriteFontCollection_Release(collection); +} + START_TEST(font) { HRESULT hr; @@ -1214,6 +1301,8 @@ START_TEST(font) test_CreateFontFileReference(); test_shared_isolated(); test_GetUnicodeRanges(); + test_GetFontFromFontFace(); + test_GetFirstMatchingFont(); IDWriteFactory_Release(factory); }

1 0

Ken Thomases : configure: For Mac, link wineloader with -no_pie if it' s available.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 5ddaf34d69fe9608e45abb65a48854b22fa3610a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ddaf34d69fe9608e45abb65a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 16 22:03:11 2014 -0500 configure: For Mac, link wineloader with -no_pie if it's available. This is necessary for the specified image base and WINE_DOS and WINE_SHAREDHEAP segment addresses to be respected. The latter are necessary to reserve the correct ranges of the address space. --- configure | 28 +++++++++++++++++++++++++--- configure.ac | 5 ++--- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 2228ce3..f57c9ad 100755 --- a/configure +++ b/configure @@ -7719,9 +7719,31 @@ uninstall:: APPKIT_LIBS="-framework AppKit" LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist" - case $host_os in - darwin11*) LDEXECFLAGS="-Wl,-macosx_version_min,10.6 $LDEXECFLAGS" ;; - esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_pie" >&5 +$as_echo_n "checking whether the compiler supports -Wl,-no_pie... " >&6; } +if ${ac_cv_cflags__Wl__no_pie+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wl,-no_pie" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wl__no_pie=yes +else + ac_cv_cflags__Wl__no_pie=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__no_pie" >&5 +$as_echo "$ac_cv_cflags__Wl__no_pie" >&6; } +if test "x$ac_cv_cflags__Wl__no_pie" = xyes; then : + LDEXECFLAGS="-Wl,-no_pie $LDEXECFLAGS" +fi if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" then DISKARBITRATION_LIBS="-framework DiskArbitration -framework CoreFoundation" diff --git a/configure.ac b/configure.ac index 240ce29..5ebc2c3 100644 --- a/configure.ac +++ b/configure.ac @@ -760,9 +760,8 @@ uninstall:: AC_SUBST(CORESERVICES_LIBS,"-framework CoreServices") AC_SUBST(APPKIT_LIBS,"-framework AppKit") LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist" - case $host_os in - darwin11*) LDEXECFLAGS="-Wl,-macosx_version_min,10.6 $LDEXECFLAGS" ;; - esac + WINE_TRY_CFLAGS([-Wl,-no_pie], + [LDEXECFLAGS="-Wl,-no_pie $LDEXECFLAGS"]) if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" then dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found

1 0

Jacek Caban : winegecko.php: Added 2.34-beta2 release.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: tools Branch: master Commit: 7b83b6710b12bec98f550daca71ab9d49086d147 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7b83b6710b12bec98f550dac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 16 13:47:23 2014 +0200 winegecko.php: Added 2.34-beta2 release. --- winegecko.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/winegecko.php b/winegecko.php index a67f423..cba6bbf 100644 --- a/winegecko.php +++ b/winegecko.php @@ -80,7 +80,9 @@ $aFileSizes = array( '2.24-x86'=>22373888, '2.24-x86_64'=>23608320, '2.34-beta1-x86'=>28131328, - '2.34-beta1-x86_64'=>29696000 + '2.34-beta1-x86_64'=>29696000, + '2.34-beta2-x86'=>28270080, + '2.34-beta2-x86_64'=>29807616 ); // Exact size of the file:

1 0

Iván Matellanes : msvcrt: Added _fseek_nolock implementation.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: c53e0384a5676626a697d99a24e1331df227e940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c53e0384a5676626a697d99a2… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 15 16:47:46 2014 +0200 msvcrt: Added _fseek_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 8 ++++++++ include/msvcrt/stdio.h | 1 + 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 280d188..6a36661 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -840,7 +840,7 @@ @ stub _freefls @ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l @ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l -@ stub _fseek_nolock +@ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @ cdecl _fsopen(str str long) MSVCRT__fsopen diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 5b74e9c..d6b1a18 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1188,7 +1188,7 @@ @ stub _freefls @ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l @ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l -@ stub _fseek_nolock +@ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @ cdecl _fsopen(str str long) MSVCRT__fsopen diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9d695cd..237539b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -507,7 +507,7 @@ @ stub _freefls @ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l @ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l -@ stub _fseek_nolock +@ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @ cdecl _fsopen(str str long) MSVCRT__fsopen diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 45ea0f9..b810c5f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -489,7 +489,7 @@ @ stub _freefls @ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l @ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l -@ stub _fseek_nolock +@ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @ cdecl _fsopen(str str long) MSVCRT__fsopen diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 9f7da57..2dd4da5 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1294,6 +1294,14 @@ int CDECL MSVCRT_fseek(MSVCRT_FILE* file, MSVCRT_long offset, int whence) } /********************************************************************* + * _fseek_nolock (MSVCRT.@) + */ +int CDECL MSVCRT__fseek_nolock(MSVCRT_FILE* file, MSVCRT_long offset, int whence) +{ + return MSVCRT__fseeki64_nolock( file, offset, whence ); +} + +/********************************************************************* * _chsize_s (MSVCRT.@) */ int CDECL MSVCRT__chsize_s(int fd, __int64 size) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 1e816ce..1c154fc 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -130,6 +130,7 @@ int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); int __cdecl _fclose_nolock(FILE*); +int __cdecl _fseek_nolock(FILE*,__msvcrt_long,int); int __cdecl _fseeki64_nolock(FILE*,__int64,int); __msvcrt_long __cdecl _ftell_nolock(FILE*); __int64 __cdecl _ftelli64_nolock(FILE*);

1 0

Iván Matellanes : msvcrt: Added _ftelli64_nolock implementation.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: 7cf0c877b3a5ab33f3c28a20f58f6a2cbf257a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cf0c877b3a5ab33f3c28a20f… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 15 16:46:01 2014 +0200 msvcrt: Added _ftelli64_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 24 ++++++++++++++++-------- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 7 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 406e9e7..2425f72 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -850,7 +850,7 @@ @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 @ stub _ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 -@ stub _ftelli64_nolock +@ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 @ cdecl _ftime32_s(ptr) MSVCRT__ftime32_s @ cdecl _ftime64(ptr) MSVCRT__ftime64 diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 0c62d69..9fa1ac4 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1198,7 +1198,7 @@ @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 @ stub _ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 -@ stub _ftelli64_nolock +@ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 @ cdecl _ftime32_s(ptr) MSVCRT__ftime32_s @ cdecl _ftime64(ptr) MSVCRT__ftime64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7123a06..334921b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -517,7 +517,7 @@ @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 @ stub _ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 -@ stub _ftelli64_nolock +@ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 @ cdecl _ftime32_s(ptr) MSVCRT__ftime32_s @ cdecl _ftime64(ptr) MSVCRT__ftime64 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 41ce183..1cbb339 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -499,7 +499,7 @@ @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 @ stub _ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 -@ stub _ftelli64_nolock +@ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 @ cdecl _ftime32_s(ptr) MSVCRT__ftime32_s @ cdecl _ftime64(ptr) MSVCRT__ftime64 diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 9a0effd..43f8055 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4226,14 +4226,25 @@ int CDECL MSVCRT_fsetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) */ __int64 CDECL MSVCRT__ftelli64(MSVCRT_FILE* file) { - __int64 pos; + __int64 ret; MSVCRT__lock_file(file); + ret = MSVCRT__ftelli64_nolock(file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _ftelli64_nolock (MSVCRT.@) + */ +__int64 CDECL MSVCRT__ftelli64_nolock(MSVCRT_FILE* file) +{ + __int64 pos; + pos = _telli64(file->_file); - if(pos == -1) { - MSVCRT__unlock_file(file); + if(pos == -1) return -1; - } if(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) { if(file->_flag & MSVCRT__IOWRT) { pos += file->_ptr - file->_base; @@ -4258,10 +4269,8 @@ __int64 CDECL MSVCRT__ftelli64(MSVCRT_FILE* file) } else { char *p; - if(MSVCRT__lseeki64(file->_file, pos, SEEK_SET) != pos) { - MSVCRT__unlock_file(file); + if(MSVCRT__lseeki64(file->_file, pos, SEEK_SET) != pos) return -1; - } pos -= file->_bufsiz; pos += file->_ptr - file->_base; @@ -4277,7 +4286,6 @@ __int64 CDECL MSVCRT__ftelli64(MSVCRT_FILE* file) } } - MSVCRT__unlock_file(file); return pos; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index b5cf8b7..41f3632 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -920,6 +920,7 @@ int __cdecl MSVCRT_ungetc(int,MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_fgetwc(MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_ungetwc(MSVCRT_wint_t,MSVCRT_FILE*); __int64 __cdecl MSVCRT__ftelli64(MSVCRT_FILE* file); +__int64 __cdecl MSVCRT__ftelli64_nolock(MSVCRT_FILE*); void __cdecl MSVCRT__exit(int); void __cdecl MSVCRT_abort(void); MSVCRT_ulong* __cdecl MSVCRT___doserrno(void); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 0170d2e..90fc3f7 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -130,6 +130,7 @@ int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); int __cdecl _fclose_nolock(FILE*); +__int64 __cdecl _ftelli64_nolock(FILE*); void __cdecl clearerr(FILE*); int __cdecl fclose(FILE*);

1 0

Nikolay Sivov : dwrite: Implement HasCharacter().
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: 9b46e19aa43f4cab48329438051206e1013f961c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b46e19aa43f4cab483294380… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 07:30:40 2014 +0400 dwrite: Implement HasCharacter(). --- dlls/dwrite/font.c | 22 ++++++++++++++++++++-- dlls/dwrite/tests/font.c | 11 +++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a220501..69b7746 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -835,8 +835,26 @@ static void WINAPI dwritefont_GetMetrics(IDWriteFont2 *iface, DWRITE_FONT_METRIC static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont2 *iface, UINT32 value, BOOL *exists) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); - FIXME("(%p)->(0x%08x %p): stub\n", This, value, exists); - return E_NOTIMPL; + IDWriteFontFace *fontface; + UINT16 index; + HRESULT hr; + + TRACE("(%p)->(0x%08x %p)\n", This, value, exists); + + *exists = FALSE; + + hr = IDWriteFont2_CreateFontFace(iface, &fontface); + if (FAILED(hr)) + return hr; + + index = 0; + hr = IDWriteFontFace_GetGlyphIndices(fontface, &value, 1, &index); + IDWriteFontFace_Release(fontface); + if (FAILED(hr)) + return hr; + + *exists = index != 0; + return S_OK; } static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont2 *iface, IDWriteFontFace **face) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 33c47bd..5e269c3 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -218,6 +218,7 @@ static void test_CreateFontFromLOGFONT(void) BOOL ret; HDC hdc; HFONT hfont; + BOOL exists; int i; UINT r; @@ -251,6 +252,16 @@ if (0) DeleteDC(hdc); DeleteObject(hfont); + exists = TRUE; + hr = IDWriteFont_HasCharacter(font, 0xd800, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists == FALSE, "got %d\n", exists); + + exists = FALSE; + hr = IDWriteFont_HasCharacter(font, 0x20, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists == TRUE, "got %d\n", exists); + /* now check properties */ weight = IDWriteFont_GetWeight(font); ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "got %d\n", weight);

1 0

Nikolay Sivov : dwrite: Added one more test for system font collection.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: 8f34bee25ac54f13538e5a6bf172c8b73dd58d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f34bee25ac54f13538e5a6bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 07:29:31 2014 +0400 dwrite: Added one more test for system font collection. --- dlls/dwrite/tests/font.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 65cd398..33c47bd 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -657,11 +657,13 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(fontface == fontface2, "got %p, was %p\n", fontface2, fontface); /* the fontface refcount is increased here */ - IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFont, (void**)&font); + ok(hr == E_NOINTERFACE || broken(hr == E_NOTIMPL), "got 0x%08x\n", hr); IDWriteFontFace_Release(fontface); - IDWriteFont_Release(font); IDWriteGdiInterop_Release(interop); } @@ -726,6 +728,7 @@ static void test_system_fontcollection(void) { IDWriteFontCollection *collection, *coll2; IDWriteFontFamily *family; + IDWriteFactory *factory2; HRESULT hr; UINT32 i; BOOL ret; @@ -743,6 +746,14 @@ static void test_system_fontcollection(void) ok(coll2 == collection, "got %p, was %p\n", coll2, collection); IDWriteFontCollection_Release(coll2); + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_ISOLATED, &IID_IDWriteFactory, (IUnknown**)&factory2); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_GetSystemFontCollection(factory2, &coll2, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(coll2 != collection, "got %p, was %p\n", coll2, collection); + IDWriteFontCollection_Release(coll2); + IDWriteFactory_Release(factory2); + i = IDWriteFontCollection_GetFontFamilyCount(collection); ok(i, "got %u\n", i);

1 0

Matteo Bruni : wined3d: Don' t replicate shader limits values for each shader.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: e789fadd56c8624a5de48ea5b17946ee64d3983f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e789fadd56c8624a5de48ea5b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 16 01:32:20 2014 +0200 wined3d: Don't replicate shader limits values for each shader. --- dlls/wined3d/arb_program_shader.c | 4 +- dlls/wined3d/glsl_shader.c | 40 +++---- dlls/wined3d/shader.c | 242 +++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 94 insertions(+), 194 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e789fadd56c8624a5de48…

1 0

Matteo Bruni : d3d8/tests: Port the applicable parts of the new unsupported shaders tests to d3d8.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: 291c4f3b65c8a0beb72c590a835285f15da22203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=291c4f3b65c8a0beb72c590a8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 16 01:32:19 2014 +0200 d3d8/tests: Port the applicable parts of the new unsupported shaders tests to d3d8. --- dlls/d3d8/tests/device.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a84166c..02ec210 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2855,6 +2855,7 @@ static void test_unsupported_shaders(void) DWORD vs, ps; HWND window; HRESULT hr; + D3DCAPS8 caps; static const DWORD vs_2_0[] = { @@ -2873,6 +2874,38 @@ static void test_unsupported_shaders(void) 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff /* end */ }; +#if 0 + vs_1_1 + dcl_position v0 + def c255, 1.0, 1.0, 1.0, 1.0 + add r0, v0, c255 + mov oPos, r0 +#endif + static const DWORD vs_1_255[] = + { + 0xfffe0101, + 0x0000001f, 0x80000000, 0x900f0000, + 0x00000051, 0xa00f00ff, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x00000002, 0x800f0000, 0x90e40000, 0xa0e400ff, + 0x00000001, 0xc00f0000, 0x80e40000, + 0x0000ffff + }; +#if 0 + vs_1_1 + dcl_position v0 + def c256, 1.0, 1.0, 1.0, 1.0 + add r0, v0, c256 + mov oPos, r0 +#endif + static const DWORD vs_1_256[] = + { + 0xfffe0101, + 0x0000001f, 0x80000000, 0x900f0000, + 0x00000051, 0xa00f0100, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x00000002, 0x800f0000, 0x90e40000, 0xa0e40100, + 0x00000001, 0xc00f0000, 0x80e40000, + 0x0000ffff + }; static const DWORD decl[] = { @@ -2906,6 +2939,23 @@ static void test_unsupported_shaders(void) hr = IDirect3DDevice8_CreatePixelShader(device, ps_2_0, &ps); ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_CreatePixelShader returned %#08x\n", hr); + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.MaxVertexShaderConst < 256) + { + hr = IDirect3DDevice8_CreateVertexShader(device, decl, vs_1_255, &vs, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + } + else + { + hr = IDirect3DDevice8_CreateVertexShader(device, decl, vs_1_255, &vs, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_DeleteVertexShader(device, vs); + ok(hr == D3D_OK, "IDirect3DDevice8_DeleteVertexShader returned %#08x\n", hr); + hr = IDirect3DDevice8_CreateVertexShader(device, decl, vs_1_256, &vs, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + } + refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D8_Release(d3d);

1 0

Iván Matellanes : msvcrt: Added _ftell_nolock implementation.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: 50574ccffa7bbc65e3afd0f7a6c8ccaeec064bec URL: http://source.winehq.org/git/wine.git/?a=commit;h=50574ccffa7bbc65e3afd0f7a… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 15 16:46:30 2014 +0200 msvcrt: Added _ftell_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 8 ++++++++ include/msvcrt/stdio.h | 1 + 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2425f72..50e2420 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -848,7 +848,7 @@ @ stub _fstat32i64 @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 -@ stub _ftell_nolock +@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 @ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 9fa1ac4..f2d2f30 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1196,7 +1196,7 @@ @ stub _fstat32i64 @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 -@ stub _ftell_nolock +@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 @ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 334921b..77a03c4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -515,7 +515,7 @@ @ stub _fstat32i64 @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 -@ stub _ftell_nolock +@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 @ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 1cbb339..59fba3d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -497,7 +497,7 @@ @ stub _fstat32i64 @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 -@ stub _ftell_nolock +@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 @ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock @ cdecl _ftime32(ptr) MSVCRT__ftime32 diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 43f8055..49cb14d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4298,6 +4298,14 @@ LONG CDECL MSVCRT_ftell(MSVCRT_FILE* file) } /********************************************************************* + * _ftell_nolock (MSVCRT.@) + */ +LONG CDECL MSVCRT__ftell_nolock(MSVCRT_FILE* file) +{ + return MSVCRT__ftelli64_nolock(file); +} + +/********************************************************************* * fgetpos (MSVCRT.@) */ int CDECL MSVCRT_fgetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 90fc3f7..dbe9231 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -130,6 +130,7 @@ int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); int __cdecl _fclose_nolock(FILE*); +__msvcrt_long __cdecl _ftell_nolock(FILE*); __int64 __cdecl _ftelli64_nolock(FILE*); void __cdecl clearerr(FILE*);

1 0

Nikolay Sivov : dwrite: Implement GetUnicodeRanges().
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: 4c0ec6700cb17022f3cbc7fddfff3d514d2d8278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c0ec6700cb17022f3cbc7fdd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 07:33:51 2014 +0400 dwrite: Implement GetUnicodeRanges(). --- dlls/dwrite/bidi.c | 2 +- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 66 +++++++++++++++++++++++-------- dlls/dwrite/gdiinterop.c | 2 +- dlls/dwrite/opentype.c | 94 +++++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/shape.c | 2 +- dlls/dwrite/tests/font.c | 77 +++++++++++++++++++++++++++++++++++- 7 files changed, 222 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c0ec6700cb17022f3cbc…

1 0