wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

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

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: 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: 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: 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

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

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 : ddraw/tests: Make enum_z_fmt_cb() static.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 3a9343e520405df1d077c21e47c6542f3091a966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9343e520405df1d077c21e4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 2 10:51:00 2011 +0200 ddraw/tests: Make enum_z_fmt_cb() static. --- dlls/ddraw/tests/d3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index a916f29..4031a75 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -4369,7 +4369,7 @@ static void dump_format(const DDPIXELFORMAT *fmt) fmt->dwStencilBitMask, fmt->dwRGBZBitMask); } -HRESULT WINAPI enum_z_fmt_cb(DDPIXELFORMAT *fmt, void *ctx) +static HRESULT WINAPI enum_z_fmt_cb(DDPIXELFORMAT *fmt, void *ctx) { static const DDPIXELFORMAT formats[] = {

1 0

Michael Stefaniuc : oleaut32: COM cleanup in typelib2.c.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 22521b5809a3b140dcd276fbb33261163326ed45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22521b5809a3b140dcd276fbb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 2 10:25:23 2011 +0200 oleaut32: COM cleanup in typelib2.c. --- dlls/oleaut32/typelib2.c | 79 ++++++++++++++++++++++----------------------- 1 files changed, 39 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22521b5809a3b140dcd27…

1 0

Michael Stefaniuc : msi: COM cleanup for the IEnumVARIANT iface.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: f0be3d81397c683d98e366304f35f3bc080a2e62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0be3d81397c683d98e366304… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 2 10:24:01 2011 +0200 msi: COM cleanup for the IEnumVARIANT iface. --- dlls/msi/automation.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 8dc1e44..26ed87f 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -88,10 +88,7 @@ struct AutomationObject { */ typedef struct { - /* VTables */ - const IEnumVARIANTVtbl *lpVtbl; - - /* Object reference count */ + IEnumVARIANT IEnumVARIANT_iface; LONG ref; /* Current position and pointer to AutomationObject that stores actual data */ @@ -202,7 +199,7 @@ static HRESULT create_list_enumerator(IUnknown *pUnkOuter, LPVOID *ppObj, Automa object = msi_alloc_zero( sizeof(ListEnumerator) ); /* Set all the VTable references */ - object->lpVtbl = &ListEnumerator_Vtbl; + object->IEnumVARIANT_iface.lpVtbl = &ListEnumerator_Vtbl; object->ref = 1; /* Store data that was passed */ @@ -560,10 +557,16 @@ static const IProvideMultipleClassInfoVtbl AutomationObject_IProvideMultipleClas * ListEnumerator methods */ +static inline ListEnumerator *impl_from_IEnumVARIANT(IEnumVARIANT* iface) +{ + return CONTAINING_RECORD(iface, ListEnumerator, IEnumVARIANT_iface); +} + /*** IUnknown methods ***/ -static HRESULT WINAPI ListEnumerator_QueryInterface(IEnumVARIANT* iface, REFIID riid, void** ppvObject) +static HRESULT WINAPI ListEnumerator_QueryInterface(IEnumVARIANT* iface, REFIID riid, + void** ppvObject) { - ListEnumerator *This = (ListEnumerator *)iface; + ListEnumerator *This = impl_from_IEnumVARIANT(iface); TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); @@ -586,7 +589,7 @@ static HRESULT WINAPI ListEnumerator_QueryInterface(IEnumVARIANT* iface, REFIID static ULONG WINAPI ListEnumerator_AddRef(IEnumVARIANT* iface) { - ListEnumerator *This = (ListEnumerator *)iface; + ListEnumerator *This = impl_from_IEnumVARIANT(iface); TRACE("(%p/%p)\n", iface, This); @@ -595,7 +598,7 @@ static ULONG WINAPI ListEnumerator_AddRef(IEnumVARIANT* iface) static ULONG WINAPI ListEnumerator_Release(IEnumVARIANT* iface) { - ListEnumerator *This = (ListEnumerator *)iface; + ListEnumerator *This = impl_from_IEnumVARIANT(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p/%p)\n", iface, This); @@ -611,9 +614,10 @@ static ULONG WINAPI ListEnumerator_Release(IEnumVARIANT* iface) /* IEnumVARIANT methods */ -static HRESULT WINAPI ListEnumerator_Next(IEnumVARIANT* iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +static HRESULT WINAPI ListEnumerator_Next(IEnumVARIANT* iface, ULONG celt, VARIANT* rgVar, + ULONG* pCeltFetched) { - ListEnumerator *This = (ListEnumerator *)iface; + ListEnumerator *This = impl_from_IEnumVARIANT(iface); ListData *data = private_data(This->pObj); ULONG idx, local; @@ -640,7 +644,7 @@ static HRESULT WINAPI ListEnumerator_Next(IEnumVARIANT* iface, ULONG celt, VARIA static HRESULT WINAPI ListEnumerator_Skip(IEnumVARIANT* iface, ULONG celt) { - ListEnumerator *This = (ListEnumerator *)iface; + ListEnumerator *This = impl_from_IEnumVARIANT(iface); ListData *data = private_data(This->pObj); TRACE("(%p,%uld)\n", iface, celt); @@ -656,7 +660,7 @@ static HRESULT WINAPI ListEnumerator_Skip(IEnumVARIANT* iface, ULONG celt) static HRESULT WINAPI ListEnumerator_Reset(IEnumVARIANT* iface) { - ListEnumerator *This = (ListEnumerator *)iface; + ListEnumerator *This = impl_from_IEnumVARIANT(iface); TRACE("(%p)\n", iface); @@ -666,7 +670,7 @@ static HRESULT WINAPI ListEnumerator_Reset(IEnumVARIANT* iface) static HRESULT WINAPI ListEnumerator_Clone(IEnumVARIANT* iface, IEnumVARIANT **ppEnum) { - ListEnumerator *This = (ListEnumerator *)iface; + ListEnumerator *This = impl_from_IEnumVARIANT(iface); HRESULT hr; TRACE("(%p,%p)\n", iface, ppEnum);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011