March 2013 - Wine-Commits - list.winehq.org

Michael Stefaniuc : dplayx/tests: Add DirectPlay COM tests.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: d09d061157fc749ad10a794ef8d6e46d3605e339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d09d061157fc749ad10a794ef… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:37:52 2013 +0100 dplayx/tests: Add DirectPlay COM tests. --- dlls/dplayx/tests/dplayx.c | 86 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 2fea137..c8ec54d 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include "wine/test.h" #include <stdio.h> #define INITGUID @@ -6364,17 +6365,98 @@ static void test_host_migration(void) } +static void test_COM(void) +{ + IDirectPlay2A *dp2A; + IDirectPlay2 *dp2; + IDirectPlay3A *dp3A; + IDirectPlay3 *dp3; + IDirectPlay4A *dp4A; + IDirectPlay4 *dp4 = (IDirectPlay4*)0xdeadbeef; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectPlay, (IUnknown*)&dp4, CLSCTX_INPROC_SERVER, &IID_IUnknown, + (void**)&dp4); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectPlay create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dp4, "dp4 = %p\n", dp4); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectPlay, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlayLobby, + (void**)&dp4); + ok(hr == E_NOINTERFACE, "DirectPlay create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Different refcount for all DirectPlay Interfaces */ + hr = CoCreateInstance(&CLSID_DirectPlay, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay4, + (void**)&dp4); + ok(hr == S_OK, "DirectPlay create failed: %08x, expected S_OK\n", hr); + refcount = IDirectPlayX_AddRef(dp4); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay2A, (void**)&dp2A); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlay2A failed: %08x\n", hr); + refcount = IDirectPlay2_AddRef(dp2A); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlay2_Release(dp2A); + + hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay2, (void**)&dp2); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlay2 failed: %08x\n", hr); + refcount = IDirectPlay2_AddRef(dp2); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlay2_Release(dp2); + + hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay3A, (void**)&dp3A); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlay3A failed: %08x\n", hr); + refcount = IDirectPlay3_AddRef(dp3A); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlay3_Release(dp3A); + + hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay3, (void**)&dp3); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlay3 failed: %08x\n", hr); + refcount = IDirectPlay3_AddRef(dp3); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlay3_Release(dp3); + + hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay4A, (void**)&dp4A); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlay4A failed: %08x\n", hr); + refcount = IDirectPlayX_AddRef(dp4A); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlayX_Release(dp4A); + + hr = IDirectPlayX_QueryInterface(dp4, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + refcount = IUnknown_Release(unk); + todo_wine ok(refcount == 1, "refcount == %u, expected 1\n", refcount); + + IUnknown_Release(unk); + IDirectPlayX_Release(dp4A); + IDirectPlay3_Release(dp3); + IDirectPlay3_Release(dp3A); + IDirectPlay2_Release(dp2); + IDirectPlay2_Release(dp2A); + IDirectPlayX_Release(dp4); + refcount = IDirectPlayX_Release(dp4); + todo_wine ok(refcount == 0, "refcount == %u, expected 0\n", refcount); +} + START_TEST(dplayx) { + CoInitialize( NULL ); + + test_COM(); + if (!winetest_interactive) { skip("Run in interactive mode to run dplayx tests.\n"); return; } - CoInitialize( NULL ); - trace("Running in interactive mode, tests will take a while\n"); test_DirectPlayCreate();

1 0

