July 2011 - Wine-Commits - list.winehq.org

Frédéric Delanoy : cmd/tests: Add FOR /D tests.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 21f7c5db614cb9c1b3689d873020e40ef99c51f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21f7c5db614cb9c1b3689d873… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 29 13:59:50 2011 +0200 cmd/tests: Add FOR /D tests. --- programs/cmd/tests/test_builtins.cmd | 16 ++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 4510074..94ec6e0 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -299,6 +299,22 @@ mkdir baz echo > bazbaz echo ...basic wildcards for %%i in (ba*) do echo %%i +echo ...for /d +for /d %%i in (baz foo bar) do echo %%i +rem FIXME for /d incorrectly parses when wildcards are used +rem for /d %%i in (bazb*) do echo %%i +rem FIXME can't test wildcard expansion here since it's listed in directory +rem order, and not in alphabetic order. +rem Proper testing would need a currently missing "sort" program implementation. +rem for /d %%i in (ba*) do echo %%i>> tmp +rem sort < tmp +rem del tmp +rem for /d %%i in (?a*) do echo %%i>> tmp +rem sort < tmp +rem del tmp +rem for /d %%i in (*) do echo %%i>> tmp +rem sort < tmp +rem del tmp cd .. rd /s/Q foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index a050c14..7abfb21 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -216,6 +216,10 @@ C @todo_wine(a)B D ...basic wildcards bazbaz +...for /d +baz +foo +bar -----------Testing del /a----------- not-r.test not found after delete, good r.test found before delete, good

1 0

Hans Leidekker : kernel32: Add a trace to ReplaceFileW.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: c41a1a29b538127ce66f7fdbdb818b613b767f27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41a1a29b538127ce66f7fdbd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 29 13:26:24 2011 +0200 kernel32: Add a trace to ReplaceFileW. --- dlls/kernel32/file.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 94d795e..79cfc97 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1527,6 +1527,10 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa IO_STATUS_BLOCK io; OBJECT_ATTRIBUTES attr; + TRACE("%s %s %s 0x%08x %p %p\n", debugstr_w(lpReplacedFileName), + debugstr_w(lpReplacementFileName), debugstr_w(lpBackupFileName), + dwReplaceFlags, lpExclude, lpReserved); + if (dwReplaceFlags) FIXME("Ignoring flags %x\n", dwReplaceFlags);

1 0

