September 2010 - Wine-commits

Hans Leidekker : msi: A progid without a class is not an error.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: c5ef45e5ef12a7ff373face488d063b85f95b45f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5ef45e5ef12a7ff373face48… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 24 17:08:56 2010 +0200 msi: A progid without a class is not an error. --- dlls/msi/classes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 30ee36b..5943805 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -1072,7 +1072,7 @@ static UINT register_progid( const MSIPROGID* progid ) if (clsid) msi_reg_set_subkey_val( hkey, szCLSID, NULL, clsid ); else - ERR("%s has no class\n", debugstr_w( progid->ProgID ) ); + TRACE("%s has no class\n", debugstr_w( progid->ProgID ) ); if (progid->Description) msi_reg_set_val_str( hkey, NULL, progid->Description );

1 0

Mariusz Pluciński : gameux: IGameStatistics:: GetMaxStatsPerCategory implementation.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 7cbcbf45770de0d7263a31e4c419e71f5fd35328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cbcbf45770de0d7263a31e4c… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Sep 23 15:40:04 2010 +0200 gameux: IGameStatistics::GetMaxStatsPerCategory implementation. --- dlls/gameux/gamestatistics.c | 12 ++++++++++-- dlls/gameux/tests/gamestatistics.c | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index c318eef..44cc04e 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -31,10 +31,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(gameux); +/* + * constant definitions + */ #define MAX_CATEGORY_LENGTH 60 #define MAX_NAME_LENGTH 30 #define MAX_VALUE_LENGTH 30 #define MAX_CATEGORIES 10 +#define MAX_STATS_PER_CATEGORY 10 /******************************************************************************* * IGameStatistics implementation */ @@ -160,8 +164,12 @@ static HRESULT WINAPI GameStatisticsImpl_GetMaxStatsPerCategory( IGameStatistics *iface, WORD *pMax) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p, %p)\n", iface, pMax); + if(!pMax) + return E_INVALIDARG; + + *pMax = MAX_STATS_PER_CATEGORY; + return S_OK; } static HRESULT WINAPI GameStatisticsImpl_SetCategoryTitle( diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index e485f9f..30e1fcd 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -260,8 +260,8 @@ static void test_gamestatisticsmgr( void ) ok(wMaxCategories==10, "getting maximum number of categories returned invalid value: %d\n", wMaxCategories); hr = IGameStatistics_GetMaxStatsPerCategory(gs, &wMaxStatsPerCategory); - todo_wine ok(hr==S_OK, "getting maximum number of statistics per category failed\n"); - todo_wine ok(wMaxStatsPerCategory==10, "getting maximum number of statistics per category returned invalid value: %d\n", wMaxStatsPerCategory); + ok(hr==S_OK, "getting maximum number of statistics per category failed\n"); + ok(wMaxStatsPerCategory==10, "getting maximum number of statistics per category returned invalid value: %d\n", wMaxStatsPerCategory); /* create name of statistics file */ hr = _buildStatisticsFilePath(&guidApplicationId, &lpStatisticsFile);

1 0

Misha Koshelev : d3dx9_36: Add stub for D3DXCreateTeapot.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 10af823fd59ed0e49068d487b9e99c527777d8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10af823fd59ed0e49068d487b… Author: Misha Koshelev <misha680(a)gmail.com> Date: Thu Sep 23 16:22:15 2010 -0500 d3dx9_36: Add stub for D3DXCreateTeapot. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 133ce16..8221118 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -89,7 +89,7 @@ @ stub D3DXCreateSkinInfoFVF @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) -@ stub D3DXCreateTeapot +@ stdcall D3DXCreateTeapot(ptr ptr ptr) @ stub D3DXCreateTextA @ stub D3DXCreateTextW @ stdcall D3DXCreateTexture(ptr long long long long long long ptr) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 3e5dd47..21ca2dc 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1070,3 +1070,10 @@ HRESULT WINAPI D3DXCreateSphere(LPDIRECT3DDEVICE9 device, FLOAT radius, UINT sli return E_NOTIMPL; } + +HRESULT WINAPI D3DXCreateTeapot(LPDIRECT3DDEVICE9 device, LPD3DXMESH *mesh, LPD3DXBUFFER* adjacency) +{ + FIXME("(%p, %p, %p): stub\n", device, mesh, adjacency); + + return E_NOTIMPL; +}

