February 2015 - Wine-commits

Stefan Dösinger : d3d11: Switch to d3d-style formatting.
by Alexandre Julliard 05 Feb '15

05 Feb '15

Module: wine Branch: master Commit: 9d93af793d9b1df0fa40458f0c745d6597b04957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d93af793d9b1df0fa40458f0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 5 10:03:07 2015 +0100 d3d11: Switch to d3d-style formatting. --- dlls/d3d11/d3d11_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 6af801d..ec8236f 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); static const char *debug_d3d_driver_type(D3D_DRIVER_TYPE driver_type) { - switch(driver_type) + switch (driver_type) { #define D3D11_TO_STR(x) case x: return #x D3D11_TO_STR(D3D_DRIVER_TYPE_UNKNOWN); @@ -46,11 +46,11 @@ static const char *debug_d3d_driver_type(D3D_DRIVER_TYPE driver_type) } HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, - const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, - ID3D11Device **device, D3D_FEATURE_LEVEL *feature_level, ID3D11DeviceContext **context) + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device, + D3D_FEATURE_LEVEL *feature_level, ID3D11DeviceContext **context) { - FIXME("stub: adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %#x, sdk_version %u, " - "device %p, feature_level %p, context %p\n", adapter, debug_d3d_driver_type(driver_type), swrast, - flags, feature_levels, levels, sdk_version, device, feature_level, context); + FIXME("adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %#x, sdk_version %u, " + "device %p, feature_level %p, context %p stub!\n", adapter, debug_d3d_driver_type(driver_type), swrast, + flags, feature_levels, levels, sdk_version, device, feature_level, context); return E_OUTOFMEMORY; }

1 0

Nikolay Sivov : dwrite: Implement GetGlyphCount().
by Alexandre Julliard 05 Feb '15

05 Feb '15

Module: wine Branch: master Commit: c949ff5d24b72a74e517d936db9bc45866a4d047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c949ff5d24b72a74e517d936d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 5 15:54:05 2015 +0300 dwrite: Implement GetGlyphCount(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 4 ++-- dlls/dwrite/freetype.c | 18 ++++++++++++++++++ dlls/dwrite/tests/font.c | 31 ++++++++++++++++++++++++++++++- 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index ce7aad5..674e9f0 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -160,6 +160,7 @@ extern HRESULT freetype_get_design_glyph_metrics(IDWriteFontFace2*,UINT16,UINT16 extern void freetype_notify_cacheremove(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern BOOL freetype_is_monospaced(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern HRESULT freetype_get_glyph_outline(IDWriteFontFace2*,FLOAT,UINT16,USHORT,struct glyph_outline**) DECLSPEC_HIDDEN; +extern UINT16 freetype_get_glyphcount(IDWriteFontFace2*) DECLSPEC_HIDDEN; /* Glyph shaping */ enum SCRIPT_JUSTIFY diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 1f1f367..e3480ec 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -349,8 +349,8 @@ static void WINAPI dwritefontface_GetMetrics(IDWriteFontFace2 *iface, DWRITE_FON static UINT16 WINAPI dwritefontface_GetGlyphCount(IDWriteFontFace2 *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return freetype_get_glyphcount(iface); } static HRESULT WINAPI dwritefontface_GetDesignGlyphMetrics(IDWriteFontFace2 *iface, diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 43fa4df..3b9681d 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -375,6 +375,19 @@ HRESULT freetype_get_glyph_outline(IDWriteFontFace2 *fontface, FLOAT emSize, UIN return hr; } +UINT16 freetype_get_glyphcount(IDWriteFontFace2 *fontface) +{ + UINT16 count = 0; + FT_Face face; + + EnterCriticalSection(&freetype_cs); + if (pFTC_Manager_LookupFace(cache_manager, fontface, &face) == 0) + count = face->num_glyphs; + LeaveCriticalSection(&freetype_cs); + + return count; +} + #else /* HAVE_FREETYPE */ BOOL init_freetype(void) @@ -406,4 +419,9 @@ HRESULT freetype_get_glyph_outline(IDWriteFontFace2 *fontface, FLOAT emSize, UIN return E_NOTIMPL; } +UINT16 freetype_get_glyphcount(IDWriteFontFace2 *fontface) +{ + return 0; +} + #endif /* HAVE_FREETYPE */ diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 915fb98..ca31f29 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -75,7 +75,7 @@ static void create_testfontfile(const WCHAR *filename) HRSRC res; void *ptr; file = CreateFileW(filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); - ok( file != INVALID_HANDLE_VALUE, "file creation failed\n" ); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, error %d\n", GetLastError()); res = FindResourceA(GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(1), (LPCSTR)RT_RCDATA); ok( res != 0, "couldn't find resource\n" ); @@ -2994,8 +2994,10 @@ static void test_GetCaretMetrics(void) ok(caret.slopeRun == 0, "got %d\n", caret.slopeRun); ok(caret.offset == 0, "got %d\n", caret.offset); IDWriteFontFace1_Release(fontface1); + IDWriteFactory_Release(factory); /* now with Tahoma Normal */ + factory = create_factory(); font = get_tahoma_instance(factory, DWRITE_FONT_STYLE_NORMAL); hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3033,6 +3035,32 @@ static void test_GetCaretMetrics(void) DeleteFileW(test_fontfile); } +static void test_GetGlyphCount(void) +{ + IDWriteFontFace *fontface; + IDWriteFactory *factory; + IDWriteFontFile *file; + HRESULT hr; + UINT16 count; + + create_testfontfile(test_fontfile); + factory = create_factory(); + + hr = IDWriteFactory_CreateFontFileReference(factory, test_fontfile, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_TRUETYPE, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFile_Release(file); + + count = IDWriteFontFace_GetGlyphCount(fontface); + ok(count == 7, "got %u\n", count); + + IDWriteFontFace_Release(fontface); + IDWriteFactory_Release(factory); + DeleteFileW(test_fontfile); +} + START_TEST(font) { IDWriteFactory *factory; @@ -3072,6 +3100,7 @@ START_TEST(font) test_GetGlyphRunOutline(); test_GetEudcFontCollection(); test_GetCaretMetrics(); + test_GetGlyphCount(); IDWriteFactory_Release(factory); }

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 05 Feb '15

05 Feb '15

Module: wine Branch: master Commit: 0cc175c050ec69e5b1d52a7be36bc75f9f622808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc175c050ec69e5b1d52a7be… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Feb 5 01:42:21 2015 +0900 po: Update Japanese translation. --- po/ja.po | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/po/ja.po b/po/ja.po index 9d3abd9..75fdca5 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-10-02 23:14+0900\n" +"PO-Revision-Date: 2015-02-05 00:17+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" @@ -13076,20 +13076,16 @@ msgid "&Test Sound" msgstr "音をテスト(&T)" #: winecfg.rc:275 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "Wine 設定" +msgstr "スピーカー設定" #: winecfg.rc:276 -#, fuzzy -#| msgid "De&vice:" msgid "Device:" -msgstr "デバイス(&V):" +msgstr "デバイス:" #: winecfg.rc:278 msgid "Speakers:" -msgstr "" +msgstr "スピーカー:" #: winecfg.rc:286 msgid "Appearance" @@ -13197,21 +13193,19 @@ msgstr "(システムデフォルト)" #: winecfg.rc:89 msgid "5.1 Surround" -msgstr "" +msgstr "5.1 サラウンド" #: winecfg.rc:90 -#, fuzzy -#| msgid "graphic" msgid "Quadraphonic" -msgstr "画像" +msgstr "4 チャンネルステレオ" #: winecfg.rc:91 msgid "Stereo" -msgstr "" +msgstr "ステレオ" #: winecfg.rc:92 msgid "Mono" -msgstr "" +msgstr "モノラル" #: winecfg.rc:54 msgid ""

1 0

Austin English : kernel32: Add CreateHardLinkTransactedA/W stubs.
by Alexandre Julliard 05 Feb '15

05 Feb '15

Module: wine Branch: master Commit: b331c4f93196876256c898080886136b0abb353f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b331c4f93196876256c898080… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 4 14:51:42 2015 -0600 kernel32: Add CreateHardLinkTransactedA/W stubs. --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/path.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3719505..f49075e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -286,8 +286,8 @@ @ stdcall CreateFileMappingA(long ptr long long long str) # @ stub CreateFileMappingNumaA # @ stub CreateFileMappingNumaW -# @ stub CreateFileTransactedA -# @ stub CreateFileTransactedW +@ stdcall CreateHardLinkTransactedA(str str ptr ptr) +@ stdcall CreateHardLinkTransactedW(wstr wstr ptr ptr) @ stdcall CreateFileMappingW(long ptr long long long wstr) @ stdcall CreateFileW(wstr long long ptr long long long) @ stdcall CreateHardLinkA(str str ptr) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index bb167a0..475b1f6 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1972,3 +1972,23 @@ BOOL WINAPI CreateSymbolicLinkA(LPCSTR link, LPCSTR target, DWORD flags) FIXME("(%s %s %d): stub\n", debugstr_a(link), debugstr_a(target), flags); return TRUE; } + +/************************************************************************* + * CreateHardLinkTransactedA (KERNEL32.@) + */ +BOOL WINAPI CreateHardLinkTransactedA(LPCSTR link, LPCSTR target, LPSECURITY_ATTRIBUTES sa, HANDLE transaction) +{ + FIXME("(%s %s %p %p): stub\n", debugstr_a(link), debugstr_a(target), sa, transaction); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/************************************************************************* + * CreateHardLinkTransactedW (KERNEL32.@) + */ +BOOL WINAPI CreateHardLinkTransactedW(LPCWSTR link, LPCWSTR target, LPSECURITY_ATTRIBUTES sa, HANDLE transaction) +{ + FIXME("(%s %s %p %p): stub\n", debugstr_w(link), debugstr_w(target), sa, transaction); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Austin English : oleaut32: Add a stub for OleSavePictureFile.
by Alexandre Julliard 05 Feb '15

05 Feb '15

Module: wine Branch: master Commit: 08f420d2def49d43d3dd01e5585f04dc91ef0c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f420d2def49d43d3dd01e55… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 4 20:36:22 2015 -0600 oleaut32: Add a stub for OleSavePictureFile. --- dlls/oleaut32/oleaut32.spec | 2 +- dlls/oleaut32/olepicture.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index a68eb0c..f5ad0ef 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -391,7 +391,7 @@ 420 stdcall OleCreateFontIndirect(ptr ptr ptr) 421 stdcall OleTranslateColor(long long long) 422 stub OleLoadPictureFile -423 stub OleSavePictureFile +423 stdcall OleSavePictureFile(ptr wstr) 424 stdcall OleLoadPicturePath(wstr ptr long long ptr ptr) 425 stdcall VarUI4FromI8(int64 ptr) 426 stdcall VarUI4FromUI8(int64 ptr) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 599042c..dfaf6f4 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2302,6 +2302,15 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, } /*********************************************************************** + * OleSavePictureFile (OLEAUT32.423) + */ +HRESULT WINAPI OleSavePictureFile(IDispatch *picture, BSTR filename) +{ + FIXME("(%p %s): stub\n", picture, debugstr_w(filename)); + return CTL_E_FILENOTFOUND; +} + +/*********************************************************************** * OleLoadPicturePath (OLEAUT32.424) */ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,

1 0

Austin English : ntoskrnl.exe: Add a stub for ExInterlockedRemoveHeadList.
by Alexandre Julliard 05 Feb '15

05 Feb '15

Module: wine Branch: master Commit: a2f864cac8c660b5aff997ab30892707e1f921bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f864cac8c660b5aff997ab3… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 4 20:16:51 2015 -0600 ntoskrnl.exe: Add a stub for ExInterlockedRemoveHeadList. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index af1626d..51ac2ca 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2022,3 +2022,12 @@ NTSTATUS WINAPI IoCsqInitialize(PIO_CSQ csq, PIO_CSQ_INSERT_IRP insert_irp, PIO_ csq, insert_irp, remove_irp, peek_irp, acquire_lock, release_lock, complete_irp); return STATUS_SUCCESS; } + +/***************************************************** + * ExInterlockedRemoveHeadList (NTOSKRNL.EXE.@) + */ +PLIST_ENTRY WINAPI ExInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK lock) +{ + FIXME("(%p %p) stub\n", head, lock); + return NULL; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index b824250..79505ef 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -153,7 +153,7 @@ @ stub ExInterlockedInsertTailList @ stub ExInterlockedPopEntryList @ stub ExInterlockedPushEntryList -@ stub ExInterlockedRemoveHeadList +@ stdcall ExInterlockedRemoveHeadList(ptr ptr) @ stub ExIsProcessorFeaturePresent @ stub ExIsResourceAcquiredExclusiveLite @ stub ExIsResourceAcquiredSharedLite

1 0

Austin English : shdocvw: Add DoFileDownload stub.
by Alexandre Julliard 05 Feb '15

05 Feb '15

Module: wine Branch: master Commit: a71fb845cd8198ea4034383ceaf87a85b9565885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71fb845cd8198ea4034383ce… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 4 21:11:46 2015 -0600 shdocvw: Add DoFileDownload stub. --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 81e18df..93f4444 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -111,7 +111,7 @@ @ stdcall -private DllUnregisterServer() @ stub DoAddToFavDlg @ stub DoAddToFavDlgW -@ stub DoFileDownload +@ stdcall DoFileDownload(wstr) @ stub DoFileDownloadEx @ stub DoOrganizeFavDlg @ stub DoOrganizeFavDlgW diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 2e5f2c9..4ef2dd5 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -550,3 +550,12 @@ void WINAPI InstallReg_RunDLL(HWND hwnd, HINSTANCE handle, LPCSTR cmdline, INT s { FIXME("(%p %p %s %x)\n", hwnd, handle, debugstr_a(cmdline), show); } + +/****************************************************************** + * DoFileDownload (SHDOCVW.@) + */ +BOOL WINAPI DoFileDownload(LPWSTR filename) +{ + FIXME("(%s) stub\n", debugstr_w(filename)); + return FALSE; +}

1 0

Austin English : apphelp: Add a stub for SdbOpenDatabase.
by Alexandre Julliard 05 Feb '15

05 Feb '15

Module: wine Branch: master Commit: 58cbdf26c9becf277e41de28c08a8b712932d9e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58cbdf26c9becf277e41de28c… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 4 13:28:01 2015 -0600 apphelp: Add a stub for SdbOpenDatabase. --- dlls/apphelp/apphelp.c | 8 +++++++- dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index a7884b1..dd120a9 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -83,10 +83,16 @@ BOOL WINAPI ShimFlushCache( HWND hwnd, HINSTANCE instance, LPCSTR cmdline, int c return TRUE; } - HSDB WINAPI SdbInitDatabase(DWORD flags, LPCWSTR path) { FIXME("stub: %08x %s\n", flags, debugstr_w(path)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return NULL; } + +PDB WINAPI SdbOpenDatabase(LPCWSTR path, PATH_TYPE type) +{ + FIXME("stub: %s %08x\n", debugstr_w(path), type); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index 06cabc5..d94c5fa 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -96,7 +96,7 @@ @ stub SdbOpenApphelpInformation @ stub SdbOpenApphelpInformationByID @ stub SdbOpenApphelpResourceFile -@ stub SdbOpenDatabase +@ stdcall SdbOpenDatabase(wstr long) @ stub SdbOpenDbFromGuid @ stub SdbOpenLocalDatabase @ stub SdbPackAppCompatData

1 0

Piotr Caban : user32: Only use DIALOGINFO-> hwndFocus to store last focus of inactive windows.
by Alexandre Julliard 05 Feb '15

05 Feb '15

Module: wine Branch: master Commit: 6c5d4cb07e6ddc578cd8f6b359f51c76c6231113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c5d4cb07e6ddc578cd8f6b35… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 4 15:05:07 2015 +0100 user32: Only use DIALOGINFO->hwndFocus to store last focus of inactive windows. --- dlls/user32/dialog.c | 8 ++++---- dlls/user32/tests/dialog.c | 13 ++++++++++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 497d545..3b48fbb 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -704,10 +704,10 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, /* By returning TRUE, app has requested a default focus assignment. * WM_INITDIALOG may have changed the tab order, so find the first * tabstop control again. */ - dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE ); - if (!dlgInfo->hwndFocus) dlgInfo->hwndFocus = GetNextDlgGroupItem( hwnd, 0, FALSE ); - if( dlgInfo->hwndFocus ) - SetFocus( dlgInfo->hwndFocus ); + focus = GetNextDlgTabItem( hwnd, 0, FALSE ); + if (!focus) focus = GetNextDlgGroupItem( hwnd, 0, FALSE ); + if (focus) + SetFocus( focus ); } } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 63e76f7..3488f31 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1227,7 +1227,12 @@ static void test_DisabledDialogTest(void) static INT_PTR CALLBACK messageBoxFontDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) { - return (uiMsg == WM_INITDIALOG); + if (uiMsg == WM_INITDIALOG) { + SetFocus(hDlg); + return 1; + } + + return 0; } static void test_MessageBoxFontTest(void) @@ -1337,6 +1342,12 @@ static void test_SaveRestoreFocus(void) foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); ok (foundId == 1000, "First edit box should have gained focus on dialog creation. Expected: %d, Found: %ld\n", 1000, foundId); + SetFocus(GetNextDlgTabItem(hDlg, GetFocus(), FALSE)); + SendMessageA(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_ACTIVE, 0), 0); + foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); + ok (foundId == 1001, "First edit box should have regained focus after dialog reactivation. Expected: %d, Found: %ld\n", 1001, foundId); + SetFocus(GetNextDlgTabItem(hDlg, NULL, FALSE)); + /* de- then reactivate the dialog */ SendMessageA(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, 0), 0); SendMessageA(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_ACTIVE, 0), 0);

