March 2008 - Wine-Commits - list.winehq.org

Francois Gouget : gdi32: Remove a trailing space in a Wine trace.
by Alexandre Julliard March 19, 2008

March 19, 2008

Module: wine Branch: master Commit: 8d38b1d60b1ab06be547345ba8b41e6371cf4437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d38b1d60b1ab06be547345ba… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 18 15:20:34 2008 +0100 gdi32: Remove a trailing space in a Wine trace. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 64569d2..8c59005 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3894,7 +3894,7 @@ static const GSUB_Feature * GSUB_get_feature(const GSUB_Header *header, const GS const GSUB_FeatureList *feature; feature = (GSUB_FeatureList*)((LPBYTE)header + GET_BE_WORD(header->FeatureList)); - TRACE("%i features \n",GET_BE_WORD(lang->FeatureCount)); + TRACE("%i features\n",GET_BE_WORD(lang->FeatureCount)); for (i = 0; i < GET_BE_WORD(lang->FeatureCount); i++) { int index = GET_BE_WORD(lang->FeatureIndex[i]);

1 0

Dmitry Timoshkov : mlang: Implement Rfc1766ToLcidA.
by Alexandre Julliard March 19, 2008

March 19, 2008

Module: wine Branch: master Commit: 2182d4600a4043ab41fcc291e4ac0718d4091348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2182d4600a4043ab41fcc291e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 18 21:55:09 2008 +0800 mlang: Implement Rfc1766ToLcidA. --- dlls/mlang/mlang.c | 10 ++++++++++ dlls/mlang/mlang.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 42da54e..a60ad70 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -784,6 +784,16 @@ HRESULT WINAPI Rfc1766ToLcidW(LCID *pLocale, LPCWSTR pszRfc1766) return hr; } +HRESULT WINAPI Rfc1766ToLcidA(LCID *lcid, LPCSTR rfc1766A) +{ + WCHAR rfc1766W[MAX_RFC1766_NAME + 1]; + + MultiByteToWideChar(CP_ACP, 0, rfc1766A, -1, rfc1766W, MAX_RFC1766_NAME); + rfc1766W[MAX_RFC1766_NAME] = 0; + + return Rfc1766ToLcidW(lcid, rfc1766W); +} + /****************************************************************************** * MLANG ClassFactory */ diff --git a/dlls/mlang/mlang.spec b/dlls/mlang/mlang.spec index d087b3c..1e8f022 100644 --- a/dlls/mlang/mlang.spec +++ b/dlls/mlang/mlang.spec @@ -10,5 +10,5 @@ @ stdcall IsConvertINetStringAvailable(long long) @ stdcall LcidToRfc1766A(long ptr long) @ stdcall LcidToRfc1766W(long ptr long) -@ stub Rfc1766ToLcidA +@ stdcall Rfc1766ToLcidA(ptr str) @ stdcall Rfc1766ToLcidW(ptr wstr)

1 0

Dmitry Timoshkov : wine.inf: Update time zone information for America/ Los_Angeles and America/Tijuana.
by Alexandre Julliard March 19, 2008

March 19, 2008

Module: wine Branch: master Commit: 1f0dcf06ea167056947233dd429bcd73c4f2b95c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f0dcf06ea167056947233dd4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 18 21:55:46 2008 +0800 wine.inf: Update time zone information for America/Los_Angeles and America/Tijuana. --- tools/wine.inf | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 97a7735..92a3422 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2323,11 +2323,11 @@ HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"TZI",1,1c,02,00,00,00, HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Display",,"America/Los_Angeles" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Dlt",,"Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Std",,"Pacific Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Display",,"America/Tijuana" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Dlt",,"Pacific Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Std",,"Pacific Standard Time (Mexico)" -HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time 2,"Display",,"America/Chihuahua" HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time 2,"Dlt",,"Mexico Daylight Time 2" HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time 2,"Std",,"Mexico Standard Time 2"

1 0

Dmitry Timoshkov : winex11.drv: Add a some heuristics when to add a maximize or fullscreen hint.
by Alexandre Julliard March 19, 2008

March 19, 2008

Module: wine Branch: master Commit: 79274bf0f57c6034ecf1b9eecd6bd2b242b56931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79274bf0f57c6034ecf1b9eec… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 18 22:25:33 2008 +0800 winex11.drv: Add a some heuristics when to add a maximize or fullscreen hint. --- dlls/winex11.drv/winpos.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index eed9eeb..b444423 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -183,16 +183,23 @@ static void update_net_wm_states( Display *display, struct x11drv_win_data *data if (!data->mapped) return; style = GetWindowLongW( data->hwnd, GWL_STYLE ); - if (style & WS_MAXIMIZE) new_state |= (1 << NET_WM_STATE_MAXIMIZED); - - if (!(style & WS_MAXIMIZE) && - data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && + if (data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height) - new_state |= (1 << NET_WM_STATE_FULLSCREEN); + { + if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) + new_state |= (1 << NET_WM_STATE_MAXIMIZED); + else + new_state |= (1 << NET_WM_STATE_FULLSCREEN); + } + else if (style & WS_MAXIMIZE) + new_state |= (1 << NET_WM_STATE_MAXIMIZED); ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); if (ex_style & WS_EX_TOPMOST) + { new_state |= (1 << NET_WM_STATE_ABOVE); + ERR("switching window %p/%lx to STATE_ABOVE\n", data->hwnd, data->whole_window); + } if (ex_style & WS_EX_TOOLWINDOW) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER);

