April 2013 - Wine-commits - list.winehq.org

Alexandre Julliard : kernel32: Fetch the system information only once the memory limits are correct.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 9181b7e8763e9070f6a1d636aeb882db829867d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9181b7e8763e9070f6a1d636a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 4 13:01:04 2013 +0200 kernel32: Fetch the system information only once the memory limits are correct. --- dlls/kernel32/kernel_main.c | 2 ++ dlls/kernel32/process.c | 1 - 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index cf548e3..13c01ed 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -83,6 +83,8 @@ static BOOL process_attach( HMODULE module ) { RTL_USER_PROCESS_PARAMETERS *params = NtCurrentTeb()->Peb->ProcessParameters; + NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); + /* Setup registry locale information */ LOCALE_InitRegistry(); diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 8fcf67b..93c0267 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1147,7 +1147,6 @@ void CDECL __wine_kernel_init(void) setbuf(stderr,NULL); kernel32_handle = GetModuleHandleW(kernel32W); IsWow64Process( GetCurrentProcess(), &is_wow64 ); - NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); LOCALE_Init();

1 0

André Hentschel : setupapi: Add CM_Get_Device_ID_ExA stub.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 32fb489f1c603b112e62e0e103ae23d390b9cc1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=32fb489f1c603b112e62e0e10… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 3 18:09:03 2013 +0200 setupapi: Add CM_Get_Device_ID_ExA stub. --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 3d687b3..a2ade67 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -64,7 +64,7 @@ @ stub CM_Get_DevNode_Status_Ex @ stdcall CM_Get_Device_IDA(ptr ptr long long) setupapi.CM_Get_Device_IDA @ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW -@ stub CM_Get_Device_ID_ExA +@ stdcall CM_Get_Device_ID_ExA(ptr ptr long long ptr) setupapi.CM_Get_Device_ID_ExA @ stdcall CM_Get_Device_ID_ExW(ptr ptr long long ptr) setupapi.CM_Get_Device_ID_ExW @ stdcall CM_Get_Device_ID_ListA(str ptr long long) setupapi.CM_Get_Device_ID_ListA @ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) setupapi.CM_Get_Device_ID_ListW diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 9733a08..9a13bb2 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -75,7 +75,7 @@ @ stub CM_Get_DevNode_Status_Ex @ stdcall CM_Get_Device_IDA(ptr ptr long long) @ stdcall CM_Get_Device_IDW(ptr ptr long long) -@ stub CM_Get_Device_ID_ExA +@ stdcall CM_Get_Device_ID_ExA(ptr ptr long long ptr) @ stdcall CM_Get_Device_ID_ExW(ptr ptr long long ptr) @ stdcall CM_Get_Device_ID_ListA(str ptr long long) @ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index d6968a6..030b295 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -79,6 +79,16 @@ CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE handle) } /*********************************************************************** + * CM_Get_Device_ID_ExA (SETUPAPI.@) + */ +DWORD WINAPI CM_Get_Device_ID_ExA( + DEVINST dnDevInst, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("0x%08x %p 0x%08x 0x%08x %p\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); + return CR_SUCCESS; +} + +/*********************************************************************** * CM_Get_Device_ID_ExW (SETUPAPI.@) */ DWORD WINAPI CM_Get_Device_ID_ExW(

1 0

André Hentschel : hid: Add HidD_GetManufacturerString stub.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 4b98d78951d4700aa39ace6f828f2d061bab3dc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b98d78951d4700aa39ace6f8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 3 18:09:21 2013 +0200 hid: Add HidD_GetManufacturerString stub. --- dlls/hid/hid.spec | 2 +- dlls/hid/main.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index b75b6b0..af6140a 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -6,7 +6,7 @@ @ stdcall HidD_GetHidGuid(ptr) @ stub HidD_GetIndexedString @ stub HidD_GetInputReport -@ stub HidD_GetManufacturerString +@ stdcall HidD_GetManufacturerString(long ptr long) @ stub HidD_GetMsGenreDescriptor @ stub HidD_GetNumInputBuffers @ stub HidD_GetPhysicalDescriptor diff --git a/dlls/hid/main.c b/dlls/hid/main.c index 1b9d7eb..ed85f00 100644 --- a/dlls/hid/main.c +++ b/dlls/hid/main.c @@ -64,6 +64,12 @@ void WINAPI HidD_GetHidGuid(LPGUID guid) *guid = HID_GUID; } +BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) +{ + FIXME("(%p %p %u) stub\n", HidDeviceObject, Buffer, BufferLength); + return FALSE; +} + BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { FIXME("(%p %p %u) stub\n", HidDeviceObject, ReportBuffer, ReportBufferLength); diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index a6bc45c..229fc14 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -29,6 +29,7 @@ typedef LONG NTSTATUS; BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); void WINAPI HidD_GetHidGuid(LPGUID guid); +BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); #endif /* __WINE_HIDSDI_H */

