August 2012 - Wine-commits - list.winehq.org

Alex Henrie : user32: Correct dialog focus behavior.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 4b67e6c778a8b8dcd74b56e866c13687345cfed4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b67e6c778a8b8dcd74b56e86… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 6 17:13:15 2012 -0600 user32: Correct dialog focus behavior. --- dlls/user32/defdlg.c | 21 ++++++++++++++------- dlls/user32/tests/dialog.c | 42 +++++++++++++++++++++++++++++++++++------- 2 files changed, 49 insertions(+), 14 deletions(-) diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index fecd417..e4b55f3 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -55,9 +55,9 @@ static DLGPROC DEFDLG_GetDlgProc( HWND hwnd ) * DEFDLG_SetFocus * * Set the focus to a control of the dialog, selecting the text if - * the control is an edit dialog. + * the control is an edit dialog that has DLGC_HASSETSEL. */ -static void DEFDLG_SetFocus( HWND hwndDlg, HWND hwndCtrl ) +static void DEFDLG_SetFocus( HWND hwndCtrl ) { if (SendMessageW( hwndCtrl, WM_GETDLGCODE, 0, 0 ) & DLGC_HASSETSEL) SendMessageW( hwndCtrl, EM_SETSEL, 0, -1 ); @@ -83,7 +83,7 @@ static void DEFDLG_SaveFocus( HWND hwnd ) /*********************************************************************** * DEFDLG_RestoreFocus */ -static void DEFDLG_RestoreFocus( HWND hwnd ) +static void DEFDLG_RestoreFocus( HWND hwnd, BOOL justActivate ) { DIALOGINFO *infoPtr; @@ -92,12 +92,19 @@ static void DEFDLG_RestoreFocus( HWND hwnd ) /* Don't set the focus back to controls if EndDialog is already called.*/ if (infoPtr->flags & DF_END) return; if (!IsWindow(infoPtr->hwndFocus) || infoPtr->hwndFocus == hwnd) { + if (justActivate) return; /* If no saved focus control exists, set focus to the first visible, non-disabled, WS_TABSTOP control in the dialog */ infoPtr->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE ); + /* If there are no WS_TABSTOP controls, set focus to the first visible, + non-disabled control in the dialog */ + if (!infoPtr->hwndFocus) infoPtr->hwndFocus = GetNextDlgGroupItem( hwnd, 0, FALSE ); if (!IsWindow( infoPtr->hwndFocus )) return; } - DEFDLG_SetFocus( hwnd, infoPtr->hwndFocus ); + if (justActivate) + SetFocus( infoPtr->hwndFocus ); + else + DEFDLG_SetFocus( infoPtr->hwndFocus ); /* This used to set infoPtr->hwndFocus to NULL for no apparent reason, sometimes losing focus when receiving WM_SETFOCUS messages. */ @@ -250,12 +257,12 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam, return DefWindowProcA( hwnd, msg, wParam, lParam ); case WM_ACTIVATE: - if (wParam) DEFDLG_RestoreFocus( hwnd ); + if (wParam) DEFDLG_RestoreFocus( hwnd, TRUE ); else DEFDLG_SaveFocus( hwnd ); return 0; case WM_SETFOCUS: - DEFDLG_RestoreFocus( hwnd ); + DEFDLG_RestoreFocus( hwnd, FALSE ); return 0; case DM_SETDEFID: @@ -280,7 +287,7 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam, HWND hwndDest = (HWND)wParam; if (!lParam) hwndDest = GetNextDlgTabItem(hwnd, GetFocus(), wParam); - if (hwndDest) DEFDLG_SetFocus( hwnd, hwndDest ); + if (hwndDest) DEFDLG_SetFocus( hwndDest ); DEFDLG_SetDefButton( hwnd, dlgInfo, hwndDest ); } return 0; diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 6bd34b3..0ebab4c 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -828,7 +828,7 @@ static const char * GetHwndString(HWND hw) return "unknown handle"; } -static void test_initial_focus(void) +static void test_focus(void) { /* Test 1: * This test intentionally returns FALSE in response to WM_INITDIALOG @@ -900,6 +900,8 @@ static void test_initial_focus(void) HRSRC hResource; HANDLE hTemplate; DLGTEMPLATE* pTemplate; + HWND hTextbox; + DWORD selectionStart = 0xdead, selectionEnd = 0xbeef; hResource = FindResourceA(g_hinst,"FOCUS_TEST_DIALOG", RT_DIALOG); hTemplate = LoadResource(g_hinst, hResource); @@ -912,6 +914,20 @@ static void test_initial_focus(void) ok ((g_hwndInitialFocusT1 == 0), "Focus should not be set for an invisible DS_CONTROL dialog %p.\n", g_hwndInitialFocusT1); + /* Also make sure that WM_SETFOCUS selects the textbox's text */ + hTextbox = GetDlgItem(hDlg, 200); + SendMessage(hTextbox, WM_SETTEXT, 0, (LPARAM)"Hello world"); + + SendMessage(hDlg, WM_SETFOCUS, 0, 0); + SendMessage(hTextbox, EM_GETSEL, (WPARAM)&selectionStart, (LPARAM)&selectionEnd); + ok(selectionStart == 0 && selectionEnd == 11, "Text selection after WM_SETFOCUS is [%i, %i) expected [0, 11)\n", selectionStart, selectionEnd); + + /* but WM_ACTIVATE does not */ + SendMessage(hTextbox, EM_SETSEL, 0, 0); + SendMessage(hDlg, WM_ACTIVATE, WA_ACTIVE, 0); + SendMessage(hTextbox, EM_GETSEL, (WPARAM)&selectionStart, (LPARAM)&selectionEnd); + ok(selectionStart == 0 && selectionEnd == 0, "Text selection after WM_ACTIVATE is [%i, %i) expected [0, 0)\n", selectionStart, selectionEnd); + DestroyWindow(hDlg); } @@ -929,13 +945,25 @@ static void test_initial_focus(void) pTemplate = LockResource(hTemplate); hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, focusDlgWinProc, 0); - g_hwndInitialFocusT1 = GetFocus(); + ok(hDlg != 0, "Failed to create test dialog.\n"); hLabel = GetDlgItem(hDlg, 200); - ok (hDlg != 0, "Failed to create test dialog.\n"); - ok ((g_hwndInitialFocusT1 == hLabel), - "Focus should have been set to the first control, expected (%p) got (%p).\n", - hLabel, g_hwndInitialFocusT1); + ok(GetFocus() == hLabel, "Focus not set to label, focus=%p dialog=%p label=%p\n", GetFocus(), hDlg, hLabel); + + DestroyWindow(hDlg); + + /* Also check focus after WM_ACTIVATE and WM_SETFOCUS */ + hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, NULL, 0); + ok(hDlg != 0, "Failed to create test dialog.\n"); + hLabel = GetDlgItem(hDlg, 200); + + SetFocus(NULL); + SendMessage(hDlg, WM_ACTIVATE, WA_ACTIVE, 0); + ok(GetFocus() == NULL, "Focus set on WM_ACTIVATE, focus=%p dialog=%p label=%p\n", GetFocus(), hDlg, hLabel); + + SetFocus(NULL); + SendMessage(hDlg, WM_SETFOCUS, 0, 0); + ok(GetFocus() == hLabel, "Focus not set to label on WM_SETFOCUS, focus=%p dialog=%p label=%p\n", GetFocus(), hDlg, hLabel); DestroyWindow(hDlg); } @@ -1404,7 +1432,7 @@ START_TEST(dialog) test_GetNextDlgItem(); test_IsDialogMessage(); test_WM_NEXTDLGCTL(); - test_initial_focus(); + test_focus(); test_GetDlgItem(); test_GetDlgItemText(); test_DialogBoxParamA();

