February 2015 - Wine-Commits

Sebastian Lackner : dbghelp: Don' t fill KdHelp structure for usermode applications.
by Alexandre Julliard Feb. 3, 2015

Feb. 3, 2015

Module: wine Branch: master Commit: c6fcb427a2485184e209b91b7b95e37fc891ff88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6fcb427a2485184e209b91b7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Sep 15 22:55:49 2014 +0200 dbghelp: Don't fill KdHelp structure for usermode applications. --- dlls/dbghelp/stack.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index 3e1ff72..21412f6 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -240,15 +240,6 @@ BOOL WINAPI StackWalk64(DWORD MachineType, HANDLE hProcess, HANDLE hThread, if (!cpu->stack_walk(&csw, frame, ctx)) return FALSE; /* we don't handle KdHelp */ - frame->KdHelp.Thread = 0xC000FADE; - frame->KdHelp.ThCallbackStack = 0x10; - frame->KdHelp.ThCallbackBStore = 0; - frame->KdHelp.NextCallback = 0; - frame->KdHelp.FramePointer = 0; - frame->KdHelp.KiCallUserMode = 0xD000DAFE; - frame->KdHelp.KeUserCallbackDispatcher = 0xE000F000; - frame->KdHelp.SystemRangeStart = 0xC0000000; - frame->KdHelp.Reserved[0] /* KiUserExceptionDispatcher */ = 0xE0005000; return TRUE; }

1 0

Orion Poplawski : msvcrt: Bump MSVCRT_MB_LEN_MAX to 5 and use it in MSVCRT__wctomb_l for default buffer lengthSet MB_LEN_MAX to 5 to match MSVCRT_MB_LEN_MAX.
by Alexandre Julliard Feb. 3, 2015

Feb. 3, 2015

Module: wine Branch: master Commit: 8bf17329625320b45d6742feed43771dd3306291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bf17329625320b45d6742fee… Author: Orion Poplawski <orion(a)cora.nwra.com> Date: Mon Feb 2 16:14:59 2015 -0700 msvcrt: Bump MSVCRT_MB_LEN_MAX to 5 and use it in MSVCRT__wctomb_l for default buffer lengthSet MB_LEN_MAX to 5 to match MSVCRT_MB_LEN_MAX. --- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/wcs.c | 2 +- include/msvcrt/limits.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 41f31b9..806c4bf 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -47,7 +47,7 @@ #define MSVCRT_I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) #define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1) #define MSVCRT_UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) -#define MSVCRT_MB_LEN_MAX 2 +#define MSVCRT_MB_LEN_MAX 5 #ifdef _WIN64 #define MSVCRT_SIZE_MAX MSVCRT_UI64_MAX #else diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 5bc544c..98bc686 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1474,7 +1474,7 @@ int CDECL MSVCRT__wctomb_l(char *dst, MSVCRT_wchar_t ch, MSVCRT__locale_t locale { int len; - MSVCRT__wctomb_s_l(&len, dst, dst ? 6 : 0, ch, locale); + MSVCRT__wctomb_s_l(&len, dst, dst ? MSVCRT_MB_LEN_MAX : 0, ch, locale); return len; } diff --git a/include/msvcrt/limits.h b/include/msvcrt/limits.h index d0f058b..ece8c68 100644 --- a/include/msvcrt/limits.h +++ b/include/msvcrt/limits.h @@ -4,7 +4,7 @@ #include <crtdefs.h> #define CHAR_BIT 8 -#define MB_LEN_MAX 2 +#define MB_LEN_MAX 5 #define SCHAR_MIN (-0x80) #define SCHAR_MAX 0x7f

1 0

Ken Thomases : opengl32: Fix get_current_context_type() to not shift the type bits down.
by Alexandre Julliard Feb. 3, 2015

Feb. 3, 2015

