July 2012 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : include: Add some useful helpers to check various pixel format properties.
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: af8721f41b3c102b17b836aba697a16be1640053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af8721f41b3c102b17b836aba… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 19 15:45:10 2012 +0900 include: Add some useful helpers to check various pixel format properties. --- include/gdipluspixelformats.h | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/include/gdipluspixelformats.h b/include/gdipluspixelformats.h index 27843a2..acfc25f 100644 --- a/include/gdipluspixelformats.h +++ b/include/gdipluspixelformats.h @@ -49,6 +49,31 @@ typedef INT PixelFormat; #define PixelFormat32bppCMYK (15 | (32 << 8)) #define PixelFormatMax 16 +static inline BOOL IsIndexedPixelFormat(PixelFormat format) +{ + return (format & PixelFormatIndexed) ? TRUE : FALSE; +} + +static inline BOOL IsAlphaPixelFormat(PixelFormat format) +{ + return (format & PixelFormatAlpha) ? TRUE : FALSE; +} + +static inline BOOL IsCanonicalPixelFormat(PixelFormat format) +{ + return (format & PixelFormatCanonical) ? TRUE : FALSE; +} + +static inline BOOL IsExtendedPixelFormat(PixelFormat format) +{ + return (format & PixelFormatExtended) ? TRUE : FALSE; +} + +static inline UINT GetPixelFormatSize(PixelFormat format) +{ + return (format >> 8) & 0xff; +} + #ifdef __cplusplus struct ColorPalette

1 0

Nozomi Kodama : d3dx9_36: Implementation of D3DXSHRotateZ.
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: f5714cccbd30609a6a71c6a0fed599e19794811d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5714cccbd30609a6a71c6a0f… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Thu Jul 19 03:56:46 2012 +0800 d3dx9_36: Implementation of D3DXSHRotateZ. --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 67 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/math.c | 51 ++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- include/d3dx9math.h | 1 + 23 files changed, 139 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5714cccbd30609a6a71c…

1 0

Dmitry Timoshkov : include: Move PaletteFlags definition to gdipluspixelformats.h.
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: 6d3154ab83eca478c12a6e26a24cb3253167f9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3154ab83eca478c12a6e26a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 19 15:46:04 2012 +0900 include: Move PaletteFlags definition to gdipluspixelformats.h. --- include/gdiplusenums.h | 7 ------- include/gdipluspixelformats.h | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 69c8154..d0fc11b 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -299,13 +299,6 @@ enum HotkeyPrefix HotkeyPrefixHide = 2 }; -enum PaletteFlags -{ - PaletteFlagsHasAlpha = 1, - PaletteFlagsGrayScale = 2, - PaletteFlagsHalftone = 4 -}; - enum ImageCodecFlags { ImageCodecFlagsEncoder = 1, diff --git a/include/gdipluspixelformats.h b/include/gdipluspixelformats.h index acfc25f..7e6b327 100644 --- a/include/gdipluspixelformats.h +++ b/include/gdipluspixelformats.h @@ -74,6 +74,13 @@ static inline UINT GetPixelFormatSize(PixelFormat format) return (format >> 8) & 0xff; } +enum PaletteFlags +{ + PaletteFlagsHasAlpha = 1, + PaletteFlagsGrayScale = 2, + PaletteFlagsHalftone = 4 +}; + #ifdef __cplusplus struct ColorPalette

1 0

Wei-Lun Chao : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: d782cfed205b1312fc94eba06be23b30085dcfc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d782cfed205b1312fc94eba06… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Sat Jul 14 01:11:03 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 153 +++++++++++++++++++++++++++++++---------------------------- 1 files changed, 80 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d782cfed205b1312fc94e…

1 0

Wei-Lun Chao : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: 70c23b10e09845c91ba0ffc2a4a04ec26c509121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c23b10e09845c91ba0ffc2a… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Sat Jul 14 01:02:26 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 468 ++++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 351 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70c23b10e09845c91ba0f…

1 0

Wei-Lun Chao : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: 4d54d953702f94c801f147afc4dce82ec8b272ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d54d953702f94c801f147afc… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Sat Jul 14 00:53:38 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 399 +++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 239 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d54d953702f94c801f14…

1 0