1 0

Erich Hoover : hhctrl.ocx: Centralize merging HH_WINTYPE data.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 494936452a1719e5a293e3cbae3b9535dbfcfa23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=494936452a1719e5a293e3cba… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Jul 25 10:01:13 2012 -0600 hhctrl.ocx: Centralize merging HH_WINTYPE data. --- dlls/hhctrl.ocx/chm.c | 189 ++++++++++++++++++++++++++++++++------------- dlls/hhctrl.ocx/hhctrl.h | 1 + 2 files changed, 135 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=494936452a1719e5a293e…

1 0

Vijay Kiran Kamuju : atl80: Implement AtlGetVersion.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 50199423fbd0462ca274b801350a27c2073bc7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50199423fbd0462ca274b8013… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Jul 22 03:18:33 2012 +0200 atl80: Implement AtlGetVersion. --- dlls/atl80/atl80.c | 5 +++++ dlls/atl80/atl80.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c index ab1a5ab..1c31fe9 100644 --- a/dlls/atl80/atl80.c +++ b/dlls/atl80/atl80.c @@ -29,3 +29,8 @@ HRESULT WINAPI AtlCreateRegistrar(IRegistrar** ppReg) FIXME("(%p) stub\n", ppReg); return E_NOTIMPL; } + +DWORD WINAPI AtlGetVersion(void *pReserved) +{ + return 0x0800; +} diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 7035991..7f8cfc2 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -21,7 +21,7 @@ 30 stdcall AtlComPtrAssign(ptr ptr) atl.AtlComPtrAssign 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl.AtlInternalQueryInterface -34 stub AtlGetVersion +34 stdcall AtlGetVersion(ptr) 35 stub AtlAxDialogBoxW 36 stub AtlAxDialogBoxA 37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl.AtlAxCreateDialogW