Module: wine Branch: master Commit: 4a6743e91353ffa8cfdf5183c6518bd95327a835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6743e91353ffa8cfdf5183c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 2 15:51:42 2015 -0600 opengl32: Fix get_current_context_type() to not shift the type bits down. The result is compared directly with handle type values like HANDLE_CONTEXT whose meaningful values are in the high nibble. --- dlls/opengl32/wgl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index cb91699..6ff54f0 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -165,7 +165,7 @@ static void free_handle_ptr( struct wgl_handle *ptr ) static inline enum wgl_handle_type get_current_context_type(void) { if (!NtCurrentTeb()->glCurrentRC) return HANDLE_CONTEXT; - return (LOWORD(NtCurrentTeb()->glCurrentRC) & HANDLE_TYPE_MASK) >> 12; + return LOWORD(NtCurrentTeb()->glCurrentRC) & HANDLE_TYPE_MASK; } /***********************************************************************

1 0

Piotr Caban : shell32: Add partial support for Mac trash enumeration.
by Alexandre Julliard Feb. 2, 2015

Feb. 2, 2015

Module: wine Branch: master Commit: 6dac2f7a776e8dc994aae4e1714fc5f03565e132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dac2f7a776e8dc994aae4e17… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 30 17:03:44 2015 +0100 shell32: Add partial support for Mac trash enumeration. --- dlls/shell32/tests/recyclebin.c | 18 ++-- dlls/shell32/trash.c | 219 ++++++++++++++++++++++++++++++---------- 2 files changed, 170 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6dac2f7a776e8dc994aae…

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_GetTransform().
by Alexandre Julliard Feb. 2, 2015

Feb. 2, 2015

Module: wine Branch: master Commit: d41ee6e57497d14abe92688751b74a1240184629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d41ee6e57497d14abe9268875… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 29 10:27:20 2015 +0100 d2d1: Implement d2d_bitmap_brush_GetTransform(). --- dlls/d2d1/brush.c | 19 +++++++++++-------- dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 2986c27..ef70847 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -147,9 +147,17 @@ HRESULT d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *rend static void d2d_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, enum d2d_brush_type type, const D2D1_BRUSH_PROPERTIES *desc, const struct ID2D1BrushVtbl *vtbl) { + static const D2D1_MATRIX_3X2_F identity = + { + 1.0f, 0.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + }; + brush->ID2D1Brush_iface.lpVtbl = vtbl; brush->refcount = 1; brush->opacity = desc ? desc->opacity : 1.0f; + brush->transform = desc ? desc->transform : identity; brush->type = type; } @@ -532,16 +540,11 @@ static float STDMETHODCALLTYPE d2d_bitmap_brush_GetOpacity(ID2D1BitmapBrush *ifa static void STDMETHODCALLTYPE d2d_bitmap_brush_GetTransform(ID2D1BitmapBrush *iface, D2D1_MATRIX_3X2_F *transform) { - static const D2D1_MATRIX_3X2_F identity = - { - 1.0f, 0.0f, - 0.0f, 1.0f, - 0.0f, 0.0f, - }; + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); - FIXME("iface %p, transform %p stub!\n", iface, transform); + TRACE("iface %p, transform %p.\n", iface, transform); - *transform = identity; + *transform = brush->transform; } static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeX(ID2D1BitmapBrush *iface, D2D1_EXTEND_MODE mode) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 05e678c..e3cb98a 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -109,6 +109,7 @@ struct d2d_brush LONG refcount; float opacity; + D2D1_MATRIX_3X2_F transform; enum d2d_brush_type type; union

1 0

Piotr Caban : shell32: Handle TRASH_EnumItems failures correctly.
by Alexandre Julliard Feb. 2, 2015

Feb. 2, 2015

Module: wine Branch: master Commit: d46862b4874519d70a4138285a6b754e3e0c4c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d46862b4874519d70a4138285… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 30 17:03:30 2015 +0100 shell32: Handle TRASH_EnumItems failures correctly. --- dlls/shell32/recyclebin.c | 15 ++++++++++++--- dlls/shell32/tests/recyclebin.c | 21 +++++++++++---------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index d839329..7053998 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -411,7 +411,7 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH IEnumIDListImpl *list; LPITEMIDLIST *pidls; HRESULT ret = E_OUTOFMEMORY; - int pidls_count; + int pidls_count = 0; int i=0; TRACE("(%p, %p, %x, %p)\n", This, hwnd, grfFlags, ppenumIDList); @@ -860,10 +860,14 @@ HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR pszRootPath, LPSHQUERYRBINFO pSHQueryR LPITEMIDLIST *apidl; INT cidl; INT i=0; + HRESULT hr; + TRACE("(%s, %p)\n", debugstr_w(pszRootPath), pSHQueryRBInfo); FIXME("Ignoring pszRootPath=%s\n",debugstr_w(pszRootPath)); - TRASH_EnumItems(&apidl,&cidl); + hr = TRASH_EnumItems(&apidl,&cidl); + if (FAILED(hr)) + return hr; pSHQueryRBInfo->i64NumItems = cidl; pSHQueryRBInfo->i64Size = 0; for (; i<cidl; i++) @@ -894,9 +898,14 @@ HRESULT WINAPI SHEmptyRecycleBinW(HWND hwnd, LPCWSTR pszRootPath, DWORD dwFlags) INT cidl; INT i=0; HRESULT ret; + TRACE("(%p, %s, 0x%08x)\n", hwnd, debugstr_w(pszRootPath) , dwFlags); FIXME("Ignoring pszRootPath=%s\n",debugstr_w(pszRootPath)); - TRASH_EnumItems(&apidl,&cidl); + + ret = TRASH_EnumItems(&apidl,&cidl); + if (FAILED(ret)) + return ret; + ret = erase_items(hwnd,(const LPCITEMIDLIST*)apidl,cidl,!(dwFlags & SHERB_NOCONFIRMATION)); for (;i<cidl;i++) ILFree(apidl[i]); diff --git a/dlls/shell32/tests/recyclebin.c b/dlls/shell32/tests/recyclebin.c index c798492..ba99adf 100644 --- a/dlls/shell32/tests/recyclebin.c +++ b/dlls/shell32/tests/recyclebin.c @@ -70,9 +70,12 @@ static void test_query_recyclebin(void) ok(GetTempFileNameA(temp_path, "trash", 0, buf), "GetTempFileName failed\n"); buf[strlen(buf) + 1] = '\0'; hr = pSHQueryRecycleBinA(buf,&info1); - ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); - ok(info1.i64Size!=0xdeadbeef,"i64Size not set\n"); - ok(info1.i64NumItems!=0xdeadbeef,"i64NumItems not set\n"); + if(hr != S_OK) todo_wine ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); + else { + ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); + ok(info1.i64Size!=0xdeadbeef,"i64Size not set\n"); + ok(info1.i64NumItems!=0xdeadbeef,"i64NumItems not set\n"); + } /*create and send a file to the recycle bin*/ file = CreateFileA(buf,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,0,NULL); ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n",buf); @@ -87,13 +90,11 @@ static void test_query_recyclebin(void) shfo.lpszProgressTitle = NULL; ok(!pSHFileOperationA(&shfo), "Deletion was not successful\n"); hr = pSHQueryRecycleBinA(buf,&info2); - ok(hr == S_OK, "SHQueryRecycleBinW failed with error 0x%x\n", hr); - if(info2.i64Size!=info1.i64Size || info2.i64NumItems!=info1.i64NumItems) { - ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",str_from_int64(info1.i64Size+written)); - ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",str_from_int64(info1.i64NumItems+1)); - } else todo_wine { - ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",str_from_int64(info1.i64Size+written)); - ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",str_from_int64(info1.i64NumItems+1)); + if(hr != S_OK) todo_wine ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); + else { + ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); + ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",str_from_int64(info1.i64Size+written)); + ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",str_from_int64(info1.i64NumItems+1)); } }

