February 2015 - Wine-commits

Akihiro Sagawa : winmm/tests: Add MPEGVideo driver tests using a wave audio file.
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: 8f6650cb00a6b836ccb2c8648013f9e6b532e4a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6650cb00a6b836ccb2c8648… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jan 31 14:16:30 2015 +0900 winmm/tests: Add MPEGVideo driver tests using a wave audio file. --- dlls/winmm/tests/mci.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index c162fce..13adc6f 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1295,6 +1295,44 @@ static void test_AutoOpenWAVE(HWND hwnd) ok(0xDEADF00D==intbuf[0] && 0xABADCAFE==intbuf[2],"DWORD buffer corruption\n"); } +static void test_playWaveTypeMpegvideo(void) +{ + MCIERROR err; + MCIDEVICEID wDeviceID; + MCI_PLAY_PARMS play_parm; + MCI_STATUS_PARMS status_parm; + char buf[1024]; + memset(buf, 0, sizeof(buf)); + + err = mciSendStringA("open tempfile.wav type MPEGVideo alias mysound", NULL, 0, NULL); + ok(err==ok_saved,"mci open tempfile.wav type MPEGVideo returned %s\n", dbg_mcierr(err)); + if(err) { + skip("Cannot open tempfile.wav type MPEGVideo for playing (%s), skipping\n", dbg_mcierr(err)); + return; + } + + wDeviceID = mciGetDeviceIDA("mysound"); + ok(wDeviceID == 1, "mciGetDeviceIDA mysound returned %u, expected 1\n", wDeviceID); + + err = mciSendCommandA(wDeviceID, MCI_PLAY, 0, (DWORD_PTR)&play_parm); + ok(!err,"mciCommand play returned %s\n", dbg_mcierr(err)); + + err = mciSendStringA("status mysound mode", buf, sizeof(buf), NULL); + ok(!err,"mci status mode returned %s\n", dbg_mcierr(err)); + todo_wine ok(!strcmp(buf,"playing"), "mci status mode: %s\n", buf); + + status_parm.dwItem = MCI_STATUS_MODE; + err = mciSendCommandA(wDeviceID, MCI_STATUS, + MCI_STATUS_ITEM, + (DWORD_PTR)&status_parm); + ok(!err,"mciCommand status mode returned %s\n", dbg_mcierr(err)); + ok(status_parm.dwReturn == MCI_MODE_PLAY, + "mciCommand status mode: %u\n", (DWORD)status_parm.dwReturn); + + err = mciSendStringA("close mysound", NULL, 0, NULL); + ok(!err,"mci close returned %s\n", dbg_mcierr(err)); +} + START_TEST(mci) { char curdir[MAX_PATH], tmpdir[MAX_PATH]; @@ -1314,6 +1352,7 @@ START_TEST(mci) test_playWAVE(hwnd); test_asyncWAVE(hwnd); test_AutoOpenWAVE(hwnd); + test_playWaveTypeMpegvideo(); }else skip("No output devices available, skipping all output tests\n"); /* Win9X hangs when exiting with something still open. */

1 0

Akihiro Sagawa : mciqtz32: "status mode" returns resource strings.
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: 7b0d86514ab4275e0bcf20183814bc6e363c9456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0d86514ab4275e0bcf20183… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jan 31 14:16:32 2015 +0900 mciqtz32: "status mode" returns resource strings. --- dlls/mciqtz32/mciqtz.c | 16 ++++++++++------ dlls/winmm/tests/mci.c | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index e25af89..c13746d 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -605,6 +605,7 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS { WINE_MCIQTZ* wma; HRESULT hr; + DWORD ret = MCI_INTEGER_RETURNED; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -663,30 +664,33 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS LONG state = State_Stopped; IMediaControl_GetState(wma->pmctrl, -1, &state); if (state == State_Stopped) - lpParms->dwReturn = MCI_MODE_STOP; + lpParms->dwReturn = MAKEMCIRESOURCE(MCI_MODE_STOP, MCI_MODE_STOP); else if (state == State_Running) { LONG code; LONG_PTR p1, p2; - lpParms->dwReturn = MCI_MODE_PLAY; + lpParms->dwReturn = MAKEMCIRESOURCE(MCI_MODE_PLAY, MCI_MODE_PLAY); do { hr = IMediaEvent_GetEvent(wma->mevent, &code, &p1, &p2, 0); if (hr == S_OK && code == EC_COMPLETE){ - lpParms->dwReturn = MCI_MODE_STOP; + lpParms->dwReturn = MAKEMCIRESOURCE(MCI_MODE_STOP, MCI_MODE_STOP); IMediaControl_Stop(wma->pmctrl); } } while (hr == S_OK); } else if (state == State_Paused) - lpParms->dwReturn = MCI_MODE_PAUSE; + lpParms->dwReturn = MAKEMCIRESOURCE(MCI_MODE_PAUSE, MCI_MODE_PAUSE); + ret = MCI_RESOURCE_RETURNED; break; } case MCI_STATUS_MEDIA_PRESENT: FIXME("MCI_STATUS_MEDIA_PRESENT not implemented yet\n"); return MCIERR_UNRECOGNIZED_COMMAND; case MCI_STATUS_TIME_FORMAT: - lpParms->dwReturn = wma->time_format; + lpParms->dwReturn = MAKEMCIRESOURCE(wma->time_format, + MCI_FORMAT_RETURN_BASE + wma->time_format); + ret = MCI_RESOURCE_RETURNED; break; case MCI_STATUS_READY: FIXME("MCI_STATUS_READY not implemented yet\n"); @@ -702,7 +706,7 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS if (dwFlags & MCI_NOTIFY) mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wDevID, MCI_NOTIFY_SUCCESSFUL); - return 0; + return ret; } /*************************************************************************** diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 13adc6f..a729b5f 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1319,7 +1319,7 @@ static void test_playWaveTypeMpegvideo(void) err = mciSendStringA("status mysound mode", buf, sizeof(buf), NULL); ok(!err,"mci status mode returned %s\n", dbg_mcierr(err)); - todo_wine ok(!strcmp(buf,"playing"), "mci status mode: %s\n", buf); + ok(!strcmp(buf,"playing"), "mci status mode: %s\n", buf); status_parm.dwItem = MCI_STATUS_MODE; err = mciSendCommandA(wDeviceID, MCI_STATUS,

1 0

Mark Harmstone : mmdevapi: Do nothing on property store Commit.
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: e20307099f99a74b5d6ec327db52d5d24aa35f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e20307099f99a74b5d6ec327d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Mon Feb 2 18:03:54 2015 +0000 mmdevapi: Do nothing on property store Commit. --- dlls/mmdevapi/devenum.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 9a27520..a78e03d 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1469,8 +1469,17 @@ static HRESULT WINAPI MMDevPropStore_SetValue(IPropertyStore *iface, REFPROPERTY static HRESULT WINAPI MMDevPropStore_Commit(IPropertyStore *iface) { - FIXME("stub\n"); - return E_NOTIMPL; + MMDevPropStore *This = impl_from_IPropertyStore(iface); + TRACE("(%p)\n", iface); + + if (This->access != STGM_WRITE + && This->access != STGM_READWRITE) + return STG_E_ACCESSDENIED; + + /* Does nothing - for mmdevapi, the propstore values are written on SetValue, + * not on Commit. */ + + return S_OK; } static const IPropertyStoreVtbl MMDevPropVtbl =

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_GetTransform().
by Alexandre Julliard 02 Feb '15

