wine-commits February 2014

wine-commits@winehq.org

2 participants
503 discussions

Alistair Leslie-Hughes : dpnet: Store information when Initialize is called.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: 658a5f450bcdb3f564bdc0684a461033602e0f8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=658a5f450bcdb3f564bdc0684… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 20 09:59:41 2014 +1100 dpnet: Store information when Initialize is called. --- dlls/dpnet/peer.c | 16 ++++++++++++++++ dlls/dpnet/tests/peer.c | 3 +++ 2 files changed, 19 insertions(+) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 1b287dd..7b962a4 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -43,6 +43,10 @@ typedef struct IDirectPlay8PeerImpl { IDirectPlay8Peer IDirectPlay8Peer_iface; LONG ref; + + PFNDPNMESSAGEHANDLER msghandler; + DWORD flags; + void *usercontext; } IDirectPlay8PeerImpl; static inline IDirectPlay8PeerImpl *impl_from_IDirectPlay8Peer(IDirectPlay8Peer *iface) @@ -96,8 +100,17 @@ static ULONG WINAPI IDirectPlay8PeerImpl_Release(IDirectPlay8Peer *iface) static HRESULT WINAPI IDirectPlay8PeerImpl_Initialize(IDirectPlay8Peer *iface, void * const pvUserContext, const PFNDPNMESSAGEHANDLER pfn, const DWORD dwFlags) { + IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); + TRACE("(%p)->(%p,%p,%x): stub\n", iface, pvUserContext, pfn, dwFlags); + if(!pfn) + return DPNERR_INVALIDPARAM; + + This->usercontext = pvUserContext; + This->msghandler = pfn; + This->flags = dwFlags; + return DPN_OK; } @@ -502,6 +515,9 @@ HRESULT DPNET_CreateDirectPlay8Peer(IClassFactory *iface, IUnknown *pUnkOuter, R Client->IDirectPlay8Peer_iface.lpVtbl = &DirectPlay8Peer_Vtbl; Client->ref = 1; + Client->usercontext = NULL; + Client->msghandler = NULL; + Client->flags = 0; ret = IDirectPlay8Peer_QueryInterface(&Client->IDirectPlay8Peer_iface, riid, ppobj); IDirectPlay8Peer_Release(&Client->IDirectPlay8Peer_iface); diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index a9ab01d..8ae0afe 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -51,6 +51,9 @@ static void test_init_dp(void) hr = CoCreateInstance(&CLSID_DirectPlay8Peer, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Peer, (void **)&peer); ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + hr = IDirectPlay8Peer_Initialize(peer, NULL, NULL, 0); + ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); + hr = IDirectPlay8Peer_Initialize(peer, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Peer_Initialize failed with %x\n", hr); }

1 0

Alistair Leslie-Hughes : dpnet: Cleanup IDirectPlay8Client.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: 9b6832942931163472f5e1c6518c9577a945ca1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b6832942931163472f5e1c65… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 17 14:38:34 2014 +1100 dpnet: Cleanup IDirectPlay8Client. --- dlls/dpnet/client.c | 50 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 637dcb8..9668a68 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -61,24 +61,24 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_QueryInterface(IDirectPlay8Client * static ULONG WINAPI IDirectPlay8ClientImpl_AddRef(IDirectPlay8Client *iface) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p) ref=%u\n", This, ref); - return refCount; + return ref; } static ULONG WINAPI IDirectPlay8ClientImpl_Release(IDirectPlay8Client *iface) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p) ref=%u\n", This, ref); - if (!refCount) { + if (!ref) { HeapFree(GetProcessHeap(), 0, This); } - return refCount; + return ref; } /* IDirectPlay8Client Interface follow: */ @@ -273,17 +273,27 @@ static const IDirectPlay8ClientVtbl DirectPlay8Client_Vtbl = IDirectPlay8ClientImpl_RegisterLobby }; -HRESULT DPNET_CreateDirectPlay8Client(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) { - IDirectPlay8ClientImpl* client; - - TRACE("(%p, %s, %p)\n", punkOuter, debugstr_guid(riid), ppobj); - - client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8ClientImpl)); - if (NULL == client) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - client->IDirectPlay8Client_iface.lpVtbl = &DirectPlay8Client_Vtbl; - client->ref = 0; /* will be inited with QueryInterface */ - return IDirectPlay8ClientImpl_QueryInterface(&client->IDirectPlay8Client_iface, riid, ppobj); +HRESULT DPNET_CreateDirectPlay8Client(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) +{ + IDirectPlay8ClientImpl* client; + HRESULT hr; + + TRACE("(%p, %s, %p)\n", pUnkOuter, debugstr_guid(riid), ppv); + + *ppv = NULL; + + if(pUnkOuter) + return CLASS_E_NOAGGREGATION; + + client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8ClientImpl)); + if (!client) + return E_OUTOFMEMORY; + + client->IDirectPlay8Client_iface.lpVtbl = &DirectPlay8Client_Vtbl; + client->ref = 1; + + hr = IDirectPlay8ClientImpl_QueryInterface(&client->IDirectPlay8Client_iface, riid, ppv); + IDirectPlay8ClientImpl_Release(&client->IDirectPlay8Client_iface); + + return hr; }

