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

Henri Verbeet : wined3d: Make the tex_unit_map parameter to shader_glsl_load_psamplers() const.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: 86dd8476db17eb792a1f5e45026c79b79da4c1c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86dd8476db17eb792a1f5e450… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 21 19:16:02 2011 +0200 wined3d: Make the tex_unit_map parameter to shader_glsl_load_psamplers() const. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c8b4a0a..b046263 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -351,7 +351,7 @@ static void shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLh */ /* GL locking is done by the caller */ static void shader_glsl_load_psamplers(const struct wined3d_gl_info *gl_info, - DWORD *tex_unit_map, GLhandleARB programId) + const DWORD *tex_unit_map, GLhandleARB programId) { GLint name_loc; int i;

1 0

Michael Stefaniuc : gameux: COM cleanup for the IClassFactory iface.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: b48f7bec0dde8c40f789cc7919a080a2bfa417b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b48f7bec0dde8c40f789cc791… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 21 13:30:27 2011 +0200 gameux: COM cleanup for the IClassFactory iface. --- dlls/gameux/factory.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gameux/factory.c b/dlls/gameux/factory.c index 38be7a5..5e8d1c6 100644 --- a/dlls/gameux/factory.c +++ b/dlls/gameux/factory.c @@ -41,13 +41,13 @@ typedef HRESULT (*fnCreateInstance)(IUnknown *pUnkOuter, IUnknown **ppObj); */ typedef struct _gameuxcf { - const struct IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; fnCreateInstance pfnCreateInstance; } gameuxcf; static inline gameuxcf *impl_from_IClassFactory(IClassFactory *iface) { - return (gameuxcf*)((char*)iface - FIELD_OFFSET(gameuxcf, lpVtbl)); + return CONTAINING_RECORD(iface, gameuxcf, IClassFactory_iface); } static HRESULT WINAPI gameuxcf_QueryInterface( @@ -130,8 +130,8 @@ static const struct IClassFactoryVtbl gameuxcf_vtbl = gameuxcf_LockServer }; -static gameuxcf gameexplorercf = { &gameuxcf_vtbl, GameExplorer_create }; -static gameuxcf gamestatisticscf = { &gameuxcf_vtbl, GameStatistics_create }; +static gameuxcf gameexplorercf = { { &gameuxcf_vtbl }, GameExplorer_create }; +static gameuxcf gamestatisticscf = { { &gameuxcf_vtbl }, GameStatistics_create }; /*************************************************************** * gameux ClassFactory @@ -147,11 +147,11 @@ HRESULT WINAPI DllGetClassObject( if(IsEqualCLSID(rclsid, &CLSID_GameExplorer)) { - cf = (IClassFactory*)&gameexplorercf.lpVtbl; + cf = &gameexplorercf.IClassFactory_iface; } else if( IsEqualCLSID( rclsid, &CLSID_GameStatistics )) { - cf = (IClassFactory*) &gamestatisticscf.lpVtbl; + cf = &gamestatisticscf.IClassFactory_iface; } if(!cf)

1 0

André Hentschel : winevdm: Use secure mode when running apps in DOSBox.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 0e3527a56466e011234739a57349daceb05525a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e3527a56466e011234739a57… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 20 22:31:03 2011 +0200 winevdm: Use secure mode when running apps in DOSBox. --- programs/winevdm/winevdm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 04f2953..8abc282 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -184,7 +184,8 @@ static void start_dosbox( const char *appname, const char *args ) p += sprintf( p, "mount %c %s/dosdevices/%c:\n", 'a' + i, config_dir, 'a' + i ); p += sprintf( p, "%c:\ncd ", path[0] ); p += WideCharToMultiByte( CP_UNIXCP, 0, path + 2, -1, p, 4 * strlenW(path), NULL, NULL ) - 1; - p += sprintf( p, "\n%s %s\n", appname, args ); + p += sprintf( p, "\nconfig -securemode\n" ); + p += sprintf( p, "%s %s\n", appname, args ); p += sprintf( p, "exit\n" ); if (WriteFile( file, buffer, strlen(buffer), &written, NULL ) && written == strlen(buffer)) {

1 0

Jeff Latimer : comctl32: Improve the stub of TaskDialogIndirect to display a simple message box pending a full implementation .
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: f669cca9993645397040f504d2e12eac089d4fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f669cca9993645397040f504d… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Thu Jul 21 23:00:13 2011 +1000 comctl32: Improve the stub of TaskDialogIndirect to display a simple message box pending a full implementation. --- dlls/comctl32/commctrl.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index a82b233..e06638c 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1696,9 +1696,34 @@ int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, RECT *rect, DWORD HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *pTaskConfig, int *pnButton, int *pnRadioButton, BOOL *pfVerificationFlagChecked) { + UINT uType = 0; + INT ret; FIXME("%p, %p, %p, %p\n", pTaskConfig, pnButton, pnRadioButton, pfVerificationFlagChecked); - if (pnButton) *pnButton = IDYES; + if (pTaskConfig->dwCommonButtons & TDCBF_YES_BUTTON && + pTaskConfig->dwCommonButtons & TDCBF_NO_BUTTON && + pTaskConfig->dwCommonButtons & TDCBF_CANCEL_BUTTON) + uType |= MB_YESNOCANCEL; + else + if (pTaskConfig->dwCommonButtons & TDCBF_YES_BUTTON && + pTaskConfig->dwCommonButtons & TDCBF_NO_BUTTON) + uType |= MB_YESNO; + else + if (pTaskConfig->dwCommonButtons & TDCBF_RETRY_BUTTON && + pTaskConfig->dwCommonButtons & TDCBF_CANCEL_BUTTON) + uType |= MB_RETRYCANCEL; + else + if (pTaskConfig->dwCommonButtons & TDCBF_OK_BUTTON && + pTaskConfig->dwCommonButtons & TDCBF_CANCEL_BUTTON) + uType |= MB_OKCANCEL; + else + if (pTaskConfig->dwCommonButtons & TDCBF_OK_BUTTON) + uType |= MB_OK; + ret = MessageBoxW(pTaskConfig->hwndParent, pTaskConfig->pszMainInstruction, + pTaskConfig->pszWindowTitle, uType); + FIXME("dwCommonButtons=%x uType=%x ret=%x\n", pTaskConfig->dwCommonButtons, uType, ret); + + if (pnButton) *pnButton = ret; if (pnRadioButton) *pnRadioButton = pTaskConfig->nDefaultButton; if (pfVerificationFlagChecked) *pfVerificationFlagChecked = TRUE; return S_OK;

1 0

Michał Ziętek : wscript: Implemented Host_get_FullName.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: d6fd86e8ec1f764c59306ed3bb3b7270a66487f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6fd86e8ec1f764c59306ed3b… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Wed Jul 20 21:47:18 2011 +0200 wscript: Implemented Host_get_FullName. --- programs/wscript/host.c | 11 +++++++++-- programs/wscript/tests/Makefile.in | 2 +- programs/wscript/tests/run.c | 26 +++++++++++++++++++++++--- programs/wscript/tests/run.js | 1 + 4 files changed, 34 insertions(+), 6 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index c0d73a5..8277cdf 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -114,8 +114,15 @@ static HRESULT WINAPI Host_get_Application(IHost *iface, IDispatch **out_Dispatc static HRESULT WINAPI Host_get_FullName(IHost *iface, BSTR *out_Path) { - WINE_FIXME("(%p)\n", out_Path); - return E_NOTIMPL; + WCHAR fullPath[MAX_PATH]; + + WINE_TRACE("(%p)\n", out_Path); + + if(GetModuleFileNameW(NULL, fullPath, sizeof(fullPath)/sizeof(WCHAR)) == 0) + return E_FAIL; + if(!(*out_Path = SysAllocString(fullPath))) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI Host_get_Path(IHost *iface, BSTR *out_Path) diff --git a/programs/wscript/tests/Makefile.in b/programs/wscript/tests/Makefile.in index 8eb0535..78f0cc4 100644 --- a/programs/wscript/tests/Makefile.in +++ b/programs/wscript/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = wscript.exe -IMPORTS = ole32 advapi32 +IMPORTS = ole32 oleaut32 advapi32 C_SRCS = \ run.c diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 2c2a15a..30230b6 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -56,9 +56,10 @@ DEFINE_EXPECT(reportSuccess); -#define DISPID_TESTOBJ_OK 10000 -#define DISPID_TESTOBJ_TRACE 10001 -#define DISPID_TESTOBJ_REPORTSUCCESS 10002 +#define DISPID_TESTOBJ_OK 10000 +#define DISPID_TESTOBJ_TRACE 10001 +#define DISPID_TESTOBJ_REPORTSUCCESS 10002 +#define DISPID_TESTOBJ_WSCRIPTFULLNAME 10003 #define TESTOBJ_CLSID "{178fc166-f585-4e24-9c13-4bb7faf80646}" @@ -120,6 +121,8 @@ static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, rgDispId[i] = DISPID_TESTOBJ_TRACE; }else if(!strcmp_wa(rgszNames[i], "reportSuccess")) { rgDispId[i] = DISPID_TESTOBJ_REPORTSUCCESS; + }else if(!strcmp_wa(rgszNames[i], "wscriptFullName")) { + rgDispId[i] = DISPID_TESTOBJ_WSCRIPTFULLNAME; }else { ok(0, "unexpected name %s\n", wine_dbgstr_w(rgszNames[i])); return DISP_E_UNKNOWNNAME; @@ -161,6 +164,23 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF if(pVarResult) V_VT(pVarResult) = VT_EMPTY; break; + case DISPID_TESTOBJ_WSCRIPTFULLNAME: + { + WCHAR fullName[MAX_PATH]; + const WCHAR wscriptexe[] = {'w','s','c','r','i','p','t','.','e','x','e',0}; + DWORD res; + + ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + V_VT(pVarResult) = VT_BSTR; + res = SearchPathW(NULL, wscriptexe, NULL, sizeof(fullName)/sizeof(WCHAR), fullName, NULL); + if(res == 0) + return E_FAIL; + if(!(V_BSTR(pVarResult) = SysAllocString(fullName))) + return E_OUTOFMEMORY; + break; + } default: ok(0, "unexpected dispIdMember %d\n", dispIdMember); return E_NOTIMPL; diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index fda62f6..1156e13 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -28,5 +28,6 @@ ok(WScript === WSH, "WScript !== WSH"); ok(WScript.Name === "Windows Script Host", "WScript.Name = " + WScript.Name); ok(typeof(WScript.Version) === "string", "typeof(WScript.Version) = " + typeof(WScript.Version)); ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuldVersion) = " + typeof(WScript.BuldVersion)); +ok(WScript.FullName === winetest.wscriptFullName, "WScript.FullName = ", WScript.FullName); winetest.reportSuccess();

1 0

Michał Ziętek : wscript: Implemented Host_get_Path.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 6afb5f078241406caf5281854daf3ca15c915092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6afb5f078241406caf5281854… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Wed Jul 20 21:47:29 2011 +0200 wscript: Implemented Host_get_Path. --- programs/wscript/host.c | 16 ++++++++++++++-- programs/wscript/tests/run.c | 33 +++++++++++++++++++++++++++++++++ programs/wscript/tests/run.js | 1 + 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 8277cdf..42343b1 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -28,6 +28,7 @@ #include "wscript.h" #include <wine/debug.h> +#include <wine/unicode.h> #define BUILDVERSION 16535 @@ -127,8 +128,19 @@ static HRESULT WINAPI Host_get_FullName(IHost *iface, BSTR *out_Path) static HRESULT WINAPI Host_get_Path(IHost *iface, BSTR *out_Path) { - WINE_FIXME("(%p)\n", out_Path); - return E_NOTIMPL; + WCHAR path[MAX_PATH]; + int howMany; + WCHAR *pos; + + WINE_TRACE("(%p)\n", out_Path); + + if(GetModuleFileNameW(NULL, path, sizeof(path)/sizeof(WCHAR)) == 0) + return E_FAIL; + pos = strrchrW(path, '\\'); + howMany = pos - path; + if(!(*out_Path = SysAllocStringLen(path, howMany))) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI Host_get_Interactive(IHost *iface, VARIANT_BOOL *out_Interactive) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 30230b6..2f5dedd 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -60,6 +60,7 @@ DEFINE_EXPECT(reportSuccess); #define DISPID_TESTOBJ_TRACE 10001 #define DISPID_TESTOBJ_REPORTSUCCESS 10002 #define DISPID_TESTOBJ_WSCRIPTFULLNAME 10003 +#define DISPID_TESTOBJ_WSCRIPTPATH 10004 #define TESTOBJ_CLSID "{178fc166-f585-4e24-9c13-4bb7faf80646}" @@ -75,6 +76,17 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpW(strw, buf); } +static const WCHAR* mystrrchr(const WCHAR *str, WCHAR ch) +{ + const WCHAR *pos = NULL, *current = str; + while(*current != 0) { + if(*current == ch) + pos = current; + ++current; + } + return pos; +} + static HRESULT WINAPI Dispatch_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDispatch)) { @@ -123,6 +135,8 @@ static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, rgDispId[i] = DISPID_TESTOBJ_REPORTSUCCESS; }else if(!strcmp_wa(rgszNames[i], "wscriptFullName")) { rgDispId[i] = DISPID_TESTOBJ_WSCRIPTFULLNAME; + }else if(!strcmp_wa(rgszNames[i], "wscriptPath")) { + rgDispId[i] = DISPID_TESTOBJ_WSCRIPTPATH; }else { ok(0, "unexpected name %s\n", wine_dbgstr_w(rgszNames[i])); return DISP_E_UNKNOWNNAME; @@ -181,6 +195,25 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF return E_OUTOFMEMORY; break; } + case DISPID_TESTOBJ_WSCRIPTPATH: + { + WCHAR fullPath[MAX_PATH]; + const WCHAR wscriptexe[] = {'w','s','c','r','i','p','t','.','e','x','e',0}; + DWORD res; + const WCHAR *pos; + + ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + V_VT(pVarResult) = VT_BSTR; + res = SearchPathW(NULL, wscriptexe, NULL, sizeof(fullPath)/sizeof(WCHAR), fullPath, NULL); + if(res == 0) + return E_FAIL; + pos = mystrrchr(fullPath, '\\'); + if(!(V_BSTR(pVarResult) = SysAllocStringLen(fullPath, pos-fullPath))) + return E_OUTOFMEMORY; + break; + } default: ok(0, "unexpected dispIdMember %d\n", dispIdMember); return E_NOTIMPL; diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 1156e13..225abef 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -29,5 +29,6 @@ ok(WScript.Name === "Windows Script Host", "WScript.Name = " + WScript.Name); ok(typeof(WScript.Version) === "string", "typeof(WScript.Version) = " + typeof(WScript.Version)); ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuldVersion) = " + typeof(WScript.BuldVersion)); ok(WScript.FullName === winetest.wscriptFullName, "WScript.FullName = ", WScript.FullName); +ok(WScript.Path === winetest.wscriptPath, "WScript.Path = ", WScript.Path); winetest.reportSuccess();

1 0

Michał Ziętek : wscript: Implemented Host_get_ScriptName.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: bf331f8dcaebe4db2672c09b81ae37624376467d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf331f8dcaebe4db2672c09b8… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Wed Jul 20 21:47:38 2011 +0200 wscript: Implemented Host_get_ScriptName. --- programs/wscript/host.c | 11 +++++++++-- programs/wscript/main.c | 5 +++++ programs/wscript/tests/run.c | 32 ++++++++++++++++++++++++++++++++ programs/wscript/tests/run.js | 1 + programs/wscript/wscript.h | 2 ++ 5 files changed, 49 insertions(+), 2 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 42343b1..b556d74 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -163,8 +163,15 @@ static HRESULT WINAPI Host_Quit(IHost *iface, int ExitCode) static HRESULT WINAPI Host_get_ScriptName(IHost *iface, BSTR *out_ScriptName) { - WINE_FIXME("(%p)\n", out_ScriptName); - return E_NOTIMPL; + WCHAR *scriptName; + + WINE_TRACE("(%p)\n", out_ScriptName); + + scriptName = strrchrW(scriptFullName, '\\'); + ++scriptName; + if(!(*out_ScriptName = SysAllocString(scriptName))) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI Host_get_ScriptFullName(IHost *iface, BSTR *out_ScriptFullName) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 0ea7011..8bf0712 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wscript); static const WCHAR wscriptW[] = {'W','S','c','r','i','p','t',0}; static const WCHAR wshW[] = {'W','S','H',0}; +WCHAR scriptFullName[MAX_PATH]; ITypeInfo *host_ti; @@ -326,6 +327,7 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm WCHAR **argv; CLSID clsid; int argc, i; + DWORD res; WINE_TRACE("(%p %p %s %x)\n", hInst, hPrevInst, wine_dbgstr_w(cmdline), cmdshow); @@ -346,6 +348,9 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm WINE_FIXME("No file name specified\n"); return 1; } + res = GetFullPathNameW(filename, sizeof(scriptFullName)/sizeof(WCHAR), scriptFullName, NULL); + if(!res || res > sizeof(scriptFullName)/sizeof(WCHAR)) + return 1; ext = strchrW(filename, '.'); if(!ext) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 2f5dedd..9595942 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -61,6 +61,7 @@ DEFINE_EXPECT(reportSuccess); #define DISPID_TESTOBJ_REPORTSUCCESS 10002 #define DISPID_TESTOBJ_WSCRIPTFULLNAME 10003 #define DISPID_TESTOBJ_WSCRIPTPATH 10004 +#define DISPID_TESTOBJ_WSCRIPTSCRIPTNAME 10005 #define TESTOBJ_CLSID "{178fc166-f585-4e24-9c13-4bb7faf80646}" @@ -87,6 +88,18 @@ static const WCHAR* mystrrchr(const WCHAR *str, WCHAR ch) return pos; } +static BSTR a2bstr(const char *str) +{ + BSTR ret; + int len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = SysAllocStringLen(NULL, len-1); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + static HRESULT WINAPI Dispatch_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDispatch)) { @@ -137,6 +150,8 @@ static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, rgDispId[i] = DISPID_TESTOBJ_WSCRIPTFULLNAME; }else if(!strcmp_wa(rgszNames[i], "wscriptPath")) { rgDispId[i] = DISPID_TESTOBJ_WSCRIPTPATH; + }else if(!strcmp_wa(rgszNames[i], "wscriptScriptName")) { + rgDispId[i] = DISPID_TESTOBJ_WSCRIPTSCRIPTNAME; }else { ok(0, "unexpected name %s\n", wine_dbgstr_w(rgszNames[i])); return DISP_E_UNKNOWNNAME; @@ -214,6 +229,23 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF return E_OUTOFMEMORY; break; } + case DISPID_TESTOBJ_WSCRIPTSCRIPTNAME: + { + char fullPath[MAX_PATH]; + char *pos; + long res; + + ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + V_VT(pVarResult) = VT_BSTR; + res = GetFullPathNameA(script_name, sizeof(fullPath)/sizeof(WCHAR), fullPath, &pos); + if(!res || res > sizeof(fullPath)/sizeof(WCHAR)) + return E_FAIL; + if(!(V_BSTR(pVarResult) = SysAllocString(a2bstr(pos)))) + return E_OUTOFMEMORY; + break; + } default: ok(0, "unexpected dispIdMember %d\n", dispIdMember); return E_NOTIMPL; diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 225abef..e9d7776 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -30,5 +30,6 @@ ok(typeof(WScript.Version) === "string", "typeof(WScript.Version) = " + typeof(W ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuldVersion) = " + typeof(WScript.BuldVersion)); ok(WScript.FullName === winetest.wscriptFullName, "WScript.FullName = ", WScript.FullName); ok(WScript.Path === winetest.wscriptPath, "WScript.Path = ", WScript.Path); +ok(WScript.ScriptName === winetest.wscriptScriptName, "WScript.ScriptName = " + WScript.ScriptName); winetest.reportSuccess(); diff --git a/programs/wscript/wscript.h b/programs/wscript/wscript.h index a5c642d..642784e 100644 --- a/programs/wscript/wscript.h +++ b/programs/wscript/wscript.h @@ -21,3 +21,5 @@ extern IHost host_obj; extern ITypeInfo *host_ti; + +extern WCHAR scriptFullName[];

1 0

Michał Ziętek : wscript: Implemented Host_get_ScriptFullName.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 4ecb339f02f7153e5f34a5b9c5918f595c268752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ecb339f02f7153e5f34a5b9c… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Wed Jul 20 21:47:47 2011 +0200 wscript: Implemented Host_get_ScriptFullName. --- programs/wscript/host.c | 7 +++++-- programs/wscript/tests/run.c | 19 +++++++++++++++++++ programs/wscript/tests/run.js | 1 + 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index b556d74..d17e4b4 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -176,8 +176,11 @@ static HRESULT WINAPI Host_get_ScriptName(IHost *iface, BSTR *out_ScriptName) static HRESULT WINAPI Host_get_ScriptFullName(IHost *iface, BSTR *out_ScriptFullName) { - WINE_FIXME("(%p)\n", out_ScriptFullName); - return E_NOTIMPL; + WINE_TRACE("(%p)\n", out_ScriptFullName); + + if(!(*out_ScriptFullName = SysAllocString(scriptFullName))) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI Host_get_Arguments(IHost *iface, IArguments2 **out_Arguments) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 9595942..50aa398 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -62,6 +62,7 @@ DEFINE_EXPECT(reportSuccess); #define DISPID_TESTOBJ_WSCRIPTFULLNAME 10003 #define DISPID_TESTOBJ_WSCRIPTPATH 10004 #define DISPID_TESTOBJ_WSCRIPTSCRIPTNAME 10005 +#define DISPID_TESTOBJ_WSCRIPTSCRIPTFULLNAME 10006 #define TESTOBJ_CLSID "{178fc166-f585-4e24-9c13-4bb7faf80646}" @@ -152,6 +153,8 @@ static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, rgDispId[i] = DISPID_TESTOBJ_WSCRIPTPATH; }else if(!strcmp_wa(rgszNames[i], "wscriptScriptName")) { rgDispId[i] = DISPID_TESTOBJ_WSCRIPTSCRIPTNAME; + }else if(!strcmp_wa(rgszNames[i], "wscriptScriptFullName")) { + rgDispId[i] = DISPID_TESTOBJ_WSCRIPTSCRIPTFULLNAME; }else { ok(0, "unexpected name %s\n", wine_dbgstr_w(rgszNames[i])); return DISP_E_UNKNOWNNAME; @@ -246,6 +249,22 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF return E_OUTOFMEMORY; break; } + case DISPID_TESTOBJ_WSCRIPTSCRIPTFULLNAME: + { + char fullPath[MAX_PATH]; + long res; + + ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + V_VT(pVarResult) = VT_BSTR; + res = GetFullPathNameA(script_name, sizeof(fullPath)/sizeof(WCHAR), fullPath, NULL); + if(!res || res > sizeof(fullPath)/sizeof(WCHAR)) + return E_FAIL; + if(!(V_BSTR(pVarResult) = SysAllocString(a2bstr(fullPath)))) + return E_OUTOFMEMORY; + break; + } default: ok(0, "unexpected dispIdMember %d\n", dispIdMember); return E_NOTIMPL; diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index e9d7776..5e61d69 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -31,5 +31,6 @@ ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuldVersion) = " + ok(WScript.FullName === winetest.wscriptFullName, "WScript.FullName = ", WScript.FullName); ok(WScript.Path === winetest.wscriptPath, "WScript.Path = ", WScript.Path); ok(WScript.ScriptName === winetest.wscriptScriptName, "WScript.ScriptName = " + WScript.ScriptName); +ok(WScript.ScriptFullName === winetest.wscriptScriptFullName, "WScript.ScriptFullName = " + WScript.ScriptFullName); winetest.reportSuccess();

1 0

Alexandre Julliard : wineps: Add a couple of helper functions to simplify the StretchDIBits implementation .
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 632391dbf42e67d296a405afb3958a7c4b99e066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=632391dbf42e67d296a405afb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 20 14:36:10 2011 +0200 wineps: Add a couple of helper functions to simplify the StretchDIBits implementation. --- dlls/wineps.drv/bitmap.c | 146 +++++++++++++++------------------------------- dlls/wineps.drv/ps.c | 33 ++++++++-- dlls/wineps.drv/psdrv.h | 3 +- 3 files changed, 76 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=632391dbf42e67d296a40…

1 0

Alexandre Julliard : wineps: Implement the PutImage entry point.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 209578aeab623e43e2791fc7d87b47929bc12a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=209578aeab623e43e2791fc7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 20 16:04:28 2011 +0200 wineps: Implement the PutImage entry point. --- dlls/wineps.drv/bitmap.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wineps.drv/init.c | 2 +- dlls/wineps.drv/psdrv.h | 2 + 3 files changed, 119 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index cb4ea30..cac4841 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -177,6 +177,11 @@ static inline DWORD max_ascii85_size(DWORD size) return (size + 3) / 4 * 5; } +static void free_heap_bits( struct gdi_image_bits *bits ) +{ + HeapFree( GetProcessHeap(), 0, bits->ptr ); +} + /*************************************************************************** * PSDRV_WriteImageBits */ @@ -205,6 +210,117 @@ static void PSDRV_WriteImageBits( PHYSDEV dev, const BITMAPINFO *info, INT xDst, HeapFree(GetProcessHeap(), 0, ascii85); } +/*********************************************************************** + * PSDRV_PutImage + */ +DWORD PSDRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, struct bitblt_coords *dst, DWORD rop ) +{ + int src_stride, dst_stride, size, x, y, width, height, bit_offset; + int dst_x, dst_y, dst_width, dst_height; + unsigned char *src_ptr, *dst_ptr; + struct gdi_image_bits dst_bits; + + if (hbitmap) return ERROR_NOT_SUPPORTED; + + if (info->bmiHeader.biPlanes != 1) goto update_format; + if (info->bmiHeader.biCompression != BI_RGB) goto update_format; + if (info->bmiHeader.biBitCount == 16 || info->bmiHeader.biBitCount == 32) goto update_format; + if (!bits) return ERROR_SUCCESS; /* just querying the format */ + + TRACE( "bpp %u %s -> %s\n", info->bmiHeader.biBitCount, wine_dbgstr_rect(&src->visrect), + wine_dbgstr_rect(&dst->visrect) ); + + width = src->visrect.right - src->visrect.left; + height = src->visrect.bottom - src->visrect.top; + src_stride = get_dib_width_bytes( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); + dst_stride = (width * info->bmiHeader.biBitCount + 7) / 8; + + src_ptr = bits->ptr; + if (info->bmiHeader.biHeight > 0) + src_ptr += (info->bmiHeader.biHeight - src->visrect.bottom) * src_stride; + else + src_ptr += src->visrect.top * src_stride; + bit_offset = src->visrect.left * info->bmiHeader.biBitCount; + src_ptr += bit_offset / 8; + bit_offset &= 7; + if (bit_offset) FIXME( "pos %s not supported\n", wine_dbgstr_rect(&src->visrect) ); + size = height * dst_stride; + + if (src_stride != dst_stride || (info->bmiHeader.biBitCount == 24 && !bits->is_copy)) + { + if (!(dst_bits.ptr = HeapAlloc( GetProcessHeap(), 0, size ))) return ERROR_OUTOFMEMORY; + dst_bits.is_copy = TRUE; + dst_bits.free = free_heap_bits; + } + else + { + dst_bits.ptr = src_ptr; + dst_bits.is_copy = bits->is_copy; + dst_bits.free = NULL; + } + dst_ptr = dst_bits.ptr; + + switch (info->bmiHeader.biBitCount) + { + case 1: + case 4: + case 8: + if (src_stride != dst_stride) + for (y = 0; y < height; y++, src_ptr += src_stride, dst_ptr += dst_stride) + memcpy( dst_ptr, src_ptr, dst_stride ); + break; + case 24: + if (dst_ptr != src_ptr) + for (y = 0; y < height; y++, src_ptr += src_stride, dst_ptr += dst_stride) + for (x = 0; x < width; x++) + { + dst_ptr[x * 3] = src_ptr[x * 3 + 2]; + dst_ptr[x * 3 + 1] = src_ptr[x * 3 + 1]; + dst_ptr[x * 3 + 2] = src_ptr[x * 3]; + } + else /* swap R and B in place */ + for (y = 0; y < height; y++, src_ptr += src_stride, dst_ptr += dst_stride) + for (x = 0; x < width; x++) + { + unsigned char tmp = dst_ptr[x * 3]; + dst_ptr[x * 3] = dst_ptr[x * 3 + 2]; + dst_ptr[x * 3 + 2] = tmp; + } + break; + } + + dst_x = dst->visrect.left; + dst_y = dst->visrect.top, + dst_width = dst->visrect.right - dst->visrect.left; + dst_height = dst->visrect.bottom - dst->visrect.top; + if (src->width * dst->width < 0) + { + dst_x += dst_width; + dst_width = -dst_width; + } + if (src->height * dst->height < 0) + { + dst_y += dst_height; + dst_height = -dst_height; + } + + PSDRV_SetClip(dev); + PSDRV_WriteGSave(dev); + PSDRV_WriteImageBits( dev, info, dst_x, dst_y, dst_width, dst_height, + width, height, dst_bits.ptr, size ); + PSDRV_WriteGRestore(dev); + PSDRV_ResetClip(dev); + if (dst_bits.free) dst_bits.free( &dst_bits ); + return ERROR_SUCCESS; + +update_format: + info->bmiHeader.biPlanes = 1; + if (info->bmiHeader.biBitCount > 8) info->bmiHeader.biBitCount = 24; + info->bmiHeader.biCompression = BI_RGB; + return ERROR_BAD_FORMAT; +} + /*************************************************************************** * * PSDRV_StretchDIBits diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index a45cf86..e9b0a04 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -868,7 +868,7 @@ static const struct gdi_dc_funcs psdrv_funcs = PSDRV_Polygon, /* pPolygon */ PSDRV_Polyline, /* pPolyline */ NULL, /* pPolylineTo */ - NULL, /* pPutImage */ + PSDRV_PutImage, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ NULL, /* pRealizePalette */ PSDRV_Rectangle, /* pRectangle */ diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index d228023..5be855d 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -443,6 +443,8 @@ extern BOOL PSDRV_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, extern BOOL PSDRV_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* counts, DWORD polylines ) DECLSPEC_HIDDEN; extern BOOL PSDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; extern BOOL PSDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; +extern DWORD PSDRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL PSDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL PSDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN;

1 0