wine-commits July 2010

wine-commits@winehq.org

2 participants
892 discussions

Alexandre Julliard : winex11: Fix handling of the lpDx array in ExtTextOut for the non-Xrender case.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: b01be941d0b017a9e65ea85f15d0a9e8a5b34060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b01be941d0b017a9e65ea85f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 23:10:49 2010 +0200 winex11: Fix handling of the lpDx array in ExtTextOut for the non-Xrender case. --- dlls/winex11.drv/text.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/text.c b/dlls/winex11.drv/text.c index 7773588..1431bc1 100644 --- a/dlls/winex11.drv/text.c +++ b/dlls/winex11.drv/text.c @@ -62,14 +62,10 @@ X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, if (pfo->lf.lfEscapement && pfo->lpX11Trans) rotated = TRUE; - TRACE("hdc=%p df=%04x %d,%d %s, %d flags=%d lpDx=%p\n", - physDev->hdc, (UINT16)(physDev->font), x, y, + TRACE("hdc=%p df=%04x %d,%d rc %s %s, %d flags=%d lpDx=%p\n", + physDev->hdc, (UINT16)physDev->font, x, y, wine_dbgstr_rect(lprect), debugstr_wn (wstr, count), count, flags, lpDx); - if (lprect != NULL) TRACE("\trect=(%d,%d - %d,%d)\n", - lprect->left, lprect->top, - lprect->right, lprect->bottom ); - /* Draw the rectangle */ if (flags & ETO_OPAQUE) @@ -126,24 +122,26 @@ X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, } else { - XTextItem16 *items, *pitem; + XTextItem16 *items; - pitem = items = HeapAlloc( GetProcessHeap(), 0, - count * sizeof(XTextItem16) ); + items = HeapAlloc( GetProcessHeap(), 0, count * sizeof(XTextItem16) ); if(items == NULL) goto FAIL; - for(i = 0; i < count; i++) + items[0].chars = str2b; + items[0].delta = 0; + items[0].nchars = 1; + items[0].font = None; + for(i = 1; i < count; i++) { - pitem->chars = str2b + i; - pitem->delta = lpDx[i]; - pitem->nchars = 1; - pitem->font = None; - pitem++; + items[i].chars = str2b + i; + items[i].delta = (flags & ETO_PDY) ? lpDx[(i - 1) * 2] : lpDx[i - 1]; + items[i].delta -= X11DRV_cptable[pfo->fi->cptable].pTextWidth( pfo, str2b + i - 1, 1 ); + items[i].nchars = 1; + items[i].font = None; } - X11DRV_cptable[pfo->fi->cptable].pDrawText( pfo, gdi_display, physDev->drawable, physDev->gc, - physDev->dc_rect.left + x, physDev->dc_rect.top + y, items, pitem - items ); + physDev->dc_rect.left + x, physDev->dc_rect.top + y, items, count ); HeapFree( GetProcessHeap(), 0, items ); } } @@ -167,7 +165,7 @@ X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, x_i, y_i, &str2b[i], 1); if (lpDx) { - offset += lpDx[i]; + offset += (flags & ETO_PDY) ? lpDx[i * 2] : lpDx[i]; } else {

1 0

Alexandre Julliard : gdi32/tests: Add some tests for the DC origin in RTL layouts.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 2773ae181e78363cdc2b0d904da7f013281f0876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2773ae181e78363cdc2b0d904… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 20:35:09 2010 +0200 gdi32/tests: Add some tests for the DC origin in RTL layouts. --- dlls/gdi32/tests/mapping.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 7968c2f..0b823a7 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -226,6 +226,8 @@ static void test_dc_layout(void) { INT ret, size_cx, size_cy, res_x, res_y, dpi_x, dpi_y; SIZE size; + POINT pt; + HBITMAP bitmap; HDC hdc; if (!pGetLayout || !pSetLayout) @@ -235,6 +237,8 @@ static void test_dc_layout(void) } hdc = CreateCompatibleDC(0); + bitmap = CreateCompatibleBitmap( hdc, 100, 100 ); + SelectObject( hdc, bitmap ); size_cx = GetDeviceCaps(hdc, HORZSIZE); size_cy = GetDeviceCaps(hdc, VERTSIZE); @@ -263,7 +267,25 @@ static void test_dc_layout(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); expect_world_transform(hdc, 1.0, 1.0); - expect_LPtoDP(hdc, -1000, 1000); + expect_LPtoDP(hdc, -1000 + 99, 1000); + GetViewportOrgEx( hdc, &pt ); + ok( pt.x == 0 && pt.y == 0, "wrong origin %d,%d\n", pt.x, pt.y ); + GetWindowOrgEx( hdc, &pt ); + ok( pt.x == 0 && pt.y == 0, "wrong origin %d,%d\n", pt.x, pt.y ); + GetDCOrgEx( hdc, &pt ); + ok( pt.x == 0 && pt.y == 0, "wrong origin %d,%d\n", pt.x, pt.y ); + if (pGetTransform) + { + XFORM xform; + BOOL ret = pGetTransform( hdc, 0x204, &xform ); /* World -> Device */ + ok( ret, "got %d\n", ret ); + ok( xform.eM11 == -1.0, "got %f\n", xform.eM11 ); + ok( xform.eM12 == 0.0, "got %f\n", xform.eM12 ); + ok( xform.eM21 == 0.0, "got %f\n", xform.eM21 ); + ok( xform.eM22 == 1.0, "got %f\n", xform.eM22 ); + ok( xform.eDx == 99.0, "got %f\n", xform.eDx ); + ok( xform.eDy == 0.0, "got %f\n", xform.eDy ); + } SetMapMode(hdc, MM_LOMETRIC); ret = GetMapMode( hdc ); @@ -278,7 +300,7 @@ static void test_dc_layout(void) rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); expect_world_transform(hdc, 1.0, 1.0); - expect_LPtoDP(hdc, -MulDiv(1000 / 10, res_x, size_cx), -MulDiv(1000 / 10, res_y, size_cy)); + expect_LPtoDP(hdc, -MulDiv(1000 / 10, res_x, size_cx) + 99, -MulDiv(1000 / 10, res_y, size_cy)); SetMapMode(hdc, MM_TEXT); ret = GetMapMode( hdc ); @@ -291,6 +313,7 @@ static void test_dc_layout(void) ok(ret == MM_TEXT, "expected MM_TEXT, got %d\n", ret); DeleteDC(hdc); + DeleteObject( bitmap ); } static void test_modify_world_transform(void)