1 0

Victor Martinez Calvo : msxml3: Fix SafeArrayGetUBond check in BindStatusCallback_create.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 0a6ab4b7135ae87c3d331df16040e85d9a3afc8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a6ab4b7135ae87c3d331df16… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Wed Apr 3 19:37:44 2013 +0200 msxml3: Fix SafeArrayGetUBond check in BindStatusCallback_create. --- dlls/msxml3/httprequest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 681ccab..682381d 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -722,7 +722,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * heap_free(bsc); return hr; } - if ((hr = SafeArrayGetUBound(sa, 1, &size) != S_OK)) + if ((hr = SafeArrayGetUBound(sa, 1, &size)) != S_OK) { SafeArrayUnaccessData(sa); heap_free(bsc);

1 0

Victor Martinez Calvo : msvcrt: Fix copy-pasta typos LOCALE_SSHORTDATE-> LOCALE_SLONGDATE in _create_locale.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: f2b78d1fd0d5958e26b11eb7dd7c00983b26ad68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b78d1fd0d5958e26b11eb7d… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Wed Apr 3 21:42:21 2013 +0200 msvcrt: Fix copy-pasta typos LOCALE_SSHORTDATE->LOCALE_SLONGDATE in _create_locale. --- dlls/msvcrt/locale.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 520c8fe..14ccd0a 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1222,7 +1222,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { size += sizeof(cloc_short_date) + sizeof(cloc_short_dateW); - }else if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { + }else if(time_data[i]==LOCALE_SLONGDATE && !lcid[MSVCRT_LC_TIME]) { size += sizeof(cloc_long_date) + sizeof(cloc_long_dateW); }else { ret = GetLocaleInfoA(lcid_tmp, time_data[i] @@ -1255,7 +1255,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_short_date, sizeof(cloc_short_date)); ret += sizeof(cloc_short_date); - }else if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { + }else if(time_data[i]==LOCALE_SLONGDATE && !lcid[MSVCRT_LC_TIME]) { memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_long_date, sizeof(cloc_long_date)); ret += sizeof(cloc_long_date); }else if(time_data[i]==LOCALE_STIMEFORMAT && !lcid[MSVCRT_LC_TIME]) { @@ -1271,7 +1271,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_short_dateW, sizeof(cloc_short_dateW)); ret += sizeof(cloc_short_dateW); - }else if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { + }else if(time_data[i]==LOCALE_SLONGDATE && !lcid[MSVCRT_LC_TIME]) { memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_long_dateW, sizeof(cloc_long_dateW)); ret += sizeof(cloc_long_dateW); }else if(time_data[i]==LOCALE_STIMEFORMAT && !lcid[MSVCRT_LC_TIME]) {

1 0

Victor Martinez Calvo : windowscodecs: Don't overwrite bih. bV5AlphaMask and set the LCS_DEVICE_RGB flag in bih.bV5CSType.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: cd7637ec6d278c6cf522688e494dd497e09e70de URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7637ec6d278c6cf522688e4… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Thu Apr 4 02:07:36 2013 +0200 windowscodecs: Don't overwrite bih.bV5AlphaMask and set the LCS_DEVICE_RGB flag in bih.bV5CSType. --- dlls/windowscodecs/bmpencode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 9bd2340..b071c80 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -360,7 +360,7 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bih.bV5GreenMask = This->format->greenmask; bih.bV5BlueMask = This->format->bluemask; bih.bV5AlphaMask = This->format->alphamask; - bih.bV5AlphaMask = LCS_DEVICE_RGB; + bih.bV5CSType = LCS_DEVICE_RGB; } bfh.bfSize = sizeof(BITMAPFILEHEADER) + info_size + bih.bV5SizeImage;

1 0