1 0

Rob Shearman : user32: Handle the undocumented behaviour in DefWindowProc for WM_NCACTIVATE that causes the nonclient area not to be redrawn .
by Alexandre Julliard March 19, 2008

March 19, 2008

Module: wine Branch: master Commit: 076c6fb550996f59ad678886d7497a0cfddd10ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=076c6fb550996f59ad678886d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 18 12:06:59 2008 +0000 user32: Handle the undocumented behaviour in DefWindowProc for WM_NCACTIVATE that causes the nonclient area not to be redrawn. If the lParam is 0xffffffff then the nonclient area is not redrawn. --- dlls/user32/controls.h | 2 +- dlls/user32/defwnd.c | 2 +- dlls/user32/nonclient.c | 16 +++++++++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 4bfe7fd..dbec147 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -90,7 +90,7 @@ extern UINT MENU_FindSubMenu( HMENU *hmenu, HMENU hSubTarget ) DECLSPEC_HIDDEN; /* nonclient area */ extern LRESULT NC_HandleNCPaint( HWND hwnd , HRGN clip) DECLSPEC_HIDDEN; -extern LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam ) DECLSPEC_HIDDEN; +extern LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCCalcSize( HWND hwnd, RECT *winRect ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 53caf12..b1dc739 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -386,7 +386,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa break; case WM_NCACTIVATE: - return NC_HandleNCActivate( hwnd, wParam ); + return NC_HandleNCActivate( hwnd, wParam, lParam ); case WM_NCDESTROY: { diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 4d1191b..8deb698 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1123,7 +1123,7 @@ LRESULT NC_HandleNCPaint( HWND hwnd , HRGN clip) * * Handle a WM_NCACTIVATE message. Called from DefWindowProc(). */ -LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam ) +LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) { WND* wndPtr = WIN_GetPtr( hwnd ); @@ -1138,10 +1138,16 @@ LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam ) else wndPtr->flags &= ~WIN_NCACTIVATED; WIN_ReleasePtr( wndPtr ); - if (IsIconic(hwnd)) - WINPOS_RedrawIconTitle( hwnd ); - else - NC_DoNCPaint( hwnd, (HRGN)1, FALSE ); + /* This isn't documented but is reproducible in at least XP SP2 and + * Outlook 2007 depends on it + */ + if (lParam != -1) + { + if (IsIconic(hwnd)) + WINPOS_RedrawIconTitle( hwnd ); + else + NC_DoNCPaint( hwnd, (HRGN)1, FALSE ); + } return TRUE; }