1 0

Eric Pouech : msacm32: In acmFormatChoose, added support for template.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 3d845b1242f5aa823c1be59811aeb537a26eea6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d845b1242f5aa823c1be5981… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Aug 12 10:03:46 2012 +0200 msacm32: In acmFormatChoose, added support for template. --- dlls/msacm32/format.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index c81b5dc..963daf7 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -210,7 +210,9 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, MSACM_FillFormatTags(hWnd); MSACM_FillFormat(hWnd); if ((afc->fdwStyle & ~(ACMFORMATCHOOSE_STYLEF_CONTEXTHELP| - ACMFORMATCHOOSE_STYLEF_SHOWHELP)) != 0) + ACMFORMATCHOOSE_STYLEF_SHOWHELP| + ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE| + ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE)) != 0) FIXME("Unsupported style %08x\n", afc->fdwStyle); if (!(afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_SHOWHELP)) ShowWindow(GetDlgItem(hWnd, IDD_ACMFORMATCHOOSE_BTN_HELP), SW_HIDE); @@ -352,6 +354,14 @@ done: */ MMRESULT WINAPI acmFormatChooseW(PACMFORMATCHOOSEW pafmtc) { + if (pafmtc->fdwStyle & ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE) + return DialogBoxIndirectParamW(MSACM_hInstance32, (LPCDLGTEMPLATEW)pafmtc->hInstance, + pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc); + + if (pafmtc->fdwStyle & ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE) + return DialogBoxParamW(pafmtc->hInstance, pafmtc->pszTemplateName, + pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc); + return DialogBoxParamW(MSACM_hInstance32, MAKEINTRESOURCEW(DLG_ACMFORMATCHOOSE_ID), pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc); }

1 0