Hans Leidekker : winhttp: Set an appropriate error when the request is cancelled.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: fb7fc894f055e43e539174d242a3f9a6419f9558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb7fc894f055e43e539174d24… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 29 13:25:24 2011 +0200 winhttp: Set an appropriate error when the request is cancelled. --- dlls/winhttp/request.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a57f801..3efa8a3 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2565,6 +2565,9 @@ static DWORD wait_for_completion( struct winhttp_request *request, DWORD timeout { case WAIT_OBJECT_0: break; + case WAIT_OBJECT_0 + 1: + request->error = ERROR_CANCELLED; + break; case WAIT_TIMEOUT: request->error = ERROR_TIMEOUT; break;

1 0

Hans Leidekker : winhttp: Fix some valgrind warnings.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: c54772c114150c5d787712f2ed1156269baeabf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c54772c114150c5d787712f2e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 29 13:25:04 2011 +0200 winhttp: Fix some valgrind warnings. --- dlls/winhttp/request.c | 5 +++-- dlls/winhttp/tests/winhttp.c | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 01fdc20..a57f801 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2446,7 +2446,6 @@ static HRESULT WINAPI winhttp_request_Open( debugstr_variant(&async)); if (!method || !url) return E_INVALIDARG; - if (!(request->verb = strdupW( method ))) return E_OUTOFMEMORY; memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); @@ -2455,6 +2454,7 @@ static HRESULT WINAPI winhttp_request_Open( uc.dwUrlPathLength = ~0u; uc.dwExtraInfoLength = ~0u; if (!WinHttpCrackUrl( url, 0, 0, &uc )) return HRESULT_FROM_WIN32( get_last_error() ); + if (!(request->verb = strdupW( method ))) return E_OUTOFMEMORY; if (!(hostname = heap_alloc( (uc.dwHostNameLength + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; memcpy( hostname, uc.lpszHostName, uc.dwHostNameLength * sizeof(WCHAR) ); @@ -2541,7 +2541,7 @@ static HRESULT WINAPI winhttp_request_SetRequestHeader( } len = strlenW( header ) + 4; if (value) len += strlenW( value ); - if (!(str = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + if (!(str = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; sprintfW( str, fmtW, header, value ? value : emptyW ); ret = WinHttpAddRequestHeaders( request->hrequest, str, len, WINHTTP_ADDREQ_FLAG_REPLACE ); @@ -2795,6 +2795,7 @@ static DWORD request_read_body( struct winhttp_request *request, DWORD timeout ) request->state = REQUEST_STATE_RESPONSE_RECEIVED; if (!(request->buffer = heap_alloc( buflen ))) return E_OUTOFMEMORY; + request->buffer[0] = 0; size = total_bytes_read = 0; do { diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index df8dd40..b450df7 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2473,6 +2473,7 @@ static void test_IWinHttpRequest(void) SysFreeString( url ); SysFreeString( username ); SysFreeString( password ); + SysFreeString( connection ); SysFreeString( date ); SysFreeString( today ); VariantClear( &proxy_server );

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 48ccf4f9f83b081dd87c303588db748e17bafe83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ccf4f9f83b081dd87c30358… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 29 12:29:54 2011 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 100 ++++++++++++++++++++-------------------- dlls/msvcp60/msvcp60.spec | 84 +++++++++++++++++----------------- dlls/msvcp70/msvcp70.spec | 88 ++++++++++++++++++------------------ dlls/msvcp71/msvcp71.spec | 88 ++++++++++++++++++------------------ dlls/msvcp80/msvcp80.spec | 104 +++++++++++++++++++++--------------------- 5 files changed, 232 insertions(+), 232 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48ccf4f9f83b081dd87c3…

1 0

Jacek Caban : mshtml: Fixed HTMLHeadElement_QI implementation.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: bc9850b42c9a342120f06566281e53b96ac32bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc9850b42c9a342120f065662… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 13:06:35 2011 +0200 mshtml: Fixed HTMLHeadElement_QI implementation. --- dlls/mshtml/htmlhead.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 51095ee..69e4edf 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -295,7 +295,7 @@ static HRESULT HTMLHeadElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) TRACE("(%p)->(IID_IHTMLHeadElement %p)\n", This, ppv); *ppv = &This->IHTMLHeadElement_iface; }else { - HTMLElement_QI(&This->element.node, riid, ppv); + return HTMLElement_QI(&This->element.node, riid, ppv); } IUnknown_AddRef((IUnknown*)*ppv);

1 0

Piotr Caban : msvcp90: Added _Locinfo class stub.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: dca8da61c11a31674c4b5643a19f8ae614cd7968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca8da61c11a31674c4b5643a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 29 12:29:32 2011 +0200 msvcp90: Added _Locinfo class stub. --- dlls/msvcp90/locale.c | 289 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.spec | 112 +++++++++--------- 2 files changed, 341 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dca8da61c11a31674c4b5…

1 0

Jacek Caban : ieframe: Removed remaining bits of shdocvw.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 7a428c3fd2aa66a9c7921f4e069b42b9042d342b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a428c3fd2aa66a9c7921f4e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 12:18:33 2011 +0200 ieframe: Removed remaining bits of shdocvw. --- dlls/ieframe/Es.rc | 2 +- dlls/ieframe/Fr.rc | 2 +- dlls/ieframe/classinfo.c | 2 +- dlls/ieframe/client.c | 2 +- dlls/ieframe/dochost.c | 2 +- dlls/ieframe/events.c | 2 +- dlls/ieframe/frame.c | 2 +- dlls/ieframe/ie.c | 2 +- dlls/ieframe/ieframe.h | 2 +- dlls/ieframe/iexplore.c | 4 ++-- dlls/ieframe/navigate.c | 2 +- dlls/ieframe/oleobject.c | 2 +- dlls/ieframe/persist.c | 2 +- dlls/ieframe/shellbrowser.c | 2 +- dlls/ieframe/taskbarlist.c | 2 +- dlls/ieframe/urlhist.c | 2 +- dlls/ieframe/view.c | 2 +- dlls/ieframe/webbrowser.c | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/ieframe/Es.rc b/dlls/ieframe/Es.rc index e0537f1..808de7b 100644 --- a/dlls/ieframe/Es.rc +++ b/dlls/ieframe/Es.rc @@ -1,5 +1,5 @@ /* - * Spanish resources for shdocvw + * Spanish resources for ieframe * * Copyright 2010 José Rostagno * diff --git a/dlls/ieframe/Fr.rc b/dlls/ieframe/Fr.rc index 7b25fee..485420a 100644 --- a/dlls/ieframe/Fr.rc +++ b/dlls/ieframe/Fr.rc @@ -1,5 +1,5 @@ /* - * shdocvw French resources + * ieframe French resources * * Copyright 2010 Frédéric Delanoy * diff --git a/dlls/ieframe/classinfo.c b/dlls/ieframe/classinfo.c index 8e68754..30b8871 100644 --- a/dlls/ieframe/classinfo.c +++ b/dlls/ieframe/classinfo.c @@ -22,7 +22,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); /********************************************************************** * Implement the IProvideClassInfo2 interface diff --git a/dlls/ieframe/client.c b/dlls/ieframe/client.c index e9d6ad9..970e28d 100644 --- a/dlls/ieframe/client.c +++ b/dlls/ieframe/client.c @@ -25,7 +25,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static inline DocHost *impl_from_IOleClientSite(IOleClientSite *iface) { diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index ffe65a1..5f60056 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -24,7 +24,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); diff --git a/dlls/ieframe/events.c b/dlls/ieframe/events.c index d2c6f1f..5a426ab 100644 --- a/dlls/ieframe/events.c +++ b/dlls/ieframe/events.c @@ -28,7 +28,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); struct ConnectionPoint { IConnectionPoint IConnectionPoint_iface; diff --git a/dlls/ieframe/frame.c b/dlls/ieframe/frame.c index ef06064..d394d74 100644 --- a/dlls/ieframe/frame.c +++ b/dlls/ieframe/frame.c @@ -20,7 +20,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static inline DocHost *impl_from_IOleInPlaceFrame(IOleInPlaceFrame *iface) { diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index c1f9cfd..5fe0a26 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -20,7 +20,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static inline InternetExplorer *impl_from_IWebBrowser2(IWebBrowser2 *iface) { diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index f657ce4..89f69fa 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -1,5 +1,5 @@ /* - * Header includes for shdocvw.dll + * Header includes for ieframe.dll * * Copyright 2011 Jacek Caban for CodeWeavers * diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 76bef14..99e3003 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -42,7 +42,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); #define IDI_APPICON 1 @@ -1016,7 +1016,7 @@ static void release_dde(void) } /****************************************************************** - * IEWinMain (SHDOCVW.101) + * IEWinMain (ieframe.101) * * Only returns on error. */ diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 35c550d..2fea374 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -30,7 +30,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static const WCHAR emptyW[] = {0}; diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index e4ee717..d227bcc 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -33,7 +33,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); /* shlwapi.dll */ HWND WINAPI SHSetParentHwnd(HWND hWnd, HWND hWndParent); diff --git a/dlls/ieframe/persist.c b/dlls/ieframe/persist.c index 93716bb..3529023 100644 --- a/dlls/ieframe/persist.c +++ b/dlls/ieframe/persist.c @@ -23,7 +23,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); /********************************************************************** * Implement the IPersistStorage interface diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 48f0e20..c3ff6c8 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -25,7 +25,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); typedef struct { IShellBrowser IShellBrowser_iface; diff --git a/dlls/ieframe/taskbarlist.c b/dlls/ieframe/taskbarlist.c index 747a033..5055d80 100644 --- a/dlls/ieframe/taskbarlist.c +++ b/dlls/ieframe/taskbarlist.c @@ -22,7 +22,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); struct taskbar_list { diff --git a/dlls/ieframe/urlhist.c b/dlls/ieframe/urlhist.c index 89480df..157138c 100644 --- a/dlls/ieframe/urlhist.c +++ b/dlls/ieframe/urlhist.c @@ -21,7 +21,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static HRESULT WINAPI UrlHistoryStg_QueryInterface(IUrlHistoryStg2 *iface, REFIID riid, void **ppv) { diff --git a/dlls/ieframe/view.c b/dlls/ieframe/view.c index 5d0c87d..2bf14b5 100644 --- a/dlls/ieframe/view.c +++ b/dlls/ieframe/view.c @@ -21,7 +21,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); /********************************************************************** * Implement the IViewObject interface diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index c398786..d1004df 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -27,7 +27,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); static inline WebBrowser *impl_from_IWebBrowser2(IWebBrowser2 *iface) {

1 0

Henri Verbeet : wined3d: Complain about users disabling GLSL.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 64f71fda6d3f3ec1dddf4cbeecaeaad63b3c893e URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f71fda6d3f3ec1dddf4cbee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 22:27:55 2011 +0200 wined3d: Complain about users disabling GLSL. --- dlls/wined3d/wined3d_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 5976c83..7a0d4b6 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -28,6 +28,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(winediag); struct wined3d_wndproc { @@ -238,6 +239,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) { if (!strcmp(buffer,"disabled")) { + ERR_(winediag)("The GLSL shader backend has been disabled. You get to keep all the pieces if it breaks.\n"); TRACE("Use of GL Shading Language disabled\n"); wined3d_settings.glslRequested = FALSE; }

1 0

Michael Stefaniuc : dmcompos: Merge the IClassFactory implementations.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: a0e46698adf8263c771b646924622f555dcb5538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e46698adf8263c771b64692… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 29 11:55:51 2011 +0200 dmcompos: Merge the IClassFactory implementations. --- dlls/dmcompos/dmcompos_main.c | 286 +++++++++-------------------------------- 1 files changed, 61 insertions(+), 225 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0e46698adf8263c771b6…

1 0