1 0

Alexandre Julliard : user32: Implemented EnumDesktopWindows.
by Alexandre Julliard March 19, 2008

March 19, 2008

Module: wine Branch: master Commit: 34fe91bf2b038806fcbe0caaa135aaf678e87410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34fe91bf2b038806fcbe0caaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 18 15:17:40 2008 +0100 user32: Implemented EnumDesktopWindows. --- dlls/user32/win.c | 28 ++++++++++++++++++++++++---- dlls/user32/winstation.c | 10 ---------- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/trace.c | 1 + server/user.h | 1 + server/window.c | 24 ++++++++++++++++-------- server/winstation.c | 3 +-- 8 files changed, 46 insertions(+), 25 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 6d065be..f0de769 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -212,7 +212,7 @@ static WND *free_window_handle( HWND hwnd ) * Build an array of the children of a given window. The array must be * freed with HeapFree. Returns NULL when no windows are found. */ -static HWND *list_window_children( HWND hwnd, LPCWSTR class, DWORD tid ) +static HWND *list_window_children( HDESK desktop, HWND hwnd, LPCWSTR class, DWORD tid ) { HWND *list; int size = 32; @@ -225,6 +225,7 @@ static HWND *list_window_children( HWND hwnd, LPCWSTR class, DWORD tid ) SERVER_START_REQ( get_window_children ) { + req->desktop = desktop; req->parent = hwnd; req->tid = tid; if (!(req->atom = get_int_atom_value( class )) && class) @@ -1522,7 +1523,7 @@ HWND WINAPI FindWindowExW( HWND parent, HWND child, LPCWSTR className, LPCWSTR t if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return 0; } - if (!(list = list_window_children( parent, className, 0 ))) goto done; + if (!(list = list_window_children( 0, parent, className, 0 ))) goto done; if (child) { @@ -2862,7 +2863,7 @@ HWND WINAPI GetLastActivePopup( HWND hwnd ) */ HWND *WIN_ListChildren( HWND hwnd ) { - return list_window_children( hwnd, NULL, 0 ); + return list_window_children( 0, hwnd, NULL, 0 ); } @@ -2906,7 +2907,7 @@ BOOL WINAPI EnumThreadWindows( DWORD id, WNDENUMPROC func, LPARAM lParam ) USER_CheckNotLock(); - if (!(list = list_window_children( GetDesktopWindow(), NULL, id ))) return TRUE; + if (!(list = list_window_children( 0, GetDesktopWindow(), NULL, id ))) return TRUE; /* Now call the callback function for every window */ @@ -2917,6 +2918,25 @@ BOOL WINAPI EnumThreadWindows( DWORD id, WNDENUMPROC func, LPARAM lParam ) } +/*********************************************************************** + * EnumDesktopWindows (USER32.@) + */ +BOOL WINAPI EnumDesktopWindows( HDESK desktop, WNDENUMPROC func, LPARAM lparam ) +{ + HWND *list; + int i; + + USER_CheckNotLock(); + + if (!(list = list_window_children( desktop, 0, NULL, 0 ))) return TRUE; + + for (i = 0; list[i]; i++) + if (!func( list[i], lparam )) break; + HeapFree( GetProcessHeap(), 0, list ); + return TRUE; +} + + /********************************************************************** * WIN_EnumChildWindows * diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 906f2ba..d836471 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -455,16 +455,6 @@ HDESK WINAPI OpenInputDesktop( DWORD flags, BOOL inherit, ACCESS_MASK access ) /*********************************************************************** - * EnumDesktopWindows (USER32.@) - */ -BOOL WINAPI EnumDesktopWindows( HDESK desktop, WNDENUMPROC func, LPARAM lparam ) -{ - FIXME( "(%p,%p,0x%lx): stub!\n", desktop, func, lparam ); - return TRUE; -} - - -/*********************************************************************** * GetUserObjectInformationA (USER32.@) */ BOOL WINAPI GetUserObjectInformationA( HANDLE handle, INT index, LPVOID info, DWORD len, LPDWORD needed ) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a659d82..eab9f9c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2901,6 +2901,7 @@ struct get_window_parents_reply struct get_window_children_request { struct request_header __header; + obj_handle_t desktop; user_handle_t parent; atom_t atom; thread_id_t tid; @@ -4994,6 +4995,6 @@ union generic_reply struct add_fd_completion_reply add_fd_completion_reply; }; -#define SERVER_PROTOCOL_VERSION 337 +#define SERVER_PROTOCOL_VERSION 338 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index ff8bf52..23aaed5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2139,6 +2139,7 @@ enum message_type /* Get a list of the window children */ @REQ(get_window_children) + obj_handle_t desktop; /* handle to desktop */ user_handle_t parent; /* parent window */ atom_t atom; /* class atom for the listed children */ thread_id_t tid; /* thread owning the listed children */ diff --git a/server/trace.c b/server/trace.c index 61d0238..aa3293e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2656,6 +2656,7 @@ static void dump_get_window_parents_reply( const struct get_window_parents_reply static void dump_get_window_children_request( const struct get_window_children_request *req ) { + fprintf( stderr, " desktop=%p,", req->desktop ); fprintf( stderr, " parent=%p,", req->parent ); fprintf( stderr, " atom=%04x,", req->atom ); fprintf( stderr, " tid=%04x,", req->tid ); diff --git a/server/user.h b/server/user.h index 946b578..f58f4d4 100644 --- a/server/user.h +++ b/server/user.h @@ -150,6 +150,7 @@ extern void *get_class_client_ptr( struct window_class *class ); /* windows station functions */ +extern struct desktop *get_desktop_obj( struct process *process, obj_handle_t handle, unsigned int access ); extern struct winstation *get_process_winstation( struct process *process, unsigned int access ); extern struct desktop *get_thread_desktop( struct thread *thread, unsigned int access ); extern void connect_process_winstation( struct process *process, struct thread *parent ); diff --git a/server/window.c b/server/window.c index e0c202e..e10f9a7 100644 --- a/server/window.c +++ b/server/window.c @@ -1804,26 +1804,34 @@ DECL_HANDLER(get_window_parents) /* get a list of the window children */ DECL_HANDLER(get_window_children) { - struct window *ptr, *parent = get_window( req->parent ); + struct window *ptr, *parent; int total = 0; user_handle_t *data; data_size_t len; atom_t atom = req->atom; + if (req->desktop) + { + struct desktop *desktop = get_desktop_obj( current->process, req->desktop, DESKTOP_ENUMERATE ); + if (!desktop) return; + parent = desktop->top_window; + release_object( desktop ); + } + else parent = get_window( req->parent ); + + if (!parent) return; + if (get_req_data_size()) { atom = find_global_atom( NULL, get_req_data(), get_req_data_size() / sizeof(WCHAR) ); if (!atom) return; } - if (parent) + LIST_FOR_EACH_ENTRY( ptr, &parent->children, struct window, entry ) { - LIST_FOR_EACH_ENTRY( ptr, &parent->children, struct window, entry ) - { - if (atom && get_class_atom(ptr->class) != atom) continue; - if (req->tid && get_thread_id(ptr->thread) != req->tid) continue; - total++; - } + if (atom && get_class_atom(ptr->class) != atom) continue; + if (req->tid && get_thread_id(ptr->thread) != req->tid) continue; + total++; } reply->count = total; len = min( get_reply_max_size(), total * sizeof(user_handle_t) ); diff --git a/server/winstation.c b/server/winstation.c index 9ad65f0..ee78ba7 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -203,8 +203,7 @@ static WCHAR *build_desktop_name( const struct unicode_str *name, } /* retrieve a pointer to a desktop object */ -static inline struct desktop *get_desktop_obj( struct process *process, obj_handle_t handle, - unsigned int access ) +struct desktop *get_desktop_obj( struct process *process, obj_handle_t handle, unsigned int access ) { return (struct desktop *)get_handle_obj( process, handle, access, &desktop_ops ); }

1 0

Zachary Goldberg : WWN 343
by Jeremy Newman March 18, 2008

March 18, 2008

Module: website Branch: master Commit: 028cbe35c2f609e0552126d4ace6243670124940 URL: http://source.winehq.org/git/website.git/?a=commit;h=028cbe35c2f609e0552126… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Mon Mar 17 23:37:24 2008 -0400 WWN 343 --- news/2008031701.xml | 7 + wwn/wn20080317_343.xml | 1126 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1133 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=028cbe35c2f609e055…

1 0

Michael Karcher : winex11: Fix alpha for client-side-rendered text.
by Alexandre Julliard March 18, 2008

March 18, 2008

Module: wine Branch: master Commit: 5e463acef74d88d451ecc4b0747d1a78a22a7962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e463acef74d88d451ecc4b07… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Mar 16 20:43:13 2008 +0100 winex11: Fix alpha for client-side-rendered text. --- dlls/winex11.drv/xrender.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index aa894a6..d39938c 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1107,7 +1107,7 @@ static Picture get_tile_pict(enum drawable_depth_type type, int text_pixel) col.green |= col.green << 8; col.blue = GetField(text_pixel, b_shift, b_len); col.blue |= col.blue << 8; - col.alpha = 0x0; + col.alpha = 0xffff; wine_tsx11_lock(); pXRenderFillRectangle(gdi_display, PictOpSrc, tile->pict, &col, 0, 0, 1, 1);

1 0

Aric Stewart : rebar: In AutoSize get the window rc after REBAR_Layout if needed to respect the sizing changes made by REBAR_Layout .
by Alexandre Julliard March 18, 2008

March 18, 2008

Module: wine Branch: master Commit: 178ef4495fae7454cc3d314929855777b5a13455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=178ef4495fae7454cc3d31492… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 17 18:00:53 2008 +0900 rebar: In AutoSize get the window rc after REBAR_Layout if needed to respect the sizing changes made by REBAR_Layout. --- dlls/comctl32/rebar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index f1f823a..7b1f008 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1516,9 +1516,9 @@ REBAR_AutoSize(REBAR_INFO *infoPtr, BOOL needsLayout) RECT rc, rcNew; NMRBAUTOSIZE autosize; - GetClientRect(infoPtr->hwndSelf, &rc); if (needsLayout) REBAR_Layout(infoPtr); + GetClientRect(infoPtr->hwndSelf, &rc); REBAR_SizeToHeight(infoPtr, get_rect_cy(infoPtr, &rc)); GetClientRect(infoPtr->hwndSelf, &rcNew);

1 0

Alexandre Julliard : winex11: Fix mouse coordinates mapping on desktop window.
by Alexandre Julliard March 18, 2008

March 18, 2008

Module: wine Branch: master Commit: d9f8f704abbb17d705d30c7c944a3a9081fbce17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f8f704abbb17d705d30c7c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 18 12:20:16 2008 +0100 winex11: Fix mouse coordinates mapping on desktop window. --- dlls/winex11.drv/mouse.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 736c5d9..8301386 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -172,11 +172,6 @@ static void update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned { struct x11drv_thread_data *data = x11drv_thread_data(); - if (window == root_window) - { - x += virtual_screen_rect.left; - y += virtual_screen_rect.top; - } get_coords( hwnd, window, x, y, pt ); /* update the cursor */

1 0