Nozomi Kodama : d3dx9: Do not use relative error for small numbers.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 97317528317bf485f3b911f17530edd4a5a8ba19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97317528317bf485f3b911f17… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Sun Mar 31 13:35:24 2013 -1000 d3dx9: Do not use relative error for small numbers. --- dlls/d3dx9_36/tests/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index c093ad8..f44240f 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -27,7 +27,7 @@ #define admitted_error 0.0001f -#define relative_error(exp, out) ((exp == 0.0f) ? fabs(exp - out) : (fabs(1.0f - (out) / (exp)))) +#define relative_error(exp, out) (fabs(exp) < 0.01f ? fabs(exp - out) : fabs(1.0f - (out) / (exp))) #define expect_color(expectedcolor,gotcolor) ok((relative_error(expectedcolor.r, gotcolor.r)<admitted_error)&&(relative_error(expectedcolor.g, gotcolor.g)<admitted_error)&&(relative_error(expectedcolor.b, gotcolor.b)<admitted_error)&&(relative_error(expectedcolor.a, gotcolor.a)<admitted_error),"Expected Color= (%f, %f, %f, %f)\n , Got Color= (%f, %f, %f, %f)\n", expectedcolor.r, expectedcolor.g, expectedcolor.b, expectedcolor.a, gotcolor.r, gotcolor.g, gotcolor.b, gotcolor.a);

1 0

