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

Francois Gouget : urlmon: Fix the spelling of the destroy_uri_obj() function.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: a188587aee7ab173636086510750cf27219bff92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a188587aee7ab173636086510… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 14 01:05:38 2012 +0200 urlmon: Fix the spelling of the destroy_uri_obj() function. --- dlls/urlmon/uri.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 3d6bf8b..20e0582 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4196,7 +4196,7 @@ static inline Uri* impl_from_IUri(IUri *iface) return CONTAINING_RECORD(iface, Uri, IUri_iface); } -static inline void destory_uri_obj(Uri *This) +static inline void destroy_uri_obj(Uri *This) { SysFreeString(This->raw_uri); heap_free(This->canon_uri); @@ -4254,7 +4254,7 @@ static ULONG WINAPI Uri_Release(IUri *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) - destory_uri_obj(This); + destroy_uri_obj(This); return ref; }

1 0

Francois Gouget : dplayx: Use a proper plural for the repliesExpected field name.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 2539004fe11256cc4368d53439a79fc6a0c1f93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2539004fe11256cc4368d5343… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 14 01:02:59 2012 +0200 dplayx: Use a proper plural for the repliesExpected field name. --- dlls/dplayx/dplay.c | 2 +- dlls/dplayx/dplay_global.h | 4 ++-- dlls/dplayx/dplayx_messages.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 87eb185..1bcb386 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -278,7 +278,7 @@ static BOOL DP_CreateDirectPlay2( LPVOID lpDP ) DPQ_INIT(This->dp2->receiveMsgs); DPQ_INIT(This->dp2->sendMsgs); - DPQ_INIT(This->dp2->replysExpected); + DPQ_INIT(This->dp2->repliesExpected); if( !NS_InitializeSessionCache( &This->dp2->lpNameServerData ) ) { diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 2a12389..273f09e 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -67,7 +67,7 @@ typedef struct tagDP_MSG_REPLY_STRUCT typedef struct tagDP_MSG_REPLY_STRUCT_LIST { - DPQ_ENTRY(tagDP_MSG_REPLY_STRUCT_LIST) replysExpected; + DPQ_ENTRY(tagDP_MSG_REPLY_STRUCT_LIST) repliesExpected; DP_MSG_REPLY_STRUCT replyExpected; } DP_MSG_REPLY_STRUCT_LIST, *LPDP_MSG_REPLY_STRUCT_LIST; @@ -193,7 +193,7 @@ typedef struct tagDirectPlay2Data enum SPSTATE connectionInitialized; /* Expected messages queue */ - DPQ_HEAD( tagDP_MSG_REPLY_STRUCT_LIST ) replysExpected; + DPQ_HEAD( tagDP_MSG_REPLY_STRUCT_LIST ) repliesExpected; } DirectPlay2Data; typedef struct tagDirectPlay3Data diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c index 8b9320d..bc888f6 100644 --- a/dlls/dplayx/dplayx_messages.c +++ b/dlls/dplayx/dplayx_messages.c @@ -172,7 +172,7 @@ HANDLE DP_MSG_BuildAndLinkReplyStruct( IDirectPlay2Impl* This, /* Insert into the message queue while locked */ EnterCriticalSection( &This->unk->DP_lock ); - DPQ_INSERT( This->dp2->replysExpected, lpReplyStructList, replysExpected ); + DPQ_INSERT( This->dp2->repliesExpected, lpReplyStructList, repliesExpected ); LeaveCriticalSection( &This->unk->DP_lock ); return lpReplyStructList->replyExpected.hReceipt; @@ -433,7 +433,7 @@ void DP_MSG_ReplyReceived( IDirectPlay2AImpl* This, WORD wCommandId, * avoid problems. */ EnterCriticalSection( &This->unk->DP_lock ); - DPQ_REMOVE_ENTRY( This->dp2->replysExpected, replysExpected, replyExpected.wExpectedReply, + DPQ_REMOVE_ENTRY( This->dp2->repliesExpected, repliesExpected, replyExpected.wExpectedReply, ==, wCommandId, lpReplyList ); LeaveCriticalSection( &This->unk->DP_lock );

1 0

Alexandre Julliard : winex11: Use the get_pixmap_image helper to import XA_PIXMAP clipboard formats.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 95de085e5e1574b61d78d9141313f8b1241d6b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=95de085e5e1574b61d78d9141… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 12:50:25 2012 +0200 winex11: Use the get_pixmap_image helper to import XA_PIXMAP clipboard formats. --- dlls/winex11.drv/clipboard.c | 81 +++++++++++++++++++++++++---------------- 1 files changed, 49 insertions(+), 32 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 6d0054e..ac17bdd 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1328,10 +1328,10 @@ static HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *display, Window w, Atom p if (X11DRV_CLIPBOARD_ReadProperty(display, w, prop, &lpdata, &cbytes)) { - HDC hdcMem; - X_PHYSBITMAP *physBitmap; - Pixmap orig_pixmap; - HBITMAP hBmp = 0; + XVisualInfo vis; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + struct gdi_image_bits bits; Window root; int x,y; /* Unused */ unsigned border_width; /* Unused */ @@ -1349,37 +1349,54 @@ static HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *display, Window w, Atom p TRACE("\tPixmap properties: width=%d, height=%d, depth=%d\n", width, height, depth); - /* - * Create an HBITMAP with the same dimensions and BPP as the pixmap, - * and make it a container for the pixmap passed. - */ - if (!(hBmp = CreateBitmap( width, height, 1, pixmap_formats[depth]->bits_per_pixel, NULL ))) + memset( &vis, 0, sizeof(vis) ); + vis.depth = depth; + if (depth == screen_depth) + { + vis.visual = visual; + vis.visualid = visual->visualid; + vis.class = visual->class; + vis.red_mask = visual->red_mask; + vis.green_mask = visual->green_mask; + vis.blue_mask = visual->blue_mask; + } + else switch (pixmap_formats[depth]->bits_per_pixel) + { + case 1: + case 4: + case 8: + break; + case 16: /* assume R5G5B5 */ + vis.red_mask = 0x7c00; + vis.green_mask = 0x03e0; + vis.blue_mask = 0x001f; + break; + case 24: /* assume R8G8B8 */ + case 32: /* assume A8R8G8B8 */ + vis.red_mask = 0xff0000; + vis.green_mask = 0x00ff00; + vis.blue_mask = 0x0000ff; + break; + default: return 0; + } - /* force bitmap to be owned by a screen DC */ - hdcMem = CreateCompatibleDC( 0 ); - SelectObject( hdcMem, SelectObject( hdcMem, hBmp )); - DeleteDC( hdcMem ); - - physBitmap = X11DRV_get_phys_bitmap( hBmp ); - - /* swap the new pixmap in */ - orig_pixmap = physBitmap->pixmap; - physBitmap->pixmap = *pPixmap; - - /* - * Create a packed DIB from the Pixmap wrapper bitmap created above. - * A packed DIB contains a BITMAPINFO structure followed immediately by - * an optional color palette and the pixel data. - */ - hClipData = create_dib_from_bitmap( hBmp ); - - /* we can now get rid of the HBITMAP and its original pixmap */ - physBitmap->pixmap = orig_pixmap; - DeleteObject(hBmp); + if (!get_pixmap_image( *pPixmap, width, height, &vis, info, &bits )) + { + DWORD info_size = bitmap_info_size( info, DIB_RGB_COLORS ); + BYTE *ptr; - /* Free the retrieved property data */ - HeapFree(GetProcessHeap(), 0, lpdata); + hClipData = GlobalAlloc( GMEM_MOVEABLE | GMEM_DDESHARE, + info_size + info->bmiHeader.biSizeImage ); + if (hClipData) + { + ptr = GlobalLock( hClipData ); + memcpy( ptr, info, info_size ); + memcpy( ptr + info_size, bits.ptr, info->bmiHeader.biSizeImage ); + GlobalUnlock( hClipData ); + } + if (bits.free) bits.free( &bits ); + } } return hClipData;

1 0

Alexandre Julliard : winex11: Add a helper to retrieve an image from a pixmap.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: f99af0bb8f71916cae86e45b219f39153b2935b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f99af0bb8f71916cae86e45b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 11:49:20 2012 +0200 winex11: Add a helper to retrieve an image from a pixmap. --- dlls/winex11.drv/bitblt.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/opengl.c | 60 ++------------------------------------------ dlls/winex11.drv/x11drv.h | 2 + 3 files changed, 64 insertions(+), 57 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 853f2ae..413f4e4 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1461,3 +1461,62 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, wine_tsx11_unlock(); return ret; } + + +/*********************************************************************** + * get_pixmap_image + * + * Equivalent of X11DRV_GetImage that reads directly from a pixmap. + */ +DWORD get_pixmap_image( Pixmap pixmap, int width, int height, const XVisualInfo *vis, + BITMAPINFO *info, struct gdi_image_bits *bits ) +{ + DWORD ret = ERROR_SUCCESS; + XImage *image; + struct gdi_image_bits src_bits; + struct bitblt_coords coords; + const XPixmapFormatValues *format = pixmap_formats[vis->depth]; + const int *mapping = NULL; + + if (!format) return ERROR_INVALID_PARAMETER; + + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biWidth = width; + info->bmiHeader.biHeight = -height; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = format->bits_per_pixel; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrImportant = 0; + set_color_info( vis, info ); + + if (!bits) return ERROR_SUCCESS; /* just querying the color information */ + + coords.x = 0; + coords.y = 0; + coords.width = width; + coords.height = height; + SetRect( &coords.visrect, 0, 0, width, height ); + + wine_tsx11_lock(); + image = XGetImage( gdi_display, pixmap, 0, 0, width, height, AllPlanes, ZPixmap ); + wine_tsx11_unlock(); + if (!image) return ERROR_OUTOFMEMORY; + + info->bmiHeader.biSizeImage = height * image->bytes_per_line; + + src_bits.ptr = image->data; + src_bits.is_copy = TRUE; + ret = copy_image_bits( info, is_r8g8b8(vis), image, &src_bits, bits, &coords, mapping, + zeropad_masks[(width * image->bits_per_pixel) & 31] ); + + if (!ret && bits->ptr == image->data) + { + bits->free = free_ximage_bits; + image->data = NULL; + } + wine_tsx11_lock(); + XDestroyImage( image ); + wine_tsx11_unlock(); + return ret; +} diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 95c1169..68854f0 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2199,68 +2199,14 @@ static void flush_pixmap( struct wine_glcontext *ctx ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; - XImage *image; - struct gdi_image_bits src_bits, bits; - struct bitblt_coords coords; - DWORD *masks; - BOOL is_r8g8b8 = FALSE; - const XPixmapFormatValues *format = pixmap_formats[ctx->vis->depth]; - - coords.x = 0; - coords.y = 0; - coords.width = ctx->pixmap_size.cx; - coords.height = ctx->pixmap_size.cy; - SetRect( &coords.visrect, 0, 0, coords.width, coords.height ); - - info->bmiHeader.biSize = sizeof(info->bmiHeader); - info->bmiHeader.biWidth = coords.width; - info->bmiHeader.biHeight = -coords.height; - info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = format->bits_per_pixel; - info->bmiHeader.biCompression = BI_RGB; - info->bmiHeader.biClrUsed = 0; - switch (info->bmiHeader.biBitCount) - { - case 16: - masks = (DWORD *)info->bmiColors; - masks[0] = ctx->vis->red_mask; - masks[1] = ctx->vis->green_mask; - masks[2] = ctx->vis->blue_mask; - info->bmiHeader.biCompression = BI_BITFIELDS; - break; - case 24: - is_r8g8b8 = (ctx->vis->red_mask == 0xff0000 && ctx->vis->blue_mask == 0x0000ff); - break; - case 32: - masks = (DWORD *)info->bmiColors; - masks[0] = ctx->vis->red_mask; - masks[1] = ctx->vis->green_mask; - masks[2] = ctx->vis->blue_mask; - if (masks[0] != 0xff0000 || masks[1] != 0x00ff00 || masks[2] != 0x0000ff) - info->bmiHeader.biCompression = BI_BITFIELDS; - break; - default: - FIXME( "depth %u not supported\n", info->bmiHeader.biBitCount ); - return; - } - - wine_tsx11_lock(); - image = XGetImage( gdi_display, ctx->pixmap, 0, 0, coords.width, coords.height, AllPlanes, ZPixmap ); - wine_tsx11_unlock(); - if (!image) return; + struct gdi_image_bits bits; - src_bits.ptr = image->data; - src_bits.is_copy = TRUE; - if (!copy_image_bits( info, is_r8g8b8, image, &src_bits, &bits, &coords, NULL, ~0u )) + if (!get_pixmap_image( ctx->pixmap, ctx->pixmap_size.cx, ctx->pixmap_size.cy, ctx->vis, info, &bits )) { HBITMAP bitmap = GetCurrentObject( ctx->hdc, OBJ_BITMAP ); - TRACE( "drawable %lx -> hdc %p bitmap %p\n", ctx->pixmap, ctx->hdc, bitmap ); - SetDIBits( 0, bitmap, 0, coords.height, bits.ptr, info, DIB_RGB_COLORS ); + SetDIBits( 0, bitmap, 0, ctx->pixmap_size.cy, bits.ptr, info, DIB_RGB_COLORS ); if (bits.free) bits.free( &bits ); } - wine_tsx11_lock(); - XDestroyImage( image ); - wine_tsx11_unlock(); } static void flush_gl_drawable( struct glx_physdev *physdev ) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 82889c2..d17565b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -229,6 +229,8 @@ extern Pixmap X11DRV_get_pixmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, struct bitblt_coords *coords, const int *mapping, unsigned int zeropad_mask ) DECLSPEC_HIDDEN; +extern DWORD get_pixmap_image( Pixmap pixmap, int width, int height, const XVisualInfo *vis, + BITMAPINFO *info, struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) DECLSPEC_HIDDEN; extern BOOL add_extra_clipping_region( X11DRV_PDEVICE *dev, HRGN rgn ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Use an XVisualInfo structure to store color formats in Get/PutImage.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 305b10aba67009b0a8feab32ce0caa9cbf8f671b URL: http://source.winehq.org/git/wine.git/?a=commit;h=305b10aba67009b0a8feab32c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 13:47:33 2012 +0200 winex11: Use an XVisualInfo structure to store color formats in Get/PutImage. --- dlls/winex11.drv/bitblt.c | 104 ++++++++++++++++++++++++--------------------- 1 files changed, 56 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=305b10aba67009b0a8fea…

1 0

Christian Costa : dmsynth: Implement IDirectMusicSynth8_GetAppend.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: aecd9c120190c47e3451f8f424caf91a0d983735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aecd9c120190c47e3451f8f42… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon May 14 08:11:46 2012 +0200 dmsynth: Implement IDirectMusicSynth8_GetAppend. --- dlls/dmsynth/synth.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index e5d5e1c..d5288b4 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -258,9 +258,10 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetFormat(LPDIRECTMUSICSYNTH8 iface static HRESULT WINAPI IDirectMusicSynth8Impl_GetAppend(LPDIRECTMUSICSYNTH8 iface, DWORD* append) { - IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + TRACE("(%p)->(%p)\n", iface, append); - FIXME("(%p)->(%p): stub\n", This, append); + /* We don't need extra space at the end of buffers passed to us for now */ + *append = 0; return S_OK; }

1 0

Francois Gouget : jscript/tests: Fix the spelling of the testEmbeddedFunctions() function name.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 22fe702f7ab0d6b42a4feeb3fc7e3bec83f24a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22fe702f7ab0d6b42a4feeb3f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 14 01:05:24 2012 +0200 jscript/tests: Fix the spelling of the testEmbeddedFunctions() function name. --- dlls/jscript/tests/lang.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 4d2efa3..308e0c9 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1215,7 +1215,7 @@ ok(tmp === 5, "testFunc4(1) = " + tmp); tmp = function testFunc4(x) { return x+4; }; ok(testFunc4 === 1, "testFunc4 = " + testFunc4); -function testEmbededFunctions() { +function testEmbeddedFunctions() { ok(typeof(testFunc5) === "function", "typeof(testFunc5) = " + typeof(testFunc5)); tmp = testFunc5(1); ok(tmp === 3, "testFunc5(1) = " + tmp); @@ -1231,7 +1231,7 @@ function testEmbededFunctions() { ok(testFunc6 === 1, "testFunc4 = " + testFunc6); } -testEmbededFunctions(); +testEmbeddedFunctions(); date = new Date(); date.toString = function() { return "toString"; }

1 0

Francois Gouget : hlink: Fix the spelling of the Hlink::SetAdditionalParams () implementation.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: fde4e8f92ed56221d806ffc56369ba3c6ec8f357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde4e8f92ed56221d806ffc56… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 14 01:05:07 2012 +0200 hlink: Fix the spelling of the Hlink::SetAdditionalParams() implementation. --- dlls/hlink/link.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 2ea4e2c..72e792b 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -528,7 +528,7 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, return r; } -static HRESULT WINAPI IHlink_fnSetAdditonalParams(IHlink* iface, +static HRESULT WINAPI IHlink_fnSetAdditionalParams(IHlink* iface, LPCWSTR pwzAdditionalParams) { TRACE("Not implemented in native IHlink\n"); @@ -559,7 +559,7 @@ static const IHlinkVtbl hlvt = IHlink_fnGetTargetFrameName, IHlink_fnGetMiscStatus, IHlink_fnNavigate, - IHlink_fnSetAdditonalParams, + IHlink_fnSetAdditionalParams, IHlink_fnGetAdditionalParams };

1 0

Christian Costa : dmusic: COM cleanup of IReferenceClock.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 540ae18f69e9cd5d5be74a1c839319982a5bb0ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=540ae18f69e9cd5d5be74a1c8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon May 14 08:06:22 2012 +0200 dmusic: COM cleanup of IReferenceClock. --- dlls/dmusic/clock.c | 74 +++++++++++++++++++++++++++--------------- dlls/dmusic/dmusic_private.h | 12 +++--- 2 files changed, 54 insertions(+), 32 deletions(-) diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c index c54992c..4d9a1b4 100644 --- a/dlls/dmusic/clock.c +++ b/dlls/dmusic/clock.c @@ -1,4 +1,5 @@ -/* IReferenceClock Implementation +/* + * IReferenceClock Implementation * * Copyright (C) 2003-2004 Rok Mandeljc * @@ -21,9 +22,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); +static inline IReferenceClockImpl *impl_from_IReferenceClock(IReferenceClock *iface) +{ + return CONTAINING_RECORD(iface, IReferenceClockImpl, IReferenceClock_iface); +} + /* IReferenceClockImpl IUnknown part: */ -static HRESULT WINAPI IReferenceClockImpl_QueryInterface (IReferenceClock *iface, REFIID riid, LPVOID *ppobj) { - IReferenceClockImpl *This = (IReferenceClockImpl *)iface; +static HRESULT WINAPI IReferenceClockImpl_QueryInterface(IReferenceClock *iface, REFIID riid, LPVOID *ppobj) +{ + IReferenceClockImpl *This = impl_from_IReferenceClock(iface); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown) || @@ -36,8 +43,9 @@ static HRESULT WINAPI IReferenceClockImpl_QueryInterface (IReferenceClock *iface return E_NOINTERFACE; } -static ULONG WINAPI IReferenceClockImpl_AddRef (IReferenceClock *iface) { - IReferenceClockImpl *This = (IReferenceClockImpl *)iface; +static ULONG WINAPI IReferenceClockImpl_AddRef(IReferenceClock *iface) +{ + IReferenceClockImpl *This = impl_from_IReferenceClock(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); @@ -47,8 +55,9 @@ static ULONG WINAPI IReferenceClockImpl_AddRef (IReferenceClock *iface) { return refCount; } -static ULONG WINAPI IReferenceClockImpl_Release (IReferenceClock *iface) { - IReferenceClockImpl *This = (IReferenceClockImpl *)iface; +static ULONG WINAPI IReferenceClockImpl_Release(IReferenceClock *iface) +{ + IReferenceClockImpl *This = impl_from_IReferenceClock(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); @@ -63,29 +72,42 @@ static ULONG WINAPI IReferenceClockImpl_Release (IReferenceClock *iface) { } /* IReferenceClockImpl IReferenceClock part: */ -static HRESULT WINAPI IReferenceClockImpl_GetTime (IReferenceClock *iface, REFERENCE_TIME* pTime) { - IReferenceClockImpl *This = (IReferenceClockImpl *)iface; - TRACE("(%p, %p)\n", This, pTime); - *pTime = This->rtTime; - return S_OK; +static HRESULT WINAPI IReferenceClockImpl_GetTime(IReferenceClock *iface, REFERENCE_TIME* pTime) +{ + IReferenceClockImpl *This = impl_from_IReferenceClock(iface); + + TRACE("(%p)->(%p)\n", This, pTime); + + *pTime = This->rtTime; + + return S_OK; } -static HRESULT WINAPI IReferenceClockImpl_AdviseTime (IReferenceClock *iface, REFERENCE_TIME baseTime, REFERENCE_TIME streamTime, HANDLE hEvent, DWORD* pdwAdviseCookie) { - IReferenceClockImpl *This = (IReferenceClockImpl *)iface; - FIXME("(%p, 0x%s, 0x%s, %p, %p): stub\n", This, wine_dbgstr_longlong(baseTime), wine_dbgstr_longlong(streamTime), hEvent, pdwAdviseCookie); - return S_OK; +static HRESULT WINAPI IReferenceClockImpl_AdviseTime(IReferenceClock *iface, REFERENCE_TIME baseTime, REFERENCE_TIME streamTime, HANDLE hEvent, DWORD* pdwAdviseCookie) +{ + IReferenceClockImpl *This = impl_from_IReferenceClock(iface); + + FIXME("(%p)->(0x%s, 0x%s, %p, %p): stub\n", This, wine_dbgstr_longlong(baseTime), wine_dbgstr_longlong(streamTime), hEvent, pdwAdviseCookie); + + return S_OK; } -static HRESULT WINAPI IReferenceClockImpl_AdvisePeriodic (IReferenceClock *iface, REFERENCE_TIME startTime, REFERENCE_TIME periodTime, HANDLE hSemaphore, DWORD* pdwAdviseCookie) { - IReferenceClockImpl *This = (IReferenceClockImpl *)iface; - FIXME("(%p, 0x%s, 0x%s, %p, %p): stub\n", This, wine_dbgstr_longlong(startTime), wine_dbgstr_longlong(periodTime), hSemaphore, pdwAdviseCookie); - return S_OK; +static HRESULT WINAPI IReferenceClockImpl_AdvisePeriodic(IReferenceClock *iface, REFERENCE_TIME startTime, REFERENCE_TIME periodTime, HANDLE hSemaphore, DWORD* pdwAdviseCookie) +{ + IReferenceClockImpl *This = impl_from_IReferenceClock(iface); + + FIXME("(%p)->(0x%s, 0x%s, %p, %p): stub\n", This, wine_dbgstr_longlong(startTime), wine_dbgstr_longlong(periodTime), hSemaphore, pdwAdviseCookie); + + return S_OK; } -static HRESULT WINAPI IReferenceClockImpl_Unadvise (IReferenceClock *iface, DWORD dwAdviseCookie) { - IReferenceClockImpl *This = (IReferenceClockImpl *)iface; - FIXME("(%p, %d): stub\n", This, dwAdviseCookie); - return S_OK; +static HRESULT WINAPI IReferenceClockImpl_Unadvise(IReferenceClock *iface, DWORD dwAdviseCookie) +{ + IReferenceClockImpl *This = impl_from_IReferenceClock(iface); + + FIXME("(%p)->(%d): stub\n", This, dwAdviseCookie); + + return S_OK; } static const IReferenceClockVtbl ReferenceClock_Vtbl = { @@ -111,8 +133,8 @@ HRESULT DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNO return E_OUTOFMEMORY; } - clock->lpVtbl = &ReferenceClock_Vtbl; - clock->ref = 0; /* will be inited by QueryInterface */ + clock->IReferenceClock_iface.lpVtbl = &ReferenceClock_Vtbl; + clock->ref = 0; /* Will be inited by QueryInterface */ clock->rtTime = 0; clock->pClockInfo.dwSize = sizeof (DMUS_CLOCKINFO); diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 4f2247e..3cfffba 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -166,13 +166,13 @@ extern HRESULT DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, * IReferenceClockImpl implementation structure */ struct IReferenceClockImpl { - /* IUnknown fields */ - const IReferenceClockVtbl *lpVtbl; - LONG ref; + /* IUnknown fields */ + IReferenceClock IReferenceClock_iface; + LONG ref; - /* IReferenceClockImpl fields */ - REFERENCE_TIME rtTime; - DMUS_CLOCKINFO pClockInfo; + /* IReferenceClockImpl fields */ + REFERENCE_TIME rtTime; + DMUS_CLOCKINFO pClockInfo; }; typedef struct _DMUS_PRIVATE_INSTRUMENT_ENTRY {

1 0

Francois Gouget : dplayx: Fix the spelling of the BuildParentalHierarchy field name and type.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: d33891784fc986a307414f7ee4c8c8e08f92190a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33891784fc986a307414f7ee… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 14 01:03:25 2012 +0200 dplayx: Fix the spelling of the BuildParentalHierarchy field name and type. --- dlls/dplayx/lobbysp.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dplayx/lobbysp.h b/dlls/dplayx/lobbysp.h index b73e65f..f20c8e9 100644 --- a/dlls/dplayx/lobbysp.h +++ b/dlls/dplayx/lobbysp.h @@ -70,14 +70,14 @@ typedef struct SPDATA_ADDREMOTEPLAYERTOGROUP LPDPNAME lpName; } SPDATA_ADDREMOTEPLAYERTOGROUP, *LPSPDATA_ADDREMOTEPLAYERTOGROUP; -typedef struct SPDATA_BUILDPARENTALHEIRARCHY +typedef struct SPDATA_BUILDPARENTALHIERARCHY { DWORD dwSize; LPDPLOBBYSP lpISP; DWORD dwGroupID; DWORD dwMessage; DWORD dwParentID; -} SPDATA_BUILDPARENTALHEIRARCHY, *LPSPDATA_BUILDPARENTALHEIRARCHY; +} SPDATA_BUILDPARENTALHIERARCHY, *LPSPDATA_BUILDPARENTALHIERARCHY; typedef struct SPDATA_CLOSE { @@ -388,7 +388,7 @@ typedef struct SPDATA_STARTSESSIONCOMMAND /* Prototypes for callbacks returned by DPLSPInit */ typedef HRESULT (WINAPI *LPSP_ADDGROUPTOGROUP)(LPSPDATA_ADDGROUPTOGROUP); typedef HRESULT (WINAPI *LPSP_ADDPLAYERTOGROUP)(LPSPDATA_ADDPLAYERTOGROUP); -typedef HRESULT (WINAPI *LPSP_BUILDPARENTALHEIRARCHY)(LPSPDATA_BUILDPARENTALHEIRARCHY); +typedef HRESULT (WINAPI *LPSP_BUILDPARENTALHIERARCHY)(LPSPDATA_BUILDPARENTALHIERARCHY); typedef HRESULT (WINAPI *LPSP_CLOSE)(LPSPDATA_CLOSE); typedef HRESULT (WINAPI *LPSP_CREATEGROUP)(LPSPDATA_CREATEGROUP); typedef HRESULT (WINAPI *LPSP_CREATEGROUPINGROUP)(LPSPDATA_CREATEGROUPINGROUP); @@ -422,7 +422,7 @@ typedef struct SP_CALLBACKS DWORD dwFlags; LPSP_ADDGROUPTOGROUP AddGroupToGroup; LPSP_ADDPLAYERTOGROUP AddPlayerToGroup; - LPSP_BUILDPARENTALHEIRARCHY BuildParentalHeirarchy; + LPSP_BUILDPARENTALHIERARCHY BuildParentalHierarchy; LPSP_CLOSE Close; LPSP_CREATEGROUP CreateGroup; LPSP_CREATEGROUPINGROUP CreateGroupInGroup;

1 0