1 0

Jacek Caban : jscript: Don' t use builtin property for a few more constructors.
by Alexandre Julliard 05 Feb '15

05 Feb '15

Module: wine Branch: master Commit: b7a27333e322ab37e21d790a7f46a723826e243f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a27333e322ab37e21d790a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 5 14:47:44 2015 +0100 jscript: Don't use builtin property for a few more constructors. --- dlls/jscript/global.c | 133 +++++++++++++++------------------------------ dlls/jscript/tests/lang.js | 12 ++++ 2 files changed, 56 insertions(+), 89 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 774ed05..1d1ec5b 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -121,30 +121,6 @@ static HRESULT constructor_call(jsdisp_t *constr, WORD flags, unsigned argc, jsv return S_OK; } -static HRESULT JSGlobal_Array(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->array_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_Date(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->date_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_Error(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->error_constr, flags, argc, argv, r); -} - static HRESULT JSGlobal_EvalError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -201,54 +177,6 @@ static HRESULT JSGlobal_URIError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return constructor_call(ctx->uri_error_constr, flags, argc, argv, r); } -static HRESULT JSGlobal_Function(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->function_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_Number(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->number_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_Object(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->object_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_String(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->string_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_RegExp(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->regexp_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_VBArray(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->vbarray_constr, flags, argc, argv, r); -} - static HRESULT JSGlobal_Enumerator(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -1071,29 +999,20 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W } static const builtin_prop_t JSGlobal_props[] = { - {ArrayW, JSGlobal_Array, PROPF_CONSTR|1}, {CollectGarbageW, JSGlobal_CollectGarbage, PROPF_METHOD}, - {DateW, JSGlobal_Date, PROPF_CONSTR|7}, {EnumeratorW, JSGlobal_Enumerator, PROPF_METHOD|7}, - {ErrorW, JSGlobal_Error, PROPF_CONSTR|1}, {EvalErrorW, JSGlobal_EvalError, PROPF_CONSTR|1}, - {FunctionW, JSGlobal_Function, PROPF_CONSTR|1}, {_GetObjectW, JSGlobal_GetObject, PROPF_METHOD|2}, - {NumberW, JSGlobal_Number, PROPF_CONSTR|1}, - {ObjectW, JSGlobal_Object, PROPF_CONSTR|1}, {RangeErrorW, JSGlobal_RangeError, PROPF_CONSTR|1}, {ReferenceErrorW, JSGlobal_ReferenceError, PROPF_CONSTR|1}, - {RegExpW, JSGlobal_RegExp, PROPF_CONSTR|2}, {RegExpErrorW, JSGlobal_RegExpError, PROPF_CONSTR|1}, {ScriptEngineW, JSGlobal_ScriptEngine, PROPF_METHOD}, {ScriptEngineBuildVersionW, JSGlobal_ScriptEngineBuildVersion, PROPF_METHOD}, {ScriptEngineMajorVersionW, JSGlobal_ScriptEngineMajorVersion, PROPF_METHOD}, {ScriptEngineMinorVersionW, JSGlobal_ScriptEngineMinorVersion, PROPF_METHOD}, - {StringW, JSGlobal_String, PROPF_CONSTR|1}, {SyntaxErrorW, JSGlobal_SyntaxError, PROPF_CONSTR|1}, {TypeErrorW, JSGlobal_TypeError, PROPF_CONSTR|1}, {URIErrorW, JSGlobal_URIError, PROPF_CONSTR|1}, - {VBArrayW, JSGlobal_VBArray, PROPF_CONSTR|1}, {decodeURIW, JSGlobal_decodeURI, PROPF_METHOD|1}, {decodeURIComponentW, JSGlobal_decodeURIComponent, PROPF_METHOD|1}, {encodeURIW, JSGlobal_encodeURI, PROPF_METHOD|1}, @@ -1124,42 +1043,82 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, FunctionW, jsval_obj(ctx->function_constr)); + if(FAILED(hres)) + return hres; + hres = create_object_constr(ctx, object_prototype, &ctx->object_constr); if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, ObjectW, jsval_obj(ctx->object_constr)); + if(FAILED(hres)) + return hres; + hres = create_array_constr(ctx, object_prototype, &ctx->array_constr); if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, ArrayW, jsval_obj(ctx->array_constr)); + if(FAILED(hres)) + return hres; + hres = create_bool_constr(ctx, object_prototype, &ctx->bool_constr); if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, BooleanW, jsval_obj(ctx->bool_constr)); + if(FAILED(hres)) + return hres; + hres = create_date_constr(ctx, object_prototype, &ctx->date_constr); if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, DateW, jsval_obj(ctx->date_constr)); + if(FAILED(hres)) + return hres; + hres = init_error_constr(ctx, object_prototype); if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, ErrorW, jsval_obj(ctx->error_constr)); + if(FAILED(hres)) + return hres; + hres = create_number_constr(ctx, object_prototype, &ctx->number_constr); if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, NumberW, jsval_obj(ctx->number_constr)); + if(FAILED(hres)) + return hres; + hres = create_regexp_constr(ctx, object_prototype, &ctx->regexp_constr); if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, RegExpW, jsval_obj(ctx->regexp_constr)); + if(FAILED(hres)) + return hres; + hres = create_string_constr(ctx, object_prototype, &ctx->string_constr); if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, StringW, jsval_obj(ctx->string_constr)); + if(FAILED(hres)) + return hres; + hres = create_vbarray_constr(ctx, object_prototype, &ctx->vbarray_constr); if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, VBArrayW, jsval_obj(ctx->vbarray_constr)); + if(FAILED(hres)) + return hres; + return S_OK; } @@ -1171,16 +1130,16 @@ HRESULT init_global(script_ctx_t *ctx) if(ctx->global) return S_OK; - hres = create_object_prototype(ctx, &object_prototype); + hres = create_dispex(ctx, &JSGlobal_info, NULL, &ctx->global); if(FAILED(hres)) return hres; - hres = init_constructors(ctx, object_prototype); - jsdisp_release(object_prototype); + hres = create_object_prototype(ctx, &object_prototype); if(FAILED(hres)) return hres; - hres = create_dispex(ctx, &JSGlobal_info, NULL, &ctx->global); + hres = init_constructors(ctx, object_prototype); + jsdisp_release(object_prototype); if(FAILED(hres)) return hres; @@ -1197,10 +1156,6 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, BooleanW, jsval_obj(ctx->bool_constr)); - if(FAILED(hres)) - return hres; - hres = jsdisp_propput_dontenum(ctx->global, ActiveXObjectW, jsval_obj(constr)); jsdisp_release(constr); if(FAILED(hres)) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index b846eb2..3e60aba 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1456,6 +1456,18 @@ ok(ActiveXObject === 1, "ActiveXObject = " + ActiveXObject); Boolean = 1; ok(Boolean === 1, "Boolean = " + Boolean); +Object = 1; +ok(Object === 1, "Object = " + Object); + +Array = 1; +ok(Array === 1, "Array = " + Array); + +Date = 1; +ok(Date === 1, "Date = " + Date); + +Error = 1; +ok(Error === 1, "Error = " + Error); + /* Keep this test in the end of file */ undefined = 6; ok(undefined === 6, "undefined = " + undefined);

1 0