wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Alexandre Julliard : winemac: Clear the thread data explicitly on detach.
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: 6ae1e33a17af1298bb451526b1c2a66d399eff9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae1e33a17af1298bb451526b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 20:48:49 2013 +0200 winemac: Clear the thread data explicitly on detach. --- dlls/winemac.drv/macdrv_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index d27ce94..5317c8b 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -224,6 +224,8 @@ static void thread_detach(void) if (data->keyboard_layout_uchr) CFRelease(data->keyboard_layout_uchr); HeapFree(GetProcessHeap(), 0, data); + /* clear data in case we get re-entered from user32 before the thread is truly dead */ + TlsSetValue(thread_data_tls_index, NULL); } }

1 0

Alexandre Julliard : winex11: Clear the thread data explicitly on detach.
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: fdde51580d9ea736b2171efd84c9c3eefca81505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdde51580d9ea736b2171efd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 19:45:22 2013 +0200 winex11: Clear the thread data explicitly on detach. --- dlls/winex11.drv/x11drv_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 7b730ca..a6572ba 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -609,6 +609,8 @@ static void thread_detach(void) if (data->font_set) XFreeFontSet( data->display, data->font_set ); XCloseDisplay( data->display ); HeapFree( GetProcessHeap(), 0, data ); + /* clear data in case we get re-entered from user32 before the thread is truly dead */ + TlsSetValue( thread_data_tls_index, NULL ); } }

1 0

Alexandre Julliard : user32: Create the desktop window before enumerating monitors.
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: eb5127dfd1fef6c0b8ed380ae1f7c8c6aa998769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5127dfd1fef6c0b8ed380ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 12:14:44 2013 +0200 user32: Create the desktop window before enumerating monitors. --- dlls/user32/misc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 50bb79a..9177f56 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -351,9 +351,6 @@ HMONITOR WINAPI MonitorFromRect( LPRECT rect, DWORD flags ) { struct monitor_enum_info info; - /* make sure the desktop window exists */ - GetDesktopWindow(); - info.rect = *rect; info.max_area = 0; info.min_distance = ~0u; @@ -444,6 +441,9 @@ BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) */ BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { + /* make sure the desktop window exists */ + GetDesktopWindow(); + return USER_Driver->pEnumDisplayMonitors( hdc, rect, proc, lp ); }

1 0