Alistair Leslie-Hughes : scrrun: Correct FileExists for directories.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 50fe9b87eda4de4aa2f03172f6e0f83ec89a93dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=50fe9b87eda4de4aa2f03172f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 6 08:38:17 2012 +1000 scrrun: Correct FileExists for directories. --- dlls/scrrun/filesystem.c | 4 +++- dlls/scrrun/tests/filesystem.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index a4e6f26..ade3310 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -215,11 +215,13 @@ static HRESULT WINAPI filesys_DriveExists(IFileSystem3 *iface, BSTR DriveSpec, static HRESULT WINAPI filesys_FileExists(IFileSystem3 *iface, BSTR path, VARIANT_BOOL *ret) { + DWORD attrs; TRACE("%p %s %p\n", iface, debugstr_w(path), ret); if (!ret) return E_POINTER; - *ret = GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES ? VARIANT_TRUE : VARIANT_FALSE; + attrs = GetFileAttributesW(path); + *ret = attrs != INVALID_FILE_ATTRIBUTES && !(attrs & FILE_ATTRIBUTE_DIRECTORY) ? VARIANT_TRUE : VARIANT_FALSE; return S_OK; } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index a19a835..d557acf 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -82,6 +82,20 @@ static void test_interfaces(void) ok(b == VARIANT_FALSE, "got %x\n", b); SysFreeString(path); + path = SysAllocString(file_path); + b = VARIANT_FALSE; + hr = IFileSystem3_FileExists(fs3, path, &b); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(b == VARIANT_TRUE, "got %x\n", b); + SysFreeString(path); + + path = SysAllocString(windows_path); + b = VARIANT_TRUE; + hr = IFileSystem3_FileExists(fs3, path, &b); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(b == VARIANT_FALSE, "got %x\n", b); + SysFreeString(path); + /* Folder Exists */ hr = IFileSystem3_FolderExists(fs3, NULL, NULL); ok(hr == E_POINTER, "got 0x%08x, expected 0x%08x\n", hr, E_POINTER);

1 0

Qian Hong : riched20/tests: Added UTF8 BOM test.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 01ebba0fc4c28c3a64a8daa96a18755233057dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ebba0fc4c28c3a64a8daa96… Author: Qian Hong <fracting(a)gmail.com> Date: Thu Aug 16 19:00:08 2012 +0800 riched20/tests: Added UTF8 BOM test. --- dlls/riched20/tests/editor.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 1ca221d..6a20b19 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5011,6 +5011,8 @@ static void test_EM_STREAMIN(void) const char * streamText3 = "RichEdit1"; + const char * streamTextUTF8BOM = "\xef\xbb\xbfTestUTF8WithBOM"; + const char * streamText4 = "This text just needs to be long enough to cause run to be split onto " "two separate lines and make sure the null terminating character is " @@ -5111,6 +5113,20 @@ static void test_EM_STREAMIN(void) "EM_STREAMIN: Test 3 set wrong text: Result: %s\n",buffer); ok(es.dwError == -16, "EM_STREAMIN: Test 3 set error %d, expected %d\n", es.dwError, -16); + es.dwCookie = (DWORD_PTR)&streamTextUTF8BOM; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_TEXT, (LPARAM)&es); + ok(result == 18, "got %ld, expected %d\n", result, 18); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + todo_wine ok(result == 15, + "EM_STREAMIN: Test UTF8WithBOM returned %ld, expected 15\n", result); + result = strcmp (buffer,"TestUTF8WithBOM"); + todo_wine ok(result == 0, + "EM_STREAMIN: Test UTF8WithBOM set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test UTF8WithBOM set error %d, expected %d\n", es.dwError, 0); + es.dwCookie = (DWORD_PTR)&cookieForStream4; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback2;

1 0

Qian Hong : riched20/tests: Fixed typo in test_EM_STREAMIN.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 7839d134e9955b35b8e640a346f7cf408d49cf26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7839d134e9955b35b8e640a34… Author: Qian Hong <fracting(a)gmail.com> Date: Thu Aug 16 19:01:03 2012 +0800 riched20/tests: Fixed typo in test_EM_STREAMIN. --- dlls/riched20/tests/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 6a20b19..27f4fee 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5146,7 +5146,7 @@ static void test_EM_STREAMIN(void) result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == length5, - "EM_STREAMIN: Test 4 returned %ld, expected %d\n", result, length5); + "EM_STREAMIN: Test 5 returned %ld, expected %d\n", result, length5); ok(es.dwError == 0, "EM_STREAMIN: Test 5 set error %d, expected %d\n", es.dwError, 0); DestroyWindow(hwndRichEdit);

