September 2011 - Wine-commits

Francois Gouget : dinput: Make semantic_to_obj_id() static.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 1e8abc39844b8a0d092ea4e161f433181fc1a61a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e8abc39844b8a0d092ea4e16… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 2 10:51:12 2011 +0200 dinput: Make semantic_to_obj_id() static. --- dlls/dinput/device.c | 2 +- dlls/dinput/device_private.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index ead1052..a4052ea 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -570,7 +570,7 @@ int find_property(const DataFormat *df, LPCDIPROPHEADER ph) return -1; } -DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) +static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) { DWORD type = (0x0000ff00 & dwSemantic) >> 8; DWORD offset = 0x000000ff & dwSemantic; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 347c642..660ebd7 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -124,7 +124,6 @@ extern void _dump_OBJECTINSTANCEW(const DIDEVICEOBJECTINSTANCEW *ddoi) DECLSPEC extern void _dump_DIDATAFORMAT(const DIDATAFORMAT *df) DECLSPEC_HIDDEN; extern const char *_dump_dinput_GUID(const GUID *guid) DECLSPEC_HIDDEN; -extern DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) DECLSPEC_HIDDEN; extern LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD type) DECLSPEC_HIDDEN; extern HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags, DWORD devMask, LPCDIDATAFORMAT df) DECLSPEC_HIDDEN;

1 0