1 0

Misha Koshelev : d3dx9_36: Implement ID3DXMesh_Lock/ UnlockVertexBuffer and ID3DXMesh_Lock/UnlockIndexBuffer.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 99e2aedbf7937c23ceb36d3bb34814406f4e8270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e2aedbf7937c23ceb36d3bb… Author: Misha Koshelev <misha680(a)gmail.com> Date: Thu Sep 23 16:22:25 2010 -0500 d3dx9_36: Implement ID3DXMesh_Lock/UnlockVertexBuffer and ID3DXMesh_Lock/UnlockIndexBuffer. --- dlls/d3dx9_36/mesh.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 21ca2dc..a7ea30a 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -213,36 +213,36 @@ static HRESULT WINAPI ID3DXMeshImpl_LockVertexBuffer(ID3DXMesh *iface, DWORD fla { ID3DXMeshImpl *This = (ID3DXMeshImpl *)iface; - FIXME("(%p)->(%u,%p): stub\n", This, flags, data); + TRACE("(%p)->(%u,%p)\n", This, flags, data); - return E_NOTIMPL; + return IDirect3DVertexBuffer9_Lock(This->vertex_buffer, 0, 0, data, flags); } static HRESULT WINAPI ID3DXMeshImpl_UnlockVertexBuffer(ID3DXMesh *iface) { ID3DXMeshImpl *This = (ID3DXMeshImpl *)iface; - FIXME("(%p): stub\n", This); + TRACE("(%p)\n", This); - return E_NOTIMPL; + return IDirect3DVertexBuffer9_Unlock(This->vertex_buffer); } static HRESULT WINAPI ID3DXMeshImpl_LockIndexBuffer(ID3DXMesh *iface, DWORD flags, LPVOID *data) { ID3DXMeshImpl *This = (ID3DXMeshImpl *)iface; - FIXME("(%p)->(%u,%p): stub\n", This, flags, data); + TRACE("(%p)->(%u,%p)\n", This, flags, data); - return E_NOTIMPL; + return IDirect3DIndexBuffer9_Lock(This->index_buffer, 0, 0, data, flags); } static HRESULT WINAPI ID3DXMeshImpl_UnlockIndexBuffer(ID3DXMesh *iface) { ID3DXMeshImpl *This = (ID3DXMeshImpl *)iface; - FIXME("(%p): stub\n", This); + TRACE("(%p)\n", This); - return E_NOTIMPL; + return IDirect3DIndexBuffer9_Unlock(This->index_buffer); } static HRESULT WINAPI ID3DXMeshImpl_GetAttributeTable(ID3DXMesh *iface, D3DXATTRIBUTERANGE *attrib_table, DWORD *attrib_table_size)

1 0

Misha Koshelev : d3dx9_36: Implement D3DXCreateSphere.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: d7d9cd5eb24bd4b682a6bb3d2b240e0e312c34f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7d9cd5eb24bd4b682a6bb3d2… Author: Misha Koshelev <misha680(a)gmail.com> Date: Thu Sep 23 16:22:34 2010 -0500 d3dx9_36: Implement D3DXCreateSphere. --- dlls/d3dx9_36/mesh.c | 222 +++++++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/mesh.c | 18 ++-- 2 files changed, 229 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7d9cd5eb24bd4b682a6b…

1 0

Alexandre Julliard : user32: Fix initial computation of client area in WM_NCCALCSIZE for RTL windows.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: deb830976093418238e7de9722f90b3463a84ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb830976093418238e7de972… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 24 12:46:02 2010 +0200 user32: Fix initial computation of client area in WM_NCCALCSIZE for RTL windows. --- dlls/user32/controls.h | 2 +- dlls/user32/defwnd.c | 2 +- dlls/user32/nonclient.c | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index c36db42..065daeb 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -167,7 +167,7 @@ extern void MENU_EndMenu(HWND) DECLSPEC_HIDDEN; /* nonclient area */ extern LRESULT NC_HandleNCPaint( HWND hwnd , HRGN clip) 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_HandleNCCalcSize( HWND hwnd, WPARAM wParam, 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; extern LRESULT NC_HandleNCLButtonDblClk( HWND hwnd, WPARAM wParam, LPARAM lParam) DECLSPEC_HIDDEN; diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index e4f14b5..226b604 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -309,7 +309,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } case WM_NCCALCSIZE: - return NC_HandleNCCalcSize( hwnd, (RECT *)lParam ); + return NC_HandleNCCalcSize( hwnd, wParam, (RECT *)lParam ); case WM_WINDOWPOSCHANGING: return WINPOS_HandleWindowPosChanging( hwnd, (WINDOWPOS *)lParam ); diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index f385445..cc52f38 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -410,7 +410,7 @@ BOOL WINAPI AdjustWindowRectEx( LPRECT rect, DWORD style, BOOL menu, DWORD exSty * * Handle a WM_NCCALCSIZE message. Called from DefWindowProc(). */ -LRESULT NC_HandleNCCalcSize( HWND hwnd, RECT *winRect ) +LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) { RECT tmpRect = { 0, 0, 0, 0 }; LRESULT result = 0; @@ -451,7 +451,11 @@ LRESULT NC_HandleNCCalcSize( HWND hwnd, RECT *winRect ) - GetSystemMetrics(SM_CYEDGE)); if (style & WS_VSCROLL) - if( winRect->right - winRect->left >= GetSystemMetrics(SM_CXVSCROLL)){ + if (winRect->right - winRect->left >= GetSystemMetrics(SM_CXVSCROLL)) + { + /* rectangle is in screen coords when wparam is false */ + if (!wparam && (exStyle & WS_EX_LAYOUTRTL)) exStyle ^= WS_EX_LEFTSCROLLBAR; + if((exStyle & WS_EX_LEFTSCROLLBAR) != 0) winRect->left += GetSystemMetrics(SM_CXVSCROLL); else

1 0

Alexandre Julliard : user32: Use screen coordinates for hittest checking to handle RTL windows correctly .
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 0df8855b205a9c29c66add86dc4f0da31e35a7ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df8855b205a9c29c66add86d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 24 14:13:03 2010 +0200 user32: Use screen coordinates for hittest checking to handle RTL windows correctly. --- dlls/user32/nonclient.c | 100 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 68 insertions(+), 32 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index cc52f38..64c1186 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -527,8 +527,7 @@ LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) TRACE("hwnd=%p pt=%d,%d\n", hwnd, pt.x, pt.y ); - ScreenToClient( hwnd, &pt ); - WIN_GetRectangles( hwnd, COORDS_CLIENT, &rect, &rcClient ); + WIN_GetRectangles( hwnd, COORDS_SCREEN, &rect, &rcClient ); if (!PtInRect( &rect, pt )) return HTNOWHERE; style = GetWindowLongW( hwnd, GWL_STYLE ); @@ -594,36 +593,81 @@ LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) { BOOL min_or_max_box = (style & WS_MAXIMIZEBOX) || (style & WS_MINIMIZEBOX); - /* Check system menu */ - if ((style & WS_SYSMENU) && !(ex_style & WS_EX_TOOLWINDOW)) + if (ex_style & WS_EX_LAYOUTRTL) { - if (NC_IconForWindow(hwnd)) rect.left += GetSystemMetrics(SM_CYCAPTION) - 1; + /* Check system menu */ + if ((style & WS_SYSMENU) && !(ex_style & WS_EX_TOOLWINDOW) && NC_IconForWindow(hwnd)) + { + rect.right -= GetSystemMetrics(SM_CYCAPTION) - 1; + if (pt.x > rect.right) return HTSYSMENU; + } + + /* Check close button */ + if (style & WS_SYSMENU) + { + rect.left += GetSystemMetrics(SM_CYCAPTION); + if (pt.x < rect.left) return HTCLOSE; + } + + /* Check maximize box */ + /* In win95 there is automatically a Maximize button when there is a minimize one*/ + if (min_or_max_box && !(ex_style & WS_EX_TOOLWINDOW)) + { + rect.left += GetSystemMetrics(SM_CXSIZE); + if (pt.x < rect.left) return HTMAXBUTTON; + } + + /* Check minimize box */ + if (min_or_max_box && !(ex_style & WS_EX_TOOLWINDOW)) + { + rect.left += GetSystemMetrics(SM_CXSIZE); + if (pt.x < rect.left) return HTMINBUTTON; + } + } + else + { + /* Check system menu */ + if ((style & WS_SYSMENU) && !(ex_style & WS_EX_TOOLWINDOW) && NC_IconForWindow(hwnd)) + { + rect.left += GetSystemMetrics(SM_CYCAPTION) - 1; + if (pt.x < rect.left) return HTSYSMENU; + } + + /* Check close button */ + if (style & WS_SYSMENU) + { + rect.right -= GetSystemMetrics(SM_CYCAPTION); + if (pt.x > rect.right) return HTCLOSE; + } + + /* Check maximize box */ + /* In win95 there is automatically a Maximize button when there is a minimize one*/ + if (min_or_max_box && !(ex_style & WS_EX_TOOLWINDOW)) + { + rect.right -= GetSystemMetrics(SM_CXSIZE); + if (pt.x > rect.right) return HTMAXBUTTON; + } + + /* Check minimize box */ + if (min_or_max_box && !(ex_style & WS_EX_TOOLWINDOW)) + { + rect.right -= GetSystemMetrics(SM_CXSIZE); + if (pt.x > rect.right) return HTMINBUTTON; + } } - if (pt.x < rect.left) return HTSYSMENU; - - /* Check close button */ - if (style & WS_SYSMENU) - rect.right -= GetSystemMetrics(SM_CYCAPTION); - if (pt.x > rect.right) return HTCLOSE; - - /* Check maximize box */ - /* In win95 there is automatically a Maximize button when there is a minimize one*/ - if (min_or_max_box && !(ex_style & WS_EX_TOOLWINDOW)) - rect.right -= GetSystemMetrics(SM_CXSIZE); - if (pt.x > rect.right) return HTMAXBUTTON; - - /* Check minimize box */ - /* In win95 there is automatically a Maximize button when there is a Maximize one*/ - if (min_or_max_box && !(ex_style & WS_EX_TOOLWINDOW)) - rect.right -= GetSystemMetrics(SM_CXSIZE); - - if (pt.x > rect.right) return HTMINBUTTON; return HTCAPTION; } } + /* Check menu bar */ + + if (HAS_MENU( hwnd, style ) && (pt.y < rcClient.top) && + (pt.x >= rcClient.left) && (pt.x < rcClient.right)) + return HTMENU; + /* Check vertical scroll bar */ + if (ex_style & WS_EX_LAYOUTRTL) ex_style ^= WS_EX_LEFTSCROLLBAR; if (style & WS_VSCROLL) { if((ex_style & WS_EX_LEFTSCROLLBAR) != 0) @@ -649,14 +693,6 @@ LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) } } - /* Check menu bar */ - - if (HAS_MENU( hwnd, style )) - { - if ((pt.y < 0) && (pt.x >= 0) && (pt.x < rcClient.right)) - return HTMENU; - } - /* Has to return HTNOWHERE if nothing was found Could happen when a window has a customized non client area */ return HTNOWHERE;