1 0

Jacek Caban : comdlg32: Use proper helpers for iface calls.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: e5e2673984ec5ba14da8a91f12c3e72f9caa30b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e2673984ec5ba14da8a91f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 13:19:27 2012 +0200 comdlg32: Use proper helpers for iface calls. --- dlls/comdlg32/filedlgbrowser.c | 28 ++++++++++++---------------- dlls/comdlg32/itemdlg.c | 4 ++-- dlls/comdlg32/tests/itemdlg.c | 12 ++++++------ 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 776abfc..1dda9a8 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -226,26 +226,22 @@ static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, *ppvObj = NULL; - if(IsEqualIID(riid, &IID_IUnknown)) /*IUnknown*/ - { *ppvObj = This; - } - else if(IsEqualIID(riid, &IID_IOleWindow)) /*IOleWindow*/ - { *ppvObj = This; - } - - else if(IsEqualIID(riid, &IID_IShellBrowser)) /*IShellBrowser*/ - { *ppvObj = This; - } - - else if(IsEqualIID(riid, &IID_ICommDlgBrowser)) /*ICommDlgBrowser*/ + if(IsEqualIID(riid, &IID_IUnknown)) + *ppvObj = &This->IShellBrowser_iface; + else if(IsEqualIID(riid, &IID_IOleWindow)) + *ppvObj = &This->IShellBrowser_iface; + else if(IsEqualIID(riid, &IID_IShellBrowser)) + *ppvObj = &This->IShellBrowser_iface; + else if(IsEqualIID(riid, &IID_ICommDlgBrowser)) *ppvObj = &This->ICommDlgBrowser_iface; - else if(IsEqualIID(riid, &IID_IServiceProvider)) /* IServiceProvider */ + else if(IsEqualIID(riid, &IID_IServiceProvider)) *ppvObj = &This->IServiceProvider_iface; - if(*ppvObj) - { IUnknown_AddRef( (IShellBrowser*) *ppvObj); - return S_OK; + if(*ppvObj) { + IUnknown_AddRef((IUnknown*)*ppvObj); + return S_OK; } + FIXME("Unknown interface requested\n"); return E_NOINTERFACE; } diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 69ef528..a9cc6bf 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -506,7 +506,7 @@ static HRESULT on_default_action(FileDialogImpl *This) pidla[i] = COMDLG32_SHSimpleIDListFromPathAW(canon_filename); if(psf_parent && !(open_action == ONOPEN_BROWSE)) - IShellItem_Release(psf_parent); + IShellFolder_Release(psf_parent); fn_iter += (WCHAR)lstrlenW(fn_iter) + 1; } @@ -528,7 +528,7 @@ static HRESULT on_default_action(FileDialogImpl *This) if(FAILED(hr)) ERR("Failed to browse to directory: %08x\n", hr); - IShellItem_Release(psf_parent); + IShellFolder_Release(psf_parent); break; case ONOPEN_OPEN: diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 208ec8c..ce05ed8 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -369,7 +369,7 @@ static BOOL test_instantiation(void) hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IFileDialogEvents, (void**)&punk); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); - if(SUCCEEDED(hr)) IUnknown_Release(pfd); + if(SUCCEEDED(hr)) IFileDialog_Release(pfd); hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IExplorerBrowser, (void**)&punk); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); @@ -379,7 +379,7 @@ static BOOL test_instantiation(void) ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); - hr = IFileOpenDialog_QueryInterface(pfsd, &IID_ICommDlgBrowser3, (void**)&punk); + hr = IFileSaveDialog_QueryInterface(pfsd, &IID_ICommDlgBrowser3, (void**)&punk); ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); @@ -1378,7 +1378,7 @@ static void test_customize(void) &IID_IFileDialog, (void**)&pfod); ok(hr == S_OK, "got 0x%08x.\n", hr); - hr = IFileOpenDialog_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&pfdc); + hr = IFileDialog_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&pfdc); ok(hr == S_OK, "got 0x%08x.\n", hr); if(FAILED(hr)) { @@ -1666,7 +1666,7 @@ static void test_customize(void) IFileDialogEvents_Release(pfde); IFileDialogCustomize_Release(pfdc); - ref = IFileOpenDialog_Release(pfod); + ref = IFileDialog_Release(pfod); ok(!ref, "Refcount not zero (%d).\n", ref); @@ -1674,7 +1674,7 @@ static void test_customize(void) &IID_IFileDialog, (void**)&pfod); ok(hr == S_OK, "got 0x%08x.\n", hr); - hr = IFileDialogCustomize_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&pfdc); + hr = IFileDialog_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&pfdc); ok(hr == S_OK, "got 0x%08x.\n", hr); i = 0; @@ -1884,7 +1884,7 @@ static void test_customize(void) } IFileDialogCustomize_Release(pfdc); - ref = IFileOpenDialog_Release(pfod); + ref = IFileDialog_Release(pfod); ok(!ref, "Refcount not zero (%d).\n", ref); }

