September 2010 - Wine-commits

Thomas Mullaly : urlmon: Some IUri's don' t include the userinfo component in the absolute URI string.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: ef8200ebd2f413b19ff31991bc61dd5c4745d9b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef8200ebd2f413b19ff31991b… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Sep 6 18:54:22 2010 -0400 urlmon: Some IUri's don't include the userinfo component in the absolute URI string. --- dlls/urlmon/tests/uri.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 67 +++++++++++++++++--- 2 files changed, 215 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef8200ebd2f413b19ff31…

1 0

Thomas Mullaly : urlmon: Implemented IUriBuilder_{Get/Set}UserName.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 380fd731e2d8bc6fb1e404539541a43b191fe575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=380fd731e2d8bc6fb1e404539… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Sep 6 17:55:23 2010 -0400 urlmon: Implemented IUriBuilder_{Get/Set}UserName. --- dlls/urlmon/tests/uri.c | 34 +++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 34 +++++++++++++++++++++------------- 2 files changed, 54 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 4c8f358..8517046 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4433,7 +4433,7 @@ static const uri_builder_test uri_builder_tests[] = { {TRUE,"#fragment",NULL,Uri_PROPERTY_FRAGMENT,S_OK,FALSE}, {TRUE,"password",NULL,Uri_PROPERTY_PASSWORD,S_OK,FALSE}, {TRUE,"?query=x",NULL,Uri_PROPERTY_QUERY,S_OK,FALSE}, - {TRUE,"username",NULL,Uri_PROPERTY_USER_NAME,S_OK,TRUE} + {TRUE,"username",NULL,Uri_PROPERTY_USER_NAME,S_OK,FALSE} }, {FALSE}, 0,S_OK,TRUE, @@ -4856,6 +4856,38 @@ static const uri_builder_test uri_builder_tests[] = { {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "http://:password(a)google.com/",0,S_OK,FALSE, + { + {FALSE}, + }, + {FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"http://:password(a)google.com/",S_OK}, + {":password(a)google.com",S_OK}, + {"http://google.com/",S_OK}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"google.com",S_OK}, + {"password",S_OK}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://:password(a)google.com/",S_OK}, + {"http",S_OK}, + {":password",S_OK}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 283c649..94be29b 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -100,6 +100,9 @@ typedef struct { WCHAR *scheme; DWORD scheme_len; + + WCHAR *username; + DWORD username_len; } UriBuilder; typedef struct { @@ -4383,6 +4386,7 @@ static ULONG WINAPI UriBuilder_Release(IUriBuilder *iface) heap_free(This->path); heap_free(This->query); heap_free(This->scheme); + heap_free(This->username); heap_free(This); } @@ -4602,19 +4606,22 @@ static HRESULT WINAPI UriBuilder_GetUserName(IUriBuilder *iface, DWORD *pcchUser UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%p %p)\n", This, pcchUserName, ppwzUserName); - if(!pcchUserName) { - if(ppwzUserName) - *ppwzUserName = NULL; - return E_POINTER; - } + if(!This->uri || This->uri->userinfo_start == -1 || + This->uri->userinfo_start == This->uri->userinfo_split || + This->modified_props & Uri_HAS_USER_NAME) + return get_builder_component(&This->username, &This->username_len, NULL, 0, ppwzUserName, pcchUserName); + else { + const WCHAR *start = This->uri->canon_uri+This->uri->userinfo_start; - if(!ppwzUserName) { - *pcchUserName = 0; - return E_POINTER; + /* Check if there's a password in the userinfo section. */ + if(This->uri->userinfo_split > -1) + /* Don't include the password. */ + return get_builder_component(&This->username, &This->username_len, start, + This->uri->userinfo_split, ppwzUserName, pcchUserName); + else + return get_builder_component(&This->username, &This->username_len, start, + This->uri->userinfo_len, ppwzUserName, pcchUserName); } - - FIXME("(%p)->(%p %p)\n", This, pcchUserName, ppwzUserName); - return E_NOTIMPL; } static HRESULT WINAPI UriBuilder_SetFragment(IUriBuilder *iface, LPCWSTR pwzNewValue) @@ -4679,8 +4686,9 @@ static HRESULT WINAPI UriBuilder_SetSchemeName(IUriBuilder *iface, LPCWSTR pwzNe static HRESULT WINAPI UriBuilder_SetUserName(IUriBuilder *iface, LPCWSTR pwzNewValue) { UriBuilder *This = URIBUILDER_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); + return set_builder_component(&This->username, &This->username_len, pwzNewValue, 0, + &This->modified_props, Uri_HAS_USER_NAME); } static HRESULT WINAPI UriBuilder_RemoveProperties(IUriBuilder *iface, DWORD dwPropertyMask)

1 0

Alexandre Julliard : include: Move some included files outside of extern "C ".
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 2349a5eb4fbb1b8b1abedcad226d3d98eae1f261 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2349a5eb4fbb1b8b1abedcad2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 7 11:36:46 2010 +0200 include: Move some included files outside of extern "C". --- include/ddrawi.h | 6 +++--- include/mapival.h | 8 ++++---- include/msi.h | 8 ++++---- include/rpcndr.h | 4 ++-- include/shlobj.h | 5 ++--- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/include/ddrawi.h b/include/ddrawi.h index 8b3b632..4e3c9e3 100644 --- a/include/ddrawi.h +++ b/include/ddrawi.h @@ -22,13 +22,13 @@ #ifndef __WINE_DDRAWI_H #define __WINE_DDRAWI_H +#include <ddraw.h> +#include <dciddi.h> /* the DD HAL is layered onto DCI escapes */ + #ifdef __cplusplus extern "C" { #endif -#include <ddraw.h> -#include <dciddi.h> /* the DD HAL is layered onto DCI escapes */ - typedef struct _DDVIDEOPORTCAPS *LPDDVIDEOPORTCAPS; /* should be in dvp.h */ typedef struct _DDKERNELCAPS *LPDDKERNELCAPS; /* should be in ddkernel.h */ typedef struct _VMEMHEAP *LPVMEMHEAP; /* should be in dmemmgr.h */ diff --git a/include/mapival.h b/include/mapival.h index 82cd020..e44c21e 100644 --- a/include/mapival.h +++ b/include/mapival.h @@ -19,14 +19,14 @@ #ifndef MAPIVAL_H #define MAPIVAL_H -#ifdef __cplusplus -extern "C" { -#endif - #include <mapiutil.h> #include <stddef.h> #include <stdarg.h> +#ifdef __cplusplus +extern "C" { +#endif + BOOL WINAPI FBadRglpszW(LPWSTR*,ULONG); BOOL WINAPI FBadRowSet(LPSRowSet); BOOL WINAPI FBadRglpNameID(LPMAPINAMEID*,ULONG); diff --git a/include/msi.h b/include/msi.h index 164cd26..550ce95 100644 --- a/include/msi.h +++ b/include/msi.h @@ -19,14 +19,14 @@ #ifndef __WINE_MSI_H #define __WINE_MSI_H -#ifdef __cplusplus -extern "C" { -#endif - #ifndef _MSI_NO_CRYPTO #include <wincrypt.h> #endif +#ifdef __cplusplus +extern "C" { +#endif + typedef ULONG MSIHANDLE; typedef enum tagINSTALLSTATE diff --git a/include/rpcndr.h b/include/rpcndr.h index 5ab0685..8c1b4df 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -24,12 +24,12 @@ #ifndef __WINE_RPCNDR_H #define __WINE_RPCNDR_H +#include <basetsd.h> + #ifdef __cplusplus extern "C" { #endif -#include <basetsd.h> - #undef CONST_VTBL #ifdef CONST_VTABLE # define CONST_VTBL const diff --git a/include/shlobj.h b/include/shlobj.h index cda1306..e0170ea 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -23,6 +23,8 @@ #include <commctrl.h> #include <prsht.h> #include <shlguid.h> +#include <shtypes.h> +#include <shobjidl.h> #ifdef WINE_NO_UNICODE_MACROS #undef GetObject @@ -35,9 +37,6 @@ extern "C" { /* Except for specific structs, this header is byte packed */ #include <pshpack1.h> -#include <shtypes.h> -#include <shobjidl.h> - #ifndef HPSXA_DEFINED #define HPSXA_DEFINED DECLARE_HANDLE(HPSXA);

1 0

Alexandre Julliard : user32: Add support for fetching window rectangles relative to various origins.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 7295b6746d64709106c235d02ab109c45e47f397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7295b6746d64709106c235d02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 7 14:31:30 2010 +0200 user32: Add support for fetching window rectangles relative to various origins. --- dlls/user32/win.c | 76 ++++++++++++++++++++++++++++----------- dlls/user32/win.h | 3 +- dlls/user32/winpos.c | 20 ++-------- dlls/winex11.drv/window.c | 5 ++- include/wine/server_protocol.h | 11 +++++- server/protocol.def | 8 ++++ server/request.h | 3 +- server/trace.c | 1 + server/window.c | 33 +++++++++++++++--- 9 files changed, 112 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7295b6746d64709106c23…

1 0

Alexandre Julliard : user32: Pass the window styles to NC_GetInsideRect instead of accessing the window structure .
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: c5bf4976f189a0fe4b083ab5161be0556390c678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bf4976f189a0fe4b083ab51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 7 14:33:13 2010 +0200 user32: Pass the window styles to NC_GetInsideRect instead of accessing the window structure. --- dlls/user32/nonclient.c | 54 ++++++++++++++++++++++++++-------------------- 1 files changed, 30 insertions(+), 24 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index a685370..6112c98 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -479,7 +479,7 @@ LRESULT NC_HandleNCCalcSize( HWND hwnd, RECT *winRect ) * but without the borders (if any). * The rectangle is in window coordinates (for drawing with GetWindowDC()). */ -static void NC_GetInsideRect( HWND hwnd, RECT *rect ) +static void NC_GetInsideRect( HWND hwnd, RECT *rect, DWORD style, DWORD ex_style ) { WND *wndPtr = WIN_GetPtr( hwnd ); @@ -489,30 +489,29 @@ static void NC_GetInsideRect( HWND hwnd, RECT *rect ) rect->right = wndPtr->rectWindow.right - wndPtr->rectWindow.left; rect->bottom = wndPtr->rectWindow.bottom - wndPtr->rectWindow.top; - if (wndPtr->dwStyle & WS_ICONIC) goto END; + if (style & WS_ICONIC) goto END; /* Remove frame from rectangle */ - if (HAS_THICKFRAME( wndPtr->dwStyle, wndPtr->dwExStyle )) + if (HAS_THICKFRAME( style, ex_style )) { InflateRect( rect, -GetSystemMetrics(SM_CXFRAME), -GetSystemMetrics(SM_CYFRAME) ); } - else if (HAS_DLGFRAME( wndPtr->dwStyle, wndPtr->dwExStyle )) + else if (HAS_DLGFRAME( style, ex_style )) { InflateRect( rect, -GetSystemMetrics(SM_CXDLGFRAME), -GetSystemMetrics(SM_CYDLGFRAME)); } - else if (HAS_THINFRAME( wndPtr->dwStyle )) + else if (HAS_THINFRAME( style )) { InflateRect( rect, -GetSystemMetrics(SM_CXBORDER), -GetSystemMetrics(SM_CYBORDER) ); } /* We have additional border information if the window * is a child (but not an MDI child) */ - if ( (wndPtr->dwStyle & WS_CHILD) && - ( (wndPtr->dwExStyle & WS_EX_MDICHILD) == 0 ) ) + if ((style & WS_CHILD) && !(ex_style & WS_EX_MDICHILD)) { - if (wndPtr->dwExStyle & WS_EX_CLIENTEDGE) + if (ex_style & WS_EX_CLIENTEDGE) InflateRect (rect, -GetSystemMetrics(SM_CXEDGE), -GetSystemMetrics(SM_CYEDGE)); - if (wndPtr->dwExStyle & WS_EX_STATICEDGE) + if (ex_style & WS_EX_STATICEDGE) InflateRect (rect, -GetSystemMetrics(SM_CXBORDER), -GetSystemMetrics(SM_CYBORDER)); } @@ -706,7 +705,10 @@ BOOL NC_DrawSysButton (HWND hwnd, HDC hdc, BOOL down) if (hIcon) { RECT rect; - NC_GetInsideRect( hwnd, &rect ); + DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); + DWORD ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); + + NC_GetInsideRect( hwnd, &rect, style, ex_style ); DrawIconEx (hdc, rect.left + 2, rect.top + 1, hIcon, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0, 0, DI_NORMAL); @@ -728,11 +730,13 @@ BOOL NC_DrawSysButton (HWND hwnd, HDC hdc, BOOL down) static void NC_DrawCloseButton (HWND hwnd, HDC hdc, BOOL down, BOOL bGrayed) { RECT rect; + DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); + DWORD ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); - NC_GetInsideRect( hwnd, &rect ); + NC_GetInsideRect( hwnd, &rect, style, ex_style ); /* A tool window has a smaller Close button */ - if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_TOOLWINDOW) + if (ex_style & WS_EX_TOOLWINDOW) { INT iBmpHeight = 11; /* Windows does not use SM_CXSMSIZE and SM_CYSMSIZE */ INT iBmpWidth = 11; /* it uses 11x11 for the close button in tool window */ @@ -766,15 +770,16 @@ static void NC_DrawMaxButton(HWND hwnd,HDC hdc,BOOL down, BOOL bGrayed) { RECT rect; UINT flags; + DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); + DWORD ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); /* never draw maximize box when window has WS_EX_TOOLWINDOW style */ - if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_TOOLWINDOW) - return; + if (ex_style & WS_EX_TOOLWINDOW) return; - flags = IsZoomed(hwnd) ? DFCS_CAPTIONRESTORE : DFCS_CAPTIONMAX; + flags = (style & WS_MAXIMIZE) ? DFCS_CAPTIONRESTORE : DFCS_CAPTIONMAX; - NC_GetInsideRect( hwnd, &rect ); - if (GetWindowLongW( hwnd, GWL_STYLE) & WS_SYSMENU) + NC_GetInsideRect( hwnd, &rect, style, ex_style ); + if (style & WS_SYSMENU) rect.right -= GetSystemMetrics(SM_CXSIZE); rect.left = rect.right - GetSystemMetrics(SM_CXSIZE); rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZE) - 2; @@ -796,12 +801,12 @@ static void NC_DrawMinButton(HWND hwnd,HDC hdc,BOOL down, BOOL bGrayed) RECT rect; UINT flags = DFCS_CAPTIONMIN; DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); + DWORD ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); /* never draw minimize box when window has WS_EX_TOOLWINDOW style */ - if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_TOOLWINDOW) - return; + if (ex_style & WS_EX_TOOLWINDOW) return; - NC_GetInsideRect( hwnd, &rect ); + NC_GetInsideRect( hwnd, &rect, style, ex_style ); if (style & WS_SYSMENU) rect.right -= GetSystemMetrics(SM_CXSIZE); if (style & (WS_MAXIMIZEBOX|WS_MINIMIZEBOX)) @@ -1215,13 +1220,14 @@ void NC_GetSysPopupPos( HWND hwnd, RECT* rect ) if (IsIconic(hwnd)) GetWindowRect( hwnd, rect ); else { + DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); + DWORD ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); WND *wndPtr = WIN_GetPtr( hwnd ); if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return; - NC_GetInsideRect( hwnd, rect ); + NC_GetInsideRect( hwnd, rect, style, ex_style ); OffsetRect( rect, wndPtr->rectWindow.left, wndPtr->rectWindow.top); - if (wndPtr->dwStyle & WS_CHILD) - ClientToScreen( GetParent(hwnd), (POINT *)rect ); + if (style & WS_CHILD) ClientToScreen( GetParent(hwnd), (POINT *)rect ); rect->right = rect->left + GetSystemMetrics(SM_CYCAPTION) - 1; rect->bottom = rect->top + GetSystemMetrics(SM_CYCAPTION) - 1; WIN_ReleasePtr( wndPtr ); @@ -1643,7 +1649,7 @@ BOOL WINAPI GetTitleBarInfo(HWND hwnd, PTITLEBARINFO tbi) { } dwStyle = GetWindowLongW(hwnd, GWL_STYLE); dwExStyle = GetWindowLongW(hwnd, GWL_EXSTYLE); - NC_GetInsideRect(hwnd, &tbi->rcTitleBar); + NC_GetInsideRect(hwnd, &tbi->rcTitleBar, dwStyle, dwExStyle); GetWindowRect(hwnd, &wndRect);

