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

Alexandre Julliard : winex11: Check if _NET_WM_MOVERESIZE is supported before using it.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: cf76c7d65c7cb6d930c735f4fe5b7755e7f8d73f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf76c7d65c7cb6d930c735f4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 12 17:29:28 2008 +0100 winex11: Check if _NET_WM_MOVERESIZE is supported before using it. --- dlls/winex11.drv/winpos.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index c30ef71..f215f41 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -639,6 +639,37 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) /*********************************************************************** + * is_netwm_supported + */ +static BOOL is_netwm_supported( Display *display, Atom atom ) +{ + static Atom *net_supported; + static int net_supported_count = -1; + int i; + + wine_tsx11_lock(); + if (net_supported_count == -1) + { + Atom type; + int format; + unsigned long count, remaining; + + if (!XGetWindowProperty( display, DefaultRootWindow(display), x11drv_atom(_NET_SUPPORTED), 0, + ~0UL, False, XA_ATOM, &type, &format, &count, + &remaining, (unsigned char **)&net_supported )) + net_supported_count = count * (format / 8) / sizeof(Atom); + else + net_supported_count = 0; + } + wine_tsx11_unlock(); + + for (i = 0; i < net_supported_count; i++) + if (net_supported[i] == atom) return TRUE; + return FALSE; +} + + +/*********************************************************************** * SysCommandSizeMove (X11DRV.@) * * Perform SC_MOVE and SC_SIZE commands. @@ -656,6 +687,12 @@ BOOL X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wparam ) if (!(data = X11DRV_get_win_data( hwnd ))) return FALSE; if (!data->whole_window || !data->managed) return FALSE; + if (!is_netwm_supported( display, x11drv_atom(_NET_WM_MOVERESIZE) )) + { + TRACE( "_NET_WM_MOVERESIZE not supported\n" ); + return FALSE; + } + if (syscommand == SC_MOVE) { if (!hittest) dir = _NET_WM_MOVERESIZE_MOVE_KEYBOARD; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index bdf6657..a685e64 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -567,6 +567,7 @@ enum x11drv_atoms XATOM__ICC_PROFILE, XATOM__MOTIF_WM_HINTS, XATOM__KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR, + XATOM__NET_SUPPORTED, XATOM__NET_SYSTEM_TRAY_OPCODE, XATOM__NET_SYSTEM_TRAY_S0, XATOM__NET_WM_MOVERESIZE, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 9162857..0ea3a1b 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -131,6 +131,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "_ICC_PROFILE", "_MOTIF_WM_HINTS", "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", + "_NET_SUPPORTED", "_NET_SYSTEM_TRAY_OPCODE", "_NET_SYSTEM_TRAY_S0", "_NET_WM_MOVERESIZE",

1 0

Rob Shearman : wininet: Fix proxy authentication by using the data in lpwhr-> pProxyAuthInfo in HTTP_InsertAuthorization instead of lpwhr-> pAuthInfo when inserting the Proxy-Authentication header.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: b8ad4dee86ce432c7e7b5328beee1000dd3a9d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ad4dee86ce432c7e7b5328b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 12 13:27:28 2008 +0000 wininet: Fix proxy authentication by using the data in lpwhr->pProxyAuthInfo in HTTP_InsertAuthorization instead of lpwhr->pAuthInfo when inserting the Proxy-Authentication header. --- dlls/wininet/http.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5ea8a45..64d527b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1186,10 +1186,9 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) * * Insert or delete the authorization field in the request header. */ -static BOOL HTTP_InsertAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR header, BOOL first ) +static BOOL HTTP_InsertAuthorization( LPWININETHTTPREQW lpwhr, struct HttpAuthInfo *pAuthInfo, LPCWSTR header, BOOL first ) { WCHAR *authorization = NULL; - struct HttpAuthInfo *pAuthInfo = lpwhr->pAuthInfo; DWORD flags; if (pAuthInfo && pAuthInfo->auth_data_len) @@ -3077,8 +3076,8 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, lpwhr->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION ? szKeepAlive : szClose, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); - HTTP_InsertAuthorization(lpwhr, szAuthorization, !loop_next); - HTTP_InsertAuthorization(lpwhr, szProxy_Authorization, !loop_next); + HTTP_InsertAuthorization(lpwhr, lpwhr->pAuthInfo, szAuthorization, !loop_next); + HTTP_InsertAuthorization(lpwhr, lpwhr->pProxyAuthInfo, szProxy_Authorization, !loop_next); /* add the headers the caller supplied */ if( lpszHeaders && dwHeaderLength )