Alexandre Julliard : user32: Delay creation of the 55AA pattern brush until it's needed.
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: 209d1a86d26f6eca9b32dd2186c5e2b59fa117c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=209d1a86d26f6eca9b32dd218… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 16:07:53 2013 +0200 user32: Delay creation of the 55AA pattern brush until it's needed. --- dlls/user32/defwnd.c | 2 +- dlls/user32/nonclient.c | 2 +- dlls/user32/sysparams.c | 32 +++++++++++++++++++++++--------- dlls/user32/text.c | 2 +- dlls/user32/uitools.c | 4 ++-- dlls/user32/user_private.h | 2 +- 6 files changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 7a55844..eb64666 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -167,7 +167,7 @@ HBRUSH DEFWND_ControlColor( HDC hDC, UINT ctlType ) * look different from the window background. */ if (bk == GetSysColor(COLOR_WINDOW)) - return SYSCOLOR_55AABrush; + return SYSCOLOR_Get55AABrush(); UnrealizeObject( hb ); return hb; diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index da9c6bd..6becd5f 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -289,7 +289,7 @@ BOOL WINAPI DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, FillRect (hdc, &rc, GetSysColorBrush (COLOR_3DFACE)); if (uFlags & DC_ACTIVE) { - HBRUSH hbr = SelectObject (hdc, SYSCOLOR_55AABrush); + HBRUSH hbr = SelectObject (hdc, SYSCOLOR_Get55AABrush()); PatBlt (hdc, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, 0xFA0089); SelectObject (hdc, hbr); diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 7c05d00..bdfed38 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -242,12 +242,8 @@ static BOOL notify_change = TRUE; /* System parameters storage */ static RECT work_area; -static const WORD wPattern55AA[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa }; - static HKEY volatile_base_key; -HBRUSH SYSCOLOR_55AABrush = 0; - union sysparam_all_entry; struct sysparam_entry @@ -1346,11 +1342,6 @@ void SYSPARAMS_Init(void) { HKEY key; DWORD i, dispos; - HBITMAP h55AABitmap = CreateBitmap( 8, 8, 1, 1, wPattern55AA ); - - SYSCOLOR_55AABrush = CreatePatternBrush( h55AABitmap ); - __wine_make_gdi_object_system( SYSCOLOR_55AABrush, TRUE ); - DeleteObject( h55AABitmap ); /* this one must be non-volatile */ if (RegCreateKeyW( HKEY_CURRENT_USER, WINE_CURRENT_USER_REGKEY, &key )) @@ -2716,6 +2707,29 @@ HPEN SYSCOLOR_GetPen( INT index ) /*********************************************************************** + * SYSCOLOR_Get55AABrush + */ +HBRUSH SYSCOLOR_Get55AABrush(void) +{ + static const WORD pattern[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa }; + static HBRUSH brush_55aa; + + if (!brush_55aa) + { + HBITMAP bitmap = CreateBitmap( 8, 8, 1, 1, pattern ); + HBRUSH brush = CreatePatternBrush( bitmap ); + DeleteObject( bitmap ); + __wine_make_gdi_object_system( brush, TRUE ); + if (InterlockedCompareExchangePointer( (void **)&brush_55aa, brush, 0 )) + { + __wine_make_gdi_object_system( brush, FALSE ); + DeleteObject( brush ); + } + } + return brush_55aa; +} + +/*********************************************************************** * ChangeDisplaySettingsA (USER32.@) */ LONG WINAPI ChangeDisplaySettingsA( LPDEVMODEA devmode, DWORD flags ) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 12432b8..7bef476 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -1240,7 +1240,7 @@ static BOOL TEXT_GrayString(HDC hdc, HBRUSH hb, GRAYSTRINGPROC fn, LPARAM lp, IN if(retval || len != -1) #endif { - hbsave = SelectObject(memdc, SYSCOLOR_55AABrush); + hbsave = SelectObject(memdc, SYSCOLOR_Get55AABrush()); PatBlt(memdc, 0, 0, cx, cy, 0x000A0329); SelectObject(memdc, hbsave); } diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 386801c..c11a1d3 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -649,7 +649,7 @@ static void UITOOLS_DrawCheckedRect( HDC dc, LPRECT rect ) FillRect(dc, rect, GetSysColorBrush(COLOR_BTNFACE)); bg = SetBkColor(dc, RGB(255, 255, 255)); - hbsave = SelectObject(dc, SYSCOLOR_55AABrush); + hbsave = SelectObject(dc, SYSCOLOR_Get55AABrush()); PatBlt(dc, rect->left, rect->top, rect->right-rect->left, rect->bottom-rect->top, 0x00FA0089); SelectObject(dc, hbsave); SetBkColor(dc, bg); @@ -1703,7 +1703,7 @@ static BOOL UITOOLS_DrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp /* This state cause the image to be dithered */ if(flags & DSS_UNION) { - hbsave = SelectObject(memdc, SYSCOLOR_55AABrush); + hbsave = SelectObject(memdc, SYSCOLOR_Get55AABrush()); if(!hbsave) goto cleanup; tmp = PatBlt(memdc, 0, 0, cx, cy, 0x00FA0089); SelectObject(memdc, hbsave); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 5666412..0f86bdf 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -209,7 +209,6 @@ static inline BOOL is_broadcast( HWND hwnd ) } extern HMODULE user32_module DECLSPEC_HIDDEN; -extern HBRUSH SYSCOLOR_55AABrush DECLSPEC_HIDDEN; struct dce; struct tagWND; @@ -234,6 +233,7 @@ extern LRESULT MSG_SendInternalMessageTimeout( DWORD dest_pid, DWORD dest_tid, UINT msg, WPARAM wparam, LPARAM lparam, UINT flags, UINT timeout, PDWORD_PTR res_ptr ) DECLSPEC_HIDDEN; extern HPEN SYSCOLOR_GetPen( INT index ) DECLSPEC_HIDDEN; +extern HBRUSH SYSCOLOR_Get55AABrush(void) DECLSPEC_HIDDEN; extern void SYSPARAMS_Init(void) DECLSPEC_HIDDEN; extern void USER_CheckNotLock(void) DECLSPEC_HIDDEN; extern BOOL USER_IsExitingThread( DWORD tid ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : user32: Delay registration of the builtin classes until the first window is created .
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: 7370a565436b404570b1b1c4ad58a320368fbd7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7370a565436b404570b1b1c4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 1 20:34:07 2007 +0100 user32: Delay registration of the builtin classes until the first window is created. --- dlls/user32/class.c | 25 +++++++++++++++++++++++-- dlls/user32/user_main.c | 3 --- dlls/user32/win.c | 3 +++ 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index a66f0db..333cb76 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -64,6 +64,7 @@ typedef struct tagCLASS } CLASS; static struct list class_list = LIST_INIT( class_list ); +static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; #define CLASS_OTHER_PROCESS ((CLASS *)1) @@ -376,9 +377,9 @@ static void register_builtin( const struct builtin_class_descr *descr ) /*********************************************************************** - * CLASS_RegisterBuiltinClasses + * register_builtins */ -void CLASS_RegisterBuiltinClasses(void) +static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **context ) { register_builtin( &DESKTOP_builtin_class ); register_builtin( &BUTTON_builtin_class ); @@ -393,6 +394,16 @@ void CLASS_RegisterBuiltinClasses(void) register_builtin( &MESSAGE_builtin_class ); register_builtin( &SCROLL_builtin_class ); register_builtin( &STATIC_builtin_class ); + return TRUE; +} + + +/*********************************************************************** + * CLASS_RegisterBuiltinClasses + */ +void CLASS_RegisterBuiltinClasses(void) +{ + InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); } @@ -488,6 +499,8 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) CLASS *classPtr; HINSTANCE instance; + InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); + if (wc->cbSize != sizeof(*wc) || wc->cbClsExtra < 0 || wc->cbWndExtra < 0 || wc->hInstance == user32_module) /* we can't register a class for user32 */ { @@ -541,6 +554,8 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) CLASS *classPtr; HINSTANCE instance; + InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); + if (wc->cbSize != sizeof(*wc) || wc->cbClsExtra < 0 || wc->cbWndExtra < 0 || wc->hInstance == user32_module) /* we can't register a class for user32 */ { @@ -597,6 +612,8 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) { CLASS *classPtr = NULL; + InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); + SERVER_START_REQ( destroy_class ) { req->instance = wine_server_client_ptr( hInstance ); @@ -1097,6 +1114,8 @@ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) TRACE("%p %s %p\n", hInstance, debugstr_a(name), wc); + InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); + if (!wc) { SetLastError( ERROR_NOACCESS ); @@ -1148,6 +1167,8 @@ BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSEXW *wc TRACE("%p %s %p\n", hInstance, debugstr_w(name), wc); + InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); + if (!wc) { SetLastError( ERROR_NOACCESS ); diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index c5b4714..e74ac19 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -278,9 +278,6 @@ static BOOL process_attach(void) /* Setup palette function pointers */ palette_init(); - /* Initialize built-in window classes */ - CLASS_RegisterBuiltinClasses(); - return TRUE; } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 1b4d34b..d506fee 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1391,6 +1391,8 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } } + CLASS_RegisterBuiltinClasses(); + /* Find the parent window */ parent = cs->hwndParent; @@ -1424,6 +1426,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, SetLastError(ERROR_TLW_WITH_WSCHILD); return 0; /* WS_CHILD needs a parent, but WS_POPUP doesn't */ } + /* are we creating the desktop or HWND_MESSAGE parent itself? */ if (className != (LPCWSTR)DESKTOP_CLASS_ATOM && (IS_INTRESOURCE(className) || strcmpiW( className, messageW )))