1 0

Alexandre Julliard : gdi32/tests: Make function pointers global in the mapping test.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: d100153e5c286ad418ef53ce63860553a3296db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d100153e5c286ad418ef53ce6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 20:34:20 2010 +0200 gdi32/tests: Make function pointers global in the mapping test. --- dlls/gdi32/tests/mapping.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 7193a0f..7968c2f 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -29,6 +29,11 @@ #include "winuser.h" #include "winerror.h" +static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); +static DWORD (WINAPI *pGetLayout)(HDC hdc); +static BOOL (WINAPI *pGetTransform)(HDC, DWORD, XFORM *); +static DWORD (WINAPI *pSetVirtualResolution)(HDC, DWORD, DWORD, DWORD, DWORD); + #define rough_match(got, expected) (abs( MulDiv( (got) - (expected), 1000, (expected) )) <= 5) #define expect_LPtoDP(_hdc, _x, _y) \ @@ -221,12 +226,8 @@ static void test_dc_layout(void) { INT ret, size_cx, size_cy, res_x, res_y, dpi_x, dpi_y; SIZE size; - DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); - DWORD (WINAPI *pGetLayout)(HDC hdc); HDC hdc; - pGetLayout = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetLayout"); - pSetLayout = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "SetLayout"); if (!pGetLayout || !pSetLayout) { win_skip( "Don't have SetLayout\n" ); @@ -421,14 +422,11 @@ static void test_setvirtualresolution(void) { HDC hdc = CreateICA("DISPLAY", NULL, NULL, NULL); DWORD r; - DWORD (WINAPI *pSetVirtualResolution)(HDC, DWORD, DWORD, DWORD, DWORD); INT horz_res = GetDeviceCaps(hdc, HORZRES); INT horz_size = GetDeviceCaps(hdc, HORZSIZE); INT log_pixels_x = GetDeviceCaps(hdc, LOGPIXELSX); SIZE orig_lometric_vp, orig_lometric_wnd; - pSetVirtualResolution = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "SetVirtualResolution"); - if(!pSetVirtualResolution) { win_skip("Don't have SetVirtualResolution\n"); @@ -533,13 +531,10 @@ static inline void xform_near_match(int line, XFORM *got, XFORM *expect) static void test_gettransform(void) { HDC hdc = CreateICA("DISPLAY", NULL, NULL, NULL); - BOOL (WINAPI *pGetTransform)(HDC, DWORD, XFORM *); XFORM xform, expect; BOOL r; SIZE lometric_vp, lometric_wnd; - pGetTransform = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetTransform"); - if(!pGetTransform) { win_skip("Don't have GetTransform\n"); @@ -635,6 +630,12 @@ static void test_gettransform(void) START_TEST(mapping) { + HMODULE mod = GetModuleHandleA("gdi32.dll"); + pGetLayout = (void *)GetProcAddress( mod, "GetLayout" ); + pSetLayout = (void *)GetProcAddress( mod, "SetLayout" ); + pGetTransform = (void *)GetProcAddress( mod, "GetTransform" ); + pSetVirtualResolution = (void *)GetProcAddress( mod, "SetVirtualResolution" ); + test_modify_world_transform(); test_world_transform(); test_dc_layout();