Michael Stefaniuc : dplayx: Forward AW agnostic IDirectPlay4A stub methods to the W versions.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 12a26e1d017cb506cce920e303423590e030cee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a26e1d017cb506cce920e30… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:08:49 2013 +0100 dplayx: Forward AW agnostic IDirectPlay4A stub methods to the W versions. --- dlls/dplayx/dplay.c | 50 ++++++++++++++++++++++---------------------------- 1 files changed, 22 insertions(+), 28 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 4658f4e..edcb20f 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -3750,12 +3750,11 @@ static HRESULT WINAPI IDirectPlay4Impl_SetGroupConnectionSettings( IDirectPlay4 return DP_OK; } -static HRESULT WINAPI IDirectPlay4AImpl_StartSession( IDirectPlay4A *iface, DWORD dwFlags, - DPID idGroup ) +static HRESULT WINAPI IDirectPlay4AImpl_StartSession( IDirectPlay4A *iface, DWORD flags, + DPID group ) { - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - FIXME("(%p)->(0x%08x,0x%08x): stub\n", This, dwFlags, idGroup ); - return DP_OK; + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_StartSession( &This->IDirectPlay4_iface, flags, group ); } static HRESULT WINAPI IDirectPlay4Impl_StartSession( IDirectPlay4 *iface, DWORD flags, DPID group ) @@ -3765,12 +3764,11 @@ static HRESULT WINAPI IDirectPlay4Impl_StartSession( IDirectPlay4 *iface, DWORD return DP_OK; } -static HRESULT WINAPI IDirectPlay4AImpl_GetGroupFlags( IDirectPlay4A *iface, DPID idGroup, - DWORD *lpdwFlags ) +static HRESULT WINAPI IDirectPlay4AImpl_GetGroupFlags( IDirectPlay4A *iface, DPID group, + DWORD *flags ) { - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - FIXME("(%p)->(0x%08x,%p): stub\n", This, idGroup, lpdwFlags ); - return DP_OK; + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_GetGroupFlags( &This->IDirectPlay4_iface, group, flags ); } static HRESULT WINAPI IDirectPlay4Impl_GetGroupFlags( IDirectPlay4 *iface, DPID group, @@ -3820,12 +3818,11 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerAccount( IDirectPlay4 *iface, DP return DP_OK; } -static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerFlags( IDirectPlay4A *iface, DPID idPlayer, - DWORD *lpdwFlags ) +static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerFlags( IDirectPlay4A *iface, DPID player, + DWORD *flags ) { - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - FIXME("(%p)->(0x%08x,%p): stub\n", This, idPlayer, lpdwFlags ); - return DP_OK; + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_GetPlayerFlags( &This->IDirectPlay4_iface, player, flags ); } static HRESULT WINAPI IDirectPlay4Impl_GetPlayerFlags( IDirectPlay4 *iface, DPID player, @@ -3836,12 +3833,11 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerFlags( IDirectPlay4 *iface, DPID return DP_OK; } -static HRESULT WINAPI DirectPlay4AImpl_GetGroupOwner - ( LPDIRECTPLAY4A iface, DPID idGroup, LPDPID lpidGroupOwner ) +static HRESULT WINAPI IDirectPlay4AImpl_GetGroupOwner( IDirectPlay4A *iface, DPID group, + DPID *owner ) { - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - FIXME("(%p)->(0x%08x,%p): stub\n", This, idGroup, lpidGroupOwner ); - return DP_OK; + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_GetGroupOwner( &This->IDirectPlay4_iface, group, owner ); } static HRESULT WINAPI IDirectPlay4Impl_GetGroupOwner( IDirectPlay4 *iface, DPID group, @@ -3852,12 +3848,11 @@ static HRESULT WINAPI IDirectPlay4Impl_GetGroupOwner( IDirectPlay4 *iface, DPID return DP_OK; } -static HRESULT WINAPI DirectPlay4AImpl_SetGroupOwner - ( LPDIRECTPLAY4A iface, DPID idGroup , DPID idGroupOwner ) +static HRESULT WINAPI IDirectPlay4AImpl_SetGroupOwner( IDirectPlay4A *iface, DPID group, + DPID owner ) { - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - FIXME("(%p)->(0x%08x,0x%08x): stub\n", This, idGroup, idGroupOwner ); - return DP_OK; + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_SetGroupOwner( &This->IDirectPlay4_iface, group, owner ); } static HRESULT WINAPI IDirectPlay4Impl_SetGroupOwner( IDirectPlay4 *iface, DPID group , @@ -4179,9 +4174,8 @@ static const IDirectPlay4Vtbl dp4A_vt = IDirectPlay4AImpl_GetGroupParent, IDirectPlay4AImpl_GetPlayerAccount, IDirectPlay4AImpl_GetPlayerFlags, - - DirectPlay4AImpl_GetGroupOwner, - DirectPlay4AImpl_SetGroupOwner, + IDirectPlay4AImpl_GetGroupOwner, + IDirectPlay4AImpl_SetGroupOwner, IDirectPlay4AImpl_SendEx, IDirectPlay4AImpl_GetMessageQueue, IDirectPlay4AImpl_CancelMessage,

1 0

Michael Stefaniuc : dplayx: Get rid of the IDirectPlayXImpl to IDirectPlayImpl casts.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 2a079ce62a082cf5ea11a40b2277be6437f532a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a079ce62a082cf5ea11a40b2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:09:40 2013 +0100 dplayx: Get rid of the IDirectPlayXImpl to IDirectPlayImpl casts. --- dlls/dplayx/dplay.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index edcb20f..7d2beb3 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -1482,7 +1482,7 @@ static HRESULT DP_IF_DestroyGroup return DPERR_INVALIDPLAYER; /* yes player */ } - context.This = (IDirectPlay3Impl*)This; + context.This = This; context.bAnsi = bAnsi; context.idGroup = idGroup; @@ -2919,15 +2919,10 @@ static HRESULT DP_IF_CreateGroupInGroup } /* Verify that the specified parent is valid */ - if( ( lpGParentData = DP_FindAnyGroup( (IDirectPlay2AImpl*)This, - idParentGroup ) ) == NULL - ) - { + if( ( lpGParentData = DP_FindAnyGroup(This, idParentGroup ) ) == NULL ) return DPERR_INVALIDGROUP; - } - lpGData = DP_CreateGroup( (IDirectPlay2AImpl*)This, lpidGroup, lpGroupName, - dwFlags, idParentGroup, bAnsi ); + lpGData = DP_CreateGroup(This, lpidGroup, lpGroupName, dwFlags, idParentGroup, bAnsi ); if( lpGData == NULL ) {

1 0

Michael Stefaniuc : dplayx: Remove superfluous forward declarations.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: f92e17033c77eea84a1873521214800ba95ddb63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92e17033c77eea84a1873521… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:10:33 2013 +0100 dplayx: Remove superfluous forward declarations. --- dlls/dplayx/dplay.c | 64 ----------------------------------------- dlls/dplayx/dplayx_messages.c | 7 ---- dlls/dplayx/dplobby.c | 13 -------- dlls/dplayx/lobbysp.h | 1 - 4 files changed, 0 insertions(+), 85 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 7d2beb3..b7b9cdd 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -52,83 +52,28 @@ extern HRESULT DPL_CreateCompoundAddress /* Local function prototypes */ static lpPlayerList DP_FindPlayer( IDirectPlay2AImpl* This, DPID dpid ); -static lpPlayerData DP_CreatePlayer( IDirectPlay2Impl* iface, LPDPID lpid, - LPDPNAME lpName, DWORD dwFlags, - HANDLE hEvent, BOOL bAnsi ); static BOOL DP_CopyDPNAMEStruct( LPDPNAME lpDst, const DPNAME *lpSrc, BOOL bAnsi ); -static void DP_SetPlayerData( lpPlayerData lpPData, DWORD dwFlags, - LPVOID lpData, DWORD dwDataSize ); - -static lpGroupData DP_CreateGroup( IDirectPlay2AImpl* iface, const DPID *lpid, - const DPNAME *lpName, DWORD dwFlags, - DPID idParent, BOOL bAnsi ); static void DP_SetGroupData( lpGroupData lpGData, DWORD dwFlags, LPVOID lpData, DWORD dwDataSize ); static void DP_DeleteDPNameStruct( LPDPNAME lpDPName ); -static void DP_DeletePlayer( IDirectPlay2Impl* This, DPID dpid ); static BOOL CALLBACK cbDeletePlayerFromAllGroups( DPID dpId, DWORD dwPlayerType, LPCDPNAME lpName, DWORD dwFlags, LPVOID lpContext ); static lpGroupData DP_FindAnyGroup( IDirectPlay2AImpl* This, DPID dpid ); -static BOOL CALLBACK cbRemoveGroupOrPlayer( DPID dpId, DWORD dwPlayerType, - LPCDPNAME lpName, DWORD dwFlags, - LPVOID lpContext ); -static void DP_DeleteGroup( IDirectPlay2Impl* This, DPID dpid ); /* Helper methods for player/group interfaces */ -static HRESULT DP_IF_CreatePlayer - ( IDirectPlay2Impl* This, LPVOID lpMsgHdr, LPDPID lpidPlayer, - LPDPNAME lpPlayerName, HANDLE hEvent, LPVOID lpData, - DWORD dwDataSize, DWORD dwFlags, BOOL bAnsi ); -static HRESULT DP_IF_DestroyGroup - ( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idGroup, BOOL bAnsi ); -static HRESULT DP_IF_DestroyPlayer - ( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idPlayer, BOOL bAnsi ); -static HRESULT DP_IF_GetGroupName - ( IDirectPlay2Impl* This, DPID idGroup, LPVOID lpData, - LPDWORD lpdwDataSize, BOOL bAnsi ); -static HRESULT DP_IF_GetPlayerName - ( IDirectPlay2Impl* This, DPID idPlayer, LPVOID lpData, - LPDWORD lpdwDataSize, BOOL bAnsi ); -static HRESULT DP_IF_SetGroupName - ( IDirectPlay2Impl* This, DPID idGroup, LPDPNAME lpGroupName, - DWORD dwFlags, BOOL bAnsi ); -static HRESULT DP_IF_SetPlayerName - ( IDirectPlay2Impl* This, DPID idPlayer, LPDPNAME lpPlayerName, - DWORD dwFlags, BOOL bAnsi ); -static HRESULT DP_IF_CreateGroup - ( IDirectPlay2AImpl* This, LPVOID lpMsgHdr, LPDPID lpidGroup, - LPDPNAME lpGroupName, LPVOID lpData, DWORD dwDataSize, - DWORD dwFlags, BOOL bAnsi ); -static HRESULT DP_IF_CreateGroupInGroup - ( IDirectPlay3Impl* This, LPVOID lpMsgHdr, DPID idParentGroup, - LPDPID lpidGroup, LPDPNAME lpGroupName, LPVOID lpData, - DWORD dwDataSize, DWORD dwFlags, BOOL bAnsi ); static HRESULT DP_SetSessionDesc ( IDirectPlay2Impl* This, LPCDPSESSIONDESC2 lpSessDesc, DWORD dwFlags, BOOL bInitial, BOOL bAnsi ); -static HRESULT DP_SecureOpen - ( IDirectPlay2Impl* This, LPCDPSESSIONDESC2 lpsd, DWORD dwFlags, - LPCDPSECURITYDESC lpSecurity, LPCDPCREDENTIALS lpCredentials, - BOOL bAnsi ); -static HRESULT DP_IF_Receive - ( IDirectPlay2Impl* This, LPDPID lpidFrom, LPDPID lpidTo, - DWORD dwFlags, LPVOID lpData, LPDWORD lpdwDataSize, BOOL bAnsi ); static HRESULT DP_SP_SendEx ( IDirectPlay2Impl* This, DWORD dwFlags, LPVOID lpData, DWORD dwDataSize, DWORD dwPriority, DWORD dwTimeout, LPVOID lpContext, LPDWORD lpdwMsgID ); -static BOOL CALLBACK cbDPCreateEnumConnections( LPCGUID lpguidSP, - LPVOID lpConnection, DWORD dwConnectionSize, LPCDPNAME lpName, - DWORD dwFlags, LPVOID lpContext ); static BOOL DP_BuildSPCompoundAddr( LPGUID lpcSpGuid, LPVOID* lplpAddrBuf, LPDWORD lpdwBufSize ); - - -static inline DPID DP_NextObjectId(void); static DPID DP_GetRemoteNextObjectId(void); static DWORD DP_CalcSessionDescSize( LPCDPSESSIONDESC2 lpSessDesc, BOOL bAnsi ); @@ -136,15 +81,6 @@ static void DP_CopySessionDesc( LPDPSESSIONDESC2 destSessionDesc, LPCDPSESSIONDESC2 srcSessDesc, BOOL bAnsi ); -static HMODULE DP_LoadSP( LPCGUID lpcGuid, LPSPINITDATA lpSpData, LPBOOL lpbIsDpSp ); -static HRESULT DP_InitializeDPSP( IDirectPlay3Impl* This, HMODULE hServiceProvider ); -static HRESULT DP_InitializeDPLSP( IDirectPlay3Impl* This, HMODULE hServiceProvider ); - - - - - - #define DPID_NOPARENT_GROUP 0 /* Magic number to indicate no parent of group */ #define DPID_SYSTEM_GROUP DPID_NOPARENT_GROUP /* If system group is supported we don't have to change much */ diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c index 7756c9f..dc712fd 100644 --- a/dlls/dplayx/dplayx_messages.c +++ b/dlls/dplayx/dplayx_messages.c @@ -154,13 +154,6 @@ end_of_thread: } /* DP messaging stuff */ -static HANDLE DP_MSG_BuildAndLinkReplyStruct( IDirectPlay2Impl* This, - LPDP_MSG_REPLY_STRUCT_LIST lpReplyStructList, - WORD wReplyCommandId ); -static LPVOID DP_MSG_CleanReplyStruct( LPDP_MSG_REPLY_STRUCT_LIST lpReplyStructList, - LPVOID* lplpReplyMsg, LPDWORD lpdwMsgBodySize ); - - static HANDLE DP_MSG_BuildAndLinkReplyStruct( IDirectPlay2Impl* This, LPDP_MSG_REPLY_STRUCT_LIST lpReplyStructList, WORD wReplyCommandId ) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 204ff59..cbdd128 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -54,19 +54,6 @@ static HRESULT DPL_CreateAddress( REFGUID guidSP, REFGUID guidDataType, LPCVOID LPVOID lpAddress, LPDWORD lpdwAddressSize, BOOL bAnsiInterface ); - -extern HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, LPCVOID lpAddress, - DWORD dwAddressSize, LPVOID lpContext ); - -static HRESULT DPL_ConnectEx( IDirectPlayLobbyAImpl* This, - DWORD dwFlags, REFIID riid, - LPVOID* lplpDP, IUnknown* pUnk ); - -static BOOL DPL_CreateAndSetLobbyHandles( DWORD dwDestProcessId, HANDLE hDestProcess, - LPHANDLE lphStart, LPHANDLE lphDeath, - LPHANDLE lphRead ); - - /***************************************************************************** * IDirectPlayLobby {1,2,3} implementation structure * diff --git a/dlls/dplayx/lobbysp.h b/dlls/dplayx/lobbysp.h index f20c8e9..8d87116 100644 --- a/dlls/dplayx/lobbysp.h +++ b/dlls/dplayx/lobbysp.h @@ -458,7 +458,6 @@ typedef struct SPDATA_INIT } SPDATA_INIT, *LPSPDATA_INIT; typedef HRESULT (WINAPI *LPSP_INIT)(LPSPDATA_INIT); -HRESULT WINAPI DPLSPInit(LPSPDATA_INIT) DECLSPEC_HIDDEN; /* Define the COM interface */ #define INTERFACE IDPLobbySP

1 0