Alexandre Julliard : wined3d: Load glPointParameter functions as extensions rather than standard OpenGL functions .
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: 2f31a66941c6c6b314c28062f78a8b1bebb09ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f31a66941c6c6b314c28062f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 16:47:39 2012 +0200 wined3d: Load glPointParameter functions as extensions rather than standard OpenGL functions. --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/state.c | 7 +------ dlls/wined3d/wined3d_gl.h | 8 ++------ 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index eb900b0..c42aaef 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -188,7 +188,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_NV_fragment_program_option", NV_FRAGMENT_PROGRAM_OPTION, 0 }, {"GL_NV_half_float", NV_HALF_FLOAT, 0 }, {"GL_NV_light_max_exponent", NV_LIGHT_MAX_EXPONENT, 0 }, - {"GL_NV_point_sprite", NV_POINT_SPRITE, 0 }, + {"GL_NV_point_sprite", NV_POINT_SPRITE, MAKEDWORD_VERSION(1, 4) }, {"GL_NV_register_combiners", NV_REGISTER_COMBINERS, 0 }, {"GL_NV_register_combiners2", NV_REGISTER_COMBINERS2, 0 }, {"GL_NV_texgen_reflection", NV_TEXGEN_REFLECTION, 0 }, diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c8944e5..bd6e13c 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -655,7 +655,7 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId } if ((!context->gl_info->supported[WINED3D_GL_VERSION_2_0] - || (!glPointParameteri && !context->gl_info->supported[NV_POINT_SPRITE])) + || !context->gl_info->supported[NV_POINT_SPRITE]) && context->render_offscreen && state->render_states[WINED3D_RS_POINTSPRITEENABLE] && state->gl_primitive_type == GL_POINTS) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b3d5fa3..ce239b4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4868,12 +4868,7 @@ static void psorigin(struct wined3d_context *context, const struct wined3d_state const struct wined3d_gl_info *gl_info = context->gl_info; GLint origin = context->render_offscreen ? GL_LOWER_LEFT : GL_UPPER_LEFT; - if (glPointParameteri) - { - glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, origin); - checkGLcall("glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, ...)"); - } - else if (gl_info->supported[NV_POINT_SPRITE]) + if (gl_info->supported[NV_POINT_SPRITE]) { GL_EXTCALL(glPointParameteriNV(GL_POINT_SPRITE_COORD_ORIGIN, origin)); checkGLcall("glPointParameteriNV(GL_POINT_SPRITE_COORD_ORIGIN, ...)"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 4e58971..8524b8e 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1352,8 +1352,6 @@ void (WINE_GLAPI *glVertex4s)(GLshort x, GLshort y, GLshort z, GLshort w) DECLSP void (WINE_GLAPI *glVertex4sv)(const GLshort *v) DECLSPEC_HIDDEN; void (WINE_GLAPI *glVertexPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer) DECLSPEC_HIDDEN; void (WINE_GLAPI *glViewport)(GLint x, GLint y, GLsizei width, GLsizei height) DECLSPEC_HIDDEN; -void (WINE_GLAPI *glPointParameterfv)(GLenum pname, const GLfloat *params) DECLSPEC_HIDDEN; -void (WINE_GLAPI *glPointParameteri)(GLenum name, GLint value) DECLSPEC_HIDDEN; /* glFinish and glFlush are always loaded from opengl32.dll, thus they always have * __stdcall calling convention. @@ -1708,8 +1706,6 @@ BOOL (WINAPI *pwglShareLists)(HGLRC, HGLRC) DECLSPEC_HIDDEN; USE_GL_FUNC(glVertex4sv) \ USE_GL_FUNC(glVertexPointer) \ USE_GL_FUNC(glViewport) \ - USE_GL_FUNC(glPointParameterfv) \ - USE_GL_FUNC(glPointParameteri) \ #define WGL_FUNCS_GEN \ USE_WGL_FUNC(wglCreateContext) \ @@ -4419,9 +4415,9 @@ typedef BOOL (WINAPI *PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelFormat); glVertexAttribs4hvNV, NV_HALF_FLOAT, NULL) \ /* GL_NV_point_sprite */ \ USE_GL_FUNC(PGLFNPOINTPARAMETERIVNVPROC, \ - glPointParameterivNV, NV_POINT_SPRITE, NULL) \ + glPointParameterivNV, NV_POINT_SPRITE, glPointParameteriv) \ USE_GL_FUNC(PGLFNPOINTPARAMETERINVPROC, \ - glPointParameteriNV, NV_POINT_SPRITE, NULL) \ + glPointParameteriNV, NV_POINT_SPRITE, glPointParameteri) \ /* GL_NV_register_combiners */ \ USE_GL_FUNC(PGLFNCOMBINERINPUTNVPROC, \ glCombinerInputNV, NV_REGISTER_COMBINERS, NULL) \