1 0

Alexandre Julliard : gdi32: Make the top right corner the DC origin for RTL layouts.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: e4b76dfd88b8991da903a83a8b8cde319cd265db URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4b76dfd88b8991da903a83a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 15:25:54 2010 +0200 gdi32: Make the top right corner the DC origin for RTL layouts. --- dlls/gdi32/dc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index d122aae..3aa2480 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -296,6 +296,7 @@ static void construct_window_to_viewport(DC *dc, XFORM *xform) xform->eM22 = scaleY; xform->eDx = (double)dc->vportOrgX - scaleX * (double)dc->wndOrgX; xform->eDy = (double)dc->vportOrgY - scaleY * (double)dc->wndOrgY; + if (dc->layout & LAYOUT_RTL) xform->eDx += dc->vis_rect.right - dc->vis_rect.left - 1; } /*********************************************************************** @@ -550,6 +551,7 @@ BOOL restore_dc_state( HDC hdc, INT level ) if (dc->hMetaRgn) DeleteObject( dc->hMetaRgn ); dc->hMetaRgn = 0; } + DC_UpdateXforms( dc ); CLIPPING_UpdateGCRegion( dc ); SelectObject( hdc, dcs->hBitmap );

1 0

Mike Kaplinskiy : server: Fix some comments.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: a6203f8b5325ea32a92d3f30dfa89a8dfae6c198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6203f8b5325ea32a92d3f30d… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Tue Jul 27 00:16:28 2010 -0400 server: Fix some comments. Apparently windows reports only currently valid events for WSAEnumNetworkEvents. --- dlls/ws2_32/tests/sock.c | 3 --- server/sock.c | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b078b9f..5a8e0df 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3126,9 +3126,6 @@ static void test_events(int useMessages) ok(ret == 2, "Failed to send buffer %d err %d\n", ret, GetLastError()); broken_seq[0] = read_read_seq; /* win9x */ broken_seq[1] = NULL; - /* we like to erase pmask in server, so we have varying behavior here * - * it is only fixed for now because we refuse to send notifications with - * any kind of asyncs requests running */ ok_event_seq(src, hEvent, empty_seq, broken_seq, 0); dwRet = WaitForSingleObject(ov.hEvent, 100); diff --git a/server/sock.c b/server/sock.c index 44422ad..4922d64 100644 --- a/server/sock.c +++ b/server/sock.c @@ -961,7 +961,9 @@ DECL_HANDLER(enable_socket_event) FILE_WRITE_ATTRIBUTES, &sock_ops))) return; - sock->pmask &= ~req->mask; /* is this safe? */ + /* for event-based notification, windows erases stale events */ + sock->pmask &= ~req->mask; + sock->hmask &= ~req->mask; sock->state |= req->sstate; sock->state &= ~req->cstate;

1 0

