April 2013 - Wine-commits - list.winehq.org

Ken Thomases : winemac: Implement an IME that uses the OS X input methods.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: 192b8dbf9d1dd4541aa6fc1deebd0d77866443ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=192b8dbf9d1dd4541aa6fc1de… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Apr 21 21:32:26 2013 -0500 winemac: Implement an IME that uses the OS X input methods. Developed with Aric Stewart. --- dlls/winemac.drv/Makefile.in | 3 +- dlls/winemac.drv/cocoa_app.h | 2 + dlls/winemac.drv/cocoa_app.m | 49 ++ dlls/winemac.drv/cocoa_event.m | 4 + dlls/winemac.drv/cocoa_window.h | 3 + dlls/winemac.drv/cocoa_window.m | 200 +++++- dlls/winemac.drv/event.c | 10 + dlls/winemac.drv/ime.c | 1511 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/keyboard.c | 47 ++ dlls/winemac.drv/macdrv.h | 15 + dlls/winemac.drv/macdrv_cocoa.h | 14 + dlls/winemac.drv/macdrv_main.c | 1 + dlls/winemac.drv/winemac.drv.spec | 18 + 13 files changed, 1875 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=192b8dbf9d1dd4541aa6f…

1 0

Nikolay Sivov : msdaps: Added proxy/stub for IDBInitialize_Uninitialize().
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: 6d36bf5f276b8684b00d12c078391e6ec38fe356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d36bf5f276b8684b00d12c07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 13:47:27 2013 +0400 msdaps: Added proxy/stub for IDBInitialize_Uninitialize(). --- dlls/msdaps/usrmarshal.c | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index ff5ae28..690077d 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -235,14 +235,29 @@ HRESULT __RPC_STUB IDBInitialize_Initialize_Stub(IDBInitialize* This, IErrorInfo HRESULT CALLBACK IDBInitialize_Uninitialize_Proxy(IDBInitialize* This) { - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + IErrorInfo *error; + HRESULT hr; + + TRACE("(%p)\n", This); + hr = IDBInitialize_RemoteUninitialize_Proxy(This, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + return hr; } -HRESULT __RPC_STUB IDBInitialize_Uninitialize_Stub(IDBInitialize* This, IErrorInfo **ppErrorInfoRem) +HRESULT __RPC_STUB IDBInitialize_Uninitialize_Stub(IDBInitialize* This, IErrorInfo **error) { - FIXME("(%p, %p): stub\n", This, ppErrorInfoRem); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p, %p)\n", This, error); + *error = NULL; + hr = IDBInitialize_Uninitialize(This); + if(FAILED(hr)) GetErrorInfo(0, error); + + return hr; } HRESULT CALLBACK IDBDataSourceAdmin_CreateDataSource_Proxy(IDBDataSourceAdmin* This, ULONG cPropertySets,

1 0

Nikolay Sivov : msdaps: Added some proxy/ stubs for IDBDataSourceAdmin methods.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: 0d623c784cdf673c4e1afa15ef775be50ea0bce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d623c784cdf673c4e1afa15e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 14:11:43 2013 +0400 msdaps: Added some proxy/stubs for IDBDataSourceAdmin methods. --- dlls/msdaps/usrmarshal.c | 66 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 52 insertions(+), 14 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 690077d..92bd802 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -321,14 +321,29 @@ HRESULT __RPC_STUB IDBDataSourceAdmin_CreateDataSource_Stub(IDBDataSourceAdmin* HRESULT CALLBACK IDBDataSourceAdmin_DestroyDataSource_Proxy(IDBDataSourceAdmin* This) { - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + IErrorInfo *error; + HRESULT hr; + + TRACE("(%p)\n", This); + hr = IDBDataSourceAdmin_RemoteDestroyDataSource_Proxy(This, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + return hr; } -HRESULT __RPC_STUB IDBDataSourceAdmin_DestroyDataSource_Stub(IDBDataSourceAdmin* This, IErrorInfo **ppErrorInfoRem) +HRESULT __RPC_STUB IDBDataSourceAdmin_DestroyDataSource_Stub(IDBDataSourceAdmin* This, IErrorInfo **error) { - FIXME("(%p, %p): stub\n", This, ppErrorInfoRem); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p, %p)\n", This, error); + *error = NULL; + hr = IDBDataSourceAdmin_DestroyDataSource(This); + if(FAILED(hr)) GetErrorInfo(0, error); + + return hr; } HRESULT CALLBACK IDBDataSourceAdmin_GetCreationProperties_Proxy(IDBDataSourceAdmin* This, ULONG cPropertyIDSets, @@ -344,24 +359,47 @@ HRESULT __RPC_STUB IDBDataSourceAdmin_GetCreationProperties_Stub(IDBDataSourceAd const DBPROPIDSET *rgPropertyIDSets, ULONG *pcPropertyInfoSets, DBPROPINFOSET **prgPropertyInfoSets, DBCOUNTITEM *pcOffsets, DBBYTEOFFSET **prgDescOffsets, ULONG *pcbDescBuffer, - OLECHAR **ppDescBuffer, IErrorInfo **ppErrorInfoRem) + OLECHAR **ppDescBuffer, IErrorInfo **error) { - FIXME("(%p, %d, %p, %p, %p, %p, %p, %p, %p, %p): stub\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, - prgPropertyInfoSets, pcOffsets, prgDescOffsets, pcbDescBuffer, ppDescBuffer, ppErrorInfoRem); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p, %d, %p, %p, %p, %p, %p, %p, %p, %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, + prgPropertyInfoSets, pcOffsets, prgDescOffsets, pcbDescBuffer, ppDescBuffer, error); + *error = NULL; + hr = IDBDataSourceAdmin_GetCreationProperties(This, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, + prgPropertyInfoSets, ppDescBuffer); + if(FAILED(hr)) GetErrorInfo(0, error); + + return hr; } HRESULT CALLBACK IDBDataSourceAdmin_ModifyDataSource_Proxy(IDBDataSourceAdmin* This, ULONG cPropertySets, DBPROPSET rgPropertySets[]) { - FIXME("(%p, %d, %p): stub\n", This, cPropertySets, rgPropertySets); - return E_NOTIMPL; + IErrorInfo *error; + HRESULT hr; + + TRACE("(%p, %d, %p)\n", This, cPropertySets, rgPropertySets); + hr = IDBDataSourceAdmin_RemoteModifyDataSource_Proxy(This, cPropertySets, rgPropertySets, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + + return hr; } HRESULT __RPC_STUB IDBDataSourceAdmin_ModifyDataSource_Stub(IDBDataSourceAdmin* This, ULONG cPropertySets, - DBPROPSET *rgPropertySets, IErrorInfo **ppErrorInfoRem) + DBPROPSET *rgPropertySets, IErrorInfo **error) { - FIXME("(%p, %d, %p, %p): stub\n", This, cPropertySets, rgPropertySets, ppErrorInfoRem); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p, %d, %p, %p)\n", This, cPropertySets, rgPropertySets, error); + *error = NULL; + hr = IDBDataSourceAdmin_ModifyDataSource(This, cPropertySets, rgPropertySets); + if(FAILED(hr)) GetErrorInfo(0, error); + + return hr; } HRESULT CALLBACK ISessionProperties_GetProperties_Proxy(ISessionProperties* This, ULONG cPropertyIDSets,

1 0

Matteo Bruni : wined3d: Use ARB_internalformat_query2 to check for texture format rendering and blending support , where available.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: 6fa87980caabdeebd0a396ec458b7262f65be696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fa87980caabdeebd0a396ec4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 19 19:06:13 2013 +0200 wined3d: Use ARB_internalformat_query2 to check for texture format rendering and blending support, where available. --- dlls/wined3d/utils.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 92ae892..91f2ae1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1221,12 +1221,105 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined gl_info->gl_ops.gl.p_glDeleteTextures(1, &tex); } +static void query_format_flag(struct wined3d_gl_info *gl_info, struct wined3d_format *format, + GLint internal, GLenum pname, DWORD flag, const char *string) +{ + GLint value; + + gl_info->gl_ops.ext.p_glGetInternalformativ(GL_TEXTURE_2D, internal, pname, 1, &value); + if (value == GL_FULL_SUPPORT) + { + TRACE("Format %s supports %s.\n", debug_d3dformat(format->id), string); + format->flags |= flag; + } + else + { + TRACE("Format %s doesn't support %s.\n", debug_d3dformat(format->id), string); + format->flags &= ~flag; + } +} + /* Context activation is done by the caller. */ static void init_format_fbo_compat_info(struct wined3d_gl_info *gl_info) { unsigned int i; GLuint fbo; + if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) + { + for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) + { + GLint value; + struct wined3d_format *format = &gl_info->formats[i]; + + if (!format->glInternal) + continue; + if (format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + continue; + + gl_info->gl_ops.ext.p_glGetInternalformativ(GL_TEXTURE_2D, format->glInternal, + GL_FRAMEBUFFER_RENDERABLE, 1, &value); + if (value == GL_FULL_SUPPORT) + { + TRACE("Format %s is supported as FBO color attachment.\n", debug_d3dformat(format->id)); + format->flags |= WINED3DFMT_FLAG_FBO_ATTACHABLE; + format->rtInternal = format->glInternal; + + query_format_flag(gl_info, format, format->glInternal, GL_FRAMEBUFFER_BLEND, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING, "post-pixelshader blending"); + } + else + { + if (!format->rtInternal) + { + if (format->flags & WINED3DFMT_FLAG_RENDERTARGET) + { + WARN("Format %s with rendertarget flag is not supported as FBO color attachment" + " and no fallback specified.\n", debug_d3dformat(format->id)); + format->flags &= ~WINED3DFMT_FLAG_RENDERTARGET; + } + else + TRACE("Format %s is not supported as FBO color attachment.\n", debug_d3dformat(format->id)); + format->rtInternal = format->glInternal; + } + else + { + gl_info->gl_ops.ext.p_glGetInternalformativ(GL_TEXTURE_2D, format->rtInternal, + GL_FRAMEBUFFER_RENDERABLE, 1, &value); + if (value == GL_FULL_SUPPORT) + { + TRACE("Format %s rtInternal format is supported as FBO color attachment.\n", + debug_d3dformat(format->id)); + } + else + { + WARN("Format %s rtInternal format is not supported as FBO color attachment.\n", + debug_d3dformat(format->id)); + format->flags &= ~WINED3DFMT_FLAG_RENDERTARGET; + } + } + } + + if (format->glInternal != format->glGammaInternal) + { + gl_info->gl_ops.ext.p_glGetInternalformativ(GL_TEXTURE_2D, format->glGammaInternal, + GL_FRAMEBUFFER_RENDERABLE, 1, &value); + if (value == GL_FULL_SUPPORT) + { + TRACE("Format %s's sRGB format is FBO attachable.\n", debug_d3dformat(format->id)); + format->flags |= WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB; + } + else + { + WARN("Format %s's sRGB format is not FBO attachable.\n", debug_d3dformat(format->id)); + } + } + else if (format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) + format->flags |= WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB; + } + return; + } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { gl_info->fbo_ops.glGenFramebuffers(1, &fbo);

1 0

Marcus Meissner : wininet: Added missing return (Coverity).
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: d762b284d8e26254668b1577b7112780e8ce74ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d762b284d8e26254668b1577b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Apr 19 22:25:43 2013 +0200 wininet: Added missing return (Coverity). --- dlls/wininet/urlcache.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 7f58a69..34337c6 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3098,6 +3098,7 @@ BOOL WINAPI CommitUrlCacheEntryW(LPCWSTR lpszUrlName, LPCWSTR lpszLocalFileName, heap_free(url); heap_free(header_info); heap_free(file_ext); + return FALSE; } ret = urlcache_entry_commit(url, lpszLocalFileName, ExpireTime, LastModifiedTime,

1 0

Marcus Meissner : dplayx: Remove unnecessary assigment (Coverity).
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: 03f519db3eda52336149947e40274072cbf973ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f519db3eda52336149947e4… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Apr 19 22:47:58 2013 +0200 dplayx: Remove unnecessary assigment (Coverity). --- dlls/dplayx/dplay.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 30a2ee3..4529c5e 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -1857,7 +1857,7 @@ static HRESULT WINAPI IDirectPlay4Impl_DeletePlayerFromGroup( IDirectPlay4 *ifac return DPERR_INVALIDGROUP; /* Find the player */ - if ( ( plist = DP_FindPlayer( This, player ) ) == NULL ) + if ( DP_FindPlayer( This, player ) == NULL ) return DPERR_INVALIDPLAYER; /* Remove the player shortcut from the group */

1 0

Gurmail Bassi : joy.cpl: Fixed incorrect variable reference.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: fbed1f7a804353455b545b6320699921affa75a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbed1f7a804353455b545b632… Author: Gurmail Bassi <Gurmail.Bassi(a)mottmac.com> Date: Sat Apr 20 10:23:42 2013 +0100 joy.cpl: Fixed incorrect variable reference. --- dlls/joy.cpl/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 857cb69..8cb1824 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -414,7 +414,7 @@ static DWORD WINAPI input_thread(void *param) axes_pos[2][1] = state.lRz; /* Set pov values */ - for (j = 0; i < sizeof(pov_val)/sizeof(pov_val[0]); j++) + for (j = 0; j < sizeof(pov_val)/sizeof(pov_val[0]); j++) { if (state.rgdwPOV[0] == pov_val[j]) {

1 0

Ken Thomases : winemac: Set up and drain autorelease pool in LogErrorv() so it's safe to call from background threads.
by Alexandre Julliard 22 Apr '13

22 Apr '13

Module: wine Branch: master Commit: 72be23270ed36bc9508e48871891c068b879cef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72be23270ed36bc9508e48871… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Apr 21 21:31:28 2013 -0500 winemac: Set up and drain autorelease pool in LogErrorv() so it's safe to call from background threads. --- dlls/winemac.drv/cocoa_app.m | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 1ef453f..204734c 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1410,9 +1410,13 @@ void LogError(const char* func, NSString* format, ...) */ void LogErrorv(const char* func, NSString* format, va_list args) { + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + NSString* message = [[NSString alloc] initWithFormat:format arguments:args]; fprintf(stderr, "err:%s:%s", func, [message UTF8String]); [message release]; + + [pool release]; } /***********************************************************************

1 0

Henri Verbeet : wined3d: Get rid of the unused wined3d_strided_data structure.
by Alexandre Julliard 19 Apr '13

19 Apr '13

Module: wine Branch: master Commit: 2e7add90c01bf0769055e26254a01993eddb7fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e7add90c01bf0769055e2625… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 19 08:34:13 2013 +0200 wined3d: Get rid of the unused wined3d_strided_data structure. --- include/wine/wined3d.h | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 378a46b..75cba55 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1712,23 +1712,6 @@ struct wined3d_box UINT back; }; -struct wined3d_strided_element -{ - enum wined3d_format_id format; /* Format of the data */ - const BYTE *data; /* Pointer to start of data */ - UINT stride; /* Stride between occurrences of this data */ -}; - -struct wined3d_strided_data -{ - struct wined3d_strided_element position; - struct wined3d_strided_element normal; - struct wined3d_strided_element diffuse; - struct wined3d_strided_element specular; - struct wined3d_strided_element tex_coords[WINED3DDP_MAXTEXCOORD]; - BOOL position_transformed; -}; - struct wined3d_vertex_shader_caps { DWORD caps;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMVIEWPORT.
by Alexandre Julliard 19 Apr '13

19 Apr '13

Module: wine Branch: master Commit: 24acd7c82a5098ab02d374c44f4daba110dae176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24acd7c82a5098ab02d374c44… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 19 08:34:14 2013 +0200 d3drm: Avoid LPDIRECT3DRMVIEWPORT. --- dlls/d3drm/tests/d3drm.c | 14 +++++++------- include/d3drmobj.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 039881c..663137d 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1008,7 +1008,7 @@ static void test_Viewport(void) IDirect3DRM *d3drm; IDirect3DRMDevice *device; LPDIRECT3DRMFRAME pFrame; - LPDIRECT3DRMVIEWPORT pViewport; + IDirect3DRMViewport *viewport; GUID driver; HWND window; RECT rc; @@ -1034,23 +1034,23 @@ static void test_Viewport(void) hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrame); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); - hr = IDirect3DRM_CreateViewport(d3drm, device, pFrame, rc.left, rc.top, rc.right, rc.bottom, &pViewport); + hr = IDirect3DRM_CreateViewport(d3drm, device, pFrame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); - hr = IDirect3DRMViewport_GetClassName(pViewport, NULL, cname); + hr = IDirect3DRMViewport_GetClassName(viewport, NULL, cname); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); - hr = IDirect3DRMViewport_GetClassName(pViewport, NULL, NULL); + hr = IDirect3DRMViewport_GetClassName(viewport, NULL, NULL); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); size = 1; - hr = IDirect3DRMViewport_GetClassName(pViewport, &size, cname); + hr = IDirect3DRMViewport_GetClassName(viewport, &size, cname); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); size = sizeof(cname); - hr = IDirect3DRMViewport_GetClassName(pViewport, &size, cname); + hr = IDirect3DRMViewport_GetClassName(viewport, &size, cname); ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); ok(size == sizeof("Viewport"), "wrong size: %u\n", size); ok(!strcmp(cname, "Viewport"), "Expected cname to be \"Viewport\", but got \"%s\"\n", cname); - IDirect3DRMViewport_Release(pViewport); + IDirect3DRMViewport_Release(viewport); IDirect3DRMFrame_Release(pFrame); IDirect3DRMDevice_Release(device); IDirectDrawClipper_Release(pClipper); diff --git a/include/d3drmobj.h b/include/d3drmobj.h index fa3559e..4e90368 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -4293,7 +4293,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewportArray, IDirect3DRMArray) /*** IDirect3DRMArray methods ***/ STDMETHOD_(DWORD, GetSize)(THIS) PURE; /*** IDirect3DRMViewportArray methods ***/ - STDMETHOD(GetElement)(THIS_ DWORD index, LPDIRECT3DRMVIEWPORT *) PURE; + STDMETHOD(GetElement)(THIS_ DWORD index, IDirect3DRMViewport **element) PURE; }; #undef INTERFACE

1 0