1 0

Alexandre Julliard : winex11: Moved support for window moving/ resizing back to user32.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: dc26f278353446c9481ab536054fc0f7c023384a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc26f278353446c9481ab5360… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 12 15:01:24 2008 +0100 winex11: Moved support for window moving/resizing back to user32. --- dlls/user32/driver.c | 7 +- dlls/user32/nonclient.c | 2 +- dlls/user32/user32.spec | 2 - dlls/user32/user_private.h | 2 +- dlls/user32/win.h | 2 +- dlls/user32/winpos.c | 483 +++++++++++++++++++++++++++++++++---- dlls/winex11.drv/window.c | 33 +++ dlls/winex11.drv/winex11.drv.spec | 1 + dlls/winex11.drv/winpos.c | 467 +---------------------------------- dlls/winex11.drv/x11drv.h | 3 - 10 files changed, 495 insertions(+), 507 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc26f278353446c9481ab…

1 0

Alexandre Julliard : user32: Add a SetCapture function to the driver interface.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: b9dee8efa7e74c49169cedf53788fefb69c3b1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9dee8efa7e74c49169cedf53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 12 14:55:28 2008 +0100 user32: Add a SetCapture function to the driver interface. --- dlls/user32/driver.c | 12 ++++++++++++ dlls/user32/input.c | 2 ++ dlls/user32/user_private.h | 1 + 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index d773c08..ad950ce 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -112,6 +112,7 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(MsgWaitForMultipleObjectsEx); GET_USER_FUNC(ReleaseDC); GET_USER_FUNC(ScrollDC); + GET_USER_FUNC(SetCapture); GET_USER_FUNC(SetFocus); GET_USER_FUNC(SetParent); GET_USER_FUNC(SetWindowPos); @@ -364,6 +365,10 @@ static BOOL nulldrv_ScrollDC( HDC hdc, INT dx, INT dy, const RECT *scroll, const return FALSE; } +static void nulldrv_SetCapture( HWND hwnd, UINT flags ) +{ +} + static void nulldrv_SetFocus( HWND hwnd ) { } @@ -452,6 +457,7 @@ static const USER_DRIVER null_driver = nulldrv_MsgWaitForMultipleObjectsEx, nulldrv_ReleaseDC, nulldrv_ScrollDC, + nulldrv_SetCapture, nulldrv_SetFocus, nulldrv_SetParent, nulldrv_SetWindowPos, @@ -676,6 +682,11 @@ static BOOL loaderdrv_ScrollDC( HDC hdc, INT dx, INT dy, const RECT *scroll, con return load_driver()->pScrollDC( hdc, dx, dy, scroll, clip, hrgn, update ); } +static void loaderdrv_SetCapture( HWND hwnd, UINT flags ) +{ + load_driver()->pSetCapture( hwnd, flags ); +} + static void loaderdrv_SetFocus( HWND hwnd ) { load_driver()->pSetFocus( hwnd ); @@ -772,6 +783,7 @@ static const USER_DRIVER lazy_load_driver = loaderdrv_MsgWaitForMultipleObjectsEx, loaderdrv_ReleaseDC, loaderdrv_ScrollDC, + loaderdrv_SetCapture, loaderdrv_SetFocus, loaderdrv_SetParent, loaderdrv_SetWindowPos, diff --git a/dlls/user32/input.c b/dlls/user32/input.c index b0fc9c5..8891f59 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -100,6 +100,8 @@ BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) } SERVER_END_REQ; + USER_Driver->pSetCapture( hwnd, gui_flags ); + if (previous && previous != hwnd) SendMessageW( previous, WM_CAPTURECHANGED, 0, (LPARAM)hwnd ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 1131046..ebca80c 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -148,6 +148,7 @@ typedef struct tagUSER_DRIVER { DWORD (*pMsgWaitForMultipleObjectsEx)(DWORD,const HANDLE*,DWORD,DWORD,DWORD); void (*pReleaseDC)(HWND,HDC); BOOL (*pScrollDC)(HDC, INT, INT, const RECT *, const RECT *, HRGN, LPRECT); + void (*pSetCapture)(HWND,UINT); void (*pSetFocus)(HWND); void (*pSetParent)(HWND,HWND,HWND); void (*pSetWindowPos)(HWND,HWND,UINT,const RECT *,const RECT *,const RECT *,const RECT *);

1 0

Alexandre Julliard : user32: Add a helper function to set the capture window.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: 4e129f88d0e8e212702a33906d3ce9609837f4f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e129f88d0e8e212702a33906… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 12 14:54:03 2008 +0100 user32: Add a helper function to set the capture window. --- dlls/user32/input.c | 62 ++++++++++++++++++++++++------------------- dlls/user32/menu.c | 33 +++-------------------- dlls/user32/user_private.h | 1 + 3 files changed, 41 insertions(+), 55 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index a24980b..b0fc9c5 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -76,6 +76,38 @@ static WORD get_key_state(void) } +/********************************************************************** + * set_capture_window + */ +BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) +{ + HWND previous = 0; + UINT flags = 0; + BOOL ret; + + if (gui_flags & GUI_INMENUMODE) flags |= CAPTURE_MENU; + if (gui_flags & GUI_INMOVESIZE) flags |= CAPTURE_MOVESIZE; + + SERVER_START_REQ( set_capture_window ) + { + req->handle = hwnd; + req->flags = flags; + if ((ret = !wine_server_call_err( req ))) + { + previous = reply->previous; + hwnd = reply->full_handle; + } + } + SERVER_END_REQ; + + if (previous && previous != hwnd) + SendMessageW( previous, WM_CAPTURECHANGED, 0, (LPARAM)hwnd ); + + if (prev_ret) *prev_ret = previous; + return ret; +} + + /*********************************************************************** * SendInput (USER32.@) */ @@ -191,22 +223,9 @@ BOOL WINAPI SetCursorPos( INT x, INT y ) */ HWND WINAPI SetCapture( HWND hwnd ) { - HWND previous = 0; - - SERVER_START_REQ( set_capture_window ) - { - req->handle = hwnd; - req->flags = 0; - if (!wine_server_call_err( req )) - { - previous = reply->previous; - hwnd = reply->full_handle; - } - } - SERVER_END_REQ; + HWND previous; - if (previous && previous != hwnd) - SendMessageW( previous, WM_CAPTURECHANGED, 0, (LPARAM)hwnd ); + set_capture_window( hwnd, 0, &previous ); return previous; } @@ -216,18 +235,7 @@ HWND WINAPI SetCapture( HWND hwnd ) */ BOOL WINAPI ReleaseCapture(void) { - BOOL ret; - HWND previous = 0; - - SERVER_START_REQ( set_capture_window ) - { - req->handle = 0; - req->flags = 0; - if ((ret = !wine_server_call_err( req ))) previous = reply->previous; - } - SERVER_END_REQ; - - if (previous) SendMessageW( previous, WM_CAPTURECHANGED, 0, 0 ); + BOOL ret = set_capture_window( 0, 0, NULL ); /* Somebody may have missed some mouse movements */ mouse_event( MOUSEEVENTF_MOVE, 0, 0, 0, 0 ); diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 660c5d5..17b2179 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2636,30 +2636,6 @@ static BOOL MENU_MouseMove( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags ) /*********************************************************************** - * MENU_SetCapture - */ -static void MENU_SetCapture( HWND hwnd ) -{ - HWND previous = 0; - - SERVER_START_REQ( set_capture_window ) - { - req->handle = hwnd; - req->flags = CAPTURE_MENU; - if (!wine_server_call_err( req )) - { - previous = reply->previous; - hwnd = reply->full_handle; - } - } - SERVER_END_REQ; - - if (previous && previous != hwnd) - SendMessageW( previous, WM_CAPTURECHANGED, 0, (LPARAM)hwnd ); -} - - -/*********************************************************************** * MENU_DoNextMenu * * NOTE: WM_NEXTMENU documented in Win32 is a bit different. @@ -2781,7 +2757,7 @@ static LRESULT MENU_DoNextMenu( MTRACKER* pmt, UINT vk ) if( hNewWnd != pmt->hOwnerWnd ) { pmt->hOwnerWnd = hNewWnd; - MENU_SetCapture( pmt->hOwnerWnd ); + set_capture_window( pmt->hOwnerWnd, GUI_INMENUMODE, NULL ); } pmt->hTopMenu = pmt->hCurrentMenu = hNewMenu; /* all subpopups are hidden */ @@ -3015,7 +2991,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, if (wFlags & TF_ENDMENU) fEndMenu = TRUE; - MENU_SetCapture( mt.hOwnerWnd ); + set_capture_window( mt.hOwnerWnd, GUI_INMENUMODE, NULL ); while (!fEndMenu) { @@ -3239,7 +3215,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, else mt.trackFlags &= ~TF_SKIPREMOVE; } - MENU_SetCapture(0); /* release the capture */ + set_capture_window( 0, GUI_INMENUMODE, NULL ); /* If dropdown is still painted and the close box is clicked on then the menu will be destroyed as part of the DispatchMessage above. @@ -4122,7 +4098,8 @@ BOOL MENU_SetMenu( HWND hWnd, HMENU hMenu ) return FALSE; hWnd = WIN_GetFullHandle( hWnd ); - if (GetCapture() == hWnd) MENU_SetCapture(0); /* release the capture */ + if (GetCapture() == hWnd) + set_capture_window( 0, GUI_INMENUMODE, NULL ); /* release the capture */ if (hMenu != 0) { diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 8292158..1131046 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -234,6 +234,7 @@ struct dce; extern BOOL CLIPBOARD_ReleaseOwner(void) DECLSPEC_HIDDEN; extern BOOL FOCUS_MouseActivate( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL HOOK_IsHooked( INT id ) DECLSPEC_HIDDEN; +extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ); extern void free_dce( struct dce *dce, HWND hwnd ) DECLSPEC_HIDDEN; extern void invalidate_dce( HWND hwnd, const RECT *rect ) DECLSPEC_HIDDEN; extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN;

1 0

Alexander Nicolaysen Sørnes : Remove workaround for PHP4
by Chris Morgan March 12, 2008

March 12, 2008

Module: appdb Branch: master Commit: a15bd62b7e76e01bd44ea34b25c5bd1f93d6f507 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a15bd62b7e76e01bd44ea34b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Mar 12 00:31:46 2008 +0100 Remove workaround for PHP4 --- include/objectManager.php | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 8fa869c..bb7e319 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -148,10 +148,7 @@ class ObjectManager /* Check whether the associated class has the given method */ public function checkMethod($sMethodName, $bEnableOutput) { - // NOTE: we only 'new' here because php4 requires an instance - // of an object as the first argument to method_exists(), php5 - // doesn't - if(!method_exists(new $this->sClass(), $sMethodName)) + if(!method_exists($this->sClass, $sMethodName)) { if($bEnableOutput) echo "class '".$this->sClass."' lacks method '".$sMethodName."'\n"; return false;

1 0

Huw Davies : comctl32: Always send WM_CTLCOLORSTATIC during WM_ERASEBKGND.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: f6603d9fcb9822920248759f637890f24abd11f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6603d9fcb9822920248759f6… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 12 11:07:25 2008 +0000 comctl32: Always send WM_CTLCOLORSTATIC during WM_ERASEBKGND. --- dlls/comctl32/animate.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index 0b406b4..a567cb3 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -856,14 +856,10 @@ static LRESULT ANIMATE_Destroy(ANIMATE_INFO *infoPtr) static BOOL ANIMATE_EraseBackground(ANIMATE_INFO const *infoPtr, HDC hdc) { RECT rect; - HBRUSH hBrush = 0; - - if(infoPtr->dwStyle & ACS_TRANSPARENT) - { - hBrush = (HBRUSH)SendMessageW(infoPtr->hwndNotify, WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)infoPtr->hwndSelf); - } + HBRUSH hBrush; + hBrush = (HBRUSH)SendMessageW(infoPtr->hwndNotify, WM_CTLCOLORSTATIC, + (WPARAM)hdc, (LPARAM)infoPtr->hwndSelf); GetClientRect(infoPtr->hwndSelf, &rect); FillRect(hdc, &rect, hBrush ? hBrush : GetCurrentObject(hdc, OBJ_BRUSH));

1 0

Alistair Leslie-Hughes : msxml3: Allow IXMLDOMDocument to save as another IXMLDOMDocument.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: 6167c6122a7d3a437bacc6619295f2c1faae8bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=6167c6122a7d3a437bacc6619… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 12 21:47:17 2008 +1100 msxml3: Allow IXMLDOMDocument to save as another IXMLDOMDocument. --- dlls/msxml3/domdoc.c | 29 +++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 55 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index fed1b8b..a05247a 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1559,12 +1559,37 @@ static HRESULT WINAPI domdoc_save( TRACE("(%p)->(var(vt %x, %s))\n", This, V_VT(&destination), V_VT(&destination) == VT_BSTR ? debugstr_w(V_BSTR(&destination)) : NULL); - if(V_VT(&destination) != VT_BSTR) + if(V_VT(&destination) != VT_BSTR && V_VT(&destination) != VT_UNKNOWN) { - FIXME("Unhandled vt %x\n", V_VT(&destination)); + FIXME("Unhandled vt %d\n", V_VT(&destination)); return S_FALSE; } + if(V_VT(&destination) == VT_UNKNOWN) + { + IUnknown *pUnk = V_UNKNOWN(&destination); + IXMLDOMDocument *pDocument; + + ret = IXMLDOMDocument_QueryInterface(pUnk, &IID_IXMLDOMDocument2, (void**)&pDocument); + if(ret == S_OK) + { + BSTR bXML; + VARIANT_BOOL bSuccessful; + + ret = IXMLDOMDocument_get_xml(iface, &bXML); + if(ret == S_OK) + { + ret = IXMLDOMDocument_loadXML(pDocument, bXML, &bSuccessful); + + SysFreeString(bXML); + } + + IXMLDOMDocument_Release(pDocument); + } + + return ret; + } + handle = CreateFileW( V_BSTR(&destination), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); if( handle == INVALID_HANDLE_VALUE ) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c4c5b9c..b597670 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3013,6 +3013,60 @@ static void test_nodeTypeTests( void ) free_bstrs(); } +static void test_DocumentSaveToDocument(void) +{ + IXMLDOMDocument *doc = NULL; + IXMLDOMDocument *doc2 = NULL; + IXMLDOMElement *pRoot; + + HRESULT hr; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc ); + if( hr != S_OK ) + return; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc2 ); + if( hr != S_OK ) + { + IXMLDOMDocument_Release(doc); + return; + } + + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)pRoot, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + VARIANT vDoc; + BSTR sOrig; + BSTR sNew; + + V_VT(&vDoc) = VT_UNKNOWN; + V_UNKNOWN(&vDoc) = (IUnknown*)doc2; + + hr = IXMLDOMDocument_save(doc, vDoc); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMDocument_get_xml(doc, &sOrig); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMDocument_get_xml(doc2, &sNew); + ok(hr == S_OK, "ret %08x\n", hr ); + + ok( !lstrcmpW( sOrig, sNew ), "New document is not the same as origial\n"); + + SysFreeString(sOrig); + SysFreeString(sNew); + } + } + + IXMLDOMDocument_Release(doc2); + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { HRESULT r; @@ -3034,6 +3088,7 @@ START_TEST(domdoc) test_cloneNode(); test_xmlTypes(); test_nodeTypeTests(); + test_DocumentSaveToDocument(); CoUninitialize(); }