02 Feb '15

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

Henri Verbeet : d2d1: Implement d2d_linear_gradient_brush_GetTransform().
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: bbba52dc345c5c0ef30e8769e111c1f40f6e712e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbba52dc345c5c0ef30e8769e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 29 10:27:21 2015 +0100 d2d1: Implement d2d_linear_gradient_brush_GetTransform(). --- dlls/d2d1/brush.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index ef70847..c1e2289 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -377,16 +377,11 @@ static float STDMETHODCALLTYPE d2d_linear_gradient_brush_GetOpacity(ID2D1LinearG static void STDMETHODCALLTYPE d2d_linear_gradient_brush_GetTransform(ID2D1LinearGradientBrush *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_ID2D1LinearGradientBrush(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_linear_gradient_brush_SetStartPoint(ID2D1LinearGradientBrush *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_solid_color_brush_GetTransform().
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: 88edc866ea4a761b0e6b69fb93e7083328373f1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=88edc866ea4a761b0e6b69fb9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 29 10:27:22 2015 +0100 d2d1: Implement d2d_solid_color_brush_GetTransform(). --- dlls/d2d1/brush.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index c1e2289..9e3f643 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -244,16 +244,11 @@ static float STDMETHODCALLTYPE d2d_solid_color_brush_GetOpacity(ID2D1SolidColorB static void STDMETHODCALLTYPE d2d_solid_color_brush_GetTransform(ID2D1SolidColorBrush *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_ID2D1SolidColorBrush(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_solid_color_brush_SetColor(ID2D1SolidColorBrush *iface, const D2D1_COLOR_F *color)

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_SetTransform().
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: fce8603a39dcb5f2ee3bb99bf7920465a2457fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fce8603a39dcb5f2ee3bb99bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 29 10:27:23 2015 +0100 d2d1: Implement d2d_bitmap_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 9e3f643..30112e8 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -515,7 +515,11 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetOpacity(ID2D1BitmapBrush *ifac static void STDMETHODCALLTYPE d2d_bitmap_brush_SetTransform(ID2D1BitmapBrush *iface, const D2D1_MATRIX_3X2_F *transform) { - FIXME("iface %p, transform %p stub!\n", iface, transform); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p, transform %p.\n", iface, transform); + + brush->transform = *transform; } static float STDMETHODCALLTYPE d2d_bitmap_brush_GetOpacity(ID2D1BitmapBrush *iface)

1 0

Henri Verbeet : d2d1: Implement d2d_linear_gradient_brush_SetTransform().
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: ecca6269481fab554c39409512b75ca0713103e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecca6269481fab554c3940951… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 29 10:27:24 2015 +0100 d2d1: Implement d2d_linear_gradient_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 30112e8..477b111 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -359,7 +359,11 @@ static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetOpacity(ID2D1LinearGr static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetTransform(ID2D1LinearGradientBrush *iface, const D2D1_MATRIX_3X2_F *transform) { - FIXME("iface %p, transform %p stub!\n", iface, transform); + struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); + + TRACE("iface %p, transform %p.\n", iface, transform); + + brush->transform = *transform; } static float STDMETHODCALLTYPE d2d_linear_gradient_brush_GetOpacity(ID2D1LinearGradientBrush *iface)

1 0

Henri Verbeet : d2d1: Implement d2d_solid_color_brush_SetTransform().
by Alexandre Julliard 02 Feb '15

02 Feb '15

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

Jacek Caban : wscript: Added IHost::Echo implementation.
by Alexandre Julliard 02 Feb '15

02 Feb '15

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