Francois Gouget : msi: Make find_table() static.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 2649761175fb4f787d17ffdf18c8452f91a525b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2649761175fb4f787d17ffdf1… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 2 10:51:16 2011 +0200 msi: Make find_table() static. --- dlls/msi/where.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index cc80a71..5304900 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -149,7 +149,7 @@ static UINT add_row(MSIWHEREVIEW *wv, UINT vals[]) return ERROR_SUCCESS; } -JOINTABLE *find_table(MSIWHEREVIEW *wv, UINT col, UINT *table_col) +static JOINTABLE *find_table(MSIWHEREVIEW *wv, UINT col, UINT *table_col) { JOINTABLE *table = wv->tables;

1 0

Stefan Dösinger : ddraw: Simplify Z format parsing a bit, remove ERRs.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 2fc534edf2447603b7dcb1743ca56b141aae1fa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc534edf2447603b7dcb1743… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 28 16:04:24 2011 +0200 ddraw: Simplify Z format parsing a bit, remove ERRs. --- dlls/ddraw/utils.c | 49 ++++++++++++++++++------------------------------- 1 files changed, 18 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 63c6a5e..d2a4194 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -519,31 +519,22 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat { switch(DDPixelFormat->u1.dwZBufferBitDepth) { - case 8: - FIXME("8 Bits Z+Stencil buffer pixelformat is not supported. Returning WINED3DFMT_UNKNOWN\n"); - return WINED3DFMT_UNKNOWN; - - case 15: - FIXME("15 bit depth buffer not handled yet, assuming 16 bit\n"); case 16: - if(DDPixelFormat->u2.dwStencilBitDepth == 1) - return WINED3DFMT_S1_UINT_D15_UNORM; - - FIXME("Don't know how to handle a 16 bit Z buffer with %d bit stencil buffer pixelformat\n", DDPixelFormat->u2.dwStencilBitDepth); + if (DDPixelFormat->u2.dwStencilBitDepth == 1) return WINED3DFMT_S1_UINT_D15_UNORM; + WARN("Unknown depth stenil format: 16 z bits, %u stencil bits\n", + DDPixelFormat->u2.dwStencilBitDepth); return WINED3DFMT_UNKNOWN; - case 24: - FIXME("Don't know how to handle a 24 bit depth buffer with stencil bits\n"); - return WINED3DFMT_D24_UNORM_S8_UINT; - case 32: - if(DDPixelFormat->u2.dwStencilBitDepth == 8) - return WINED3DFMT_D24_UNORM_S8_UINT; - else - return WINED3DFMT_S4X4_UINT_D24_UNORM; + if (DDPixelFormat->u2.dwStencilBitDepth == 8) return WINED3DFMT_D24_UNORM_S8_UINT; + else if (DDPixelFormat->u2.dwStencilBitDepth == 4) return WINED3DFMT_S4X4_UINT_D24_UNORM; + WARN("Unknown depth stenil format: 32 z bits, %u stencil bits\n", + DDPixelFormat->u2.dwStencilBitDepth); + return WINED3DFMT_UNKNOWN; default: - ERR("Unknown Z buffer depth %d\n", DDPixelFormat->u1.dwZBufferBitDepth); + WARN("Unknown depth stenil format: %u z bits, %u stencil bits\n", + DDPixelFormat->u1.dwZBufferBitDepth, DDPixelFormat->u2.dwStencilBitDepth); return WINED3DFMT_UNKNOWN; } } @@ -551,10 +542,6 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat { switch(DDPixelFormat->u1.dwZBufferBitDepth) { - case 8: - ERR("8 Bit Z buffers are not supported. Trying a 16 Bit one\n"); - return WINED3DFMT_D16_UNORM; - case 16: return WINED3DFMT_D16_UNORM; @@ -562,16 +549,16 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat return WINED3DFMT_X8D24_UNORM; case 32: - if(DDPixelFormat->u3.dwZBitMask == 0x00FFFFFF) { - return WINED3DFMT_X8D24_UNORM; - } else if(DDPixelFormat->u3.dwZBitMask == 0xFFFFFFFF) { - return WINED3DFMT_D32_UNORM; - } - FIXME("Unhandled 32 bit depth buffer bitmasks, returning WINED3DFMT_D24X8\n"); - return WINED3DFMT_X8D24_UNORM; /* That's most likely to make games happy */ + if (DDPixelFormat->u3.dwZBitMask == 0x00FFFFFF) return WINED3DFMT_X8D24_UNORM; + else if (DDPixelFormat->u3.dwZBitMask == 0xFFFFFF00) return WINED3DFMT_X8D24_UNORM; + else if (DDPixelFormat->u3.dwZBitMask == 0xFFFFFFFF) return WINED3DFMT_D32_UNORM; + WARN("Unknown depth-only format: 32 z bits, mask 0x%08x\n", + DDPixelFormat->u3.dwZBitMask); + return WINED3DFMT_UNKNOWN; default: - ERR("Unsupported Z buffer depth %d\n", DDPixelFormat->u1.dwZBufferBitDepth); + WARN("Unknown depth-only format: %u z bits, mask 0x%08x\n", + DDPixelFormat->u1.dwZBufferBitDepth, DDPixelFormat->u3.dwZBitMask); return WINED3DFMT_UNKNOWN; } }

1 0

Stefan Dösinger : ddraw: Mark DepthFill blit failures between beginScene and EndScene broken.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 5ce2e1f39e139070d648f30a914bbf82a16ffed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce2e1f39e139070d648f30a9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 28 16:23:49 2011 +0200 ddraw: Mark DepthFill blit failures between beginScene and EndScene broken. --- dlls/ddraw/tests/d3d.c | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 4031a75..c799678 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -706,20 +706,35 @@ static void SceneTest(void) /* Test a normal BeginScene / EndScene pair, this should work */ hr = IDirect3DDevice7_BeginScene(lpD3DDevice); ok(hr == D3D_OK, "IDirect3DDevice7_BeginScene failed with %08x\n", hr); - if(SUCCEEDED(hr)) + if (SUCCEEDED(hr)) + { + hr = IDirect3DDevice7_EndScene(lpD3DDevice); + ok(hr == D3D_OK, "IDirect3DDevice7_EndScene failed with %08x\n", hr); + } + + if (lpDDSdepth) { DDBLTFX fx; memset(&fx, 0, sizeof(fx)); fx.dwSize = sizeof(fx); - if(lpDDSdepth) { + hr = IDirectDrawSurface7_Blt(lpDDSdepth, NULL, NULL, NULL, DDBLT_DEPTHFILL, &fx); + ok(hr == D3D_OK, "Depthfill failed outside a BeginScene / EndScene pair, hr 0x%08x\n", hr); + + hr = IDirect3DDevice7_BeginScene(lpD3DDevice); + ok(hr == D3D_OK, "IDirect3DDevice7_BeginScene failed with %08x\n", hr); + if (SUCCEEDED(hr)) + { hr = IDirectDrawSurface7_Blt(lpDDSdepth, NULL, NULL, NULL, DDBLT_DEPTHFILL, &fx); - ok(hr == D3D_OK, "Depthfill failed in a BeginScene / EndScene pair\n"); - } else { - skip("Depth stencil creation failed at startup, skipping\n"); + ok(hr == D3D_OK || broken(hr == E_FAIL), + "Depthfill failed in a BeginScene / EndScene pair, hr 0x%08x\n", hr); + hr = IDirect3DDevice7_EndScene(lpD3DDevice); + ok(hr == D3D_OK, "IDirect3DDevice7_EndScene failed with %08x\n", hr); } - hr = IDirect3DDevice7_EndScene(lpD3DDevice); - ok(hr == D3D_OK, "IDirect3DDevice7_EndScene failed with %08x\n", hr); + } + else + { + skip("Depth stencil creation failed at startup, skipping depthfill test\n"); } /* Test another EndScene without having begun a new scene. Should return an error */

1 0

Stefan Dösinger : ddraw: Set the viewport after changing the render target.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: e0db367aefb85a2defca983a59a7165c8fe3f7dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0db367aefb85a2defca983a5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 28 16:48:52 2011 +0200 ddraw: Set the viewport after changing the render target. --- dlls/ddraw/tests/visual.c | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index acefb67..9026f97 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -210,16 +210,24 @@ out: return ret; } -/* - * Helper function to get and set the viewport - needed on geforce 8800 on XP - driver bug? - * This is needed after IDirect3DDevice7_SetRenderTarget in combination with offscreen to backbuffer rendering. - */ -static void set_the_same_viewport_again(IDirect3DDevice7 *device) +static void set_viewport_size(IDirect3DDevice7 *device) { D3DVIEWPORT7 vp = {0}; + DDSURFACEDESC2 ddsd; HRESULT hr; - hr = IDirect3DDevice7_GetViewport(device,&vp); - ok(hr == D3D_OK && vp.dwWidth == 640 && vp.dwHeight == 480, "IDirect3DDevice7_SetViewport returned %08x\n", hr); + IDirectDrawSurface7 *target; + + hr = IDirect3DDevice7_GetRenderTarget(device, &target); + ok(hr == D3D_OK, "IDirect3DDevice7_GetRenderTarget returned %08x\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + IDirectDrawSurface7_GetSurfaceDesc(target, &ddsd); + ok(hr == D3D_OK, "IDirectDrawSurface7_GetSurfaceDesc returned %08x\n", hr); + IDirectDrawSurface7_Release(target); + + vp.dwWidth = ddsd.dwWidth; + vp.dwHeight = ddsd.dwHeight; hr = IDirect3DDevice7_SetViewport(device, &vp); ok(hr == D3D_OK, "IDirect3DDevice7_SetViewport returned %08x\n", hr); return; @@ -831,6 +839,7 @@ static void offscreen_test(IDirect3DDevice7 *device) if(IDirect3DDevice7_BeginScene(device) == D3D_OK) { hr = IDirect3DDevice7_SetRenderTarget(device, offscreen, 0); ok(hr == D3D_OK, "SetRenderTarget failed, hr = %08x\n", hr); + set_viewport_size(device); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr); @@ -840,7 +849,7 @@ static void offscreen_test(IDirect3DDevice7 *device) hr = IDirect3DDevice7_SetRenderTarget(device, backbuffer, 0); ok(hr == D3D_OK, "SetRenderTarget failed, hr = %08x\n", hr); - set_the_same_viewport_again(device); + set_viewport_size(device); hr = IDirect3DDevice7_SetTexture(device, 0, offscreen); ok(hr == D3D_OK, "SetTexture failed, %08x\n", hr); @@ -987,7 +996,8 @@ static void alpha_test(IDirect3DDevice7 *device) * vertices */ hr = IDirect3DDevice7_SetRenderTarget(device, offscreen, 0); - ok(hr == D3D_OK, "Can't get back buffer, hr = %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderTarget failed, hr = %08x\n", hr); + set_viewport_size(device); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x80ff0000, 0.0, 0); ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr); @@ -1006,8 +1016,8 @@ static void alpha_test(IDirect3DDevice7 *device) ok(hr == D3D_OK, "DrawPrimitive failed, hr = %08x\n", hr); hr = IDirect3DDevice7_SetRenderTarget(device, backbuffer, 0); - ok(hr == D3D_OK, "Can't get back buffer, hr = %08x\n", hr); - set_the_same_viewport_again(device); + ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderTarget failed, hr = %08x\n", hr); + set_viewport_size(device); /* Render the offscreen texture onto the frame buffer to be able to compare it regularly. * Disable alpha blending for the final composition

1 0

Stefan Dösinger : ddraw: Make the overlay tests pass on Windows 7.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 6057041debe35dc965bbb90a51c1a45356e3e99a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6057041debe35dc965bbb90a5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 28 17:11:43 2011 +0200 ddraw: Make the overlay tests pass on Windows 7. --- dlls/ddraw/tests/overlay.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index 55c4989..93d6c9c 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -96,17 +96,18 @@ static BOOL CreateDirectDraw(void) static void rectangle_settings(void) { IDirectDrawSurface7 *overlay = create_overlay(64, 64, MAKEFOURCC('U','Y','V','Y')); - HRESULT hr; + HRESULT hr, hr2; RECT rect = {0, 0, 64, 64}; LONG posx, posy; - /* The dx sdk sort of implies that rect must be set when DDOVER_SHOW is used. Show that this is wrong */ + /* The dx sdk sort of implies that rect must be set when DDOVER_SHOW is used. This is not true + * in Windows Vista and earlier, but changed in Win7 */ hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, &rect, DDOVER_SHOW, NULL); ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, NULL, DDOVER_HIDE, NULL); ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, NULL, DDOVER_SHOW, NULL); - ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); + ok(hr == DD_OK || hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); /* Show that the overlay position is the (top, left) coordinate of the dest rectangle */ rect.top += 16; @@ -122,13 +123,21 @@ static void rectangle_settings(void) { posx, posy, rect.left, rect.top); /* Passing a NULL dest rect sets the position to 0/0 . Visually it can be seen that the overlay overlays the whole primary(==screen)*/ - hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, NULL, 0, NULL); - ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); + hr2 = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, NULL, 0, NULL); + ok(hr2 == DD_OK || hr2 == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr); hr = IDirectDrawSurface7_GetOverlayPosition(overlay, &posx, &posy); ok(hr == DD_OK, "IDirectDrawSurface7_GetOverlayPosition failed with hr=0x%08x\n", hr); - ok(posx == 0 && posy == 0, "Overlay position is (%d, %d), expected (%d, %d)\n", - posx, posy, 0, 0); - + if (SUCCEEDED(hr2)) + { + ok(posx == 0 && posy == 0, "Overlay position is (%d, %d), expected (%d, %d)\n", + posx, posy, 0, 0); + } + else + { + /* Otherwise the position remains untouched */ + ok(posx == 32 && posy == 16, "Overlay position is (%d, %d), expected (%d, %d)\n", + posx, posy, 32, 16); + } /* The position cannot be retrieved when the overlay is not shown */ hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, primary, &rect, DDOVER_HIDE, NULL); ok(hr == DD_OK, "IDirectDrawSurface7_UpdateOverlay failed with hr=0x%08x\n", hr);