1 0

Piotr Caban : shell32: Create trash test file in temp directory.
by Alexandre Julliard Feb. 2, 2015

Feb. 2, 2015

Module: wine Branch: master Commit: 814ab9ee4635c73e88e27960d30ad023a4d9121c URL: http://source.winehq.org/git/wine.git/?a=commit;h=814ab9ee4635c73e88e27960d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 30 17:03:25 2015 +0100 shell32: Create trash test file in temp directory. --- dlls/shell32/tests/recyclebin.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/tests/recyclebin.c b/dlls/shell32/tests/recyclebin.c index d449b7e..c798492 100644 --- a/dlls/shell32/tests/recyclebin.c +++ b/dlls/shell32/tests/recyclebin.c @@ -55,8 +55,7 @@ static void test_query_recyclebin(void) HRESULT hr; HANDLE file; SHFILEOPSTRUCTA shfo; - const CHAR name[] = "test.txt"; - CHAR buf[MAX_PATH + sizeof(name) + 1]; + CHAR temp_path[MAX_PATH-14], buf[MAX_PATH+1]; if(!pSHQueryRecycleBinA) { skip("SHQueryRecycleBinA does not exist\n"); @@ -67,18 +66,17 @@ static void test_query_recyclebin(void) skip("SHFileOperationA does not exist\n"); return; } - GetCurrentDirectoryA(MAX_PATH, buf); - strcat(buf,"\\"); - strcat(buf,name); + ok(GetTempPathA(sizeof(temp_path), temp_path), "GetTempPath failed\n"); + ok(GetTempFileNameA(temp_path, "trash", 0, buf), "GetTempFileName failed\n"); buf[strlen(buf) + 1] = '\0'; hr = pSHQueryRecycleBinA(buf,&info1); ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); ok(info1.i64Size!=0xdeadbeef,"i64Size not set\n"); ok(info1.i64NumItems!=0xdeadbeef,"i64NumItems not set\n"); /*create and send a file to the recycle bin*/ - file = CreateFileA(name,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,0,NULL); - ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n",name); - WriteFile(file,name,strlen(name),&written,NULL); + file = CreateFileA(buf,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,0,NULL); + ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n",buf); + WriteFile(file,buf,strlen(buf),&written,NULL); CloseHandle(file); shfo.hwnd = NULL; shfo.wFunc = FO_DELETE;