1 0

Alexandre Julliard : explorer: Create the driver desktop window after the window handle is created.
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: 13149b67d3972c5babc8b5c368ffba85a5c5c2c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13149b67d3972c5babc8b5c36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 12:13:50 2013 +0200 explorer: Create the driver desktop window after the window handle is created. --- dlls/winex11.drv/desktop.c | 1 + dlls/winex11.drv/window.c | 19 ++++++++----------- dlls/winex11.drv/x11drv.h | 3 ++- programs/explorer/desktop.c | 32 +++++++++++++++++--------------- 4 files changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 39b9965..7a1bb92 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -171,6 +171,7 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) PropModeReplace, (unsigned char*)&x11drv_atom(_NET_WM_STATE_FULLSCREEN), 1); } + if (!create_desktop_win_data( win )) return FALSE; XFlush( display ); X11DRV_init_desktop( win, width, height ); return TRUE; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 17859f8..a76e80d 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1651,16 +1651,19 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) /* initialize the desktop window id in the desktop manager process */ -static BOOL create_desktop_win_data( Display *display, HWND hwnd ) +BOOL create_desktop_win_data( Window win ) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + Display *display = thread_data->display; struct x11drv_win_data *data; - if (!(data = alloc_win_data( display, hwnd ))) return FALSE; - data->whole_window = root_window; + if (!(data = alloc_win_data( display, GetDesktopWindow() ))) return FALSE; + data->whole_window = win; data->managed = TRUE; - SetPropA( data->hwnd, whole_window_prop, (HANDLE)root_window ); - set_initial_wm_hints( display, root_window ); + SetPropA( data->hwnd, whole_window_prop, (HANDLE)win ); + set_initial_wm_hints( display, win ); release_win_data( data ); + if (thread_data->clip_window) XReparentWindow( display, thread_data->clip_window, win, 0, 0 ); return TRUE; } @@ -1719,12 +1722,6 @@ BOOL CDECL X11DRV_CreateWindow( HWND hwnd ) struct x11drv_thread_data *data = x11drv_init_thread_data(); XSetWindowAttributes attr; - if (root_window != DefaultRootWindow( gdi_display )) - { - /* the desktop win data can't be created lazily */ - if (!create_desktop_win_data( data->display, hwnd )) return FALSE; - } - /* create the cursor clipping window */ attr.override_redirect = TRUE; attr.event_mask = StructureNotifyMask | FocusChangeMask; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3b235ca..98386ce 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -639,7 +639,8 @@ struct x11drv_mode_info extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; extern void X11DRV_resize_desktop(unsigned int width, unsigned int height) DECLSPEC_HIDDEN; -BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; +extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; +extern BOOL create_desktop_win_data( Window win ) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq) DECLSPEC_HIDDEN; unsigned int X11DRV_Settings_GetModeCount(void) DECLSPEC_HIDDEN; diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 49bbbe9..694f3f6 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -552,23 +552,15 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR static BOOL create_desktop( const WCHAR *name, unsigned int width, unsigned int height ) { static const WCHAR rootW[] = {'r','o','o','t',0}; - HDESK desktop; BOOL ret = FALSE; BOOL (CDECL *create_desktop_func)(unsigned int, unsigned int); - desktop = CreateDesktopW( name, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); - if (!desktop) - { - WINE_ERR( "failed to create desktop %s error %d\n", wine_dbgstr_w(name), GetLastError() ); - ExitProcess( 1 ); - } /* magic: desktop "root" means use the root window */ if (graphics_driver && strcmpiW( name, rootW )) { create_desktop_func = (void *)GetProcAddress( graphics_driver, "wine_create_desktop" ); if (create_desktop_func) ret = create_desktop_func( width, height ); } - SetThreadDesktop( desktop ); return ret; } @@ -703,8 +695,8 @@ static void set_desktop_window_title( HWND hwnd, const WCHAR *name ) /* main desktop management function */ void manage_desktop( WCHAR *arg ) { - static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; + HDESK desktop = 0; MSG msg; HDC hdc; HWND hwnd, msg_hwnd; @@ -737,10 +729,15 @@ void manage_desktop( WCHAR *arg ) if (!get_default_desktop_size( name, &width, &height )) width = height = 0; } - hdc = CreateDCW( displayW, NULL, NULL, NULL ); - graphics_driver = __wine_get_driver_module( hdc ); - - if (name && width && height) using_root = !create_desktop( name, width, height ); + if (name && width && height) + { + if (!(desktop = CreateDesktopW( name, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ))) + { + WINE_ERR( "failed to create desktop %s error %d\n", wine_dbgstr_w(name), GetLastError() ); + ExitProcess( 1 ); + } + SetThreadDesktop( desktop ); + } /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, @@ -750,13 +747,18 @@ void manage_desktop( WCHAR *arg ) msg_hwnd = CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 100, 100, 0, 0, 0, NULL ); - DeleteDC( hdc ); - if (hwnd == GetDesktopWindow()) { HMODULE shell32; void (WINAPI *pShellDDEInit)( BOOL ); + if (desktop) + { + hdc = GetDC( hwnd ); + graphics_driver = __wine_get_driver_module( hdc ); + using_root = !create_desktop( name, width, height ); + ReleaseDC( hwnd, hdc ); + } SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name );