1 0

Alistair Leslie-Hughes : msxml3: Register msxml3 typelib.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: a1cce9288bb325a21fcd15bfe10ec254534e8388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1cce9288bb325a21fcd15bfe… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 12 20:09:32 2008 +1100 msxml3: Register msxml3 typelib. --- dlls/msxml3/main.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/regsvr.c | 18 ++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 92e9dbb..abbe040 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); - +static HINSTANCE hInstance; static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; @@ -96,6 +96,41 @@ HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) return S_OK; } +static CRITICAL_SECTION MSXML3_typelib_cs; +static CRITICAL_SECTION_DEBUG MSXML3_typelib_cs_debug = +{ + 0, 0, &MSXML3_typelib_cs, + { &MSXML3_typelib_cs_debug.ProcessLocksList, + &MSXML3_typelib_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": MSXML3_typelib_cs") } +}; +static CRITICAL_SECTION MSXML3_typelib_cs = { &MSXML3_typelib_cs_debug, -1, 0, 0, 0, 0 }; + +ITypeLib *get_msxml3_typelib( LPWSTR *path ) +{ + static WCHAR msxml3_path[MAX_PATH]; + + EnterCriticalSection( &MSXML3_typelib_cs ); + + if (!typelib) + { + TRACE("loading typelib\n"); + + if (GetModuleFileNameW( hInstance, msxml3_path, MAX_PATH )) + LoadTypeLib( msxml3_path, &typelib ); + } + + LeaveCriticalSection( &MSXML3_typelib_cs ); + + if (path) + *path = msxml3_path; + + if (typelib) + ITypeLib_AddRef( typelib ); + + return typelib; +} + static void process_detach(void) { if(typelib) { @@ -123,6 +158,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) #ifdef HAVE_LIBXML2 xmlInitParser(); #endif + hInstance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 6feb8ac..3767686 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -112,5 +112,6 @@ enum tid_t { }; extern HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo); +extern ITypeLib *get_msxml3_typelib( LPWSTR *path ); #endif /* __MSXML_PRIVATE__ */ diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index 3a0c6bd..1f08150 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -3,6 +3,7 @@ * * Copyright (C) 2003 John K. Hohm * Copyright (C) 2006 Robert Shearman + * Copyright (C) 2008 Alistair Leslie-Hughes * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,6 +25,8 @@ #include <stdarg.h> #include <string.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -651,6 +654,8 @@ static struct progid const progid_list[] = { HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; + ITypeLib *tl; + LPWSTR path = NULL; TRACE("\n"); @@ -659,6 +664,16 @@ HRESULT WINAPI DllRegisterServer(void) hr = register_interfaces(interface_list); if (SUCCEEDED(hr)) hr = register_progids(progid_list); + + tl = get_msxml3_typelib( &path ); + if (tl) + { + hr = RegisterTypeLib( tl, path, NULL ); + ITypeLib_Release( tl ); + } + else + hr = E_FAIL; + return hr; } @@ -676,5 +691,8 @@ HRESULT WINAPI DllUnregisterServer(void) hr = unregister_interfaces(interface_list); if (SUCCEEDED(hr)) hr = unregister_progids(progid_list); + if (SUCCEEDED(hr)) + hr = UnRegisterTypeLib(&LIBID_MSXML2, 3, 0, LOCALE_SYSTEM_DEFAULT, SYS_WIN32); + return hr; }

1 0

Lei Zhang : shell32: Use xdg well known directories for my_xxx folder symbolic links.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: 78f5db2b511cb8b558f1198dbf640781e929de8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=78f5db2b511cb8b558f1198db… Author: Lei Zhang <thestig(a)google.com> Date: Tue Mar 11 13:51:43 2008 -0700 shell32: Use xdg well known directories for my_xxx folder symbolic links. --- dlls/shell32/shellpath.c | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index d3d3b75..dd7eb0c 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -46,6 +46,7 @@ #include "pidl.h" #include "wine/unicode.h" #include "shlwapi.h" +#include "xdg.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -1993,8 +1994,9 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { * point directly to $HOME. We assume the user to be a unix hacker who does not * want wine to create anything anywhere besides the .wine directory. So, if * there already is a 'My Music' directory in $HOME, we symlink the 'My Music' - * shell folder to it. But if not, we symlink it to $HOME directly. The same - * holds fo 'My Pictures' and 'My Video'. + * shell folder to it. But if not, then we check XDG_MUSIC_DIR - "well known" + * directory, and try to link to that. If that fails, then we symlink to + * $HOME directly. The same holds fo 'My Pictures' and 'My Video'. * - The Desktop shell folder is symlinked to '$HOME/Desktop', if that does * exists and left alone if not. * ('My Music',... above in fact means LoadString(IDS_MYMUSIC)) @@ -2003,6 +2005,7 @@ static void _SHCreateSymbolicLinks(void) { UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEO, IDS_MYMUSIC }, i; int acsidlMyStuff[] = { CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC }; + static const char * xdg_dirs[] = { "PICTURES", "VIDEOS", "MUSIC" }; WCHAR wszTempPath[MAX_PATH]; char szPersonalTarget[FILENAME_MAX], *pszPersonal; char szMyStuffTarget[FILENAME_MAX], *pszMyStuff; @@ -2010,6 +2013,8 @@ static void _SHCreateSymbolicLinks(void) struct stat statFolder; const char *pszHome; HRESULT hr; + const unsigned int num = sizeof(xdg_dirs) / sizeof(xdg_dirs[0]); + char ** xdg_results = NULL; /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ hr = SHGetFolderPathW(NULL, CSIDL_PERSONAL|CSIDL_FLAG_CREATE, NULL, @@ -2018,6 +2023,8 @@ static void _SHCreateSymbolicLinks(void) pszPersonal = wine_get_unix_file_name(wszTempPath); if (!pszPersonal) return; + XDG_UserDirLookup(xdg_dirs, num, &xdg_results); + pszHome = getenv("HOME"); if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) { strcpy(szPersonalTarget, pszHome); @@ -2073,9 +2080,17 @@ static void _SHCreateSymbolicLinks(void) } else { - /* Else link to where 'My Documents' itself links to. */ rmdir(pszMyStuff); - symlink(szPersonalTarget, pszMyStuff); + if (xdg_results && xdg_results[i]) + { + /* the folder specified by XDG_XXX_DIR exists, link to it. */ + symlink(xdg_results[i], pszMyStuff); + } + else + { + /* Else link to where 'My Documents' itself links to. */ + symlink(szPersonalTarget, pszMyStuff); + } } HeapFree(GetProcessHeap(), 0, pszMyStuff); } @@ -2099,6 +2114,14 @@ static void _SHCreateSymbolicLinks(void) HeapFree(GetProcessHeap(), 0, pszDesktop); } } + + /* Free resources allocated by XDG_UserDirLookup() */ + if (xdg_results) + { + for (i = 0; i < num; i++) + HeapFree(GetProcessHeap(), 0, xdg_results[i]); + HeapFree(GetProcessHeap(), 0, xdg_results); + } } /* Register the default values in the registry, as some apps seem to depend

1 0