1 0

Alexandre Julliard : user32: Fix the window positions when moving a child window for a RTL window.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: d43cc0cd8227755acf799da20359f10104df5dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d43cc0cd8227755acf799da20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 24 15:36:02 2010 +0200 user32: Fix the window positions when moving a child window for a RTL window. --- dlls/user32/winpos.c | 60 +++++++++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 27 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 1721b34..17730f2 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2310,25 +2310,28 @@ UINT WINAPI ArrangeIconicWindows( HWND parent ) * * Draw the frame used when moving or resizing window. */ -static void draw_moving_frame( HDC hdc, RECT *rect, BOOL thickframe ) +static void draw_moving_frame( HWND parent, HDC hdc, RECT *screen_rect, BOOL thickframe ) { + RECT rect = *screen_rect; + + if (parent) MapWindowPoints( 0, parent, (POINT *)&rect, 2 ); if (thickframe) { const int width = GetSystemMetrics(SM_CXFRAME); const int height = GetSystemMetrics(SM_CYFRAME); HBRUSH hbrush = SelectObject( hdc, GetStockObject( GRAY_BRUSH ) ); - PatBlt( hdc, rect->left, rect->top, - rect->right - rect->left - width, height, PATINVERT ); - PatBlt( hdc, rect->left, rect->top + height, width, - rect->bottom - rect->top - height, PATINVERT ); - PatBlt( hdc, rect->left + width, rect->bottom - 1, - rect->right - rect->left - width, -height, PATINVERT ); - PatBlt( hdc, rect->right - 1, rect->top, -width, - rect->bottom - rect->top - height, PATINVERT ); + PatBlt( hdc, rect.left, rect.top, + rect.right - rect.left - width, height, PATINVERT ); + PatBlt( hdc, rect.left, rect.top + height, width, + rect.bottom - rect.top - height, PATINVERT ); + PatBlt( hdc, rect.left + width, rect.bottom - 1, + rect.right - rect.left - width, -height, PATINVERT ); + PatBlt( hdc, rect.right - 1, rect.top, -width, + rect.bottom - rect.top - height, PATINVERT ); SelectObject( hdc, hbrush ); } - else DrawFocusRect( hdc, rect ); + else DrawFocusRect( hdc, &rect ); } @@ -2486,10 +2489,13 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) WINPOS_GetMinMaxInfo( hwnd, NULL, NULL, &minTrack, &maxTrack ); WIN_GetRectangles( hwnd, COORDS_PARENT, &sizingRect, NULL ); + origRect = sizingRect; if (style & WS_CHILD) { parent = GetParent(hwnd); GetClientRect( parent, &mouseRect ); + MapWindowPoints( parent, 0, (LPPOINT)&mouseRect, 2 ); + MapWindowPoints( parent, 0, (LPPOINT)&sizingRect, 2 ); } else { @@ -2500,7 +2506,6 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) mouseRect.right = mouseRect.left + GetSystemMetrics( SM_CXVIRTUALSCREEN ); mouseRect.bottom = mouseRect.top + GetSystemMetrics( SM_CYVIRTUALSCREEN ); } - origRect = sizingRect; if (ON_LEFT_BORDER(hittest)) { @@ -2522,7 +2527,6 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) mouseRect.top = max( mouseRect.top, sizingRect.top+minTrack.y ); mouseRect.bottom = min( mouseRect.bottom, sizingRect.top+maxTrack.y ); } - if (parent) MapWindowPoints( parent, 0, (LPPOINT)&mouseRect, 2 ); /* Retrieve a default cache DC (without using the window style) */ hdc = GetDCEx( parent, 0, DCX_CACHE ); @@ -2593,39 +2597,40 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) WINPOS_ShowIconTitle( hwnd, FALSE ); } else if(!DragFullWindows) - draw_moving_frame( hdc, &sizingRect, thickframe ); + draw_moving_frame( parent, hdc, &sizingRect, thickframe ); } if (msg.message == WM_KEYDOWN) SetCursorPos( pt.x, pt.y ); else { - RECT newRect = sizingRect; WPARAM wpSizingHit = 0; - if (hittest == HTCAPTION) OffsetRect( &newRect, dx, dy ); - if (ON_LEFT_BORDER(hittest)) newRect.left += dx; - else if (ON_RIGHT_BORDER(hittest)) newRect.right += dx; - if (ON_TOP_BORDER(hittest)) newRect.top += dy; - else if (ON_BOTTOM_BORDER(hittest)) newRect.bottom += dy; - if(!iconic && !DragFullWindows) draw_moving_frame( hdc, &sizingRect, thickframe ); + if(!iconic && !DragFullWindows) draw_moving_frame( parent, hdc, &sizingRect, thickframe ); + if (hittest == HTCAPTION) OffsetRect( &sizingRect, dx, dy ); + if (ON_LEFT_BORDER(hittest)) sizingRect.left += dx; + else if (ON_RIGHT_BORDER(hittest)) sizingRect.right += dx; + if (ON_TOP_BORDER(hittest)) sizingRect.top += dy; + else if (ON_BOTTOM_BORDER(hittest)) sizingRect.bottom += dy; capturePoint = pt; /* determine the hit location */ if (hittest >= HTLEFT && hittest <= HTBOTTOMRIGHT) wpSizingHit = WMSZ_LEFT + (hittest - HTLEFT); - SendMessageW( hwnd, WM_SIZING, wpSizingHit, (LPARAM)&newRect ); + SendMessageW( hwnd, WM_SIZING, wpSizingHit, (LPARAM)&sizingRect ); if (!iconic) { if(!DragFullWindows) - draw_moving_frame( hdc, &newRect, thickframe ); + draw_moving_frame( parent, hdc, &sizingRect, thickframe ); else - SetWindowPos( hwnd, 0, newRect.left, newRect.top, - newRect.right - newRect.left, - newRect.bottom - newRect.top, + { + RECT rect = sizingRect; + MapWindowPoints( 0, parent, (POINT *)&rect, 2 ); + SetWindowPos( hwnd, 0, rect.left, rect.top, + rect.right - rect.left, rect.bottom - rect.top, ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 ); + } } - sizingRect = newRect; } } } @@ -2640,11 +2645,12 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) } else if (moved && !DragFullWindows) { - draw_moving_frame( hdc, &sizingRect, thickframe ); + draw_moving_frame( parent, hdc, &sizingRect, thickframe ); } set_capture_window( 0, GUI_INMOVESIZE, NULL ); ReleaseDC( parent, hdc ); + if (parent) MapWindowPoints( 0, parent, (POINT *)&sizingRect, 2 ); if (HOOK_CallHooks( WH_CBT, HCBT_MOVESIZE, (WPARAM)hwnd, (LPARAM)&sizingRect, TRUE )) moved = FALSE;

