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

Piotr Caban : msvcp100: Fixed basic_streambuf virtual functions table.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 197de8d6ece36c7e3a7058b4b1931608bbea26cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=197de8d6ece36c7e3a7058b4b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 16 10:36:04 2012 +0200 msvcp100: Fixed basic_streambuf virtual functions table. --- dlls/msvcp100/ios.c | 90 +++++++++++++++++++++++++++++--------------------- 1 files changed, 52 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=197de8d6ece36c7e3a705…

1 0

Piotr Caban : msvcp100: Update spec file.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 4bdaa20a73e86e6170453e28d7a2527154c09a0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bdaa20a73e86e6170453e28d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 16 10:36:28 2012 +0200 msvcp100: Update spec file. --- dlls/msvcp100/msvcp100.spec | 4392 +++++++++++++++++++++--------------------- 1 files changed, 2196 insertions(+), 2196 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4bdaa20a73e86e6170453…

1 0

Piotr Caban : msvcp100: Fixed 64-bit variables alignment.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 5e7452ade9dccebcc53a0b2f2c481a3b70755339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e7452ade9dccebcc53a0b2f2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 16 10:47:23 2012 +0200 msvcp100: Fixed 64-bit variables alignment. --- dlls/msvcp100/ios.c | 64 ++++++++++++++++++++++++------------------------ dlls/msvcp100/msvcp.h | 6 +++- 2 files changed, 36 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e7452ade9dccebcc53a0…

1 0