1 0

Stefan Dösinger : ddraw: Fix a test message.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 41079639679e7a77e2cf053d54603e99d3ece62a URL: http://source.winehq.org/git/wine.git/?a=commit;h=41079639679e7a77e2cf053d5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 28 17:17:40 2011 +0200 ddraw: Fix a test message. --- dlls/ddraw/tests/overlay.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index 93d6c9c..5053efb 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -212,7 +212,7 @@ static void yv12_test(void) ok(desc.ddsCaps.dwCaps == (DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM) || desc.ddsCaps.dwCaps == (DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_HWCODEC), "Unexpected desc.ddsCaps.dwCaps 0x%08x\n", desc.ddsCaps.dwCaps); - ok(desc.dwWidth == 256 && desc.dwHeight == 256, "Expected size 64x64, got %ux%u\n", + ok(desc.dwWidth == 256 && desc.dwHeight == 256, "Expected size 256x256, got %ux%u\n", desc.dwWidth, desc.dwHeight); /* The overlay pitch seems to have 256 byte alignment */ ok(U1(desc).lPitch == 256, "Unexpected pitch %u, expected 256\n", U1(desc).lPitch);

1 0

Jacek Caban : mshtml: Added support for text/vbscript script type.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 3a268796b82a3ffc4f11c986d69a80066f620453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a268796b82a3ffc4f11c986d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 2 12:03:17 2011 +0200 mshtml: Added support for text/vbscript script type. --- dlls/mshtml/script.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 9b1a81e..25ae0b6 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -48,6 +48,8 @@ static const WCHAR emptyW[] = {0}; static const CLSID CLSID_JScript = {0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; +static const CLSID CLSID_VBScript = + {0xb54f3741,0x5b07,0x11cf,{0xa4,0xb0,0x00,0xaa,0x00,0x4a,0x55,0xe8}}; struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; @@ -718,10 +720,14 @@ static BOOL get_guid_from_type(LPCWSTR type, GUID *guid) { const WCHAR text_javascriptW[] = {'t','e','x','t','/','j','a','v','a','s','c','r','i','p','t',0}; + const WCHAR text_vbscriptW[] = + {'t','e','x','t','/','v','b','s','c','r','i','p','t',0}; /* FIXME: Handle more types */ if(!strcmpiW(type, text_javascriptW)) { *guid = CLSID_JScript; + }else if(!strcmpiW(type, text_vbscriptW)) { + *guid = CLSID_VBScript; }else { FIXME("Unknown type %s\n", debugstr_w(type)); return FALSE;

1 0

Jacek Caban : vbscript: Added IObjectSafety stub implementation.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 0491b0326013f6f529fe13866094e208b1dd0f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0491b0326013f6f529fe13866… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 2 13:15:51 2011 +0200 vbscript: Added IObjectSafety stub implementation. --- dlls/vbscript/vbscript.c | 53 +++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript_main.c | 1 + 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index caee4d4..3f963a3 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "ole2.h" +#include "objsafe.h" #include "vbscript.h" @@ -48,6 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); struct VBScript { IActiveScript IActiveScript_iface; IActiveScriptParse IActiveScriptParse_iface; + IObjectSafety IObjectSafety_iface; LONG ref; @@ -135,6 +137,9 @@ static HRESULT WINAPI VBScript_QueryInterface(IActiveScript *iface, REFIID riid, }else if(IsEqualGUID(riid, &IID_IActiveScriptParse)) { TRACE("(%p)->(IID_IActiveScriptParse %p)\n", This, ppv); *ppv = &This->IActiveScriptParse_iface; + }else if(IsEqualGUID(riid, &IID_IObjectSafety)) { + TRACE("(%p)->(IID_IObjectSafety %p)\n", This, ppv); + *ppv = &This->IObjectSafety_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -403,6 +408,53 @@ static const IActiveScriptParseVtbl VBScriptParseVtbl = { VBScriptParse_ParseScriptText }; +static inline VBScript *impl_from_IObjectSafety(IObjectSafety *iface) +{ + return CONTAINING_RECORD(iface, VBScript, IObjectSafety_iface); +} + +static HRESULT WINAPI VBScriptSafety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) +{ + VBScript *This = impl_from_IObjectSafety(iface); + return IActiveScript_QueryInterface(&This->IActiveScript_iface, riid, ppv); +} + +static ULONG WINAPI VBScriptSafety_AddRef(IObjectSafety *iface) +{ + VBScript *This = impl_from_IObjectSafety(iface); + return IActiveScript_AddRef(&This->IActiveScript_iface); +} + +static ULONG WINAPI VBScriptSafety_Release(IObjectSafety *iface) +{ + VBScript *This = impl_from_IObjectSafety(iface); + return IActiveScript_Release(&This->IActiveScript_iface); +} + +static HRESULT WINAPI VBScriptSafety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, + DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) +{ + VBScript *This = impl_from_IObjectSafety(iface); + FIXME("(%p)->(%s %p %p)\n", This, debugstr_guid(riid), pdwSupportedOptions, pdwEnabledOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI VBScriptSafety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, + DWORD dwOptionSetMask, DWORD dwEnabledOptions) +{ + VBScript *This = impl_from_IObjectSafety(iface); + FIXME("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); + return E_NOTIMPL; +} + +static const IObjectSafetyVtbl VBScriptSafetyVtbl = { + VBScriptSafety_QueryInterface, + VBScriptSafety_AddRef, + VBScriptSafety_Release, + VBScriptSafety_GetInterfaceSafetyOptions, + VBScriptSafety_SetInterfaceSafetyOptions +}; + HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) { VBScript *ret; @@ -416,6 +468,7 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU ret->IActiveScript_iface.lpVtbl = &VBScriptVtbl; ret->IActiveScriptParse_iface.lpVtbl = &VBScriptParseVtbl; + ret->IObjectSafety_iface.lpVtbl = &VBScriptSafetyVtbl; ret->ref = 1; ret->state = SCRIPTSTATE_UNINITIALIZED; diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 093019a..71eaa86 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -27,6 +27,7 @@ #include "initguid.h" #include "ole2.h" +#include "objsafe.h" #include "rpcproxy.h" #include "vbscript.h" #include "vbscript_classes.h"

1 0

Jacek Caban : vbscript: Added SetInterfaceSafetyOptions implementation.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: a34ece4cbe10321ed3c1f1b8c724cddaf18b7fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34ece4cbe10321ed3c1f1b8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 2 13:16:00 2011 +0200 vbscript: Added SetInterfaceSafetyOptions implementation. --- dlls/vbscript/vbscript.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 3f963a3..70b35f2 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -53,6 +53,7 @@ struct VBScript { LONG ref; + DWORD safeopt; SCRIPTSTATE state; IActiveScriptSite *site; script_ctx_t *ctx; @@ -431,6 +432,8 @@ static ULONG WINAPI VBScriptSafety_Release(IObjectSafety *iface) return IActiveScript_Release(&This->IActiveScript_iface); } +#define SUPPORTED_OPTIONS (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER) + static HRESULT WINAPI VBScriptSafety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) { @@ -443,8 +446,14 @@ static HRESULT WINAPI VBScriptSafety_SetInterfaceSafetyOptions(IObjectSafety *if DWORD dwOptionSetMask, DWORD dwEnabledOptions) { VBScript *This = impl_from_IObjectSafety(iface); - FIXME("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); + + if(dwOptionSetMask & ~SUPPORTED_OPTIONS) + return E_FAIL; + + This->safeopt = (dwEnabledOptions & dwOptionSetMask) | (This->safeopt & ~dwOptionSetMask) | INTERFACE_USES_DISPEX; + return S_OK; } static const IObjectSafetyVtbl VBScriptSafetyVtbl = { @@ -472,6 +481,7 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU ret->ref = 1; ret->state = SCRIPTSTATE_UNINITIALIZED; + ret->safeopt = INTERFACE_USES_DISPEX; hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv); IActiveScript_Release(&ret->IActiveScript_iface);

1 0