1 0

Alexandre Julliard : explorer: Set the final size of the desktop window only after it has been created.
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: 1f9c541b58360559f2f8a6db9d876ada4dcc2b48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f9c541b58360559f2f8a6db9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 12:01:32 2013 +0200 explorer: Set the final size of the desktop window only after it has been created. --- programs/explorer/desktop.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 5503787..49bbbe9 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -744,10 +744,7 @@ void manage_desktop( WCHAR *arg ) /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, - WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, - GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), - GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN), - 0, 0, 0, NULL ); + WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, NULL ); /* create the HWND_MESSAGE parent */ msg_hwnd = CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, @@ -763,7 +760,9 @@ void manage_desktop( WCHAR *arg ) SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name ); - ShowWindow( hwnd, SW_SHOW ); + SetWindowPos( hwnd, 0, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), + GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN), + SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW ); SystemParametersInfoW( SPI_SETDESKWALLPAPER, 0, NULL, FALSE ); ClipCursor( NULL ); initialize_display_settings( hwnd );

1 0

Lauri Kenttä : readme: Update Finnish translation.
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: 623230b3ccc0591eef2791fa846c216d22a653cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=623230b3ccc0591eef2791fa8… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Oct 16 11:29:52 2013 +0300 readme: Update Finnish translation. --- documentation/README.fi | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/documentation/README.fi b/documentation/README.fi index 780cf43..15b8302 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -52,6 +52,7 @@ Tietoa NetBSD:lle: Tietoa Mac OS X:lle: Winen onnistuneeseen kääntämiseen x86:lla tarvitaan Xcode 2.4 tai uudempi. + Mac-ajuri vaatii OS X 10.6:n tai uudemman, ja sitä ei käännetä 10.5:ssä. Tuetut tiedostojärjestelmät:

1 0

Michael Stefaniuc : dxgi/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: 22af120a7a3f7f4fc8fb234f4d514a37fa59afa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22af120a7a3f7f4fc8fb234f4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 16 09:46:57 2013 +0200 dxgi/tests: Compile with -D__WINESRC__. --- dlls/dxgi/tests/Makefile.in | 1 - dlls/dxgi/tests/device.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index 02888af..08d2db1 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = dxgi.dll IMPORTS = dxgi user32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ device.c diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index d492a95..9be59db 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -308,7 +308,7 @@ static void test_createswapchain(IDXGIDevice *device) IDXGISwapChain *swapchain; DXGI_SWAP_CHAIN_DESC creation_desc, result_desc; HRESULT hr; - WNDCLASS wc = {0}; + WNDCLASSA wc = {0}; UINT i; const struct refresh_rates refresh_list[] = @@ -321,10 +321,10 @@ static void test_createswapchain(IDXGIDevice *device) }; - wc.lpfnWndProc = DefWindowProc; + wc.lpfnWndProc = DefWindowProcA; wc.lpszClassName = "dxgi_test_wc"; - RegisterClass(&wc); + RegisterClassA(&wc); creation_desc.OutputWindow = 0; creation_desc.BufferDesc.Width = 800; @@ -338,7 +338,7 @@ static void test_createswapchain(IDXGIDevice *device) creation_desc.SampleDesc.Quality = 0; creation_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; creation_desc.BufferCount = 1; - creation_desc.OutputWindow = CreateWindow("dxgi_test_wc", "dxgi_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + creation_desc.OutputWindow = CreateWindowA("dxgi_test_wc", "dxgi_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); creation_desc.Windowed = TRUE; creation_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; creation_desc.Flags = 0;

1 0

Gerald Pfeifer : winefile: Remove redundant check in format_bytes().
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: f0392519916fb12f807a8e20299b426e6d43f866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0392519916fb12f807a8e202… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Oct 15 22:34:59 2013 +0200 winefile: Remove redundant check in format_bytes(). --- programs/winefile/winefile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 3b30255..4729436 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2658,7 +2658,7 @@ static void format_bytes(LPWSTR buffer, LONGLONG bytes) fBytes = ((float)bytes)/1048576.f+.5f; resid = IDS_UNIT_MB; } - else if (bytes >= 1024) /* 1 kB */ + else /* bytes >= 1024 */ /* 1 kB */ { fBytes = ((float)bytes)/1024.f+.5f; resid = IDS_UNIT_KB;

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
76
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 October 2013