Mike Kaplinskiy : server: Don't delay events, we simply shouldn' t send them in the first place.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 93db86a7e026645007e37f23725546612e4de5c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93db86a7e026645007e37f237… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Tue Jul 27 00:16:24 2010 -0400 server: Don't delay events, we simply shouldn't send them in the first place. --- server/sock.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index 36f6c7a..44422ad 100644 --- a/server/sock.c +++ b/server/sock.c @@ -260,9 +260,7 @@ static void sock_wake_up( struct sock *sock ) unsigned int events = sock->pmask & sock->mask; int i; - /* Do not signal events if there are still pending asynchronous IO requests */ - /* We need this to delay FD_CLOSE events until all pending overlapped requests are processed */ - if ( !events || async_queued( sock->read_q ) || async_queued( sock->write_q ) ) return; + if ( !events ) return; if (sock->event) {

1 0

Mike Kaplinskiy : server: Consume events triggered.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 0b251c08f2e9e2693beb9a1f1ed72286d634cb3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b251c08f2e9e2693beb9a1f1… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Tue Jul 27 00:16:18 2010 -0400 server: Consume events triggered. --- dlls/ws2_32/tests/sock.c | 10 ---------- server/sock.c | 7 +++++-- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 19d29bf..b078b9f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3205,16 +3205,6 @@ static void test_events(int useMessages) ok_event_seq(src, hEvent, empty_seq, NULL, 0); } - /* wine gets a stale notifications because of the async ops, clear them. - * remove when sending messages during pending asyncs is fixed */ - ret = send(dst, "2", 1, 0); - ok(ret == 1, "Failed to send buffer %d err %d\n", ret, GetLastError()); - ok_event_seq(src, hEvent, read_seq, NULL, 0); - - ret = recv(src, buffer, 1, 0); - ok(ret == 1, "Failed to empty buffer: %d - %d\n", ret, GetLastError()); - ok_event_seq(src, hEvent, empty_seq, NULL, 0); - /* Flood the send queue */ hThread = CreateThread(NULL, 0, drain_socket_thread, &dst, 0, &id); if (hThread == NULL) diff --git a/server/sock.c b/server/sock.c index e5681b0..36f6c7a 100644 --- a/server/sock.c +++ b/server/sock.c @@ -295,7 +295,7 @@ static inline int sock_error( struct fd *fd ) return optval; } -static void sock_dispatch_asyncs( struct sock *sock, int event, int error ) +static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) { if ( sock->flags & WSA_FLAG_OVERLAPPED ) { @@ -303,11 +303,13 @@ static void sock_dispatch_asyncs( struct sock *sock, int event, int error ) { if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock ); async_wake_up( sock->read_q, STATUS_ALERTED ); + event &= ~(POLLIN|POLLPRI); } if ( event & POLLOUT && async_waiting( sock->write_q ) ) { if (debug_level) fprintf( stderr, "activating write queue for socket %p\n", sock ); async_wake_up( sock->write_q, STATUS_ALERTED ); + event &= ~POLLOUT; } if ( event & (POLLERR|POLLHUP) ) { @@ -319,6 +321,7 @@ static void sock_dispatch_asyncs( struct sock *sock, int event, int error ) async_wake_up( sock->write_q, status ); } } + return event; } static void sock_dispatch_events( struct sock *sock, int prevstate, int event, int error ) @@ -451,7 +454,7 @@ static void sock_poll_event( struct fd *fd, int event ) event |= POLLHUP; } - sock_dispatch_asyncs( sock, event, error ); + event = sock_dispatch_asyncs( sock, event, error ); sock_dispatch_events( sock, prevstate, event, error ); /* if anyone is stupid enough to wait on the socket object itself,

1 0

Alexandre Julliard : server: Use tgkill to send signals on x86_64 too.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 10b6d6ba4d6949a3dade22d3c87a6661b6b1e0a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b6d6ba4d6949a3dade22d3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 16:06:13 2010 +0200 server: Use tgkill to send signals on x86_64 too. --- server/ptrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index cc08d32..99f9d2b 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -219,7 +219,7 @@ static inline int tkill( int tgid, int pid, int sig ) ret = syscall(238 /*SYS_tkill*/, pid, sig); return ret; # elif defined(__x86_64__) - return syscall(200 /*SYS_tkill*/, pid, sig); + return syscall(234 /*SYS_tgkill*/, tgid, pid, sig); # else errno = ENOSYS; return -1;

1 0

Mariusz Pluciński : gameux: Add interface registration routines.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: c8861296b1408e3358b48f8ba58d9b6ae3fec9f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8861296b1408e3358b48f8ba… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Fri Jul 23 01:58:07 2010 +0200 gameux: Add interface registration routines. --- dlls/gameux/Makefile.in | 5 +- dlls/gameux/gameux.spec | 4 +- dlls/gameux/regsvr.c | 523 +++++++++++++++++++++++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 4 files changed, 529 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8861296b1408e3358b48…

1 0

