January 2006 - Wine-Commits

Robert Reif : dsound: Duplex test fix.
by Alexandre Julliard Jan. 25, 2006

Jan. 25, 2006

Module: wine Branch: refs/heads/master Commit: 6255936c83b2070de67f055d824762bb60cdfe99 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6255936c83b2070de67f055… Author: Robert Reif <reif(a)earthlink.net> Date: Wed Jan 25 13:15:25 2006 +0100 dsound: Duplex test fix. --- dlls/dsound/tests/duplex.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index e45bbde..2833d35 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -124,8 +124,8 @@ static void IDirectSoundFullDuplex_tests CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex, (void**)&dsfdo); ok(rc==S_OK||rc==REGDB_E_CLASSNOTREG, - "CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s\n", - DXGetErrorString8(rc)); + "CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s (0x%08lx)\n", + DXGetErrorString8(rc), rc); if (rc==REGDB_E_CLASSNOTREG) { trace(" Class Not Registered\n"); return; @@ -138,8 +138,8 @@ static void IDirectSoundFullDuplex_tests rc=CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex, (void**)&dsfdo); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s (0x%08lx)\n", + DXGetErrorString8(rc), rc); if (dsfdo) IDirectSoundFullDuplex_test(dsfdo, FALSE, &DSDEVID_DefaultCapture, &DSDEVID_DefaultPlayback); @@ -149,8 +149,8 @@ static void IDirectSoundFullDuplex_tests rc=CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex, (void**)&dsfdo); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s (0x%08lx)\n", + DXGetErrorString8(rc), rc); if (dsfdo) IDirectSoundFullDuplex_test(dsfdo, FALSE, &DSDEVID_DefaultVoiceCapture, &DSDEVID_DefaultVoicePlayback); @@ -162,7 +162,7 @@ static void IDirectSoundFullDuplex_tests (void**)&dsfdo); ok(rc==E_NOINTERFACE, "CoCreateInstance(CLSID_DirectSoundFullDuplex,CLSID_DirectSoundPrivate) " - "should have failed: %s\n",DXGetErrorString8(rc)); + "should have failed: %s (0x%08lx)\n",DXGetErrorString8(rc), rc); ZeroMemory(&wfex, sizeof(wfex)); wfex.wFormatTag = WAVE_FORMAT_PCM; @@ -188,8 +188,8 @@ static void IDirectSoundFullDuplex_tests rc=pDirectSoundFullDuplexCreate(NULL,NULL,&DSCBufferDesc,&DSBufferDesc, get_hwnd(),DSSCL_EXCLUSIVE ,&dsfdo,&pDSCBuffer8, &pDSBuffer8,NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundFullDuplexCreate(NULL) failed: %s\n",DXGetErrorString8(rc)); + ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL||rc==DSERR_INVALIDCALL, + "DirectSoundFullDuplexCreate(NULL,NULL) failed: %s\n",DXGetErrorString8(rc)); if (rc==S_OK && dsfdo) IDirectSoundFullDuplex_test(dsfdo, TRUE, NULL, NULL); @@ -198,7 +198,7 @@ static void IDirectSoundFullDuplex_tests &DSDEVID_DefaultPlayback,&DSCBufferDesc, &DSBufferDesc,get_hwnd(),DSSCL_EXCLUSIVE,&dsfdo, &pDSCBuffer8,&pDSBuffer8,NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, + ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL||rc==DSERR_INVALIDCALL, "DirectSoundFullDuplexCreate(DSDEVID_DefaultCapture," "DSDEVID_DefaultPlayback) failed: %s\n", DXGetErrorString8(rc)); @@ -210,7 +210,7 @@ static void IDirectSoundFullDuplex_tests &DSDEVID_DefaultVoicePlayback, &DSCBufferDesc,&DSBufferDesc,get_hwnd(),DSSCL_EXCLUSIVE, &dsfdo,&pDSCBuffer8,&pDSBuffer8,NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, + ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL||rc==DSERR_INVALIDCALL, "DirectSoundFullDuplexCreate(DSDEVID_DefaultVoiceCapture," "DSDEVID_DefaultVoicePlayback) failed: %s\n", DXGetErrorString8(rc)); @@ -222,7 +222,7 @@ static void IDirectSoundFullDuplex_tests &DSDEVID_DefaultVoiceCapture, &DSCBufferDesc,&DSBufferDesc,get_hwnd(),DSSCL_EXCLUSIVE, &dsfdo,&pDSCBuffer8,&pDSBuffer8,NULL); - ok(rc==DSERR_NODRIVER, + ok(rc==DSERR_NODRIVER||rc==DSERR_INVALIDCALL, "DirectSoundFullDuplexCreate(DSDEVID_DefaultVoicePlayback," "DSDEVID_DefaultVoiceCapture) should have failed: %s\n", DXGetErrorString8(rc));

1 0

Jacek Caban : shdocvw: Added TranslateUrl implementation.
by Alexandre Julliard Jan. 25, 2006

Jan. 25, 2006

Module: wine Branch: refs/heads/master Commit: 53c469f1e869ff07e80240cf8fb104eebeb10558 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=53c469f1e869ff07e80240c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 25 13:15:12 2006 +0100 shdocvw: Added TranslateUrl implementation. --- dlls/shdocvw/dochost.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 0ac1fcc..2a4a81d 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -352,8 +352,14 @@ static HRESULT WINAPI DocHostUIHandler_T DWORD dwTranslate, OLECHAR *pchURLIn, OLECHAR **ppchURLOut) { WebBrowser *This = DOCHOSTUI_THIS(iface); - FIXME("(%p)->(%ld %s %p)\n", This, dwTranslate, debugstr_w(pchURLIn), ppchURLOut); - return E_NOTIMPL; + + TRACE("(%p)->(%ld %s %p)\n", This, dwTranslate, debugstr_w(pchURLIn), ppchURLOut); + + if(This->hostui) + return IDocHostUIHandler_TranslateUrl(This->hostui, dwTranslate, + pchURLIn, ppchURLOut); + + return S_FALSE; } static HRESULT WINAPI DocHostUIHandler_FilterDataObject(IDocHostUIHandler2 *iface,

1 0

Jacek Caban : shdocvw: Store IDocHostUIHandler interface in the WebBrowser object.
by Alexandre Julliard Jan. 25, 2006

Jan. 25, 2006

Module: wine Branch: refs/heads/master Commit: 9cbe52b111b774c3482973b7fc1363c875c15501 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9cbe52b111b774c3482973b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 25 13:14:57 2006 +0100 shdocvw: Store IDocHostUIHandler interface in the WebBrowser object. --- dlls/shdocvw/dochost.c | 31 +++++++++---------------------- dlls/shdocvw/oleobject.c | 8 ++++++++ dlls/shdocvw/shdocvw.h | 2 ++ 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 57b8660..0ac1fcc 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -1,5 +1,5 @@ /* - * Copyright 2005 Jacek Caban for CodeWeavers + * Copyright 2005-2006 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -239,19 +239,14 @@ static HRESULT WINAPI DocHostUIHandler_G DOCHOSTUIINFO *pInfo) { WebBrowser *This = DOCHOSTUI_THIS(iface); - IDocHostUIHandler *handler; HRESULT hres; TRACE("(%p)->(%p)\n", This, pInfo); - if(This->client) { - hres = IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler, (void**)&handler); - if(SUCCEEDED(hres)) { - hres = IDocHostUIHandler_GetHostInfo(handler, pInfo); - IDocHostUIHandler_Release(handler); - if(SUCCEEDED(hres)) - return hres; - } + if(This->hostui) { + hres = IDocHostUIHandler_GetHostInfo(This->hostui, pInfo); + if(SUCCEEDED(hres)) + return hres; } pInfo->dwFlags = DOCHOSTUIFLAG_DISABLE_HELP_MENU | DOCHOSTUIFLAG_OPENNEWWIN @@ -328,21 +323,11 @@ static HRESULT WINAPI DocHostUIHandler_G LPOLESTR *pchKey, DWORD dw) { WebBrowser *This = DOCHOSTUI_THIS(iface); - IDocHostUIHandler *handler; - HRESULT hres; TRACE("(%p)->(%p %ld)\n", This, pchKey, dw); - if(!This->client) - return S_OK; - - hres = IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler, - (void**)&handler); - if(SUCCEEDED(hres)) { - hres = IDocHostUIHandler_GetOptionKeyPath(handler, pchKey, dw); - IDocHostUIHandler_Release(handler); - return hres; - } + if(This->hostui) + return IDocHostUIHandler_GetOptionKeyPath(This->hostui, pchKey, dw); return S_OK; } @@ -430,5 +415,7 @@ void WebBrowser_DocHost_Init(WebBrowser { This->lpDocHostUIHandlerVtbl = &DocHostUIHandler2Vtbl; + This->hostui = NULL; + This->doc_view_hwnd = NULL; } diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 656fe0d..4f41da3 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -124,6 +124,7 @@ static ULONG WINAPI OleObject_Release(IO static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE pClientSite) { WebBrowser *This = OLEOBJ_THIS(iface); + HRESULT hres; TRACE("(%p)->(%p)\n", This, pClientSite); @@ -139,6 +140,8 @@ static HRESULT WINAPI OleObject_SetClien This->shell_embedding_hwnd = NULL; } + if(This->hostui) + IDocHostUIHandler_Release(This->hostui); if(This->client) IOleClientSite_Release(This->client); @@ -152,6 +155,11 @@ static HRESULT WINAPI OleObject_SetClien This->client = pClientSite; IOleClientSite_AddRef(pClientSite); + hres = IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler, + (void**)&This->hostui); + if(FAILED(hres)) + This->hostui = NULL; + create_shell_embedding_hwnd(This); return S_OK; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 49508b8..1aa8480 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -2,6 +2,7 @@ * Header includes for shdocvw.dll * * Copyright 2001 John R. Sheets (for CodeWeavers) + * Copyright 2005-2006 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -94,6 +95,7 @@ typedef struct { IOleClientSite *client; IOleContainer *container; IOleDocumentView *view; + IDocHostUIHandler *hostui; LPOLESTR url;

1 0

Michael Kaufmann : static control: SS_CENTERIMAGE fixes.
by Alexandre Julliard Jan. 25, 2006

Jan. 25, 2006

Module: wine Branch: refs/heads/master Commit: 1de825f746c6f4873a54ab21c16d728695c9a1e8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1de825f746c6f4873a54ab2… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Wed Jan 25 13:14:44 2006 +0100 static control: SS_CENTERIMAGE fixes. - Stretch bitmaps and icons to the whole control size if SS_CENTERIMAGE is absent - Draw the background of centered bitmaps and icons with the background brush (like Windows XP for applications with a manifest) --- dlls/user/static.c | 106 +++++++++++++++++++++++++++++++++------------------- 1 files changed, 68 insertions(+), 38 deletions(-) diff --git a/dlls/user/static.c b/dlls/user/static.c index b830a61..4c38e1e 100644 --- a/dlls/user/static.c +++ b/dlls/user/static.c @@ -25,14 +25,21 @@ * Unless otherwise noted, we believe this code to be complete, as per * the specification mentioned above. * If you discover missing features, or bugs, please note them below. - * - * TODO: * - * Styles - * - SS_RIGHTJUST + * Notes: + * - Windows XP introduced new behavior: The background of centered + * icons and bitmaps is painted differently. This is only done if + * a manifest is present. + * Because it has not yet been decided how to implement the two + * different modes in Wine, only the Windows XP mode is implemented. + * - Controls with SS_SIMPLE but without SS_NOPREFIX: + * The text should not be changed. Windows doesn't clear the + * client rectangle, so the new text must be larger than the old one. + * - The SS_RIGHTJUST style is currently not implemented by Windows + * (or it does something different than documented). * - * Messages - * - STM_SETIMAGE: IMAGE_CURSOR + * TODO: + * - Animated cursors */ #include <stdarg.h> @@ -531,13 +538,11 @@ static LRESULT StaticWndProc_common( HWN case IMAGE_BITMAP: lResult = (LRESULT)STATIC_SetBitmap( hwnd, (HBITMAP)lParam, full_style ); break; - case IMAGE_CURSOR: - FIXME("STM_SETIMAGE: Unhandled type IMAGE_CURSOR\n"); - break; case IMAGE_ENHMETAFILE: lResult = (LRESULT)STATIC_SetEnhMetaFile( hwnd, (HENHMETAFILE)lParam, full_style ); break; case IMAGE_ICON: + case IMAGE_CURSOR: lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style ); break; default: @@ -733,65 +738,90 @@ static void STATIC_PaintRectfn( HWND hwn static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) { - RECT rc; + RECT rc, iconRect; HBRUSH hbrush; HICON hIcon; - INT x, y; + CURSORICONINFO * info; GetClientRect( hwnd, &rc ); - hbrush = (HBRUSH)SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)hwnd ); - FillRect( hdc, &rc, hbrush ); + hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); hIcon = (HICON)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ); - if (style & SS_CENTERIMAGE) + info = hIcon ? (CURSORICONINFO *)GlobalLock16(HICON_16(hIcon)) : NULL; + if (!hIcon || !info) { - CURSORICONINFO *info = hIcon ? (CURSORICONINFO *)GlobalLock16(HICON_16(hIcon)) : NULL; - x = (rc.right - rc.left)/2 - (info ? info->nWidth/2 : 0); - y = (rc.bottom - rc.top)/2 - (info ? info->nHeight/2 : 0); + FillRect(hdc, &rc, hbrush); } else { - x = rc.left; - y = rc.top; + if (style & SS_CENTERIMAGE) + { + iconRect.left = (rc.right - rc.left) / 2 - info->nWidth / 2; + iconRect.top = (rc.bottom - rc.top) / 2 - info->nHeight / 2; + iconRect.right = iconRect.left + info->nWidth; + iconRect.bottom = iconRect.top + info->nHeight; + FillRect( hdc, &rc, hbrush ); + } + else + { + FillRect( hdc, &rc, hbrush ); + DrawIconEx( hdc, rc.left, rc.top, hIcon, rc.right - rc.left, + rc.bottom - rc.top, 0, NULL, DI_NORMAL ); + } } - if (hIcon) - DrawIcon( hdc, x, y, hIcon ); + if (info) GlobalUnlock16(HICON_16(hIcon)); } static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) { HDC hMemDC; HBITMAP hBitmap, oldbitmap; + HBRUSH hbrush; /* message is still sent, even if the returned brush is not used */ - SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)hwnd ); + hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); - if ((hBitmap = (HBITMAP)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ))) + if ((hBitmap = (HBITMAP)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET )) + && (GetObjectType(hBitmap) == OBJ_BITMAP) + && (hMemDC = CreateCompatibleDC( hdc ))) { - INT x, y; BITMAP bm; + RECT rcClient; + LOGBRUSH brush; + + GetObjectW(hBitmap, sizeof(bm), &bm); + oldbitmap = SelectObject(hMemDC, hBitmap); - if(GetObjectType(hBitmap) != OBJ_BITMAP) return; - if (!(hMemDC = CreateCompatibleDC( hdc ))) return; - GetObjectW(hBitmap, sizeof(bm), &bm); - oldbitmap = SelectObject(hMemDC, hBitmap); + /* Set the background color for monochrome bitmaps + to the color of the background brush */ + if (GetObjectW( hbrush, sizeof(brush), &brush )) + { + if (brush.lbStyle == BS_SOLID) + SetBkColor(hdc, brush.lbColor); + } + GetClientRect(hwnd, &rcClient); if (style & SS_CENTERIMAGE) { - RECT rcClient; - GetClientRect(hwnd, &rcClient); + INT x, y; x = (rcClient.right - rcClient.left)/2 - bm.bmWidth/2; y = (rcClient.bottom - rcClient.top)/2 - bm.bmHeight/2; + FillRect( hdc, &rcClient, hbrush ); + BitBlt(hdc, x, y, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, + SRCCOPY); } else { - x = 0; - y = 0; + StretchBlt(hdc, 0, 0, rcClient.right - rcClient.left, + rcClient.bottom - rcClient.top, hMemDC, + 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); } - BitBlt(hdc, x, y, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, - SRCCOPY); - SelectObject(hMemDC, oldbitmap); - DeleteDC(hMemDC); + SelectObject(hMemDC, oldbitmap); + DeleteDC(hMemDC); + } + else + { + RECT rcClient; + GetClientRect( hwnd, &rcClient ); + FillRect( hdc, &rcClient, hbrush ); } }

1 0

Michael Kaufmann : gdi: Fix the EMF bounding box calculation.
by Alexandre Julliard Jan. 25, 2006

Jan. 25, 2006

Module: wine Branch: refs/heads/master Commit: 2fed6479d88369a22b3bbd5853e27bb3bfce22ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2fed6479d88369a22b3bbd5… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Wed Jan 25 13:14:27 2006 +0100 gdi: Fix the EMF bounding box calculation. --- dlls/gdi/enhmfdrv/init.c | 36 +++++++++++++++++++++++++++--------- 1 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/gdi/enhmfdrv/init.c b/dlls/gdi/enhmfdrv/init.c index 8fe665c..e4425da 100644 --- a/dlls/gdi/enhmfdrv/init.c +++ b/dlls/gdi/enhmfdrv/init.c @@ -225,16 +225,34 @@ void EMFDRV_UpdateBBox( PHYSDEV dev, REC RECTL vportRect = *rect; LPtoDP(physDev->hdc, (LPPOINT)&vportRect, 2); + + /* The coordinate systems may be mirrored + (LPtoDP handles points, not rectangles) */ + if (vportRect.left > vportRect.right) + { + LONG temp = vportRect.right; + vportRect.right = vportRect.left; + vportRect.left = temp; + } + if (vportRect.top > vportRect.bottom) + { + LONG temp = vportRect.bottom; + vportRect.bottom = vportRect.top; + vportRect.top = temp; + } - if(bounds->left > bounds->right) {/* first rect */ - *bounds = vportRect; - return; - } - bounds->left = min(bounds->left, vportRect.left); - bounds->top = min(bounds->top, vportRect.top); - bounds->right = max(bounds->right, vportRect.right); - bounds->bottom = max(bounds->bottom, vportRect.bottom); - return; + if (bounds->left > bounds->right) + { + /* first bounding rectangle */ + *bounds = vportRect; + } + else + { + bounds->left = min(bounds->left, vportRect.left); + bounds->top = min(bounds->top, vportRect.top); + bounds->right = max(bounds->right, vportRect.right); + bounds->bottom = max(bounds->bottom, vportRect.bottom); + } } /**********************************************************************

1 0

Juan Lang : iphlpapi: Remove one IP address per interface restriction.
by Alexandre Julliard Jan. 25, 2006

Jan. 25, 2006

Module: wine Branch: refs/heads/master Commit: 201cdcc462ca8edcd6aab42b0c462c6852717435 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=201cdcc462ca8edcd6aab42… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Jan 25 13:14:12 2006 +0100 iphlpapi: Remove one IP address per interface restriction. - remove restriction of one IP address per interface - remove dead code, and make static functions that can be - update comments and copyright notice --- dlls/iphlpapi/ifenum.c | 263 ++++++++++++++++++----------------------- dlls/iphlpapi/ifenum.h | 22 --- dlls/iphlpapi/iphlpapi_main.c | 67 ++++++++-- dlls/iphlpapi/ipstats.c | 2 dlls/iphlpapi/ipstats.h | 2 5 files changed, 170 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=201cdcc462ca8edcd6a…

1 0

Hans Leidekker : kernel: Test moving a directory that has a change notification
by Alexandre Julliard Jan. 25, 2006

Jan. 25, 2006

Module: wine Branch: refs/heads/master Commit: b825b8ba3cb0178bd0e4e45031be76817957b4e0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b825b8ba3cb0178bd0e4e45… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Jan 25 13:13:58 2006 +0100 kernel: Test moving a directory that has a change notification registered for itself. --- dlls/kernel/tests/change.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernel/tests/change.c b/dlls/kernel/tests/change.c index 4e0877b..5afe4fe 100644 --- a/dlls/kernel/tests/change.c +++ b/dlls/kernel/tests/change.c @@ -136,12 +136,21 @@ static void test_FindFirstChangeNotifica lstrcpyA(dirname1, filename1); lstrcatA(dirname1, "dir"); + lstrcpyA(dirname2, dirname1); + lstrcatA(dirname2, "new"); + ret = CreateDirectoryA(dirname1, NULL); ok(ret, "CreateDirectoryA error: %ld\n", GetLastError()); - /* What if we remove the directory we registered notification for? */ + /* What if we move the directory we registered notification for? */ thread = StartNotificationThread(dirname1, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); - ret = RemoveDirectoryA(dirname1); + ret = MoveFileA(dirname1, dirname2); + ok(ret, "MoveFileA error: %ld\n", GetLastError()); + ok(FinishNotificationThread(thread), "Missed notification\n"); + + /* What if we remove the directory we registered notification for? */ + thread = StartNotificationThread(dirname2, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); + ret = RemoveDirectoryA(dirname2); ok(ret, "RemoveDirectoryA error: %ld\n", GetLastError()); /* win98 and win2k behave differently here */ @@ -156,9 +165,6 @@ static void test_FindFirstChangeNotifica ok(ret, "CreateDirectoryA error: %ld\n", GetLastError()); ok(FinishNotificationThread(thread), "Missed notification\n"); - lstrcpyA(dirname2, dirname1); - lstrcatA(dirname2, "new"); - /* Rename a directory */ thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = MoveFileA(dirname1, dirname2);

1 0

Alexandre Julliard : loader: Detect pthread_get_stackaddr_np returning the top of the stack
by Alexandre Julliard Jan. 25, 2006

Jan. 25, 2006

Module: wine Branch: refs/heads/master Commit: 538cd17859318ebcff6a245af21c7afe05b62e4e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=538cd17859318ebcff6a245… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 15:11:58 2006 +0100 loader: Detect pthread_get_stackaddr_np returning the top of the stack instead of the base. --- loader/pthread.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/loader/pthread.c b/loader/pthread.c index f2f87d7..20cc3a9 100644 --- a/loader/pthread.c +++ b/loader/pthread.c @@ -70,8 +70,12 @@ static void init_thread( struct wine_pth pthread_getattr_np( pthread_self(), &attr ); pthread_attr_getstack( &attr, &info->stack_base, &info->stack_size ); #elif defined(HAVE_PTHREAD_GET_STACKSIZE_NP) && defined(HAVE_PTHREAD_GET_STACKADDR_NP) + char dummy; info->stack_size = pthread_get_stacksize_np(pthread_self()); info->stack_base = pthread_get_stackaddr_np(pthread_self()); + /* if base is too large assume it's the top of the stack instead */ + if ((char *)info->stack_base > &dummy) + info->stack_base = (char *)info->stack_base - info->stack_size; #else /* assume that the stack allocation is page aligned */ char dummy;

1 0

lostwages/templates/en download.template
by Jeremy Newman Jan. 24, 2006

Jan. 24, 2006

ChangeSet ID: 22527 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/01/24 14:26:23 Modified files: templates/en : download.template Log message: based on patch from: Sven Paschukat <Sven.Paschukat(a)t-online.de> add a note to the WineTools link Patch: http://cvs.winehq.org/patch.py?id=22527 Old revision New revision Changes Path 1.72 1.73 +8 -3 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.72 lostwages/templates/en/download.template:1.73 --- lostwages/templates/en/download.template:1.72 24 Jan 2006 20:26:23 -0000 +++ lostwages/templates/en/download.template 24 Jan 2006 20:26:23 -0000 @@ -122,13 +122,18 @@ for post-installation instructions.</b>< </a> </td> <td align=left bgcolor="#ffffff"> - <b><a href="http://www.von-thadden.de/Joachim/WineTools/">Wine Tools</a></b> - WineTools is a menu driven installer for installing Windows programs. This software lets you install the following Windows software: DCOM98, IE6, Windows Core Fonts, Windows System Software, Office & Office Viewer, - Adobe Photoshop 7, Illustrator 9 and many other programs. - By <a href="http://www.von-thadden.de/Joachim/WineTools/">Joachim von Thadden</a>. + Adobe Photoshop 7, Illustrator 9 and many other programs.<br /> + By <a href="http://www.von-thadden.de/Joachim/WineTools/">Joachim von + Thadden</a>.<br /> + <div style="margin: 10px; padding: 5px; border: 1px solid #C0C0C0; background-color: #F0F0F0;"> + <b>Note:</b> WineTools only recommended if installation or operability of + Windows software failed on pure Wine or because the Wine developers need + your feedback from testing. + </div> </td> </tr> </table>

1 0

Huw Davies : msxml: Implement save.
by Alexandre Julliard Jan. 24, 2006

Jan. 24, 2006

Module: wine Branch: refs/heads/master Commit: 727970e242acdee2984918eb1dbdacf2815e6d54 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=727970e242acdee2984918e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 24 14:43:18 2006 +0100 msxml: Implement save. --- dlls/msxml3/domdoc.c | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 388f2db..5b27b28 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -929,8 +929,40 @@ static HRESULT WINAPI domdoc_save( IXMLDOMDocument *iface, VARIANT destination ) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument( iface ); + HANDLE handle; + xmlChar *mem; + int size; + HRESULT ret = S_OK; + DWORD written; + + 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) + { + FIXME("Unhandled vt %x\n", V_VT(&destination)); + return S_FALSE; + } + + handle = CreateFileW( V_BSTR(&destination), GENERIC_WRITE, 0, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + if( handle == INVALID_HANDLE_VALUE ) + { + WARN("failed to create file\n"); + return S_FALSE; + } + + xmlDocDumpMemory(get_doc(This), &mem, &size); + if(!WriteFile(handle, mem, (DWORD)size, &written, NULL) || written != (DWORD)size) + { + WARN("write error\n"); + ret = S_FALSE; + } + + xmlFree(mem); + CloseHandle(handle); + return ret; } static HRESULT WINAPI domdoc_get_validateOnParse(

1 0