1 0

Francois Gouget : wined3d: Change some internal function and structure names to the more standard ' converter' spelling.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: b2a7111a3d7d8523fc3bc11c6b270bf70a5dbd9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2a7111a3d7d8523fc3bc11c6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 16 12:58:54 2012 +0200 wined3d: Change some internal function and structure names to the more standard 'converter' spelling. --- dlls/wined3d/surface.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5e0eb5b..71beb51 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3710,13 +3710,13 @@ static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst, } } -struct d3dfmt_convertor_desc +struct d3dfmt_converter_desc { enum wined3d_format_id from, to; void (*convert)(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h); }; -static const struct d3dfmt_convertor_desc convertors[] = +static const struct d3dfmt_converter_desc converters[] = { {WINED3DFMT_R32_FLOAT, WINED3DFMT_R16_FLOAT, convert_r32_float_r16_float}, {WINED3DFMT_B5G6R5_UNORM, WINED3DFMT_B8G8R8X8_UNORM, convert_r5g6b5_x8r8g8b8}, @@ -3726,15 +3726,15 @@ static const struct d3dfmt_convertor_desc convertors[] = {WINED3DFMT_YUY2, WINED3DFMT_B5G6R5_UNORM, convert_yuy2_r5g6b5}, }; -static inline const struct d3dfmt_convertor_desc *find_convertor(enum wined3d_format_id from, +static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_format_id from, enum wined3d_format_id to) { unsigned int i; - for (i = 0; i < (sizeof(convertors) / sizeof(*convertors)); ++i) + for (i = 0; i < (sizeof(converters) / sizeof(*converters)); ++i) { - if (convertors[i].from == from && convertors[i].to == to) - return &convertors[i]; + if (converters[i].from == from && converters[i].to == to) + return &converters[i]; } return NULL; @@ -3754,11 +3754,11 @@ static inline const struct d3dfmt_convertor_desc *find_convertor(enum wined3d_fo static struct wined3d_surface *surface_convert_format(struct wined3d_surface *source, enum wined3d_format_id to_fmt) { struct wined3d_map_desc src_map, dst_map; - const struct d3dfmt_convertor_desc *conv; + const struct d3dfmt_converter_desc *conv; struct wined3d_surface *ret = NULL; HRESULT hr; - conv = find_convertor(source->resource.format->id, to_fmt); + conv = find_converter(source->resource.format->id, to_fmt); if (!conv) { FIXME("Cannot find a conversion function from format %s to %s.\n",

1 0

Alexandre Julliard : winex11: Create contexts at initialization time to avoid the need for locks.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: c970621d90372d14f982b41811efa4e4fe9e5ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c970621d90372d14f982b4181… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 15 15:51:06 2012 +0200 winex11: Create contexts at initialization time to avoid the need for locks. --- dlls/winex11.drv/mouse.c | 12 +++++------- dlls/winex11.drv/window.c | 6 +----- dlls/winex11.drv/x11drv.h | 4 ++++ dlls/winex11.drv/x11drv_main.c | 4 ++++ 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index e8ba8e3..caa2530 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -121,10 +121,11 @@ static const UINT button_up_data[NB_BUTTONS] = XBUTTON2 }; +XContext cursor_context = 0; + static HWND cursor_window; static HCURSOR last_cursor; static DWORD last_cursor_change; -static XContext cursor_context; static RECT clip_rect; static Cursor create_cursor( HANDLE handle ); @@ -200,16 +201,13 @@ void set_window_cursor( Window window, HCURSOR handle ) { Cursor cursor, prev; - wine_tsx11_lock(); if (!handle) cursor = get_empty_cursor(); - else if (!cursor_context || XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&cursor )) + else if (XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&cursor )) { /* try to create it */ - wine_tsx11_unlock(); if (!(cursor = create_cursor( handle ))) return; wine_tsx11_lock(); - if (!cursor_context) cursor_context = XUniqueContext(); if (!XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&prev )) { /* someone else was here first */ @@ -221,12 +219,12 @@ void set_window_cursor( Window window, HCURSOR handle ) XSaveContext( gdi_display, (XID)handle, cursor_context, (char *)cursor ); TRACE( "cursor %p created %lx\n", handle, cursor ); } + wine_tsx11_unlock(); } XDefineCursor( gdi_display, window, cursor ); /* make the change take effect immediately */ XFlush( gdi_display ); - wine_tsx11_unlock(); } /*********************************************************************** @@ -1205,7 +1203,7 @@ void CDECL X11DRV_DestroyCursorIcon( HCURSOR handle ) Cursor cursor; wine_tsx11_lock(); - if (cursor_context && !XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&cursor )) + if (!XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&cursor )) { TRACE( "%p xid %lx\n", handle, cursor ); XFreeCursor( gdi_display, cursor ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index c69ef8c..c8e48b2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -75,7 +75,7 @@ int clipping_cursor = 0; XContext winContext = 0; /* X context to associate a struct x11drv_win_data to an hwnd */ -static XContext win_data_context; +XContext win_data_context = 0; /* time of last user event and window where it's stored */ static Time last_user_time; @@ -1914,11 +1914,7 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) if ((data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)))) { data->hwnd = hwnd; - wine_tsx11_lock(); - if (!winContext) winContext = XUniqueContext(); - if (!win_data_context) win_data_context = XUniqueContext(); XSaveContext( display, (XID)hwnd, win_data_context, (char *)data ); - wine_tsx11_unlock(); } return data; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f24ccdc..3aaedef 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -615,6 +615,10 @@ static inline BOOL is_window_rect_fullscreen( const RECT *rect ) /* X context to associate a hwnd to an X window */ extern XContext winContext DECLSPEC_HIDDEN; +/* X context to associate a struct x11drv_win_data to an hwnd */ +extern XContext win_data_context DECLSPEC_HIDDEN; +/* X context to associate an X cursor to a Win32 cursor handle */ +extern XContext cursor_context DECLSPEC_HIDDEN; extern void X11DRV_InitClipboard(void) DECLSPEC_HIDDEN; extern int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 1499329..5659143 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -570,6 +570,10 @@ static BOOL process_attach(void) XInternAtoms( display, (char **)atom_names, NB_XATOMS - FIRST_XATOM, False, X11DRV_Atoms ); + winContext = XUniqueContext(); + win_data_context = XUniqueContext(); + cursor_context = XUniqueContext(); + if (TRACE_ON(synchronous)) XSynchronize( display, True ); xinerama_init( WidthOfScreen(screen), HeightOfScreen(screen) );

1 0