Dmitry Timoshkov : gdiplus: Properly convert source coordinates to device units in GdipDrawImagePointsRect .
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: e7b5e6984338b741c33dca240b016a7edc9bc27a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b5e6984338b741c33dca240… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 15 12:10:45 2012 +0900 gdiplus: Properly convert source coordinates to device units in GdipDrawImagePointsRect. --- dlls/gdiplus/graphics.c | 43 +++++++++++++++---------------------------- 1 files changed, 15 insertions(+), 28 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index dfa37eb..85234c8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3040,7 +3040,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image { GpPointF ptf[4]; POINT pti[4]; - REAL dx, dy; GpStatus stat; TRACE("(%p, %p, %p, %d, %f, %f, %f, %f, %d, %p, %p, %p)\n", graphics, image, points, @@ -3063,6 +3062,15 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image return Ok; transform_and_round_points(graphics, pti, ptf, 4); + TRACE("%s %s %s %s\n", wine_dbgstr_point(&pti[0]), wine_dbgstr_point(&pti[1]), + wine_dbgstr_point(&pti[2]), wine_dbgstr_point(&pti[3])); + + srcx = units_to_pixels(srcx, srcUnit, image->xres); + srcy = units_to_pixels(srcy, srcUnit, image->yres); + srcwidth = units_to_pixels(srcwidth, srcUnit, image->xres); + srcheight = units_to_pixels(srcheight, srcUnit, image->yres); + TRACE("src pixels: %f,%f %fx%f\n", srcx, srcy, srcwidth, srcheight); + if (image->picture) { if (!graphics->hdc) @@ -3070,23 +3078,10 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image FIXME("graphics object has no HDC\n"); } - /* FIXME: partially implemented (only works for rectangular parallelograms) */ - if(srcUnit == UnitInch) - dx = dy = (REAL) INCH_HIMETRIC; - else if(srcUnit == UnitPixel){ - dx = ((REAL) INCH_HIMETRIC) / - ((REAL) GetDeviceCaps(graphics->hdc, LOGPIXELSX)); - dy = ((REAL) INCH_HIMETRIC) / - ((REAL) GetDeviceCaps(graphics->hdc, LOGPIXELSY)); - } - else - return NotImplemented; - if(IPicture_Render(image->picture, graphics->hdc, pti[0].x, pti[0].y, pti[1].x - pti[0].x, pti[2].y - pti[0].y, - srcx * dx, srcy * dy, - srcwidth * dx, srcheight * dy, - NULL) != S_OK){ + srcx, srcy, srcwidth, srcheight, NULL) != S_OK) + { if(callback) callback(callbackData); return GenericError; @@ -3097,18 +3092,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image GpBitmap* bitmap = (GpBitmap*)image; int use_software=0; - if (srcUnit == UnitInch) - dx = dy = 96.0; /* FIXME: use the image resolution */ - else if (srcUnit == UnitPixel) - dx = dy = 1.0; - else - return NotImplemented; - - srcx = srcx * dx; - srcy = srcy * dy; - srcwidth = srcwidth * dx; - srcheight = srcheight * dy; - if (imageAttributes || (graphics->image && graphics->image->type == ImageTypeBitmap) || !((GpBitmap*)image)->hbitmap || @@ -3145,6 +3128,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (dst_area.bottom < pti[i].y) dst_area.bottom = pti[i].y; } + TRACE("dst_area: %s\n", wine_dbgstr_rect(&dst_area)); + m11 = (ptf[1].X - ptf[0].X) / srcwidth; m21 = (ptf[2].X - ptf[0].X) / srcheight; mdx = ptf[0].X - m11 * srcx - m21 * srcy; @@ -3174,6 +3159,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image get_bitmap_sample_size(interpolation, imageAttributes->wrap, bitmap, srcx, srcy, srcwidth, srcheight, &src_area); + TRACE("src_area: %d x %d\n", src_area.Width, src_area.Height); + src_data = GdipAlloc(sizeof(ARGB) * src_area.Width * src_area.Height); if (!src_data) {

1 0

Dmitry Timoshkov : gdiplus: Destination points passed to GdipDrawImagePointsRect should be in device units .
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 7f1cb3bca20a94ce0161e6a9c44e9c831611ef8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1cb3bca20a94ce0161e6a9c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 15 12:09:24 2012 +0900 gdiplus: Destination points passed to GdipDrawImagePointsRect should be in device units. --- dlls/gdiplus/graphics.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 77f2f8d..4606074 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2969,14 +2969,19 @@ GpStatus WINGDIPAPI GdipDrawImagePointRect(GpGraphics *graphics, GpImage *image, GpUnit srcUnit) { GpPointF points[3]; + REAL scale_x, scale_y, width, height; + TRACE("(%p, %p, %f, %f, %f, %f, %f, %f, %d)\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); + scale_x = units_scale(srcUnit, graphics->unit, graphics->xres); + scale_y = units_scale(srcUnit, graphics->unit, graphics->yres); + width = srcwidth * scale_x; + height = srcheight * scale_y; + points[0].X = points[2].X = x; points[0].Y = points[1].Y = y; - - /* FIXME: convert image coordinates to Graphics coordinates? */ - points[1].X = x + srcwidth; - points[2].Y = y + srcheight; + points[1].X = x + width; + points[2].Y = y + height; return GdipDrawImagePointsRect(graphics, image, points, 3, srcx, srcy, srcwidth, srcheight, srcUnit, NULL, NULL, NULL);

1 0

Piotr Caban : msvcp100: Copy source files from msvcp90.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 4fe6e583752915161142089c3c0d916eefde5ef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fe6e583752915161142089c3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 16 10:35:15 2012 +0200 msvcp100: Copy source files from msvcp90. --- dlls/msvcp100/Makefile.in | 12 +- dlls/msvcp100/cxx.h | 224 + dlls/msvcp100/exception.c | 759 +++ dlls/msvcp100/ios.c |13037 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp100/locale.c | 8755 ++++++++++++++++++++++++++++++ dlls/msvcp100/math.c | 896 ++++ dlls/msvcp100/memory.c | 338 ++ dlls/msvcp100/misc.c | 221 + dlls/msvcp100/msvcp.h | 467 ++ dlls/msvcp100/msvcp100.c | 93 +- dlls/msvcp100/string.c | 4473 ++++++++++++++++ 11 files changed, 29250 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4fe6e5837529151611420…

1 0

Dmitry Timoshkov : gdiplus: When there is no target rectangle specified DrawImage should scale image to device dpi .
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 938d42c1480fbc7c80a4db187a29148a7742e219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=938d42c1480fbc7c80a4db187… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 15 12:10:08 2012 +0900 gdiplus: When there is no target rectangle specified DrawImage should scale image to device dpi. --- dlls/gdiplus/graphics.c | 2 ++ dlls/gdiplus/tests/image.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4606074..dfa37eb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2974,7 +2974,9 @@ GpStatus WINGDIPAPI GdipDrawImagePointRect(GpGraphics *graphics, GpImage *image, TRACE("(%p, %p, %f, %f, %f, %f, %f, %f, %d)\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); scale_x = units_scale(srcUnit, graphics->unit, graphics->xres); + scale_x *= graphics->xres / image->xres; scale_y = units_scale(srcUnit, graphics->unit, graphics->yres); + scale_y *= graphics->yres / image->yres; width = srcwidth * scale_x; height = srcheight * scale_y; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 24cb434..9e90cca 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3642,7 +3642,6 @@ static void test_DrawImage(void) expect(Ok, status); match = memcmp(white_2x2, black_2x2, sizeof(black_2x2)) == 0; -todo_wine ok(match, "data should match\n"); if (!match) { @@ -3695,7 +3694,6 @@ static void test_GdipDrawImagePointRect(void) expect(Ok, status); match = memcmp(white_2x2, black_2x2, sizeof(black_2x2)) == 0; -todo_wine ok(match, "data should match\n"); if (!match) {

1 0

Michael Stefaniuc : dsound: Add COM aggregation to DirectSoundCapture for internal use.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 850b294efa1d1c80915b43685664ee9550b5e121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=850b294efa1d1c80915b43685… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:49:10 2012 +0200 dsound: Add COM aggregation to DirectSoundCapture for internal use. --- dlls/dsound/capture.c | 27 +++++++++++++++++---------- dlls/dsound/dsound_private.h | 1 + 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 23668e9..8d0fc65 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -997,9 +997,10 @@ static HRESULT DirectSoundCaptureDevice_Initialize( */ typedef struct IDirectSoundCaptureImpl { - IUnknown IUnknown_iface; /* Separate refcount */ + IUnknown IUnknown_inner; IDirectSoundCapture IDirectSoundCapture_iface; LONG ref, refdsc, numIfaces; + IUnknown *outer_unk; /* internal */ DirectSoundCaptureDevice *device; BOOL has_dsc8; } IDirectSoundCaptureImpl; @@ -1017,7 +1018,7 @@ static void capture_destroy(IDirectSoundCaptureImpl *This) */ static inline IDirectSoundCaptureImpl *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, IDirectSoundCaptureImpl, IUnknown_iface); + return CONTAINING_RECORD(iface, IDirectSoundCaptureImpl, IUnknown_inner); } static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) @@ -1033,7 +1034,7 @@ static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown *iface, REFIID riid, *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = &This->IUnknown_iface; + *ppv = &This->IUnknown_inner; else if (IsEqualIID(riid, &IID_IDirectSoundCapture)) *ppv = &This->IDirectSoundCapture_iface; else { @@ -1089,7 +1090,7 @@ static HRESULT WINAPI IDirectSoundCaptureImpl_QueryInterface(IDirectSoundCapture { IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); - return IUnknown_QueryInterface(&This->IUnknown_iface, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI IDirectSoundCaptureImpl_AddRef(IDirectSoundCapture *iface) @@ -1219,7 +1220,7 @@ static const IDirectSoundCaptureVtbl dscvt = IDirectSoundCaptureImpl_Initialize }; -static HRESULT IDirectSoundCaptureImpl_Create(REFIID riid, void **ppv, BOOL has_dsc8) +HRESULT IDirectSoundCaptureImpl_Create(IUnknown *outer_unk, REFIID riid, void **ppv, BOOL has_dsc8) { IDirectSoundCaptureImpl *obj; HRESULT hr; @@ -1235,7 +1236,7 @@ static HRESULT IDirectSoundCaptureImpl_Create(REFIID riid, void **ppv, BOOL has_ setup_dsound_options(); - obj->IUnknown_iface.lpVtbl = &unk_vtbl; + obj->IUnknown_inner.lpVtbl = &unk_vtbl; obj->IDirectSoundCapture_iface.lpVtbl = &dscvt; obj->ref = 1; obj->refdsc = 0; @@ -1243,20 +1244,26 @@ static HRESULT IDirectSoundCaptureImpl_Create(REFIID riid, void **ppv, BOOL has_ obj->device = NULL; obj->has_dsc8 = has_dsc8; - hr = IUnknown_QueryInterface(&obj->IUnknown_iface, riid, ppv); - IUnknown_Release(&obj->IUnknown_iface); + /* COM aggregation supported only internally */ + if (outer_unk) + obj->outer_unk = outer_unk; + else + obj->outer_unk = &obj->IUnknown_inner; + + hr = IUnknown_QueryInterface(&obj->IUnknown_inner, riid, ppv); + IUnknown_Release(&obj->IUnknown_inner); return hr; } HRESULT DSOUND_CaptureCreate(REFIID riid, void **ppv) { - return IDirectSoundCaptureImpl_Create(riid, ppv, FALSE); + return IDirectSoundCaptureImpl_Create(NULL, riid, ppv, FALSE); } HRESULT DSOUND_CaptureCreate8(REFIID riid, void **ppv) { - return IDirectSoundCaptureImpl_Create(riid, ppv, TRUE); + return IDirectSoundCaptureImpl_Create(NULL, riid, ppv, TRUE); } /*************************************************************************** diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index d9139be..8419a7f 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -301,6 +301,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN; HRESULT DSOUND_CaptureCreate(REFIID riid, void **ppv) DECLSPEC_HIDDEN; HRESULT DSOUND_CaptureCreate8(REFIID riid, void **ppv) DECLSPEC_HIDDEN; +HRESULT IDirectSoundCaptureImpl_Create(IUnknown *outer_unk, REFIID riid, void **ppv, BOOL has_dsc8) DECLSPEC_HIDDEN; #define STATE_STOPPED 0 #define STATE_STARTING 1

1 0

Michael Stefaniuc : dsound: Aggregate IDirectSound8 instead of wrapping it.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: ac3cd73ca2f19aa2a8244432a8450dd7b28b6e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac3cd73ca2f19aa2a8244432a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:47:44 2012 +0200 dsound: Aggregate IDirectSound8 instead of wrapping it. --- dlls/dsound/duplex.c | 240 ++++++-------------------------------------------- 1 files changed, 29 insertions(+), 211 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac3cd73ca2f19aa2a8244…

1 0

Michael Stefaniuc : dsound: Add COM aggregation to DirectSound for internal use.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 9cb53818e85513cd73f621d65fa581abab981a2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb53818e85513cd73f621d65… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:45:29 2012 +0200 dsound: Add COM aggregation to DirectSound for internal use. --- dlls/dsound/dsound.c | 27 +++++++++++++++++---------- dlls/dsound/dsound_private.h | 1 + 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index ad41f59..3847a18 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -42,8 +42,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); typedef struct IDirectSoundImpl { - IUnknown IUnknown_iface; /* Separate refcount, not for COM aggregation */ + IUnknown IUnknown_inner; IDirectSound8 IDirectSound8_iface; + IUnknown *outer_unk; /* internal */ LONG ref, refds, numIfaces; DirectSoundDevice *device; BOOL has_ds8; @@ -129,7 +130,7 @@ static void directsound_destroy(IDirectSoundImpl *This) */ static inline IDirectSoundImpl *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, IDirectSoundImpl, IUnknown_iface); + return CONTAINING_RECORD(iface, IDirectSoundImpl, IUnknown_inner); } static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) @@ -145,7 +146,7 @@ static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown *iface, REFIID riid, *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = &This->IUnknown_iface; + *ppv = &This->IUnknown_inner; else if (IsEqualIID(riid, &IID_IDirectSound) || (IsEqualIID(riid, &IID_IDirectSound8) && This->has_ds8)) *ppv = &This->IDirectSound8_iface; @@ -204,7 +205,7 @@ static HRESULT WINAPI IDirectSound8Impl_QueryInterface(IDirectSound8 *iface, REF { IDirectSoundImpl *This = impl_from_IDirectSound8(iface); TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppv); - return IUnknown_QueryInterface(&This->IUnknown_iface, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI IDirectSound8Impl_AddRef(IDirectSound8 *iface) @@ -317,7 +318,7 @@ static const IDirectSound8Vtbl ds8_vtbl = IDirectSound8Impl_VerifyCertification }; -static HRESULT IDirectSoundImpl_Create(REFIID riid, void **ppv, BOOL has_ds8) +HRESULT IDirectSoundImpl_Create(IUnknown *outer_unk, REFIID riid, void **ppv, BOOL has_ds8) { IDirectSoundImpl *obj; HRESULT hr; @@ -333,7 +334,7 @@ static HRESULT IDirectSoundImpl_Create(REFIID riid, void **ppv, BOOL has_ds8) setup_dsound_options(); - obj->IUnknown_iface.lpVtbl = &unk_vtbl; + obj->IUnknown_inner.lpVtbl = &unk_vtbl; obj->IDirectSound8_iface.lpVtbl = &ds8_vtbl; obj->ref = 1; obj->refds = 0; @@ -341,20 +342,26 @@ static HRESULT IDirectSoundImpl_Create(REFIID riid, void **ppv, BOOL has_ds8) obj->device = NULL; obj->has_ds8 = has_ds8; - hr = IUnknown_QueryInterface(&obj->IUnknown_iface, riid, ppv); - IUnknown_Release(&obj->IUnknown_iface); + /* COM aggregation supported only internally */ + if (outer_unk) + obj->outer_unk = outer_unk; + else + obj->outer_unk = &obj->IUnknown_inner; + + hr = IUnknown_QueryInterface(&obj->IUnknown_inner, riid, ppv); + IUnknown_Release(&obj->IUnknown_inner); return hr; } HRESULT DSOUND_Create(REFIID riid, void **ppv) { - return IDirectSoundImpl_Create(riid, ppv, FALSE); + return IDirectSoundImpl_Create(NULL, riid, ppv, FALSE); } HRESULT DSOUND_Create8(REFIID riid, void **ppv) { - return IDirectSoundImpl_Create(riid, ppv, TRUE); + return IDirectSoundImpl_Create(NULL, riid, ppv, TRUE); } /******************************************************************************* diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 1855319..d9139be 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -263,6 +263,7 @@ HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, IKsPropertySet **piks) DEC HRESULT DSOUND_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; HRESULT DSOUND_Create8(REFIID riid, void **ppv) DECLSPEC_HIDDEN; +HRESULT IDirectSoundImpl_Create(IUnknown *outer_unk, REFIID riid, void **ppv, BOOL has_ds8) DECLSPEC_HIDDEN; /* primary.c */

1 0