1 0

Dmitry Timoshkov : include: Add PixelFormat32bppCMYK definition.
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: ccfdb827b53fdb7005a408f415f1d9ecf9a78581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccfdb827b53fdb7005a408f41… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 19 15:44:10 2012 +0900 include: Add PixelFormat32bppCMYK definition. --- include/gdipluspixelformats.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/gdipluspixelformats.h b/include/gdipluspixelformats.h index d7382f1..27843a2 100644 --- a/include/gdipluspixelformats.h +++ b/include/gdipluspixelformats.h @@ -46,7 +46,8 @@ typedef INT PixelFormat; #define PixelFormat48bppRGB (12 | (48 << 8) | PixelFormatExtended) #define PixelFormat64bppARGB (13 | (64 << 8) | PixelFormatAlpha | PixelFormatCanonical | PixelFormatExtended) #define PixelFormat64bppPARGB (14 | (64 << 8) | PixelFormatAlpha | PixelFormatPAlpha | PixelFormatExtended) -#define PixelFormatMax 15 +#define PixelFormat32bppCMYK (15 | (32 << 8)) +#define PixelFormatMax 16 #ifdef __cplusplus

1 0

Michael Stefaniuc : dsound: Drop a redundant 'IDirectSound8' from the method names.
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: db5344e438b69a50e259e561ef3af0ef6f320a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=db5344e438b69a50e259e561e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 19 02:01:55 2012 +0200 dsound: Drop a redundant 'IDirectSound8' from the method names. --- dlls/dsound/dsound.c | 91 +++++++++++++++++++------------------------------ 1 files changed, 35 insertions(+), 56 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 9060e76..55af754 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -62,7 +62,6 @@ struct IDirectSound8_IDirectSound8 { }; static HRESULT IDirectSound8_IDirectSound8_Create(LPDIRECTSOUND8 pds, LPDIRECTSOUND8 * ppds); -static ULONG WINAPI IDirectSound8_IDirectSound8_AddRef(LPDIRECTSOUND8 iface); typedef struct IDirectSoundImpl { IUnknown IUnknown_iface; /* Separate refcount, not for COM aggregation */ @@ -183,7 +182,7 @@ static HRESULT DSOUND_QueryInterface( return E_NOINTERFACE; } } - IDirectSound8_IDirectSound8_AddRef(This->pDS8); + IDirectSound8_AddRef(This->pDS8); *ppobj = This->pDS8; return S_OK; } @@ -412,20 +411,17 @@ static HRESULT IDirectSound_IDirectSound_Create( } /******************************************************************************* - * IDirectSound8_IDirectSound8 + * IDirectSound8 Implementation */ -static HRESULT WINAPI IDirectSound8_IDirectSound8_QueryInterface( - LPDIRECTSOUND8 iface, - REFIID riid, - LPVOID * ppobj) +static HRESULT WINAPI IDirectSound8Impl_QueryInterface(IDirectSound8 *iface, REFIID riid, + void **ppobj) { IDirectSound8_IDirectSound8 *This = (IDirectSound8_IDirectSound8 *)iface; TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); return DSOUND_QueryInterface(This->pds, riid, ppobj); } -static ULONG WINAPI IDirectSound8_IDirectSound8_AddRef( - LPDIRECTSOUND8 iface) +static ULONG WINAPI IDirectSound8Impl_AddRef(IDirectSound8 *iface) { IDirectSound8_IDirectSound8 *This = (IDirectSound8_IDirectSound8 *)iface; ULONG ref = InterlockedIncrement(&(This->ref)); @@ -433,8 +429,7 @@ static ULONG WINAPI IDirectSound8_IDirectSound8_AddRef( return ref; } -static ULONG WINAPI IDirectSound8_IDirectSound8_Release( - LPDIRECTSOUND8 iface) +static ULONG WINAPI IDirectSound8Impl_Release(IDirectSound8 *iface) { IDirectSound8_IDirectSound8 *This = (IDirectSound8_IDirectSound8 *)iface; ULONG ref = InterlockedDecrement(&(This->ref)); @@ -448,104 +443,88 @@ static ULONG WINAPI IDirectSound8_IDirectSound8_Release( return ref; } -static HRESULT WINAPI IDirectSound8_IDirectSound8_CreateSoundBuffer( - LPDIRECTSOUND8 iface, - LPCDSBUFFERDESC dsbd, - LPLPDIRECTSOUNDBUFFER ppdsb, - LPUNKNOWN lpunk) +static HRESULT WINAPI IDirectSound8Impl_CreateSoundBuffer(IDirectSound8 *iface, + const DSBUFFERDESC *dsbd, IDirectSoundBuffer **ppdsb, IUnknown *lpunk) { IDirectSound8_IDirectSound8 *This = (IDirectSound8_IDirectSound8 *)iface; TRACE("(%p,%p,%p,%p)\n",This,dsbd,ppdsb,lpunk); return DirectSoundDevice_CreateSoundBuffer(((IDirectSoundImpl *)This->pds)->device,dsbd,ppdsb,lpunk,TRUE); } -static HRESULT WINAPI IDirectSound8_IDirectSound8_GetCaps( - LPDIRECTSOUND8 iface, - LPDSCAPS lpDSCaps) +static HRESULT WINAPI IDirectSound8Impl_GetCaps(IDirectSound8 *iface, DSCAPS *lpDSCaps) { IDirectSound8_IDirectSound8 *This = (IDirectSound8_IDirectSound8 *)iface; TRACE("(%p,%p)\n",This,lpDSCaps); return DirectSoundDevice_GetCaps(((IDirectSoundImpl *)This->pds)->device, lpDSCaps); } -static HRESULT WINAPI IDirectSound8_IDirectSound8_DuplicateSoundBuffer( - LPDIRECTSOUND8 iface, - LPDIRECTSOUNDBUFFER psb, - LPLPDIRECTSOUNDBUFFER ppdsb) +static HRESULT WINAPI IDirectSound8Impl_DuplicateSoundBuffer(IDirectSound8 *iface, + IDirectSoundBuffer *psb, IDirectSoundBuffer **ppdsb) { IDirectSound8_IDirectSound8 *This = (IDirectSound8_IDirectSound8 *)iface; TRACE("(%p,%p,%p)\n",This,psb,ppdsb); return DirectSoundDevice_DuplicateSoundBuffer(((IDirectSoundImpl *)This->pds)->device,psb,ppdsb); } -static HRESULT WINAPI IDirectSound8_IDirectSound8_SetCooperativeLevel( - LPDIRECTSOUND8 iface, - HWND hwnd, - DWORD level) +static HRESULT WINAPI IDirectSound8Impl_SetCooperativeLevel(IDirectSound8 *iface, HWND hwnd, + DWORD level) { IDirectSound8_IDirectSound8 *This = (IDirectSound8_IDirectSound8 *)iface; TRACE("(%p,%p,%s)\n",This,hwnd,dumpCooperativeLevel(level)); return DirectSoundDevice_SetCooperativeLevel(((IDirectSoundImpl *)This->pds)->device, hwnd, level); } -static HRESULT WINAPI IDirectSound8_IDirectSound8_Compact( - LPDIRECTSOUND8 iface) +static HRESULT WINAPI IDirectSound8Impl_Compact(IDirectSound8 *iface) { IDirectSound8_IDirectSound8 *This = (IDirectSound8_IDirectSound8 *)iface; TRACE("(%p)\n", This); return DirectSoundDevice_Compact(((IDirectSoundImpl *)This->pds)->device); } -static HRESULT WINAPI IDirectSound8_IDirectSound8_GetSpeakerConfig( - LPDIRECTSOUND8 iface, - LPDWORD lpdwSpeakerConfig) +static HRESULT WINAPI IDirectSound8Impl_GetSpeakerConfig(IDirectSound8 *iface, + DWORD *lpdwSpeakerConfig) { IDirectSound8_IDirectSound8 *This = (IDirectSound8_IDirectSound8 *)iface; TRACE("(%p, %p)\n", This, lpdwSpeakerConfig); return DirectSoundDevice_GetSpeakerConfig(((IDirectSoundImpl *)This->pds)->device,lpdwSpeakerConfig); } -static HRESULT WINAPI IDirectSound8_IDirectSound8_SetSpeakerConfig( - LPDIRECTSOUND8 iface, - DWORD config) +static HRESULT WINAPI IDirectSound8Impl_SetSpeakerConfig(IDirectSound8 *iface, DWORD config) { IDirectSound8_IDirectSound8 *This = (IDirectSound8_IDirectSound8 *)iface; TRACE("(%p,0x%08x)\n",This,config); return DirectSoundDevice_SetSpeakerConfig(((IDirectSoundImpl *)This->pds)->device,config); } -static HRESULT WINAPI IDirectSound8_IDirectSound8_Initialize( - LPDIRECTSOUND8 iface, - LPCGUID lpcGuid) +static HRESULT WINAPI IDirectSound8Impl_Initialize(IDirectSound8 *iface, const GUID *lpcGuid) { IDirectSound8_IDirectSound8 *This = (IDirectSound8_IDirectSound8 *)iface; TRACE("(%p, %s)\n", This, debugstr_guid(lpcGuid)); return DirectSoundDevice_Initialize(&((IDirectSoundImpl *)This->pds)->device,lpcGuid); } -static HRESULT WINAPI IDirectSound8_IDirectSound8_VerifyCertification( - LPDIRECTSOUND8 iface, - LPDWORD pdwCertified) +static HRESULT WINAPI IDirectSound8Impl_VerifyCertification(IDirectSound8 *iface, + DWORD *pdwCertified) { IDirectSound8_IDirectSound8 *This = (IDirectSound8_IDirectSound8 *)iface; TRACE("(%p, %p)\n", This, pdwCertified); return DirectSoundDevice_VerifyCertification(((IDirectSoundImpl *)This->pds)->device,pdwCertified); } -static const IDirectSound8Vtbl DirectSound8_DirectSound8_Vtbl = +static const IDirectSound8Vtbl ds8_vtbl = { - IDirectSound8_IDirectSound8_QueryInterface, - IDirectSound8_IDirectSound8_AddRef, - IDirectSound8_IDirectSound8_Release, - IDirectSound8_IDirectSound8_CreateSoundBuffer, - IDirectSound8_IDirectSound8_GetCaps, - IDirectSound8_IDirectSound8_DuplicateSoundBuffer, - IDirectSound8_IDirectSound8_SetCooperativeLevel, - IDirectSound8_IDirectSound8_Compact, - IDirectSound8_IDirectSound8_GetSpeakerConfig, - IDirectSound8_IDirectSound8_SetSpeakerConfig, - IDirectSound8_IDirectSound8_Initialize, - IDirectSound8_IDirectSound8_VerifyCertification + IDirectSound8Impl_QueryInterface, + IDirectSound8Impl_AddRef, + IDirectSound8Impl_Release, + IDirectSound8Impl_CreateSoundBuffer, + IDirectSound8Impl_GetCaps, + IDirectSound8Impl_DuplicateSoundBuffer, + IDirectSound8Impl_SetCooperativeLevel, + IDirectSound8Impl_Compact, + IDirectSound8Impl_GetSpeakerConfig, + IDirectSound8Impl_SetSpeakerConfig, + IDirectSound8Impl_Initialize, + IDirectSound8Impl_VerifyCertification }; static HRESULT IDirectSound8_IDirectSound8_Create( @@ -573,7 +552,7 @@ static HRESULT IDirectSound8_IDirectSound8_Create( return DSERR_OUTOFMEMORY; } - pdsds->lpVtbl = &DirectSound8_DirectSound8_Vtbl; + pdsds->lpVtbl = &ds8_vtbl; pdsds->ref = 0; pdsds->pds = pds;

1 0

Michael Stefaniuc : dsound: Merge IDirectSound8 into the main DirectSound object.
by Alexandre Julliard July 19, 2012

July 19, 2012

Module: wine Branch: master Commit: 6fecd3d6428ceb3bbba09212327f10bfd66e1610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fecd3d6428ceb3bbba092123… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 19 02:04:11 2012 +0200 dsound: Merge IDirectSound8 into the main DirectSound object. --- dlls/dsound/dsound.c | 151 +++++++++++++++--------------------------- dlls/dsound/dsound_private.h | 1 - 2 files changed, 54 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6fecd3d6428ceb3bbba09…

1 0