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

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

Aug. 16, 2012

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

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

Aug. 16, 2012

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

Vijay Kiran Kamuju : atl80: Implement AtlGetVersion.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

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 Aug. 16, 2012

Aug. 16, 2012

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

Alexandre Julliard : winex11: Add a critical section to protect the keyboard mapping tables.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 26fb3d4a69d3d63d79442bb782db9a946118eba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26fb3d4a69d3d63d79442bb78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 16 16:43:19 2012 +0200 winex11: Add a critical section to protect the keyboard mapping tables. --- dlls/winex11.drv/keyboard.c | 292 +++++++++++++++++++++---------------------- 1 files changed, 143 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26fb3d4a69d3d63d79442…

1 0

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

Aug. 16, 2012

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

Alex Henrie : user32: Correct dialog focus behavior.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

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 Aug. 16, 2012

Aug. 16, 2012

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

Alexandre Julliard : wined3d: Remove references to the (no longer used) X11 lock.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 3bd185c3df38509b1ee71cebf4cf2373cdf792f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd185c3df38509b1ee71cebf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 16 16:52:16 2012 +0200 wined3d: Remove references to the (no longer used) X11 lock. --- dlls/wined3d/wined3d_main.c | 20 -------------------- dlls/wined3d/wined3d_private.h | 13 ------------- 2 files changed, 0 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index fb8493c..2247e9c 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -48,10 +48,6 @@ struct wined3d_wndproc_table static struct wined3d_wndproc_table wndproc_table; -int num_lock = 0; -void (CDECL *wine_tsx11_lock_ptr)(void) = NULL; -void (CDECL *wine_tsx11_unlock_ptr)(void) = NULL; - static CRITICAL_SECTION wined3d_cs; static CRITICAL_SECTION_DEBUG wined3d_cs_debug = { @@ -132,14 +128,9 @@ static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *name, DW return ERROR_FILE_NOT_FOUND; } -static void CDECL wined3d_do_nothing(void) -{ -} - static BOOL wined3d_dll_init(HINSTANCE hInstDLL) { DWORD wined3d_context_tls_idx; - HMODULE mod; char buffer[MAX_PATH+10]; DWORD size = sizeof(buffer); HKEY hkey = 0; @@ -183,17 +174,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) DisableThreadLibraryCalls(hInstDLL); - mod = GetModuleHandleA( "winex11.drv" ); - if (mod) - { - wine_tsx11_lock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_lock" ); - wine_tsx11_unlock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_unlock" ); - } - else /* We are most likely on Windows */ - { - wine_tsx11_lock_ptr = wined3d_do_nothing; - wine_tsx11_unlock_ptr = wined3d_do_nothing; - } /* @@ Wine registry key: HKCU\Software\Wine\Direct3D */ if ( RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Direct3D", &hkey ) ) hkey = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c0b00bf..c23a6fa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -784,21 +784,8 @@ extern const struct wined3d_shader_backend_ops glsl_shader_backend DECLSPEC_HIDD extern const struct wined3d_shader_backend_ops arb_program_shader_backend DECLSPEC_HIDDEN; extern const struct wined3d_shader_backend_ops none_shader_backend DECLSPEC_HIDDEN; -/* X11 locking */ - -extern void (CDECL *wine_tsx11_lock_ptr)(void) DECLSPEC_HIDDEN; -extern void (CDECL *wine_tsx11_unlock_ptr)(void) DECLSPEC_HIDDEN; - -/* As GLX relies on X, this is needed */ -extern int num_lock DECLSPEC_HIDDEN; - -#if 0 -#define ENTER_GL() wine_tsx11_lock_ptr() -#define LEAVE_GL() wine_tsx11_unlock_ptr() -#else #define ENTER_GL() do {} while(0) #define LEAVE_GL() do {} while(0) -#endif /***************************************************************************** * Defines

1 0

Alexandre Julliard : winex11: Get rid of the X11 locking functions.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 9980868b81844528f3c3610d67e0be45b218f23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9980868b81844528f3c3610d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 16 16:52:31 2012 +0200 winex11: Get rid of the X11 locking functions. --- dlls/winex11.drv/winex11.drv.spec | 4 ---- dlls/winex11.drv/x11drv.h | 3 --- dlls/winex11.drv/x11drv_main.c | 26 -------------------------- 3 files changed, 0 insertions(+), 33 deletions(-) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 038c3e4..5b64dd7 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -61,10 +61,6 @@ @ cdecl LoadTabletInfo(long) X11DRV_LoadTabletInfo @ cdecl WTInfoW(long long ptr) X11DRV_WTInfoW -# X11 locks -@ cdecl -norelay wine_tsx11_lock() -@ cdecl -norelay wine_tsx11_unlock() - # Desktop @ cdecl wine_create_desktop(long long) X11DRV_create_desktop diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3aaedef..8566cd2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -63,9 +63,6 @@ typedef int Status; #define WINE_XDND_VERSION 4 -extern void CDECL wine_tsx11_lock(void); -extern void CDECL wine_tsx11_unlock(void); - /* X physical pen */ typedef struct { diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index f3c9d3f..0f94716 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -56,15 +56,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); WINE_DECLARE_DEBUG_CHANNEL(synchronous); WINE_DECLARE_DEBUG_CHANNEL(winediag); -static CRITICAL_SECTION X11DRV_CritSection; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &X11DRV_CritSection, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": X11DRV_CritSection") } -}; -static CRITICAL_SECTION X11DRV_CritSection = { &critsect_debug, -1, 0, 0, 0, 0 }; - static Screen *screen; Visual *visual; XPixmapFormatValues **pixmap_formats; @@ -300,23 +291,6 @@ static int error_handler( Display *display, XErrorEvent *error_evt ) } /*********************************************************************** - * wine_tsx11_lock (X11DRV.@) - */ -void CDECL wine_tsx11_lock(void) -{ - EnterCriticalSection( &X11DRV_CritSection ); -} - -/*********************************************************************** - * wine_tsx11_unlock (X11DRV.@) - */ -void CDECL wine_tsx11_unlock(void) -{ - LeaveCriticalSection( &X11DRV_CritSection ); -} - - -/*********************************************************************** * init_pixmap_formats */ static void init_pixmap_formats( Display *display )

1 0