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

André Hentschel : setupapi: Add CM_Get_Device_ID_ExA stub.
by Alexandre Julliard April 4, 2013

April 4, 2013

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

Ken Thomases : winemac: Constify some macdrv_event pointer parameters.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: b55d7aae1077f7628c16b97f924b6ce9b350e5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b55d7aae1077f7628c16b97f9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 3 18:56:25 2013 -0500 winemac: Constify some macdrv_event pointer parameters. --- dlls/winemac.drv/event.c | 4 ++-- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_cocoa.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 4f4d247..6f35d9d 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -111,7 +111,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) * * Handler for QUERY_EVENT queries. */ -static void macdrv_query_event(HWND hwnd, macdrv_event *event) +static void macdrv_query_event(HWND hwnd, const macdrv_event *event) { BOOL success = FALSE; macdrv_query *query = event->query_event.query; @@ -148,7 +148,7 @@ static void macdrv_query_event(HWND hwnd, macdrv_event *event) /*********************************************************************** * macdrv_handle_event */ -void macdrv_handle_event(macdrv_event *event) +void macdrv_handle_event(const macdrv_event *event) { HWND hwnd = macdrv_get_window_hwnd(event->window); const macdrv_event *prev; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index f8c45ab..f905359 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -142,7 +142,7 @@ extern struct window_surface *create_surface(macdrv_window window, const RECT *r extern void set_window_surface(macdrv_window window, struct window_surface *window_surface) DECLSPEC_HIDDEN; extern void set_surface_use_alpha(struct window_surface *window_surface, BOOL use_alpha) DECLSPEC_HIDDEN; -extern void macdrv_handle_event(macdrv_event *event) DECLSPEC_HIDDEN; +extern void macdrv_handle_event(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_window_close_requested(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_frame_changed(HWND hwnd, CGRect frame) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 2d74969..67da3a3 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -266,7 +266,7 @@ static inline macdrv_event_mask event_mask_for_type(int type) return ((macdrv_event_mask)1 << type); } -typedef void (*macdrv_event_handler)(macdrv_event *event); +typedef void (*macdrv_event_handler)(const macdrv_event *event); extern macdrv_event_queue macdrv_create_event_queue(macdrv_event_handler handler) DECLSPEC_HIDDEN; extern void macdrv_destroy_event_queue(macdrv_event_queue queue) DECLSPEC_HIDDEN;

1 0

Nozomi Kodama : d3dx9: Do not use relative error for small numbers.
by Alexandre Julliard April 4, 2013

April 4, 2013

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

Victor Martinez Calvo : windowscodecs: Don't overwrite bih. bV5AlphaMask and set the LCS_DEVICE_RGB flag in bih.bV5CSType.
by Alexandre Julliard April 4, 2013

April 4, 2013

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

Alexandre Julliard : kernel32: Fetch the system information only once the memory limits are correct.
by Alexandre Julliard April 4, 2013

April 4, 2013

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

Michael Stefaniuc : dplayx: Merge dpinit.h into dplay_global.h.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: 5e03836603db95347a75e4d7d7906bee606a93ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e03836603db95347a75e4d7d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:11:29 2013 +0100 dplayx: Merge dpinit.h into dplay_global.h. --- dlls/dplayx/dpclassfactory.c | 2 +- dlls/dplayx/dpinit.h | 37 ------------------------------------- dlls/dplayx/dplay.c | 1 - dlls/dplayx/dplay_global.h | 5 +++++ dlls/dplayx/dplaysp.c | 1 - dlls/dplayx/dplobby.c | 1 - dlls/dplayx/lobbysp.c | 1 - 7 files changed, 6 insertions(+), 42 deletions(-) diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index 438ad60..c64c5fc 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -31,7 +31,7 @@ #include "dplay.h" #include "dplobby.h" #include "initguid.h" -#include "dpinit.h" +#include "dplay_global.h" WINE_DEFAULT_DEBUG_CHANNEL(dplay); diff --git a/dlls/dplayx/dpinit.h b/dlls/dplayx/dpinit.h deleted file mode 100644 index 090b67a..0000000 --- a/dlls/dplayx/dpinit.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 1999, 2000 Peter Hunnisett - * - * 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 - */ - -#ifndef __WINE_DPINIT_H -#define __WINE_DPINIT_H - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "dplay_global.h" - -extern HRESULT dplay_create( REFIID riid, void **ppv ) DECLSPEC_HIDDEN; -extern HRESULT DPL_CreateInterface( REFIID riid, LPVOID* ppvObj ) DECLSPEC_HIDDEN; -extern HRESULT DPSP_CreateInterface( REFIID riid, LPVOID* ppvObj, - IDirectPlay2Impl* dp ) DECLSPEC_HIDDEN; -extern HRESULT DPLSP_CreateInterface( REFIID riid, LPVOID* ppvObj, - IDirectPlay2Impl* dp ) DECLSPEC_HIDDEN; - - -#endif diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index b7b9cdd..eb52cd2 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -35,7 +35,6 @@ #include "wine/unicode.h" #include "wine/debug.h" -#include "dpinit.h" #include "dplayx_global.h" #include "name_server.h" #include "dplayx_queue.h" diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 18eb8077..0928c1a 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -209,4 +209,9 @@ extern HRESULT DP_SetSPPlayerData( IDirectPlay2Impl* lpDP, DPID idPlayer, LPVOID /* DP external interfaces to call into DPSP interface */ extern LPVOID DPSP_CreateSPPlayerData(void) DECLSPEC_HIDDEN; +extern HRESULT dplay_create( REFIID riid, void **ppv ) DECLSPEC_HIDDEN; +extern HRESULT DPL_CreateInterface( REFIID riid, LPVOID* ppvObj ) DECLSPEC_HIDDEN; +extern HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; +extern HRESULT DPLSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; + #endif /* __WINE_DPLAY_GLOBAL_INCLUDED */ diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 9ce6910..4a8c4a5 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -22,7 +22,6 @@ #include "winerror.h" #include "wine/debug.h" -#include "dpinit.h" #include "wine/dplaysp.h" #include "dplay_global.h" #include "name_server.h" diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index cbdd128..46a2168 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -32,7 +32,6 @@ #include "dplayx_messages.h" #include "dplayx_queue.h" #include "dplobby.h" -#include "dpinit.h" WINE_DEFAULT_DEBUG_CHANNEL(dplay); diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index 737cb3f..18d9d00 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -23,7 +23,6 @@ #include "lobbysp.h" #include "dplay_global.h" -#include "dpinit.h" WINE_DEFAULT_DEBUG_CHANNEL(dplay);

1 0

Michael Stefaniuc : dplayx: Remove superfluous forward declarations.
by Alexandre Julliard April 4, 2013

April 4, 2013

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

Ken Thomases : winemac: Drain the autorelease pool within loop in OnMainThread().
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: 5dac8a90cc718548fab6455e6130157ca4024f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dac8a90cc718548fab6455e6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 3 18:56:11 2013 -0500 winemac: Drain the autorelease pool within loop in OnMainThread(). --- dlls/winemac.drv/cocoa_event.m | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index a1a6f9c..76fb543 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -314,7 +314,12 @@ void OnMainThread(dispatch_block_t block) } if (!finished) + { + [pool release]; + pool = [[NSAutoreleasePool alloc] init]; + kevent(queue->kq, NULL, 0, &kev, 1, NULL); + } } [pool release];

1 0

Victor Martinez Calvo : msvcrt: Fix copy-pasta typos LOCALE_SSHORTDATE-> LOCALE_SLONGDATE in _create_locale.
by Alexandre Julliard April 4, 2013

April 4, 2013

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 : msxml3: Fix SafeArrayGetUBond check in BindStatusCallback_create.
by Alexandre Julliard April 4, 2013

April 4, 2013

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