wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Ken Thomases : winemac: By default, make full-screen windows not float when not the active app.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: c3d2e4306095b99d8078f3ce6a8a8f3e45a37e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3d2e4306095b99d8078f3ce6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 29 09:21:25 2013 -0500 winemac: By default, make full-screen windows not float when not the active app. Added a registry setting to control the behavior: WindowsFloatWhenInactive with possible values "none", "all, and "nonfullscreen" which is the default. --- dlls/winemac.drv/cocoa_window.m | 13 +++++--- dlls/winemac.drv/macdrv_cocoa.h | 7 ++++ dlls/winemac.drv/macdrv_main.c | 66 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d2b2547..a47715a 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -577,20 +577,23 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (NSInteger) minimumLevelForActive:(BOOL)active { + NSScreen* screen; + BOOL fullscreen; NSInteger level; - if (self.floating) + screen = screen_covered_by_rect([self frame], [NSScreen screens]); + fullscreen = (screen != nil); + + if (self.floating && (active || topmost_float_inactive == TOPMOST_FLOAT_INACTIVE_ALL || + (topmost_float_inactive == TOPMOST_FLOAT_INACTIVE_NONFULLSCREEN && !fullscreen))) level = NSFloatingWindowLevel; else level = NSNormalWindowLevel; if (active) { - BOOL fullscreen, captured; - NSScreen* screen; + BOOL captured; - screen = screen_covered_by_rect([self frame], [NSScreen screens]); - fullscreen = (screen != nil); captured = (screen || [self screen]) && [[WineApplicationController sharedController] areDisplaysCaptured]; if (captured || fullscreen) diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 905738f..e7e2c4c 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -111,6 +111,12 @@ enum { DRAG_OP_EVERY = UINT32_MAX }; +enum { + TOPMOST_FLOAT_INACTIVE_NONE, + TOPMOST_FLOAT_INACTIVE_NONFULLSCREEN, + TOPMOST_FLOAT_INACTIVE_ALL, +}; + typedef struct macdrv_opaque_window* macdrv_window; typedef struct macdrv_opaque_event_queue* macdrv_event_queue; @@ -129,6 +135,7 @@ struct macdrv_display { /* main */ extern int macdrv_err_on; +extern int topmost_float_inactive DECLSPEC_HIDDEN; extern int macdrv_start_cocoa_app(unsigned long long tickcount) DECLSPEC_HIDDEN; extern void macdrv_window_rejected_focus(const struct macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 501b7d5..cf036c4 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -26,6 +26,7 @@ #include "macdrv.h" #include "winuser.h" +#include "winreg.h" #include "wine/server.h" WINE_DEFAULT_DEBUG_CHANNEL(macdrv); @@ -41,6 +42,8 @@ C_ASSERT(NUM_EVENT_TYPES <= sizeof(macdrv_event_mask) * 8); DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; +int topmost_float_inactive = TOPMOST_FLOAT_INACTIVE_NONFULLSCREEN; + /************************************************************************** * debugstr_cf @@ -91,6 +94,67 @@ static void set_app_icon(void) /*********************************************************************** + * get_config_key + * + * Get a config key from either the app-specific or the default config + */ +static inline DWORD get_config_key(HKEY defkey, HKEY appkey, const char *name, + char *buffer, DWORD size) +{ + if (appkey && !RegQueryValueExA(appkey, name, 0, NULL, (LPBYTE)buffer, &size)) return 0; + if (defkey && !RegQueryValueExA(defkey, name, 0, NULL, (LPBYTE)buffer, &size)) return 0; + return ERROR_FILE_NOT_FOUND; +} + + +/*********************************************************************** + * setup_options + * + * Set up the Mac driver options. + */ +static void setup_options(void) +{ + char buffer[MAX_PATH + 16]; + HKEY hkey, appkey = 0; + DWORD len; + + /* @@ Wine registry key: HKCU\Software\Wine\Mac Driver */ + if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Mac Driver", &hkey)) hkey = 0; + + /* open the app-specific key */ + + len = GetModuleFileNameA(0, buffer, MAX_PATH); + if (len && len < MAX_PATH) + { + HKEY tmpkey; + char *p, *appname = buffer; + if ((p = strrchr(appname, '/'))) appname = p + 1; + if ((p = strrchr(appname, '\\'))) appname = p + 1; + strcat(appname, "\\Mac Driver"); + /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\Mac Driver */ + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey)) + { + if (RegOpenKeyA(tmpkey, appname, &appkey)) appkey = 0; + RegCloseKey(tmpkey); + } + } + + if (!get_config_key(hkey, appkey, "WindowsFloatWhenInactive", buffer, sizeof(buffer))) + { + if (!strcmp(buffer, "none")) + topmost_float_inactive = TOPMOST_FLOAT_INACTIVE_NONE; + else if (!strcmp(buffer, "all")) + topmost_float_inactive = TOPMOST_FLOAT_INACTIVE_ALL; + else + topmost_float_inactive = TOPMOST_FLOAT_INACTIVE_NONFULLSCREEN; + } + + if (appkey) RegCloseKey(appkey); + if (hkey) RegCloseKey(hkey); +} + + +/*********************************************************************** * process_attach */ static BOOL process_attach(void) @@ -102,6 +166,8 @@ static BOOL process_attach(void) if (status != noErr || !(attributes & sessionHasGraphicAccess)) return FALSE; + setup_options(); + if ((thread_data_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) return FALSE; macdrv_err_on = ERR_ON(macdrv);

1 0

Sergey Guralnik : user32/tests: Fix a typo.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: e3219fa426f141098558dcb069cf7c96b2584bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3219fa426f141098558dcb06… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Wed May 29 10:56:17 2013 +0300 user32/tests: Fix a typo. --- dlls/user32/tests/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 37d210e..20d8d9f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7353,12 +7353,12 @@ static void test_update_region(void) rgn1 = CreateRectRgn(0, 0, 0, 0); ok(GetUpdateRgn(parent, rgn1, FALSE) == NULLREGION, - "has invalid area after ValidRgn(NULL)\n"); + "has invalid area after ValidateRgn(NULL)\n"); GetUpdateRgn(hwnd, rgn1, FALSE); rgn2 = CreateRectRgnIndirect(&rc); ok(EqualRgn(rgn1, rgn2), "assigned and retrieved update regions are different\n"); ok(GetUpdateRgn(child, rgn2, FALSE) == NULLREGION, - "has invalid area after ValidRgn(NULL)\n"); + "has invalid area after ValidateRgn(NULL)\n"); SetWindowPos(hwnd, 0, wnd_orig.x, wnd_orig.y, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE);