1 0

Michael Stefaniuc : winmm/tests: Avoid spurious test failures on Windows.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: ff7ebba27f8aea62f09cabd8a8bf285baec6a938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff7ebba27f8aea62f09cabd8a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 4 13:30:57 2014 +0100 winmm/tests: Avoid spurious test failures on Windows. --- dlls/winmm/tests/mci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 1ce0260..6a68b41 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -986,14 +986,14 @@ static void test_asyncWAVE(HWND hwnd) /* Check that the 2s sound plays at a normal pace, giving a wide margin to * account for timing granularity and small delays. */ - todo_wine ok(400 <= p2 && p2 <= 600, "%ums is not in the expected 400-600ms range\n", p2); + todo_wine ok(350 <= p2 && p2 <= 600, "%ums is not in the expected 350-600ms range\n", p2); /* Wine's asynchronous thread needs some time to start up. Furthermore, it * uses 3 buffers per second, so that the positions reported will be 333ms, * 667ms etc. at best, which is why it fails the above test. So add a * second test specifically to prevent Wine from getting even worse. * FIXME: To be removed when Wine is fixed and passes the above test. */ - ok(400 <= p2 && p2 <= 1000, "%ums is not even in the expected 400-1000ms range\n", p2); + ok(350 <= p2 && p2 <= 1000, "%ums is not even in the expected 350-1000ms range\n", p2); test_notification(hwnd,"play (nowait)",0); err = mciSendStringA("pause mysound wait", NULL, 0, hwnd);

1 0

Frédéric Delanoy : kernel32/tests: Remove unused variable.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: cb167e8e18ed5483d595699c65e25f9a5933bb46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb167e8e18ed5483d595699c6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 4 11:05:43 2014 +0100 kernel32/tests: Remove unused variable. --- dlls/kernel32/tests/loader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 2f54968..67d838a 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -42,7 +42,6 @@ struct PROCESS_BASIC_INFORMATION_PRIVATE ULONG_PTR InheritedFromUniqueProcessId; }; -static BOOL is_child; static LONG *child_failures; static WORD cb_count; static DWORD page_size; @@ -2649,7 +2648,6 @@ START_TEST(loader) child_failures = MapViewOfFile(mapping, FILE_MAP_READ|FILE_MAP_WRITE, 0, 0, 4096); if (*child_failures == -1) { - is_child = 1; *child_failures = 0; } else

1 0

André Hentschel : msi: Use boolean return value in boolean function.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: 3c1ca4e548a5249060515fda9e241f4643fedc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c1ca4e548a5249060515fda9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 29 22:28:29 2014 +0100 msi: Use boolean return value in boolean function. --- dlls/msi/record.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 3c1cf00..88d94a9 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -378,7 +378,7 @@ BOOL WINAPI MsiRecordIsNull( MSIHANDLE handle, UINT iField ) rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) - return 0; + return FALSE; msiobj_lock( &rec->hdr ); ret = MSI_RecordIsNull( rec, iField ); msiobj_unlock( &rec->hdr );

1 0

André Hentschel : gdi16: Use boolean return value in boolean function.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: f43234289dda0b547cd083e7aa88c380b4742ab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43234289dda0b547cd083e7a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 29 22:28:31 2014 +0100 gdi16: Use boolean return value in boolean function. --- dlls/gdi.exe16/gdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index c2193a9..8ee37d7 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -2907,7 +2907,7 @@ BOOL16 WINAPI IsGDIObject16( HGDIOBJ16 handle16 ) UINT type = GetObjectType( HGDIOBJ_32( handle16 )); - if (type >= sizeof(type_map)/sizeof(type_map[0])) return 0; + if (type >= sizeof(type_map)/sizeof(type_map[0])) return FALSE; return type_map[type]; }

1 0