Mariusz Pluciński : gameux: Add IClassFactory implementation.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: de239b7ac7f1ac37615c3abac9d598e8ccf8894b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de239b7ac7f1ac37615c3abac… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Sat Jul 24 15:53:19 2010 +0200 gameux: Add IClassFactory implementation. --- dlls/gameux/Makefile.in | 1 + dlls/gameux/factory.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/gameux/gameux.spec | 2 +- 3 files changed, 158 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/Makefile.in b/dlls/gameux/Makefile.in index 7cf2600..c4c8937 100644 --- a/dlls/gameux/Makefile.in +++ b/dlls/gameux/Makefile.in @@ -7,6 +7,7 @@ MODULE = gameux.dll IMPORTS = uuid C_SRCS = \ + factory.c \ gameexplorer.c \ main.c diff --git a/dlls/gameux/factory.c b/dlls/gameux/factory.c new file mode 100644 index 0000000..da1eee0 --- /dev/null +++ b/dlls/gameux/factory.c @@ -0,0 +1,156 @@ +/* + * Gameux library IClassFactory implementation + * + * Copyright (C) 2010 Mariusz Pluciński + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "config.h" + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "ole2.h" + +#include "gameux.h" +#include "gameux_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gameux); + +typedef HRESULT (*fnCreateInstance)(IUnknown *pUnkOuter, IUnknown **ppObj); + +/*************************************************************** + * gameux ClassFactory + */ +typedef struct _gameuxcf +{ + const struct IClassFactoryVtbl *lpVtbl; + fnCreateInstance pfnCreateInstance; +} gameuxcf; + +static inline gameuxcf *impl_from_IClassFactory(IClassFactory *iface) +{ + return (gameuxcf*)((char*)iface - FIELD_OFFSET(gameuxcf, lpVtbl)); +} + +static HRESULT WINAPI gameuxcf_QueryInterface( + IClassFactory *iface, + REFIID riid, + LPVOID *ppObj) +{ + TRACE("(%p, %s, %p)\n", iface, debugstr_guid(riid), ppObj); + + *ppObj = NULL; + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *ppObj = iface; + return S_OK; + } + + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI gameuxcf_AddRef( + IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI gameuxcf_Release( + IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI gameuxcf_CreateInstance( + IClassFactory *iface, + LPUNKNOWN pUnkOuter, + REFIID riid, + LPVOID *ppObj) +{ + gameuxcf *This = impl_from_IClassFactory(iface); + HRESULT hr; + IUnknown *pUnk; + + TRACE("(%p, %p, %s, %p)\n", iface, pUnkOuter, debugstr_guid(riid), ppObj); + + *ppObj = NULL; + + if(pUnkOuter) + return CLASS_E_NOAGGREGATION; + + hr = This->pfnCreateInstance(pUnkOuter, &pUnk); + if(FAILED(hr)) + return hr; + + hr = IUnknown_QueryInterface(pUnk, riid, ppObj); + IUnknown_Release(pUnk); + return hr; +} + +static HRESULT WINAPI gameuxcf_LockServer( + IClassFactory *iface, + BOOL dolock) +{ + gameuxcf *This = impl_from_IClassFactory(iface); + TRACE("(%p, %d)\n", This, dolock); + FIXME("stub\n"); + return S_OK; +} + +static const struct IClassFactoryVtbl gameuxcf_vtbl = +{ + gameuxcf_QueryInterface, + gameuxcf_AddRef, + gameuxcf_Release, + gameuxcf_CreateInstance, + gameuxcf_LockServer +}; + +static gameuxcf gameexplorercf = { &gameuxcf_vtbl, GameExplorer_create }; + +/*************************************************************** + * gameux ClassFactory + */ +HRESULT WINAPI DllGetClassObject( + REFCLSID rclsid, + REFIID riid, + LPVOID *ppv) +{ + IClassFactory *cf = NULL; + + TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if(IsEqualCLSID(rclsid, &CLSID_GameExplorer)) + { + cf = (IClassFactory*)&gameexplorercf.lpVtbl; + } + + if(!cf) + return CLASS_E_CLASSNOTAVAILABLE; + + return IClassFactory_QueryInterface(cf, riid, ppv); +} diff --git a/dlls/gameux/gameux.spec b/dlls/gameux/gameux.spec index 1c89098..5ee88cd 100644 --- a/dlls/gameux/gameux.spec +++ b/dlls/gameux/gameux.spec @@ -1,5 +1,5 @@ @ stub GameUxShimW @ stdcall -private DllCanUnloadNow() -@ stub DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub DllRegisterServer @ stub DllUnregisterServer

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
90
Older →

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 July 2010