Ken Thomases : winemac: Draw surface region rects separately instead of clipping one big draw.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: 0e8b30502341ee9483d5f4cbc5878ae4a4787e1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8b30502341ee9483d5f4cbc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Mar 28 23:34:03 2013 -0500 winemac: Draw surface region rects separately instead of clipping one big draw. --- dlls/winemac.drv/cocoa_window.m | 66 ++++++++++++++++++++------------------ 1 files changed, 35 insertions(+), 31 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 48ca593..279f81f 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -186,51 +186,55 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (window.surface && window.surface_mutex && !pthread_mutex_lock(window.surface_mutex)) { + CGRect bounds; const CGRect* rects; int count; - if (!get_surface_region_rects(window.surface, &rects, &count) || count) + if (!get_surface_region_rects(window.surface, &rects, &count)) { - CGRect imageRect; - CGImageRef image; + bounds = NSRectToCGRect([self bounds]); + rects = &bounds; + count = 1; + } - imageRect = NSRectToCGRect(rect); - image = create_surface_image(window.surface, &imageRect, FALSE); + if (count) + { + CGContextRef context; + int i; - if (image) - { - CGContextRef context; + [window.shape addClip]; - if (rects && count) - { - NSBezierPath* surfaceClip = [NSBezierPath bezierPath]; - int i; - for (i = 0; i < count; i++) - [surfaceClip appendBezierPathWithRect:NSRectFromCGRect(rects[i])]; - [surfaceClip addClip]; - } + context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; + CGContextSetBlendMode(context, kCGBlendModeCopy); - [window.shape addClip]; + for (i = 0; i < count; i++) + { + CGRect imageRect; + CGImageRef image; + + imageRect = CGRectIntersection(rects[i], NSRectToCGRect(rect)); + image = create_surface_image(window.surface, &imageRect, FALSE); - if (window.colorKeyed) + if (image) { - CGImageRef maskedImage; - CGFloat components[] = { window.colorKeyRed - 0.5, window.colorKeyRed + 0.5, - window.colorKeyGreen - 0.5, window.colorKeyGreen + 0.5, - window.colorKeyBlue - 0.5, window.colorKeyBlue + 0.5 }; - maskedImage = CGImageCreateWithMaskingColors(image, components); - if (maskedImage) + if (window.colorKeyed) { - CGImageRelease(image); - image = maskedImage; + CGImageRef maskedImage; + CGFloat components[] = { window.colorKeyRed - 0.5, window.colorKeyRed + 0.5, + window.colorKeyGreen - 0.5, window.colorKeyGreen + 0.5, + window.colorKeyBlue - 0.5, window.colorKeyBlue + 0.5 }; + maskedImage = CGImageCreateWithMaskingColors(image, components); + if (maskedImage) + { + CGImageRelease(image); + image = maskedImage; + } } - } - context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; - CGContextSetBlendMode(context, kCGBlendModeCopy); - CGContextDrawImage(context, imageRect, image); + CGContextDrawImage(context, imageRect, image); - CGImageRelease(image); + CGImageRelease(image); + } } }

1 0

Michael Stefaniuc : dplayx: Remove the duplicated IDirectPlayXImpl structs.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: 82b51258eae9ab4dc1e6e2e2d5b7c61980d12037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b51258eae9ab4dc1e6e2e2d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:39:26 2013 +0100 dplayx: Remove the duplicated IDirectPlayXImpl structs. --- dlls/dplayx/dplay.c | 29 +++++------------------------ dlls/dplayx/dplay_global.h | 44 +++++++++++++------------------------------- 2 files changed, 18 insertions(+), 55 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 0ddde38..c7ab380 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -396,46 +396,26 @@ static BOOL DP_DestroyDirectPlay2( LPVOID lpDP ) HRESULT DP_CreateInterface ( REFIID riid, LPVOID* ppvObj ) { - TRACE( " for %s\n", debugstr_guid( riid ) ); + IDirectPlayImpl *This; - *ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof( IDirectPlay2Impl ) ); + TRACE( " for %s\n", debugstr_guid( riid ) ); - if( *ppvObj == NULL ) - { + This = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( IDirectPlayImpl ) ); + if( !This ) return DPERR_OUTOFMEMORY; - } if( IsEqualGUID( &IID_IDirectPlay2, riid ) ) - { - IDirectPlay2Impl *This = *ppvObj; This->lpVtbl = &directPlay2WVT; - } else if( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlay2A, riid ) ) - { - IDirectPlay2AImpl *This = *ppvObj; This->lpVtbl = &directPlay2AVT; - } else if( IsEqualGUID( &IID_IDirectPlay3, riid ) ) - { - IDirectPlay3Impl *This = *ppvObj; This->lpVtbl = &directPlay3WVT; - } else if( IsEqualGUID( &IID_IDirectPlay3A, riid ) ) - { - IDirectPlay3AImpl *This = *ppvObj; This->lpVtbl = &directPlay3AVT; - } else if( IsEqualGUID( &IID_IDirectPlay4, riid ) ) - { - IDirectPlay4Impl *This = *ppvObj; This->lpVtbl = &directPlay4WVT; - } else if( IsEqualGUID( &IID_IDirectPlay4A, riid ) ) - { - IDirectPlay4AImpl *This = *ppvObj; This->lpVtbl = &directPlay4AVT; - } else { /* Unsupported interface */ @@ -446,6 +426,7 @@ HRESULT DP_CreateInterface } /* Initialize it */ + *ppvObj = This; if ( DP_CreateIUnknown( *ppvObj ) && DP_CreateDirectPlay2( *ppvObj ) ) { IDirectPlayX_AddRef( (LPDIRECTPLAY2A)*ppvObj ); diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 7578e04..94b8f9a 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -31,16 +31,6 @@ extern HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, LPCVOID lpAddress, DWORD dwAddressSize, LPVOID lpContext ) DECLSPEC_HIDDEN; -/***************************************************************************** - * Predeclare the interface implementation structures - */ -typedef struct IDirectPlay2Impl IDirectPlay2AImpl; -typedef struct IDirectPlay2Impl IDirectPlay2Impl; -typedef struct IDirectPlay3Impl IDirectPlay3AImpl; -typedef struct IDirectPlay3Impl IDirectPlay3Impl; -typedef struct IDirectPlay4Impl IDirectPlay4AImpl; -typedef struct IDirectPlay4Impl IDirectPlay4Impl; - typedef struct tagDirectPlayIUnknownData { LONG ulObjRef; @@ -196,28 +186,20 @@ typedef struct tagDirectPlay2Data DPQ_HEAD( tagDP_MSG_REPLY_STRUCT_LIST ) repliesExpected; } DirectPlay2Data; -#define DP_IMPL_FIELDS \ - LONG ulInterfaceRef; \ - DirectPlayIUnknownData* unk; \ - DirectPlay2Data* dp2; - -struct IDirectPlay2Impl -{ - const IDirectPlay2Vtbl *lpVtbl; - DP_IMPL_FIELDS -}; - -struct IDirectPlay3Impl +typedef struct IDirectPlayImpl { - const IDirectPlay3Vtbl *lpVtbl; - DP_IMPL_FIELDS -}; - -struct IDirectPlay4Impl -{ - const IDirectPlay4Vtbl *lpVtbl; - DP_IMPL_FIELDS -}; + const void *lpVtbl; + LONG ulInterfaceRef; + DirectPlayIUnknownData *unk; + DirectPlay2Data *dp2; +} IDirectPlayImpl; + +typedef struct IDirectPlayImpl IDirectPlay2Impl; +typedef struct IDirectPlayImpl IDirectPlay2AImpl; +typedef struct IDirectPlayImpl IDirectPlay3Impl; +typedef struct IDirectPlayImpl IDirectPlay3AImpl; +typedef struct IDirectPlayImpl IDirectPlay4Impl; +typedef struct IDirectPlayImpl IDirectPlay4AImpl; HRESULT DP_HandleMessage( IDirectPlay2Impl* This, LPCVOID lpMessageBody, DWORD dwMessageBodySize, LPCVOID lpMessageHeader,