1 0

Alexandre Julliard : user32: Set the default process layout based on the file description in the version resource .
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: ddaea5456edf7df5ef1a04cf6c8bbcd05247827d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddaea5456edf7df5ef1a04cf6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 24 15:20:52 2010 +0200 user32: Set the default process layout based on the file description in the version resource. --- dlls/user32/Makefile.in | 2 +- dlls/user32/win.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index acd827b..e37f536 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_USER32_ -D_WINABLE_ MODULE = user32.dll IMPORTLIB = user32 -IMPORTS = gdi32 advapi32 +IMPORTS = gdi32 version advapi32 DELAYIMPORTS = imm32 C_SRCS = \ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index b847a44..ee44278 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -27,6 +27,7 @@ #include <string.h> #include "windef.h" #include "winbase.h" +#include "winver.h" #include "wine/server.h" #include "wine/unicode.h" #include "win.h" @@ -40,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); #define NB_USER_HANDLES ((LAST_USER_HANDLE - FIRST_USER_HANDLE + 1) >> 1) #define USER_HANDLE_TO_INDEX(hwnd) ((LOWORD(hwnd) - FIRST_USER_HANDLE) >> 1) -static DWORD process_layout; +static DWORD process_layout = ~0u; /**********************************************************************/ @@ -1254,8 +1255,10 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, if (className != (LPCWSTR)DESKTOP_CLASS_ATOM && (IS_INTRESOURCE(className) || strcmpiW( className, messageW ))) { + DWORD layout; + GetProcessDefaultLayout( &layout ); + if (layout & LAYOUT_RTL) cs->dwExStyle |= WS_EX_LAYOUTRTL; parent = GetDesktopWindow(); - if (process_layout & LAYOUT_RTL) cs->dwExStyle |= WS_EX_LAYOUTRTL; } } @@ -3552,6 +3555,41 @@ BOOL WINAPI GetProcessDefaultLayout( DWORD *layout ) SetLastError( ERROR_NOACCESS ); return FALSE; } + if (process_layout == ~0u) + { + static const WCHAR translationW[] = { '\\','V','a','r','F','i','l','e','I','n','f','o', + '\\','T','r','a','n','s','l','a','t','i','o','n', 0 }; + static const WCHAR filedescW[] = { '\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', + '\\','%','0','4','x','%','0','4','x', + '\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0 }; + WCHAR *str, buffer[MAX_PATH]; + DWORD i, len, version_layout = 0; + DWORD user_lang = GetUserDefaultLangID(); + DWORD *languages; + void *data = NULL; + + GetModuleFileNameW( 0, buffer, MAX_PATH ); + if (!(len = GetFileVersionInfoSizeW( buffer, NULL ))) goto done; + if (!(data = HeapAlloc( GetProcessHeap(), 0, len ))) goto done; + if (!GetFileVersionInfoW( buffer, 0, len, data )) goto done; + if (!VerQueryValueW( data, translationW, (void **)&languages, &len ) || !len) goto done; + + len /= sizeof(DWORD); + for (i = 0; i < len; i++) if (LOWORD(languages[i]) == user_lang) break; + if (i == len) /* try neutral language */ + for (i = 0; i < len; i++) + if (LOWORD(languages[i]) == MAKELANGID( PRIMARYLANGID(user_lang), SUBLANG_NEUTRAL )) break; + if (i == len) i = 0; /* default to the first one */ + + sprintfW( buffer, filedescW, LOWORD(languages[i]), HIWORD(languages[i]) ); + if (!VerQueryValueW( data, buffer, (void **)&str, &len )) goto done; + TRACE( "found description %s\n", debugstr_w( str )); + if (str[0] == 0x200e && str[1] == 0x200e) version_layout = LAYOUT_RTL; + + done: + HeapFree( GetProcessHeap(), 0, data ); + process_layout = version_layout; + } *layout = process_layout; return TRUE; }

1 0

Alexandre Julliard : version: Don't bother importing lz32, all the functions are in kernel32.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: deaf2f593da0b8bf3170b0df1194a0ec2dc4880f URL: http://source.winehq.org/git/wine.git/?a=commit;h=deaf2f593da0b8bf3170b0df1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 24 15:37:10 2010 +0200 version: Don't bother importing lz32, all the functions are in kernel32. --- dlls/version/Makefile.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in index 1e5142a..c4e3f38 100644 --- a/dlls/version/Makefile.in +++ b/dlls/version/Makefile.in @@ -1,6 +1,5 @@ MODULE = version.dll IMPORTLIB = version -IMPORTS = lz32 C_SRCS = \ info.c \

1 0