1 0

Ken Thomases : winemac: Track which window was brought forward by Cocoa separately from the window receiving the click event.
by Alexandre Julliard Feb. 2, 2015

Feb. 2, 2015

Module: wine Branch: master Commit: 5fe3c4b89e0676aa0442a0f3dbde82977881db4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fe3c4b89e0676aa0442a0f3d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 29 16:49:01 2015 -0600 winemac: Track which window was brought forward by Cocoa separately from the window receiving the click event. If the mouse is captured, we change which window receives the click event, but that shouldn't change which window we tell Wine was brought forward by Cocoa. --- dlls/winemac.drv/cocoa_app.m | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 1196987..119de2a 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1584,7 +1584,7 @@ int macdrv_err_on; { WineWindow* window = (WineWindow*)[theEvent window]; NSEventType type = [theEvent type]; - BOOL broughtWindowForward = FALSE; + WineWindow* windowBroughtForward = nil; if ([window isKindOfClass:[WineWindow class]] && type == NSLeftMouseDown && @@ -1592,7 +1592,7 @@ int macdrv_err_on; { NSWindowButton windowButton; - broughtWindowForward = TRUE; + windowBroughtForward = window; /* Any left-click on our window anyplace other than the close or minimize buttons will bring it forward. */ @@ -1606,7 +1606,7 @@ int macdrv_err_on; NSPoint point = [button convertPoint:[theEvent locationInWindow] fromView:nil]; if ([button mouse:point inRect:[button bounds]]) { - broughtWindowForward = FALSE; + windowBroughtForward = nil; break; } } @@ -1689,11 +1689,11 @@ int macdrv_err_on; macdrv_release_event(event); } - else if (broughtWindowForward) + else if (windowBroughtForward) { - [[window ancestorWineWindow] postBroughtForwardEvent]; - if (![window isKeyWindow] && !window.disabled && !window.noActivate) - [self windowGotFocus:window]; + [[windowBroughtForward ancestorWineWindow] postBroughtForwardEvent]; + if (![windowBroughtForward isKeyWindow] && !windowBroughtForward.disabled && !windowBroughtForward.noActivate) + [self windowGotFocus:windowBroughtForward]; } }