1 0

Michael Stefaniuc : dplayx/tests: Get rid of the LPDIRECTPLAY type usage.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: 7eaafd0141ad3309e6601bc4905835345b2db2ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eaafd0141ad3309e6601bc49… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:36:52 2013 +0100 dplayx/tests: Get rid of the LPDIRECTPLAY type usage. --- dlls/dplayx/tests/dplayx.c | 70 ++++++++++++++++++++----------------------- 1 files changed, 33 insertions(+), 37 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index e507c50..2fea137 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -63,7 +63,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); typedef struct tagCallbackData { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; UINT dwCounter1, dwCounter2; DWORD dwFlags; char szTrace1[1024], szTrace2[1024]; @@ -581,10 +581,8 @@ static char dpid2char(DPID* dpid, DWORD dpidSize, DPID idPlayer) return '?'; } -static void check_messages( LPDIRECTPLAY4 pDP, - DPID *dpid, - DWORD dpidSize, - lpCallbackData callbackData ) +static void check_messages( IDirectPlay4 *pDP, DPID *dpid, DWORD dpidSize, + lpCallbackData callbackData ) { /* Retrieves all messages from the queue of pDP, performing tests * to check if we are receiving what we expect. @@ -647,9 +645,7 @@ static void check_messages( LPDIRECTPLAY4 pDP, HeapFree( GetProcessHeap(), 0, lpData ); } -static void init_TCPIP_provider( LPDIRECTPLAY4 pDP, - LPCSTR strIPAddressString, - WORD port ) +static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, WORD port ) { DPCOMPOUNDADDRESSELEMENT addressElements[3]; @@ -732,7 +728,7 @@ static BOOL CALLBACK EnumSessions_cb_join( LPCDPSESSIONDESC2 lpThisSD, static void test_DirectPlayCreate(void) { - LPDIRECTPLAY pDP; + IDirectPlay *pDP; HRESULT hr; /* TODO: Check how it behaves with pUnk!=NULL */ @@ -833,7 +829,7 @@ static BOOL CALLBACK EnumConnections_cb( LPCGUID lpguidSP, static void test_EnumConnections(void) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; CallbackData callbackData; HRESULT hr; @@ -936,7 +932,7 @@ static BOOL CALLBACK EnumConnections_cb2( LPCGUID lpguidSP, static void test_InitializeConnection(void) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; HRESULT hr; hr = CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, @@ -955,7 +951,7 @@ static void test_InitializeConnection(void) static void test_GetCaps(void) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; DPCAPS dpcaps; DWORD dwFlags; HRESULT hr; @@ -1068,7 +1064,7 @@ static BOOL CALLBACK EnumSessions_cb2( LPCDPSESSIONDESC2 lpThisSD, static void test_Open(void) { - LPDIRECTPLAY4 pDP, pDP_server; + IDirectPlay4 *pDP, *pDP_server; DPSESSIONDESC2 dpsd, dpsd_server; HRESULT hr; @@ -1228,10 +1224,10 @@ static BOOL CALLBACK EnumSessions_cb( LPCDPSESSIONDESC2 lpThisSD, return TRUE; } -static LPDIRECTPLAY4 create_session(DPSESSIONDESC2 *lpdpsd) +static IDirectPlay4 *create_session(DPSESSIONDESC2 *lpdpsd) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; DPNAME name; DPID dpid; HRESULT hr; @@ -1266,7 +1262,7 @@ static void test_EnumSessions(void) #define N_SESSIONS 6 - LPDIRECTPLAY4 pDP, pDPserver[N_SESSIONS]; + IDirectPlay4 *pDP, *pDPserver[N_SESSIONS]; DPSESSIONDESC2 dpsd, dpsd_server[N_SESSIONS]; CallbackData callbackData; HRESULT hr; @@ -1636,7 +1632,7 @@ static void test_EnumSessions(void) static void test_SessionDesc(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; LPDPSESSIONDESC2 lpData[2]; LPVOID lpDataMsg; @@ -1814,7 +1810,7 @@ static void test_SessionDesc(void) static void test_CreatePlayer(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPNAME name; DPID dpid; @@ -1987,7 +1983,7 @@ static void test_CreatePlayer(void) static void test_GetPlayerCaps(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[2]; HRESULT hr; @@ -2149,7 +2145,7 @@ static void test_GetPlayerCaps(void) static void test_PlayerData(void) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; DPSESSIONDESC2 dpsd; DPID dpid; HRESULT hr; @@ -2415,7 +2411,7 @@ static void test_PlayerData(void) static void test_PlayerName(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[2]; HRESULT hr; @@ -2695,7 +2691,7 @@ static BOOL CALLBACK EnumSessions_cb_join_secure( LPCDPSESSIONDESC2 lpThisSD, static void test_GetPlayerAccount(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[2]; HRESULT hr; @@ -2879,7 +2875,7 @@ static BOOL CALLBACK EnumAddress_cb( REFGUID guidDataType, static void test_GetPlayerAddress(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; LPDIRECTPLAYLOBBY3 pDPL; DPSESSIONDESC2 dpsd; DPID dpid[2]; @@ -3017,7 +3013,7 @@ static void test_GetPlayerAddress(void) static void test_GetPlayerFlags(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[4]; HRESULT hr; @@ -3125,7 +3121,7 @@ static void test_GetPlayerFlags(void) static void test_CreateGroup(void) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; DPSESSIONDESC2 dpsd; DPID idFrom, idTo, dpid, idGroup, idGroupParent; DPNAME groupName; @@ -3434,7 +3430,7 @@ static void test_CreateGroup(void) static void test_GroupOwner(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[2], idGroup, idOwner; HRESULT hr; @@ -3602,7 +3598,7 @@ static BOOL CALLBACK EnumSessions_cb_EnumPlayers( LPCDPSESSIONDESC2 lpThisSD, static void test_EnumPlayers(void) { - LPDIRECTPLAY4 pDP[3]; + IDirectPlay4 *pDP[3]; DPSESSIONDESC2 dpsd[3]; DPID dpid[5+2]; /* 5 players, 2 groups */ CallbackData callbackData; @@ -3925,7 +3921,7 @@ static BOOL CALLBACK EnumSessions_cb_EnumGroups( LPCDPSESSIONDESC2 lpThisSD, static void test_EnumGroups(void) { - LPDIRECTPLAY4 pDP[3]; + IDirectPlay4 *pDP[3]; DPSESSIONDESC2 dpsd[3]; DPID dpid[5]; CallbackData callbackData; @@ -4152,7 +4148,7 @@ static void test_EnumGroups(void) static void test_EnumGroupsInGroup(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd[2]; DPID dpid[6]; CallbackData callbackData; @@ -4387,7 +4383,7 @@ static void test_EnumGroupsInGroup(void) static void test_groups_p2p(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID idPlayer[6], idGroup[3]; HRESULT hr; @@ -4622,7 +4618,7 @@ static void test_groups_p2p(void) static void test_groups_cs(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID idPlayer[6], idGroup[3]; CallbackData callbackData; @@ -4859,7 +4855,7 @@ static void test_groups_cs(void) static void test_Send(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[4], idFrom, idTo; CallbackData callbackData; @@ -5194,7 +5190,7 @@ static void test_Send(void) static void test_Receive(void) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; DPSESSIONDESC2 dpsd; DPID dpid[4], idFrom, idTo; HRESULT hr; @@ -5479,7 +5475,7 @@ static void test_Receive(void) static void test_GetMessageCount(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[4]; HRESULT hr; @@ -5702,7 +5698,7 @@ static void test_GetMessageCount(void) static void test_GetMessageQueue(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[4]; CallbackData callbackData; @@ -6011,7 +6007,7 @@ static void test_GetMessageQueue(void) static void test_remote_data_replication(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[2], idFrom, idTo; CallbackData callbackData; @@ -6239,7 +6235,7 @@ static void test_remote_data_replication(void) static void test_host_migration(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[2], idFrom, idTo; HRESULT hr;

1 0

Michael Stefaniuc : dplayx/tests: Remove superfluous void pointer casts.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: c1907b5ff9c61aa161c130b5190a2b56a40b9220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1907b5ff9c61aa161c130b51… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:35:29 2013 +0100 dplayx/tests: Remove superfluous void pointer casts. --- dlls/dplayx/tests/dplayx.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index a1da9e4..e507c50 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -706,7 +706,7 @@ static BOOL CALLBACK EnumSessions_cb_join( LPCDPSESSIONDESC2 lpThisSD, DWORD dwFlags, LPVOID lpContext ) { - LPDIRECTPLAY4 pDP = (LPDIRECTPLAY4) lpContext; + IDirectPlay4 *pDP = lpContext; DPSESSIONDESC2 dpsd; HRESULT hr; @@ -766,7 +766,7 @@ static BOOL CALLBACK EnumAddress_cb2( REFGUID guidDataType, LPCVOID lpData, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; static REFGUID types[] = { &DPAID_TotalSize, &DPAID_ServiceProvider, @@ -801,7 +801,7 @@ static BOOL CALLBACK EnumConnections_cb( LPCGUID lpguidSP, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; LPDIRECTPLAYLOBBY pDPL; HRESULT hr; @@ -910,7 +910,7 @@ static BOOL CALLBACK EnumConnections_cb2( LPCGUID lpguidSP, DWORD dwFlags, LPVOID lpContext ) { - LPDIRECTPLAY4 pDP = (LPDIRECTPLAY4) lpContext; + IDirectPlay4 *pDP = lpContext; HRESULT hr; /* Incorrect parameters */ @@ -1028,7 +1028,7 @@ static BOOL CALLBACK EnumSessions_cb2( LPCDPSESSIONDESC2 lpThisSD, DWORD dwFlags, LPVOID lpContext ) { - LPDIRECTPLAY4 pDP = (LPDIRECTPLAY4) lpContext; + IDirectPlay4 *pDP = lpContext; DPSESSIONDESC2 dpsd; HRESULT hr; @@ -1201,7 +1201,7 @@ static BOOL CALLBACK EnumSessions_cb( LPCDPSESSIONDESC2 lpThisSD, DWORD dwFlags, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; callbackData->dwCounter1++; if ( dwFlags & DPESC_TIMEDOUT ) @@ -2664,7 +2664,7 @@ static BOOL CALLBACK EnumSessions_cb_join_secure( LPCDPSESSIONDESC2 lpThisSD, DWORD dwFlags, LPVOID lpContext ) { - LPDIRECTPLAY4 pDP = (LPDIRECTPLAY4) lpContext; + IDirectPlay4 *pDP = lpContext; DPSESSIONDESC2 dpsd; DPCREDENTIALS dpCredentials; HRESULT hr; @@ -2841,7 +2841,7 @@ static BOOL CALLBACK EnumAddress_cb( REFGUID guidDataType, LPCVOID lpData, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; static REFGUID types[] = { &DPAID_TotalSize, &DPAID_ServiceProvider, &DPAID_INet, @@ -3515,7 +3515,7 @@ static BOOL CALLBACK EnumPlayers_cb( DPID dpId, DWORD dwFlags, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; char playerIndex = dpid2char( callbackData->dpid, callbackData->dpidSize, dpId ); @@ -3551,7 +3551,7 @@ static BOOL CALLBACK EnumSessions_cb_EnumPlayers( LPCDPSESSIONDESC2 lpThisSD, DWORD dwFlags, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; HRESULT hr; if (dwFlags & DPESC_TIMEDOUT) @@ -3846,7 +3846,7 @@ static BOOL CALLBACK EnumGroups_cb( DPID dpId, DWORD dwFlags, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; char playerIndex = dpid2char( callbackData->dpid, callbackData->dpidSize, dpId ); @@ -3874,7 +3874,7 @@ static BOOL CALLBACK EnumSessions_cb_EnumGroups( LPCDPSESSIONDESC2 lpThisSD, DWORD dwFlags, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; HRESULT hr; if (dwFlags & DPESC_TIMEDOUT)

1 0

Michael Stefaniuc : dplayx: Get rid of LPCLASSFACTORY and use a better name for the methods.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: fa4950c38a5670dc40356edf2d5b0784481c4bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4950c38a5670dc40356edf2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:32:57 2013 +0100 dplayx: Get rid of LPCLASSFACTORY and use a better name for the methods. --- dlls/dplayx/dpclassfactory.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index c0842b0..a933e90 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -52,8 +52,9 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); } -static HRESULT WINAPI -DP_and_DPL_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { +static HRESULT WINAPI IClassFactoryImpl_QueryInterface(IClassFactory *iface, REFIID riid, + void **ppobj) +{ IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj); @@ -61,21 +62,22 @@ DP_and_DPL_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { return E_NOINTERFACE; } -static ULONG WINAPI -DP_and_DPL_AddRef(LPCLASSFACTORY iface) { +static ULONG WINAPI IClassFactoryImpl_AddRef(IClassFactory *iface) +{ IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI DP_and_DPL_Release(LPCLASSFACTORY iface) { +static ULONG WINAPI IClassFactoryImpl_Release(IClassFactory *iface) +{ IClassFactoryImpl *This = impl_from_IClassFactory(iface); /* static class (reference starts @ 1), won't ever be freed */ return InterlockedDecrement(&This->ref); } -static HRESULT WINAPI DP_and_DPL_CreateInstance( - LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj -) { +static HRESULT WINAPI IClassFactoryImpl_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) +{ IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); @@ -92,18 +94,19 @@ static HRESULT WINAPI DP_and_DPL_CreateInstance( return E_NOINTERFACE; } -static HRESULT WINAPI DP_and_DPL_LockServer(LPCLASSFACTORY iface,BOOL dolock) { +static HRESULT WINAPI IClassFactoryImpl_LockServer(IClassFactory *iface, BOOL dolock) +{ IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%d),stub!\n",This,dolock); return S_OK; } static const IClassFactoryVtbl DP_and_DPL_Vtbl = { - DP_and_DPL_QueryInterface, - DP_and_DPL_AddRef, - DP_and_DPL_Release, - DP_and_DPL_CreateInstance, - DP_and_DPL_LockServer + IClassFactoryImpl_QueryInterface, + IClassFactoryImpl_AddRef, + IClassFactoryImpl_Release, + IClassFactoryImpl_CreateInstance, + IClassFactoryImpl_LockServer }; static IClassFactoryImpl DP_and_DPL_CF = {{&DP_and_DPL_Vtbl}, 1 };

1 0

C.W. Betts : winemac: Implement getting and setting screen saver state on OS X.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: 95daa45dbcbca59a4eedc9d34966ebc309b6c330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95daa45dbcbca59a4eedc9d34… Author: C.W. Betts <computers57(a)hotmail.com> Date: Mon Jan 28 12:32:21 2013 -0700 winemac: Implement getting and setting screen saver state on OS X. --- dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/macdrv_main.c | 72 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 3 files changed, 74 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 6bbac42..3e196e7 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -1,7 +1,7 @@ MODULE = winemac.drv IMPORTS = uuid user32 gdi32 advapi32 DELAYIMPORTS = ole32 shell32 -EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL +EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit C_SRCS = \ clipboard.c \ diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index a801109..353b4ca 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -22,12 +22,20 @@ #include "config.h" #include <Security/AuthSession.h> +#include <IOKit/pwr_mgt/IOPMLib.h> #include "macdrv.h" +#include "winuser.h" #include "wine/server.h" WINE_DEFAULT_DEBUG_CHANNEL(macdrv); +#ifndef kIOPMAssertionTypePreventUserIdleDisplaySleep +#define kIOPMAssertionTypePreventUserIdleDisplaySleep CFSTR("PreventUserIdleDisplaySleep") +#endif +#ifndef kCFCoreFoundationVersionNumber10_7 +#define kCFCoreFoundationVersionNumber10_7 635.00 +#endif DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; @@ -206,3 +214,67 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) } return ret; } + +/*********************************************************************** + * SystemParametersInfo (MACDRV.@) + */ +BOOL CDECL macdrv_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, UINT flags ) +{ + switch (action) + { + case SPI_GETSCREENSAVEACTIVE: + if (ptr_param) + { + CFDictionaryRef assertionStates; + IOReturn status = IOPMCopyAssertionsStatus(&assertionStates); + if (status == kIOReturnSuccess) + { + CFNumberRef count = CFDictionaryGetValue(assertionStates, kIOPMAssertionTypeNoDisplaySleep); + CFNumberRef count2 = CFDictionaryGetValue(assertionStates, kIOPMAssertionTypePreventUserIdleDisplaySleep); + long longCount = 0, longCount2 = 0; + + if (count) + CFNumberGetValue(count, kCFNumberLongType, &longCount); + if (count2) + CFNumberGetValue(count2, kCFNumberLongType, &longCount2); + + *(BOOL *)ptr_param = !longCount && !longCount2; + CFRelease(assertionStates); + } + else + { + WARN("Could not determine screen saver state, error code %d\n", status); + *(BOOL *)ptr_param = TRUE; + } + return TRUE; + } + break; + + case SPI_SETSCREENSAVEACTIVE: + { + static IOPMAssertionID powerAssertion = kIOPMNullAssertionID; + if (int_param) + { + if (powerAssertion != kIOPMNullAssertionID) + { + IOPMAssertionRelease(powerAssertion); + powerAssertion = kIOPMNullAssertionID; + } + } + else if (powerAssertion == kIOPMNullAssertionID) + { + CFStringRef assertName; + /*Are we running Lion or later?*/ + if (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber10_7) + assertName = kIOPMAssertionTypePreventUserIdleDisplaySleep; + else + assertName = kIOPMAssertionTypeNoDisplaySleep; + IOPMAssertionCreateWithName( assertName, kIOPMAssertionLevelOn, + CFSTR("Wine Process requesting no screen saver"), + &powerAssertion); + } + } + break; + } + return FALSE; +} diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 9eb416a..460d0ed 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -46,6 +46,7 @@ @ cdecl WindowMessage(long long long long) macdrv_WindowMessage @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) macdrv_WindowPosChanged @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) macdrv_WindowPosChanging +@ cdecl SystemParametersInfo(long long ptr long) macdrv_SystemParametersInfo # System tray @ cdecl wine_notify_icon(long ptr)

1 0

Ken Thomases : winemac: Invalidate window shadow on every draw for transparent windows.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: f7406e74ae9f15c476e5735ec1539daf8abf2ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7406e74ae9f15c476e5735ec… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Mar 28 23:33:59 2013 -0500 winemac: Invalidate window shadow on every draw for transparent windows. --- dlls/winemac.drv/cocoa_window.m | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a2087da..48ca593 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -231,18 +231,20 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) CGContextDrawImage(context, imageRect, image); CGImageRelease(image); - - if (window.shapeChangedSinceLastDraw || window.colorKeyed || - window.usePerPixelAlpha) - { - window.shapeChangedSinceLastDraw = FALSE; - [window invalidateShadow]; - } } } pthread_mutex_unlock(window.surface_mutex); } + + // If the window may be transparent, then we have to invalidate the + // shadow every time we draw. Also, if this is the first time we've + // drawn since changing from transparent to opaque. + if (![window isOpaque] || window.shapeChangedSinceLastDraw) + { + window.shapeChangedSinceLastDraw = FALSE; + [window invalidateShadow]; + } } /* By default, NSView will swallow right-clicks in an attempt to support contextual

1 0

Ken Thomases : winemac: Track drawn surface region to reduce black flicker for new or resized windows .
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: a767ee99fa59a15980847bc9af980a860919f114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a767ee99fa59a15980847bc9a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Mar 28 23:34:06 2013 -0500 winemac: Track drawn surface region to reduce black flicker for new or resized windows. --- dlls/winemac.drv/cocoa_window.m | 10 +---- dlls/winemac.drv/macdrv.h | 3 +- dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/surface.c | 84 +++++++++++++++++++++++++++++++------- dlls/winemac.drv/window.c | 4 +- 5 files changed, 74 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a767ee99fa59a15980847…

1 0

Aric Stewart : imm32/tests: Show behavior with VK_PROCESSKEY in relation to PeekMessage.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 83e233c97da8d3338abe5686bb69559b8d2c78db URL: http://source.winehq.org/git/wine.git/?a=commit;h=83e233c97da8d3338abe5686b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 28 12:34:28 2013 -0500 imm32/tests: Show behavior with VK_PROCESSKEY in relation to PeekMessage. --- dlls/imm32/tests/imm32.c | 137 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 136 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 5aff7f7..8e6dab8 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -29,6 +29,7 @@ static BOOL (WINAPI *pImmAssociateContextEx)(HWND,HIMC,DWORD); static BOOL (WINAPI *pImmIsUIMessageA)(HWND,UINT,WPARAM,LPARAM); +static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); /* * msgspy - record and analyse message traces sent to a certain window @@ -46,6 +47,19 @@ static struct _msg_spy { unsigned int i_msg; } msg_spy; +typedef struct +{ + DWORD type; + union + { + MOUSEINPUT mi; + KEYBDINPUT ki; + HARDWAREINPUT hi; + } u; +} TEST_INPUT; + +static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); + static LRESULT CALLBACK get_msg_filter(int nCode, WPARAM wParam, LPARAM lParam) { if (HC_ACTION == nCode) { @@ -169,11 +183,13 @@ static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) static BOOL init(void) { WNDCLASSEX wc; HIMC imc; - HMODULE hmod; + HMODULE hmod,huser; hmod = GetModuleHandleA("imm32.dll"); + huser = GetModuleHandleA("user32"); pImmAssociateContextEx = (void*)GetProcAddress(hmod, "ImmAssociateContextEx"); pImmIsUIMessageA = (void*)GetProcAddress(hmod, "ImmIsUIMessageA"); + pSendInput = (void*)GetProcAddress(huser, "SendInput"); wc.cbSize = sizeof(WNDCLASSEX); wc.style = 0; @@ -701,6 +717,122 @@ static void test_ImmMessages(void) DestroyWindow(hwnd); } +static LRESULT CALLBACK processkey_wnd_proc( HWND hWnd, UINT msg, WPARAM wParam, + LPARAM lParam ) +{ + return DefWindowProcW(hWnd, msg, wParam, lParam); +} + +static void test_ime_processkey(void) +{ + WCHAR classNameW[] = {'P','r','o','c','e','s','s', 'K','e','y','T','e','s','t','C','l','a','s','s',0}; + WCHAR windowNameW[] = {'P','r','o','c','e','s','s', 'K','e','y',0}; + + MSG msg; + WNDCLASSW wclass; + HANDLE hInstance = GetModuleHandleW(NULL); + TEST_INPUT inputs[2]; + HIMC imc; + INT rc; + HWND hWndTest; + + wclass.lpszClassName = classNameW; + wclass.style = CS_HREDRAW | CS_VREDRAW; + wclass.lpfnWndProc = processkey_wnd_proc; + wclass.hInstance = hInstance; + wclass.hIcon = LoadIcon(0, IDI_APPLICATION); + wclass.hCursor = LoadCursor( NULL, IDC_ARROW); + wclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wclass.lpszMenuName = 0; + wclass.cbClsExtra = 0; + wclass.cbWndExtra = 0; + if(!RegisterClassW(&wclass)){ + win_skip("Failed to register window.\n"); + return; + } + + /* create the test window that will receive the keystrokes */ + hWndTest = CreateWindowW(wclass.lpszClassName, windowNameW, + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100, + NULL, NULL, hInstance, NULL); + + ShowWindow(hWndTest, SW_SHOW); + SetWindowPos(hWndTest, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + SetForegroundWindow(hWndTest); + UpdateWindow(hWndTest); + + imc = ImmGetContext(hWndTest); + if (!imc) + { + win_skip("IME not supported\n"); + DestroyWindow(hWndTest); + return; + } + + rc = ImmSetOpenStatus(imc, TRUE); + if (rc != TRUE) + { + win_skip("Unable to open IME\n"); + ImmReleaseContext(hWndTest, imc); + DestroyWindow(hWndTest); + return; + } + + /* flush pending messages */ + while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageW(&msg); + + SetFocus(hWndTest); + + /* init input data that never changes */ + inputs[1].type = inputs[0].type = INPUT_KEYBOARD; + inputs[1].u.ki.dwExtraInfo = inputs[0].u.ki.dwExtraInfo = 0; + inputs[1].u.ki.time = inputs[0].u.ki.time = 0; + + /* Pressing a key */ + inputs[0].u.ki.wVk = 0x41; + inputs[0].u.ki.wScan = 0x1e; + inputs[0].u.ki.dwFlags = 0x0; + + pSendInput(1, (INPUT*)inputs, sizeof(INPUT)); + + while(PeekMessageW(&msg, hWndTest, 0, 0, PM_NOREMOVE)) { + if(msg.message != WM_KEYDOWN) + PeekMessageW(&msg, hWndTest, 0, 0, PM_REMOVE); + else + { + ok(msg.wParam != VK_PROCESSKEY,"Incorrect ProcessKey Found\n"); + PeekMessageW(&msg, hWndTest, 0, 0, PM_REMOVE); + if(msg.wParam == VK_PROCESSKEY) + trace("ProcessKey was correctly found\n"); + } + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + inputs[0].u.ki.wVk = 0x41; + inputs[0].u.ki.wScan = 0x1e; + inputs[0].u.ki.dwFlags = KEYEVENTF_KEYUP; + + pSendInput(1, (INPUT*)inputs, sizeof(INPUT)); + + while(PeekMessageW(&msg, hWndTest, 0, 0, PM_NOREMOVE)) { + if(msg.message != WM_KEYUP) + PeekMessageW(&msg, hWndTest, 0, 0, PM_REMOVE); + else + { + ok(msg.wParam != VK_PROCESSKEY,"Incorrect ProcessKey Found\n"); + PeekMessageW(&msg, hWndTest, 0, 0, PM_REMOVE); + ok(msg.wParam != VK_PROCESSKEY,"ProcessKey should still not be Found\n"); + } + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + ImmReleaseContext(hWndTest, imc); + ImmSetOpenStatus(imc, FALSE); + DestroyWindow(hWndTest); +} + START_TEST(imm32) { if (init()) { @@ -719,6 +851,9 @@ START_TEST(imm32) { msg_spy_init(NULL); test_ImmMessages(); msg_spy_cleanup(); + if (pSendInput) + test_ime_processkey(); + else win_skip("SendInput is not available\n"); } cleanup(); }

1 0