1 0

Alexandre Julliard : user32: Use WIN_GetRectangles where possible instead of accessing the window structure .
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 141defbd54239e8bf86ee299ac5294c5d2598c48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=141defbd54239e8bf86ee299a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 7 14:41:07 2010 +0200 user32: Use WIN_GetRectangles where possible instead of accessing the window structure. --- dlls/user32/defwnd.c | 5 +-- dlls/user32/nonclient.c | 51 ++++++++------------------------ dlls/user32/painting.c | 13 ++------ dlls/user32/scroll.c | 32 ++++++++++---------- dlls/user32/win.c | 19 ++++------- dlls/user32/winpos.c | 74 +++++++++++++++++++++++----------------------- 6 files changed, 78 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=141defbd54239e8bf86ee…

1 0

Alexandre Julliard : user32: Use WIN_GetRectangles where possible instead of mapping coordinates explicitly .
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 9b693ddadbdcba044f17b1d61729d565ab41273f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b693ddadbdcba044f17b1d61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 7 15:11:24 2010 +0200 user32: Use WIN_GetRectangles where possible instead of mapping coordinates explicitly. --- dlls/user32/edit.c | 3 +-- dlls/user32/mdi.c | 3 +-- dlls/user32/menu.c | 3 +-- dlls/user32/painting.c | 6 ++---- dlls/user32/win.c | 7 +------ dlls/user32/winpos.c | 4 +--- 6 files changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 05a68ea..8f59d95 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3109,8 +3109,7 @@ static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y) { RECT rc; /* Windows places the menu at the edit's center in this case */ - GetClientRect(es->hwndSelf, &rc); - MapWindowPoints(es->hwndSelf, 0, (POINT *)&rc, 2); + WIN_GetRectangles( es->hwndSelf, COORDS_SCREEN, NULL, &rc ); x = rc.left + (rc.right - rc.left) / 2; y = rc.top + (rc.bottom - rc.top) / 2; } diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index d382eb7..bcaef76 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1720,13 +1720,12 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll ) if (style & WS_VISIBLE) { RECT rect; - GetWindowRect( list[i], &rect ); + WIN_GetRectangles( list[i], COORDS_PARENT, &rect, NULL ); UnionRect( &childRect, &rect, &childRect ); } } HeapFree( GetProcessHeap(), 0, list ); } - MapWindowPoints( 0, hwnd, (POINT *)&childRect, 2 ); UnionRect( &childRect, &clientRect, &childRect ); /* set common info values */ diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 764b7ea..e4dc607 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3632,8 +3632,7 @@ BOOL WINAPI EnableMenuItem( HMENU hMenu, UINT wItemID, UINT wFlags ) return (UINT)-1; /* Refresh the frame to reflect the change */ - GetWindowRect(parentMenu->hWnd, &rc); - MapWindowPoints(0, parentMenu->hWnd, (POINT *)&rc, 2); + WIN_GetRectangles( parentMenu->hWnd, COORDS_CLIENT, &rc, NULL ); rc.bottom = 0; RedrawWindow(parentMenu->hWnd, &rc, 0, RDW_FRAME | RDW_INVALIDATE | RDW_NOCHILDREN); } diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 2a29db5..94bb630 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -637,8 +637,7 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) /* check if update rgn overlaps with nonclient area */ type = GetRgnBox( whole_rgn, &update ); - GetClientRect( hwnd, &client ); - MapWindowPoints( hwnd, 0, (POINT *)&client, 2 ); + WIN_GetRectangles( hwnd, COORDS_SCREEN, 0, &client ); if ((*flags & UPDATE_NONCLIENT) || update.left < client.left || update.top < client.top || @@ -1486,8 +1485,7 @@ INT WINAPI ScrollWindowEx( HWND hwnd, INT dx, INT dy, RECT r, dummy; for (i = 0; list[i]; i++) { - GetWindowRect( list[i], &r ); - MapWindowPoints( 0, hwnd, (POINT *)&r, 2 ); + WIN_GetRectangles( list[i], COORDS_PARENT, &r, NULL ); if (!rect || IntersectRect(&dummy, &r, rect)) SetWindowPos( list[i], 0, r.left + dx, r.top + dy, 0, 0, SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE | diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 8de2843..4f85547 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3350,12 +3350,7 @@ UINT WINAPI GetWindowModuleFileNameW( HWND hwnd, LPWSTR module, UINT size ) BOOL WINAPI GetWindowInfo( HWND hwnd, PWINDOWINFO pwi) { if (!pwi) return FALSE; - if (!IsWindow(hwnd)) return FALSE; - - GetWindowRect(hwnd, &pwi->rcWindow); - GetClientRect(hwnd, &pwi->rcClient); - /* translate to screen coordinates */ - MapWindowPoints(hwnd, 0, (LPPOINT)&pwi->rcClient, 2); + if (!WIN_GetRectangles( hwnd, COORDS_SCREEN, &pwi->rcWindow, &pwi->rcClient )) return FALSE; pwi->dwStyle = GetWindowLongW(hwnd, GWL_STYLE); pwi->dwExStyle = GetWindowLongW(hwnd, GWL_EXSTYLE); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 2fb0138..485f32d 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2428,12 +2428,10 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) /* Get min/max info */ WINPOS_GetMinMaxInfo( hwnd, NULL, NULL, &minTrack, &maxTrack ); - GetWindowRect( hwnd, &sizingRect ); + WIN_GetRectangles( hwnd, COORDS_PARENT, &sizingRect, NULL ); if (style & WS_CHILD) { parent = GetParent(hwnd); - /* make sizing rect relative to parent */ - MapWindowPoints( 0, parent, (POINT*)&sizingRect, 2 ); GetClientRect( parent, &mouseRect ); } else

1 0

Andrew Nguyen : setupapi: Improve parameter validation for SetupCreateDiskSpaceListA/W.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 188ed272dc577305b0482174f2bc6e93406d4f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=188ed272dc577305b0482174f… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Sep 7 05:00:29 2010 -0500 setupapi: Improve parameter validation for SetupCreateDiskSpaceListA/W. --- dlls/setupapi/diskspace.c | 8 ++ dlls/setupapi/tests/Makefile.in | 1 + dlls/setupapi/tests/diskspace.c | 153 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c index 07025bd..61e20de 100644 --- a/dlls/setupapi/diskspace.c +++ b/dlls/setupapi/diskspace.c @@ -53,6 +53,14 @@ HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID Reserved1, DWORD Reserved2, UINT WCHAR *ptr; LPDISKSPACELIST list=NULL; + TRACE("(%p, %u, 0x%08x)\n", Reserved1, Reserved2, Flags); + + if (Reserved1 || Reserved2 || Flags & ~SPDSL_IGNORE_DISK) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + rc = GetLogicalDriveStringsW(255,drives); if (rc == 0) diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in index 27de9ff..2818ec0 100644 --- a/dlls/setupapi/tests/Makefile.in +++ b/dlls/setupapi/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = setupapi user32 advapi32 C_SRCS = \ devinst.c \ + diskspace.c \ install.c \ misc.c \ parser.c \ diff --git a/dlls/setupapi/tests/diskspace.c b/dlls/setupapi/tests/diskspace.c new file mode 100644 index 0000000..33ea608 --- /dev/null +++ b/dlls/setupapi/tests/diskspace.c @@ -0,0 +1,153 @@ +/* + * Unit tests for disk space functions + * + * Copyright 2010 Andrew Nguyen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winuser.h" +#include "winreg.h" +#include "setupapi.h" + +#include "wine/test.h" + +static void test_SetupCreateDiskSpaceListA(void) +{ + HDSKSPC ret; + + ret = SetupCreateDiskSpaceListA(NULL, 0, 0); + ok(ret != NULL, + "Expected SetupCreateDiskSpaceListA to return a valid handle, got NULL\n"); + + ok(SetupDestroyDiskSpaceList(ret), "Expected SetupDestroyDiskSpaceList to succeed\n"); + + ret = SetupCreateDiskSpaceListA(NULL, 0, SPDSL_IGNORE_DISK); + ok(ret != NULL, + "Expected SetupCreateDiskSpaceListA to return a valid handle, got NULL\n"); + + ok(SetupDestroyDiskSpaceList(ret), "Expected SetupDestroyDiskSpaceList to succeed\n"); + + SetLastError(0xdeadbeef); + ret = SetupCreateDiskSpaceListA(NULL, 0, ~0U); + ok(ret == NULL || + broken(ret != NULL), /* NT4/Win9x/Win2k */ + "Expected SetupCreateDiskSpaceListA to return NULL, got %p\n", ret); + if (!ret) + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + else + ok(SetupDestroyDiskSpaceList(ret), "Expected SetupDestroyDiskSpaceList to succeed\n"); + + SetLastError(0xdeadbeef); + ret = SetupCreateDiskSpaceListA(NULL, 0xdeadbeef, 0); + ok(ret == NULL, + "Expected SetupCreateDiskSpaceListA to return NULL, got %p\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* NT4/Win9x/Win2k */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupCreateDiskSpaceListA((void *)0xdeadbeef, 0, 0); + ok(ret == NULL, + "Expected SetupCreateDiskSpaceListA to return NULL, got %p\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* NT4/Win9x/Win2k */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupCreateDiskSpaceListA((void *)0xdeadbeef, 0xdeadbeef, 0); + ok(ret == NULL, + "Expected SetupCreateDiskSpaceListA to return NULL, got %p\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* NT4/Win9x/Win2k */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); +} + +static void test_SetupCreateDiskSpaceListW(void) +{ + HDSKSPC ret; + + ret = SetupCreateDiskSpaceListW(NULL, 0, 0); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("SetupCreateDiskSpaceListW is not implemented\n"); + return; + } + ok(ret != NULL, + "Expected SetupCreateDiskSpaceListW to return a valid handle, got NULL\n"); + + ok(SetupDestroyDiskSpaceList(ret), "Expected SetupDestroyDiskSpaceList to succeed\n"); + + ret = SetupCreateDiskSpaceListW(NULL, 0, SPDSL_IGNORE_DISK); + ok(ret != NULL, + "Expected SetupCreateDiskSpaceListW to return a valid handle, got NULL\n"); + + ok(SetupDestroyDiskSpaceList(ret), "Expected SetupDestroyDiskSpaceList to succeed\n"); + + SetLastError(0xdeadbeef); + ret = SetupCreateDiskSpaceListW(NULL, 0, ~0U); + ok(ret == NULL || + broken(ret != NULL), /* NT4/Win2k */ + "Expected SetupCreateDiskSpaceListW to return NULL, got %p\n", ret); + if (!ret) + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + else + ok(SetupDestroyDiskSpaceList(ret), "Expected SetupDestroyDiskSpaceList to succeed\n"); + + SetLastError(0xdeadbeef); + ret = SetupCreateDiskSpaceListW(NULL, 0xdeadbeef, 0); + ok(ret == NULL, + "Expected SetupCreateDiskSpaceListW to return NULL, got %p\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* NT4/Win2k */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0, 0); + ok(ret == NULL, + "Expected SetupCreateDiskSpaceListW to return NULL, got %p\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* NT4/Win2k */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0xdeadbeef, 0); + ok(ret == NULL, + "Expected SetupCreateDiskSpaceListW to return NULL, got %p\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* NT4/Win2k */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); +} + +START_TEST(diskspace) +{ + test_SetupCreateDiskSpaceListA(); + test_SetupCreateDiskSpaceListW(); +}

1 0

Andrew Nguyen : setupapi: Implement SetupQuerySpaceRequiredOnDriveW.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 3902efc9cb088d8623ff993613d0b091ffe56d18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3902efc9cb088d8623ff99361… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Sep 7 05:00:39 2010 -0500 setupapi: Implement SetupQuerySpaceRequiredOnDriveW. --- dlls/setupapi/diskspace.c | 50 ++++++++++++++++++++++++++++++++++++++---- dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c index 61e20de..c87d4b6 100644 --- a/dlls/setupapi/diskspace.c +++ b/dlls/setupapi/diskspace.c @@ -115,20 +115,26 @@ BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC DiskSpace, } /*********************************************************************** -* SetupQuerySpaceRequiredOnDriveA (SETUPAPI.@) +* SetupQuerySpaceRequiredOnDriveW (SETUPAPI.@) */ -BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC DiskSpace, - LPCSTR DriveSpec, LONGLONG* SpaceRequired, +BOOL WINAPI SetupQuerySpaceRequiredOnDriveW(HDSKSPC DiskSpace, + LPCWSTR DriveSpec, LONGLONG *SpaceRequired, PVOID Reserved1, UINT Reserved2) { - WCHAR driveW[20]; + WCHAR *driveW; unsigned int i; LPDISKSPACELIST list = DiskSpace; BOOL rc = FALSE; static const WCHAR bkslsh[]= {'\\',0}; - MultiByteToWideChar(CP_ACP,0,DriveSpec,-1,driveW,20); + driveW = HeapAlloc(GetProcessHeap(), 0, lstrlenW(DriveSpec) + 2); + if (!driveW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + lstrcpyW(driveW,DriveSpec); lstrcatW(driveW,bkslsh); TRACE("Looking for drive %s\n",debugstr_w(driveW)); @@ -144,10 +150,44 @@ BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC DiskSpace, } } + HeapFree(GetProcessHeap(), 0, driveW); + return rc; } /*********************************************************************** +* SetupQuerySpaceRequiredOnDriveA (SETUPAPI.@) +*/ +BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC DiskSpace, + LPCSTR DriveSpec, LONGLONG *SpaceRequired, + PVOID Reserved1, UINT Reserved2) +{ + LPWSTR DriveSpecW = NULL; + BOOL ret; + + if (DriveSpec) + { + DWORD len = MultiByteToWideChar(CP_ACP, 0, DriveSpec, -1, NULL, 0); + + DriveSpecW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!DriveSpecW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + MultiByteToWideChar(CP_ACP, 0, DriveSpec, -1, DriveSpecW, len); + } + + ret = SetupQuerySpaceRequiredOnDriveW(DiskSpace, DriveSpecW, SpaceRequired, + Reserved1, Reserved2); + + HeapFree(GetProcessHeap(), 0, DriveSpecW); + + return ret; +} + +/*********************************************************************** * SetupDestroyDiskSpaceList (SETUPAPI.@) */ BOOL WINAPI SetupDestroyDiskSpaceList(HDSKSPC DiskSpace) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index a3dd4b0..bb96c19 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -482,7 +482,7 @@ @ stub SetupQuerySourceListA @ stub SetupQuerySourceListW @ stdcall SetupQuerySpaceRequiredOnDriveA(long str ptr ptr long) -@ stub SetupQuerySpaceRequiredOnDriveW +@ stdcall SetupQuerySpaceRequiredOnDriveW(long wstr ptr ptr long) @ stdcall SetupQueueCopyA(long str str str str str str str long) @ stdcall SetupQueueCopyIndirectA(ptr) @ stdcall SetupQueueCopyIndirectW(ptr)

1 0

Andrew Nguyen : setupapi: Improve parameter validation in SetupQuerySpaceRequiredOnDriveA/W.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: beb3018bd56059b338c809411bc3aa2b79d0453c URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb3018bd56059b338c809411… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Sep 7 05:00:56 2010 -0500 setupapi: Improve parameter validation in SetupQuerySpaceRequiredOnDriveA/W. --- dlls/setupapi/diskspace.c | 45 ++++++++-- dlls/setupapi/tests/diskspace.c | 176 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 211 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=beb3018bd56059b338c80…

1 0