1 0

Aric Stewart : gdi32/tests: Do not try to test OS/ 2 win metrics on non-windows fonts.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 3108f3cf3d99aac1983cc5256afa87752899275e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3108f3cf3d99aac1983cc5256… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 29 06:53:51 2013 -0500 gdi32/tests: Do not try to test OS/2 win metrics on non-windows fonts. --- dlls/gdi32/tests/font.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index fdb6451..b57a630 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3077,19 +3077,13 @@ static void test_text_metrics(const LOGFONT *lf, const NEWTEXTMETRIC *ntm) ret = GetFontData(hdc, MS_OS2_TAG, 0, &tt_os2, size); ok(ret == size, "GetFontData should return %u not %u\n", size, ret); - ascent = GET_BE_WORD(tt_os2.usWinAscent); - descent = GET_BE_WORD(tt_os2.usWinDescent); - cell_height = ascent + descent; - ok(ntm->ntmCellHeight == cell_height, "%s: ntmCellHeight %u != %u, os2.usWinAscent/os2.usWinDescent %u/%u\n", - font_name, ntm->ntmCellHeight, cell_height, ascent, descent); - SetLastError(0xdeadbeef); ret = GetTextMetricsA(hdc, &tmA); ok(ret, "GetTextMetricsA error %u\n", GetLastError()); if(!get_first_last_from_cmap(hdc, &cmap_first, &cmap_last, &cmap_type)) { - skip("Unable to retrieve first and last glyphs from cmap\n"); + skip("%s is not a Windows font, OS/2 metrics may be invalid.\n",font_name); } else { @@ -3099,6 +3093,12 @@ static void test_text_metrics(const LOGFONT *lf, const NEWTEXTMETRIC *ntm) USHORT version; TEXTMETRICW tmW; + ascent = GET_BE_WORD(tt_os2.usWinAscent); + descent = GET_BE_WORD(tt_os2.usWinDescent); + cell_height = ascent + descent; + ok(ntm->ntmCellHeight == cell_height, "%s: ntmCellHeight %u != %u, os2.usWinAscent/os2.usWinDescent %u/%u\n", + font_name, ntm->ntmCellHeight, cell_height, ascent, descent); + version = GET_BE_WORD(tt_os2.version); os2_first_char = GET_BE_WORD(tt_os2.usFirstCharIndex);

1 0

Hans Leidekker : wbemprox: Add a partial implementation of Win32_Directory.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 074e6c74542e5aeef26a68a0ac1b274e66ce4a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=074e6c74542e5aeef26a68a0a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 29 12:16:44 2013 +0200 wbemprox: Add a partial implementation of Win32_Directory. --- dlls/wbemprox/builtin.c | 256 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 250 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=074e6c74542e5aeef26a6…

1 0

Hans Leidekker : msi: Remove an unused parameter from action_type_matches_script.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 1be1b8433a6ccdf26e6bf6f8f8b8c236ac23e35e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be1b8433a6ccdf26e6bf6f8f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 29 12:16:17 2013 +0200 msi: Remove an unused parameter from action_type_matches_script. --- dlls/msi/custom.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 5b58976..33be99b 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1118,7 +1118,7 @@ static UINT HANDLE_CustomType53_54( MSIPACKAGE *package, const WCHAR *source, co return wait_thread_handle( info ); } -static BOOL action_type_matches_script( MSIPACKAGE *package, UINT type, UINT script ) +static BOOL action_type_matches_script( UINT type, UINT script ) { switch (script) { @@ -1212,7 +1212,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL if (type & msidbCustomActionTypeNoImpersonate) WARN("msidbCustomActionTypeNoImpersonate not handled\n"); - if (!execute || !action_type_matches_script( package, type, script )) + if (!execute || !action_type_matches_script( type, script )) { rc = defer_custom_action( package, action, type ); goto end;

1 0

Hans Leidekker : msi: The UI sequence exists if there are runnable actions in the InstallUISequence table .
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 74aa47fa8e3fbb7541723b1fcb051cc4ed0ad268 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74aa47fa8e3fbb7541723b1fc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 29 12:15:39 2013 +0200 msi: The UI sequence exists if there are runnable actions in the InstallUISequence table. --- dlls/msi/action.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e6422a7..1fa065b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -409,18 +409,16 @@ static BOOL ui_sequence_exists( MSIPACKAGE *package ) static const WCHAR query [] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','I','n','s','t','a','l','l','U','I','S','e','q','u','e','n','c','e','`',' ', - 'W','H','E','R','E',' ','`','S','e','q','u','e','n','c','e','`',' ','>',' ','0',' ', - 'O','R','D','E','R',' ','B','Y',' ','`','S','e','q','u','e','n','c','e','`',0}; + 'W','H','E','R','E',' ','`','S','e','q','u','e','n','c','e','`',' ','>',' ','0',0}; MSIQUERY *view; - UINT rc; + DWORD count = 0; - rc = MSI_DatabaseOpenViewW(package->db, query, &view); - if (rc == ERROR_SUCCESS) + if (!(MSI_DatabaseOpenViewW( package->db, query, &view ))) { - msiobj_release(&view->hdr); - return TRUE; + MSI_IterateRecords( view, &count, NULL, package ); + msiobj_release( &view->hdr ); } - return FALSE; + return count != 0; } UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace)

1 0

Alexandre Julliard : shell32: Forward font messages to the listview window.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: ba486ca1b4abe8f81f81527647f90f85f91f1336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba486ca1b4abe8f81f8152764… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 17:59:43 2013 +0200 shell32: Forward font messages to the listview window. --- dlls/shell32/shlview.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 7738694..2cdd160 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1717,6 +1717,8 @@ static LRESULT CALLBACK ShellView_WndProc(HWND hWnd, UINT uMessage, WPARAM wPara break; case WM_GETDLGCODE: return SendMessageW(pThis->hWndList, uMessage, 0, 0); + case WM_SETFONT: return SendMessageW(pThis->hWndList, WM_SETFONT, wParam, lParam); + case WM_GETFONT: return SendMessageW(pThis->hWndList, WM_GETFONT, wParam, lParam); case WM_DESTROY: RevokeDragDrop(pThis->hWnd);

1 0

Alexandre Julliard : comdlg32: Scale the shell folder list in the open dialog with the font size.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 6a40d65ba83bb5f7f230538e051813e0d0baffeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a40d65ba83bb5f7f230538e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 16:17:48 2013 +0200 comdlg32: Scale the shell folder list in the open dialog with the font size. --- dlls/comdlg32/filedlg.c | 56 ++++++++++++++++++++------------------- dlls/comdlg32/filedlgbrowser.c | 1 + 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 9481517..c08e8d4 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -110,7 +110,6 @@ typedef struct tagLookInInfo */ /* Draw item constant */ -#define ICONWIDTH 18 #define XTEXTOFFSET 3 /* AddItem flags*/ @@ -3182,7 +3181,8 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo) IShellFolder *psfRoot, *psfDrives; IEnumIDList *lpeRoot, *lpeDrives; LPITEMIDLIST pidlDrives, pidlTmp, pidlTmp1, pidlAbsTmp; - + HDC hdc; + TEXTMETRICW tm; LookInInfos *liInfos = MemAlloc(sizeof(LookInInfos)); TRACE("\n"); @@ -3191,10 +3191,15 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo) SetPropA(hwndCombo, LookInInfosStr, liInfos); + hdc = GetDC( hwndCombo ); + SelectObject( hdc, (HFONT)SendMessageW( hwndCombo, WM_GETFONT, 0, 0 )); + GetTextMetricsW( hdc, &tm ); + ReleaseDC( hwndCombo, hdc ); + /* set item height for both text field and listbox */ - CBSetItemHeight(hwndCombo,-1,GetSystemMetrics(SM_CYSMICON)); - CBSetItemHeight(hwndCombo,0,GetSystemMetrics(SM_CYSMICON)); - + CBSetItemHeight( hwndCombo, -1, max( tm.tmHeight, GetSystemMetrics(SM_CYSMICON) )); + CBSetItemHeight( hwndCombo, 0, max( tm.tmHeight, GetSystemMetrics(SM_CYSMICON) )); + /* Turn on the extended UI for the combo box like Windows does */ CBSetExtendedUI(hwndCombo, TRUE); @@ -3269,6 +3274,8 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) TEXTMETRICW tm; LPSFOLDER tmpFolder; LookInInfos *liInfos = GetPropA(pDIStruct->hwndItem,LookInInfosStr); + UINT shgfi_flags = SHGFI_PIDL | SHGFI_OPENICON | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME; + UINT icon_width, icon_height; TRACE("\n"); @@ -3280,25 +3287,24 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) return 0; + icon_width = GetSystemMetrics(SM_CXICON); + icon_height = GetSystemMetrics(SM_CYICON); + if (pDIStruct->rcItem.bottom - pDIStruct->rcItem.top < icon_height) + { + icon_width = GetSystemMetrics(SM_CXSMICON); + icon_height = GetSystemMetrics(SM_CYSMICON); + shgfi_flags |= SHGFI_SMALLICON; + } + if(pDIStruct->itemID == liInfos->uSelectedItem) { ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, - &sfi, - sizeof (sfi), - SHGFI_PIDL | SHGFI_SMALLICON | - SHGFI_OPENICON | SHGFI_SYSICONINDEX | - SHGFI_DISPLAYNAME ); + 0, &sfi, sizeof (sfi), shgfi_flags ); } else { ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, - &sfi, - sizeof (sfi), - SHGFI_PIDL | SHGFI_SMALLICON | - SHGFI_SYSICONINDEX | - SHGFI_DISPLAYNAME); + 0, &sfi, sizeof (sfi), shgfi_flags ); } /* Is this item selected ? */ @@ -3320,11 +3326,7 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) { iIndentation = 0; ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, - &sfi, - sizeof (sfi), - SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_OPENICON - | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME ); + 0, &sfi, sizeof (sfi), shgfi_flags ); } else @@ -3334,17 +3336,17 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) /* Draw text and icon */ /* Initialise the icon display area */ - rectIcon.left = pDIStruct->rcItem.left + ICONWIDTH/2 * iIndentation; - rectIcon.top = pDIStruct->rcItem.top; - rectIcon.right = rectIcon.left + ICONWIDTH; - rectIcon.bottom = pDIStruct->rcItem.bottom; + rectIcon.left = pDIStruct->rcItem.left + 1 + icon_width/2 * iIndentation; + rectIcon.top = (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom - icon_height) / 2; + rectIcon.right = rectIcon.left + icon_width + XTEXTOFFSET; + rectIcon.bottom = (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom + icon_height) / 2; /* Initialise the text display area */ GetTextMetricsW(pDIStruct->hDC, &tm); rectText.left = rectIcon.right; rectText.top = (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom - tm.tmHeight) / 2; - rectText.right = pDIStruct->rcItem.right + XTEXTOFFSET; + rectText.right = pDIStruct->rcItem.right; rectText.bottom = (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom + tm.tmHeight) / 2; diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index ffe65c9..499ebb7 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -452,6 +452,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, /* Set view window control id to 5002 */ SetWindowLongPtrW(hwndView, GWLP_ID, lst2); + SendMessageW( hwndView, WM_SETFONT, SendMessageW( GetParent(hwndView), WM_GETFONT, 0, 0 ), FALSE ); /* Select the new folder in the Look In combo box of the Open file dialog */ FILEDLG95_LOOKIN_SelectItem(fodInfos->DlgInfos.hwndLookInCB,fodInfos->ShellInfos.pidlAbsCurrent);

1 0

Alexandre Julliard : comdlg32: Scale the listboxes in the font dialog with the font size.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 60b5ae785a850ee94cdff6254ec6be5abfc28936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b5ae785a850ee94cdff6254… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 16:28:48 2013 +0200 comdlg32: Scale the listboxes in the font dialog with the font size. --- dlls/comdlg32/fontdlg.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 25dc1e4..e5b87bf 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -782,7 +782,7 @@ static LRESULT CFn_WMMeasureItem(HWND hDlg, LPARAM lParam) /* use MAX of bitmap height and tm.tmHeight .*/ hdc=GetDC(hDlg); if(!hdc) return 0; - hfontprev = SelectObject( hdc, GetStockObject( DEFAULT_GUI_FONT ) ); + hfontprev = SelectObject( hdc, (HFONT)SendMessageW( hDlg, WM_GETFONT, 0, 0 )); GetTextMetricsW(hdc, &tm); if( tm.tmHeight > lpmi->itemHeight) lpmi->itemHeight = tm.tmHeight; SelectObject(hdc, hfontprev); @@ -801,7 +801,7 @@ static LRESULT CFn_WMDrawItem(LPARAM lParam) COLORREF cr, oldText=0, oldBk=0; RECT rect; int nFontType; - int idx; + int cx, cy, idx; LPDRAWITEMSTRUCT lpdi = (LPDRAWITEMSTRUCT)lParam; if (lpdi->itemID == (UINT)-1) /* got no items */ @@ -830,9 +830,10 @@ static LRESULT CFn_WMDrawItem(LPARAM lParam) { case cmb1: /* TRACE(commdlg,"WM_Drawitem cmb1\n"); */ + ImageList_GetIconSize( himlTT, &cx, &cy); SendMessageW(lpdi->hwndItem, CB_GETLBTEXT, lpdi->itemID, (LPARAM)buffer); - TextOutW(lpdi->hDC, lpdi->rcItem.left + TTBITMAP_XSIZE + 10, + TextOutW(lpdi->hDC, lpdi->rcItem.left + cx + 4, lpdi->rcItem.top, buffer, lstrlenW(buffer)); nFontType = SendMessageW(lpdi->hwndItem, CB_GETITEMDATA, lpdi->itemID,0L); idx = -1; @@ -848,7 +849,7 @@ static LRESULT CFn_WMDrawItem(LPARAM lParam) idx = 1; /* picture: printer */ if( idx >= 0) ImageList_Draw( himlTT, idx, lpdi->hDC, lpdi->rcItem.left, - lpdi->rcItem.top, ILD_TRANSPARENT); + (lpdi->rcItem.top + lpdi->rcItem.bottom - cy) / 2, ILD_TRANSPARENT); break; case cmb2: case cmb3:

1 0

Alexandre Julliard : comctl32/comboex: Add support for setting the font.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 3e33f61c562a53c62d2e66ab5abfb9c26f6237c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e33f61c562a53c62d2e66ab5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 15:55:32 2013 +0200 comctl32/comboex: Add support for setting the font. --- dlls/comctl32/comboex.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 244cc95..f1acc7d 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1607,6 +1607,15 @@ static LRESULT COMBOEX_Size (COMBOEX_INFO *infoPtr, INT width, INT height) return 0; } +static LRESULT COMBOEX_SetFont( COMBOEX_INFO *infoPtr, HFONT font, BOOL redraw ) +{ + infoPtr->font = font; + SendMessageW( infoPtr->hwndCombo, WM_SETFONT, (WPARAM)font, 0 ); + if (infoPtr->hwndEdit) SendMessageW( infoPtr->hwndEdit, WM_SETFONT, (WPARAM)font, 0 ); + COMBOEX_ReSize( infoPtr ); + if (redraw) InvalidateRect( infoPtr->hwndCombo, NULL, TRUE ); + return 0; +} static LRESULT COMBOEX_SetRedraw(const COMBOEX_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { @@ -2136,6 +2145,12 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_SIZE: return COMBOEX_Size (infoPtr, LOWORD(lParam), HIWORD(lParam)); + case WM_GETFONT: + return (LRESULT)infoPtr->font; + + case WM_SETFONT: + return COMBOEX_SetFont( infoPtr, (HFONT)wParam, LOWORD(lParam) != 0 ); + case WM_SETREDRAW: return COMBOEX_SetRedraw(infoPtr, wParam, lParam);

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2013