André Hentschel : user32: Use boolean return values in boolean functions.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: bdc9b147b948b3476815c52f7fc53f4c29494800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc9b147b948b3476815c52f7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 29 22:28:27 2014 +0100 user32: Use boolean return values in boolean functions. --- dlls/user32/input.c | 2 +- dlls/user32/nonclient.c | 2 +- dlls/user32/painting.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 078fa49..457e67c 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -266,7 +266,7 @@ BOOL WINAPI GetCursorInfo( PCURSORINFO pci ) { BOOL ret; - if (!pci) return 0; + if (!pci) return FALSE; SERVER_START_REQ( get_thread_input ) { diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index d8d0807..5ea26dc 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -360,7 +360,7 @@ BOOL WINAPI DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, if (uFlags & 0x2000) FIXME("undocumented flag (0x2000)!\n"); - return 0; + return FALSE; } diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 11447da..63e09c5 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -486,7 +486,7 @@ static BOOL CALLBACK dc_hook( HDC hDC, WORD code, DWORD_PTR data, LPARAM lParam TRACE("hDC = %p, %u\n", hDC, code); - if (!dce) return 0; + if (!dce) return FALSE; assert( dce->hdc == hDC ); switch( code )

1 0

André Hentschel : wininet: Use boolean return value in boolean function.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: c8426495fcf9db0d5cfb73d7d8080d1a82c36e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8426495fcf9db0d5cfb73d7d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 29 22:28:25 2014 +0100 wininet: Use boolean return value in boolean function. --- dlls/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 3cf3ea6..a37606a 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1765,7 +1765,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWOR if(!found_colon){ SetLastError(ERROR_INTERNET_UNRECOGNIZED_SCHEME); - return 0; + return FALSE; } lpUC->nScheme = INTERNET_SCHEME_UNKNOWN;

1 0

André Hentschel : comctl32: Use boolean return values in boolean functions.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: 1776ded8e68f48546337705d30392d8ace7dd053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1776ded8e68f48546337705d3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 29 22:26:05 2014 +0100 comctl32: Use boolean return values in boolean functions. --- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/updown.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index d13b50c..9f91fd3 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -198,7 +198,7 @@ static BOOL DATETIME_IsDateInValidRange(const DATETIME_INFO *infoPtr, const SYST static BOOL DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *systime) { - if (!systime) return 0; + if (!systime) return FALSE; TRACE("%04d/%02d/%02d %02d:%02d:%02d\n", systime->wYear, systime->wMonth, systime->wDay, diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 23a633e..28dd5e3 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -354,7 +354,7 @@ static BOOL UPDOWN_SetBuddyInt (const UPDOWN_INFO *infoPtr) /* if nothing changed exit earlier */ GetWindowTextW(infoPtr->Buddy, txt_old, sizeof(txt_old)/sizeof(WCHAR)); - if (lstrcmpiW(txt_old, txt) == 0) return 0; + if (lstrcmpiW(txt_old, txt) == 0) return FALSE; return SetWindowTextW(infoPtr->Buddy, txt); }

1 0

André Hentschel : advapi32: Use boolean return values in boolean functions.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: 929d9fb9f79b9ba0b7392215e51a152ec709d62c URL: http://source.winehq.org/git/wine.git/?a=commit;h=929d9fb9f79b9ba0b7392215e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 29 22:25:44 2014 +0100 advapi32: Use boolean return values in boolean functions. --- dlls/advapi32/advapi.c | 2 +- dlls/advapi32/security.c | 2 +- dlls/advapi32/service.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 884b5d1..01ee4de 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -136,7 +136,7 @@ BOOL WINAPI GetCurrentHwProfileA(LPHW_PROFILE_INFOA pInfo) pInfo->dwDockInfo = DOCKINFO_DOCKED; strcpy(pInfo->szHwProfileGuid,"{12340001-1234-1234-1234-123456789012}"); strcpy(pInfo->szHwProfileName,"Wine Profile"); - return 1; + return TRUE; } /****************************************************************************** diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index ac0a941..3dc40dc 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2399,7 +2399,7 @@ BOOL WINAPI NotifyBootConfigStatus( BOOL x1 ) { FIXME("(0x%08d):stub\n",x1); - return 1; + return TRUE; } /****************************************************************************** diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 5f3f15f..0047031 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1858,7 +1858,7 @@ BOOL WINAPI GetServiceKeyNameW( SC_HANDLE hSCManager, LPCWSTR lpDisplayName, if (!hSCManager) { SetLastError( ERROR_INVALID_HANDLE ); - return 0; + return FALSE; } /* provide a buffer if the caller didn't */ @@ -1982,7 +1982,7 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, if (!hSCManager) { SetLastError( ERROR_INVALID_HANDLE ); - return 0; + return FALSE; } /* provide a buffer if the caller didn't */

1 0

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 February 2014