1 0

Jacek Caban : wscript: Added IHost::Echo implementation.
by Alexandre Julliard Feb. 2, 2015

Feb. 2, 2015

Module: wine Branch: master Commit: d6f527af14d0e9f9ea629024433e3735da439194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f527af14d0e9f9ea6290244… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 29 12:56:22 2015 +0100 wscript: Added IHost::Echo implementation. --- programs/cscript/Makefile.in | 2 +- programs/wscript/Makefile.in | 2 +- programs/wscript/host.c | 124 +++++++++++++++++++++++++++++++++++++++++-- programs/wscript/wscript.h | 15 ++++++ 4 files changed, 138 insertions(+), 5 deletions(-) diff --git a/programs/cscript/Makefile.in b/programs/cscript/Makefile.in index 0a47509..b3fee31 100644 --- a/programs/cscript/Makefile.in +++ b/programs/cscript/Makefile.in @@ -1,6 +1,6 @@ MODULE = cscript.exe APPMODE = -mwindows -municode -IMPORTS = uuid shell32 oleaut32 ole32 advapi32 +IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 EXTRADEFS = -DCSCRIPT_BUILD PARENTSRC = ../wscript diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in index 879daf5..07d8832 100644 --- a/programs/wscript/Makefile.in +++ b/programs/wscript/Makefile.in @@ -1,6 +1,6 @@ MODULE = wscript.exe APPMODE = -mwindows -municode -IMPORTS = uuid shell32 oleaut32 ole32 advapi32 +IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 RC_SRCS = \ rsrc.rc diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 55d4010..893d006 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -30,6 +30,8 @@ #include <wine/debug.h> #include <wine/unicode.h> +WINE_DEFAULT_DEBUG_CHANNEL(wscript); + #define BUILDVERSION 16535 static const WCHAR wshNameW[] = {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; @@ -42,7 +44,59 @@ VARIANT_BOOL wshInteractive = VARIANT_FALSE; #endif -WINE_DEFAULT_DEBUG_CHANNEL(wscript); +static HRESULT to_string(VARIANT *src, BSTR *dst) +{ + VARIANT v; + HRESULT hres; + + static const WCHAR nullW[] = {'n','u','l','l',0}; + + if(V_VT(src) == VT_NULL) { + *dst = SysAllocString(nullW); + return *dst ? S_OK : E_OUTOFMEMORY; + } + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, src, 0, VT_BSTR); + if(FAILED(hres)) { + WARN("Could not convert argument %s to string\n", debugstr_variant(src)); + return hres; + } + + *dst = V_BSTR(&v); + return S_OK; +} + +static void print_string(const WCHAR *string) +{ + DWORD count, ret, len, lena; + char *buf; + + if(wshInteractive) { + static const WCHAR windows_script_hostW[] = + {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; + MessageBoxW(NULL, string, windows_script_hostW, MB_OK); + return; + } + + len = strlenW(string); + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), string, len, &count, NULL); + if(ret) { + static const WCHAR crnlW[] = {'\r','\n'}; + WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), crnlW, sizeof(crnlW)/sizeof(*crnlW), &count, NULL); + return; + } + + lena = WideCharToMultiByte(GetConsoleOutputCP(), 0, string, len, NULL, 0, NULL, NULL); + buf = heap_alloc(len); + if(!buf) + return; + + WideCharToMultiByte(GetConsoleOutputCP(), 0, string, len, buf, lena, NULL, NULL); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), buf, lena, &count, FALSE); + heap_free(buf); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), "\r\n", 2, &count, FALSE); +} static HRESULT WINAPI Host_QueryInterface(IHost *iface, REFIID riid, void **ppv) { @@ -263,8 +317,72 @@ static HRESULT WINAPI Host_CreateObject(IHost *iface, BSTR ProgID, BSTR Prefix, static HRESULT WINAPI Host_Echo(IHost *iface, SAFEARRAY *args) { - WINE_FIXME("(%p)\n", args); - return E_NOTIMPL; + WCHAR *output = NULL, *ptr; + unsigned argc, i, len; + int ubound, lbound; + VARIANT *argv; + BSTR *strs; + HRESULT hres; + + TRACE("(%p)\n", args); + + if(SafeArrayGetDim(args) != 1) { + FIXME("Unsupported args dim %d\n", SafeArrayGetDim(args)); + return E_NOTIMPL; + } + + SafeArrayGetLBound(args, 1, &lbound); + SafeArrayGetUBound(args, 1, &ubound); + + hres = SafeArrayAccessData(args, (void**)&argv); + if(FAILED(hres)) + return hres; + + argc = ubound-lbound+1; + strs = heap_alloc_zero(argc*sizeof(*strs)); + if(!strs) { + SafeArrayUnaccessData(args); + return E_OUTOFMEMORY; + } + + /* Len of spaces between arguments. */ + len = argc-1; + + for(i=0; i < argc; i++) { + hres = to_string(argv+i, strs+i); + if(FAILED(hres)) + break; + + len += SysStringLen(strs[i]); + } + + SafeArrayUnaccessData(args); + if(SUCCEEDED(hres)) { + ptr = output = heap_alloc((len+1)*sizeof(WCHAR)); + if(output) { + for(i=0; i < argc; i++) { + if(i) + *ptr++ = ' '; + len = SysStringLen(strs[i]); + memcpy(ptr, strs[i], len*sizeof(WCHAR)); + ptr += len; + } + *ptr = 0; + }else { + hres = E_OUTOFMEMORY; + } + } + + for(i=0; i < argc; i++) + SysFreeString(strs[i]); + heap_free(strs); + if(FAILED(hres)) + return hres; + + print_string(output); + + heap_free(output); + return S_OK; } static HRESULT WINAPI Host_GetObject(IHost *iface, BSTR Pathname, BSTR ProgID, diff --git a/programs/wscript/wscript.h b/programs/wscript/wscript.h index d624a2d..2a64b34 100644 --- a/programs/wscript/wscript.h +++ b/programs/wscript/wscript.h @@ -33,3 +33,18 @@ extern WCHAR **argums; extern int numOfArgs; extern VARIANT_BOOL wshInteractive; + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +}

1 0

Henri Verbeet : d2d1: Implement d2d_solid_color_brush_SetTransform().
by Alexandre Julliard Feb. 2, 2015

Feb. 2, 2015

Module: wine Branch: master Commit: 81c51768a553a3a39b60afcd9513f4c4bbebf767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c51768a553a3a39b60afcd9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 29 10:27:25 2015 +0100 d2d1: Implement d2d_solid_color_brush_SetTransform(). --- dlls/d2d1/brush.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 477b111..d6d9ef2 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -229,7 +229,11 @@ static void STDMETHODCALLTYPE d2d_solid_color_brush_SetOpacity(ID2D1SolidColorBr static void STDMETHODCALLTYPE d2d_solid_color_brush_SetTransform(ID2D1SolidColorBrush *iface, const D2D1_MATRIX_3X2_F *transform) { - FIXME("iface %p, transform %p stub!\n", iface, transform); + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); + + TRACE("iface %p, transform %p.\n", iface, transform); + + brush->transform = *transform; } static float STDMETHODCALLTYPE d2d_solid_color_brush_GetOpacity(ID2D1SolidColorBrush *iface)

1 0