August 2010 - Wine-commits - list.winehq.org

Alexandre Julliard : kernel32: Use int64 in the spec file for 64-bit integers.
by Alexandre Julliard 31 Aug '10

31 Aug '10

Module: wine Branch: master Commit: 56bce685d5fe2a8fc2ad6693516cab2073c62ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56bce685d5fe2a8fc2ad66935… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 31 12:22:18 2010 +0200 kernel32: Use int64 in the spec file for 64-bit integers. --- dlls/kernel32/kernel32.spec | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1ba7978..4cb4f96 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -729,7 +729,7 @@ @ stdcall InitializeCriticalSectionEx(ptr long long) @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @ stdcall -arch=i386 InterlockedCompareExchange (ptr long long) -@ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr double double) ntdll.RtlInterlockedCompareExchange64 +@ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr int64 int64) ntdll.RtlInterlockedCompareExchange64 @ stdcall -arch=i386 InterlockedDecrement(ptr) @ stdcall -arch=i386 InterlockedExchange(ptr long) @ stdcall -arch=i386 InterlockedExchangeAdd (ptr long ) @@ -1027,11 +1027,11 @@ @ stdcall SetFileAttributesA(str long) @ stdcall SetFileAttributesW(wstr long) @ stdcall SetFilePointer(long long ptr long) -@ stdcall SetFilePointerEx(long double ptr long) +@ stdcall SetFilePointerEx(long int64 ptr long) # @ stub SetFileShortNameA # @ stub SetFileShortNameW @ stdcall SetFileTime(long ptr ptr ptr) -@ stdcall SetFileValidData(ptr double) +@ stdcall SetFileValidData(ptr int64) # @ stub SetFirmwareEnvironmentVariableA # @ stub SetFirmwareEnvironmentVariableW @ stdcall SetHandleContext(long long) @@ -1131,8 +1131,8 @@ @ stdcall VerLanguageNameW(long wstr long) @ stdcall -ret64 VerSetConditionMask(long long long long) ntdll.VerSetConditionMask @ stdcall VerifyConsoleIoHandle(long) -@ stdcall VerifyVersionInfoA(long long double) -@ stdcall VerifyVersionInfoW(long long double) +@ stdcall VerifyVersionInfoA(long long int64) +@ stdcall VerifyVersionInfoW(long long int64) @ stdcall VirtualAlloc(ptr long long long) @ stdcall VirtualAllocEx(long ptr long long long) @ stub VirtualBufferExceptionHandler

1 0

Alexandre Julliard : mapi32: Use int64 in the spec file for 64-bit integers .
by Alexandre Julliard 31 Aug '10

31 Aug '10

Module: wine Branch: master Commit: 73cf53843312aaac9b695bcb20e743de29783111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73cf53843312aaac9b695bcb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 31 12:22:33 2010 +0200 mapi32: Use int64 in the spec file for 64-bit integers. --- dlls/mapi32/mapi32.spec | 8 ++++---- dlls/mapistub/mapistub.spec | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index 8037c9b..ae85b4a 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -62,12 +62,12 @@ 80 stdcall LPropCompareProp(a)8(ptr ptr) LPropCompareProp 81 stub HrAddColumns(a)16 82 stub HrAddColumnsEx(a)20 -121 stdcall -ret64 FtAddFt(a)16(double double) MAPI32_FtAddFt +121 stdcall -ret64 FtAddFt(a)16(int64 int64) MAPI32_FtAddFt 122 stub FtAdcFt(a)20 -123 stdcall -ret64 FtSubFt(a)16(double double) MAPI32_FtSubFt -124 stdcall -ret64 FtMulDw(a)12(long double) MAPI32_FtMulDw +123 stdcall -ret64 FtSubFt(a)16(int64 int64) MAPI32_FtSubFt +124 stdcall -ret64 FtMulDw(a)12(long int64) MAPI32_FtMulDw 125 stdcall -ret64 FtMulDwDw(a)8(long long) MAPI32_FtMulDwDw -126 stdcall -ret64 FtNegFt(a)8(double) MAPI32_FtNegFt +126 stdcall -ret64 FtNegFt(a)8(int64) MAPI32_FtNegFt 127 stub FtDivFtBogus(a)20 128 stdcall UlAddRef(a)4(ptr) UlAddRef 129 stdcall UlRelease(a)4(ptr) UlRelease diff --git a/dlls/mapistub/mapistub.spec b/dlls/mapistub/mapistub.spec index 389c6a3..15cd25d 100644 --- a/dlls/mapistub/mapistub.spec +++ b/dlls/mapistub/mapistub.spec @@ -62,12 +62,12 @@ 80 stdcall LPropCompareProp(a)8(ptr ptr) mapi32.LPropCompareProp 81 stub HrAddColumns(a)16 82 stub HrAddColumnsEx(a)20 -121 stdcall -ret64 FtAddFt(a)16(double double) mapi32.MAPI32_FtAddFt +121 stdcall -ret64 FtAddFt(a)16(int64 int64) mapi32.MAPI32_FtAddFt 122 stub FtAdcFt(a)20 -123 stdcall -ret64 FtSubFt(a)16(double double) mapi32.MAPI32_FtSubFt -124 stdcall -ret64 FtMulDw(a)12(long double) mapi32.MAPI32_FtMulDw +123 stdcall -ret64 FtSubFt(a)16(int64 int64) mapi32.MAPI32_FtSubFt +124 stdcall -ret64 FtMulDw(a)12(long int64) mapi32.MAPI32_FtMulDw 125 stdcall -ret64 FtMulDwDw(a)8(long long) mapi32.MAPI32_FtMulDwDw -126 stdcall -ret64 FtNegFt(a)8(double) mapi32.MAPI32_FtNegFt +126 stdcall -ret64 FtNegFt(a)8(int64) mapi32.MAPI32_FtNegFt 127 stub FtDivFtBogus(a)20 128 stdcall UlAddRef(a)4(ptr) mapi32.UlAddRef 129 stdcall UlRelease(a)4(ptr) mapi32.UlRelease

1 0

Alexandre Julliard : mscoree: Use int64 in the spec file for 64-bit integers.
by Alexandre Julliard 31 Aug '10

31 Aug '10

Module: wine Branch: master Commit: 755b385d57e86a4e8e3b06b3e09ba8dbda4e8552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755b385d57e86a4e8e3b06b3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 31 12:22:41 2010 +0200 mscoree: Use int64 in the spec file for 64-bit integers. --- dlls/mscoree/mscoree.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 8e25cec..2654813 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -80,7 +80,7 @@ @ stdcall ND_RU1(ptr long) @ stdcall ND_WI2(ptr long long) @ stdcall ND_WI4(ptr long long) -@ stdcall ND_WI8(ptr long double) +@ stdcall ND_WI8(ptr long int64) @ stdcall ND_WU1(ptr long long) @ stub OpenCtrs @ stub ReOpenMetaDataWithMemoryEx

1 0

Francois Gouget : winmm: Make MCI_{MessageToString, strdupAtoW}() static and remove MCI_strdupWtoA().
by Alexandre Julliard 31 Aug '10

31 Aug '10

Module: wine Branch: master Commit: f8c55fdcd1cd795fe5ec3d7a1274244ca2957da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c55fdcd1cd795fe5ec3d7a1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 31 11:52:57 2010 +0200 winmm: Make MCI_{MessageToString,strdupAtoW}() static and remove MCI_strdupWtoA(). --- dlls/winmm/mci.c | 16 ++-------------- dlls/winmm/winemm.h | 3 --- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index f65aee7..d604c98 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -144,7 +144,7 @@ static UINT MCI_GetDriverFromString(LPCWSTR lpstrName) /************************************************************************** * MCI_MessageToString [internal] */ -const char* MCI_MessageToString(UINT wMsg) +static const char* MCI_MessageToString(UINT wMsg) { #define CASE(s) case (s): return #s @@ -213,7 +213,7 @@ const char* MCI_MessageToString(UINT wMsg) } } -LPWSTR MCI_strdupAtoW( LPCSTR str ) +static LPWSTR MCI_strdupAtoW( LPCSTR str ) { LPWSTR ret; INT len; @@ -225,18 +225,6 @@ LPWSTR MCI_strdupAtoW( LPCSTR str ) return ret; } -LPSTR MCI_strdupWtoA( LPCWSTR str ) -{ - LPSTR ret; - INT len; - - if (!str) return NULL; - len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); - ret = HeapAlloc( GetProcessHeap(), 0, len ); - if (ret) WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); - return ret; -} - static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2) { if (msg < DRV_RESERVED) return 0; diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index c0551d3..75dc1e4 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -145,10 +145,7 @@ LPWINE_MLD MMDRV_GetRelated(HANDLE hndl, UINT srcType, BOOL bSrcCanBeID, UINT ds DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); -const char* MCI_MessageToString(UINT wMsg); DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); -LPWSTR MCI_strdupAtoW(LPCSTR str); -LPSTR MCI_strdupWtoA(LPCWSTR str); const char* WINMM_ErrorToString(MMRESULT error);

1 0

Francois Gouget : hhctrl.ocx: Make strbuf_{append,chr}() static.
by Alexandre Julliard 31 Aug '10

31 Aug '10

Module: wine Branch: master Commit: 836ea0d8981c5eeed2fb6ff4db91912f85c21a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=836ea0d8981c5eeed2fb6ff4d… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 31 11:53:21 2010 +0200 hhctrl.ocx: Make strbuf_{append,chr}() static. --- dlls/hhctrl.ocx/stream.c | 4 ++-- dlls/hhctrl.ocx/stream.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/hhctrl.ocx/stream.c b/dlls/hhctrl.ocx/stream.c index 317eeeb..eb2bcc3 100644 --- a/dlls/hhctrl.ocx/stream.c +++ b/dlls/hhctrl.ocx/stream.c @@ -40,7 +40,7 @@ void strbuf_free(strbuf_t *buf) heap_free(buf->buf); } -void strbuf_append(strbuf_t *buf, const char *data, int len) +static void strbuf_append(strbuf_t *buf, const char *data, int len) { if(buf->len+len > buf->size) { buf->size = buf->len+len; @@ -57,7 +57,7 @@ void stream_init(stream_t *stream, IStream *str) stream->str = str; } -BOOL stream_chr(stream_t *stream, strbuf_t *buf, char c) +static BOOL stream_chr(stream_t *stream, strbuf_t *buf, char c) { BOOL b = TRUE; ULONG i; diff --git a/dlls/hhctrl.ocx/stream.h b/dlls/hhctrl.ocx/stream.h index a03fd46..3996c09 100644 --- a/dlls/hhctrl.ocx/stream.h +++ b/dlls/hhctrl.ocx/stream.h @@ -37,9 +37,7 @@ typedef struct { void strbuf_init(strbuf_t *buf); void strbuf_zero(strbuf_t *buf); void strbuf_free(strbuf_t *buf); -void strbuf_append(strbuf_t *buf, const char *data, int len); void stream_init(stream_t *stream, IStream *str); -BOOL stream_chr(stream_t *stream, strbuf_t *buf, char c); void get_node_name(strbuf_t *node, strbuf_t *name); BOOL next_content(stream_t *stream, strbuf_t *buf); BOOL next_node(stream_t *stream, strbuf_t *buf);

1 0

Francois Gouget : usp10: Add a trailing '\n' to a TRACE() call.
by Alexandre Julliard 31 Aug '10

31 Aug '10

Module: wine Branch: master Commit: 673d7538cbfe30279e651768763348b51f3fe4a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=673d7538cbfe30279e6517687… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 31 11:53:36 2010 +0200 usp10: Add a trailing '\n' to a TRACE() call. --- dlls/usp10/bidi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 0538fa5..9c5884d 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -750,7 +750,7 @@ BOOL BIDI_DetermineLevels( { WORD *chartype; unsigned baselevel = 0,j; - TRACE("%s, %d", debugstr_wn(lpString, uCount), uCount); + TRACE("%s, %d\n", debugstr_wn(lpString, uCount), uCount); chartype = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(WORD)); if (!chartype)

1 0

Francois Gouget : rpcrt4: Make RPCRT4_Receive() static.
by Alexandre Julliard 31 Aug '10

31 Aug '10

Module: wine Branch: master Commit: 99c5ca7e4076d61e50865c27ba663de5ea7d6544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c5ca7e4076d61e50865c27b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 31 11:54:17 2010 +0200 rpcrt4: Make RPCRT4_Receive() static. --- dlls/rpcrt4/rpc_message.c | 4 ++-- dlls/rpcrt4/rpc_message.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 0144f85..1d18627 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -1547,8 +1547,8 @@ fail: * * Receive a packet from connection and merge the fragments. */ -RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, - PRPC_MESSAGE pMsg) +static RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, + PRPC_MESSAGE pMsg) { return RPCRT4_ReceiveWithAuth(Connection, Header, pMsg, NULL, NULL); } diff --git a/dlls/rpcrt4/rpc_message.h b/dlls/rpcrt4/rpc_message.h index 2509527..cf1e410 100644 --- a/dlls/rpcrt4/rpc_message.h +++ b/dlls/rpcrt4/rpc_message.h @@ -36,7 +36,6 @@ RpcPktHdr *RPCRT4_BuildHttpFlowControlHeader(BOOL server, ULONG bytes_transmitte VOID RPCRT4_FreeHeader(RpcPktHdr *Header); RPC_STATUS RPCRT4_Send(RpcConnection *Connection, RpcPktHdr *Header, void *Buffer, unsigned int BufferLength); RPC_STATUS RPCRT4_SendWithAuth(RpcConnection *Connection, RpcPktHdr *Header, void *Buffer, unsigned int BufferLength, const void *Auth, unsigned int AuthLength); -RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, PRPC_MESSAGE pMsg); RPC_STATUS RPCRT4_ReceiveWithAuth(RpcConnection *Connection, RpcPktHdr **Header, PRPC_MESSAGE pMsg, unsigned char **auth_data_out, ULONG *auth_length_out); DWORD RPCRT4_GetHeaderSize(const RpcPktHdr *Header); RPC_STATUS RPCRT4_ValidateCommonHeader(const RpcPktCommonHdr *hdr);

1 0

Francois Gouget : mshtml: Make free_strings() static.
by Alexandre Julliard 31 Aug '10

31 Aug '10

Module: wine Branch: master Commit: 3b7fc00d29f312d1a1e7006424819b5d07fe7884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b7fc00d29f312d1a1e700642… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 31 11:53:41 2010 +0200 mshtml: Make free_strings() static. --- dlls/mshtml/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 4aef475..a8bfb5e 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -65,7 +65,7 @@ static void thread_detach(void) heap_free(thread_data); } -void free_strings(void) +static void free_strings(void) { int i; for(i = 0; i < NUM_STATUS_STRINGS; i++)

1 0

Henri Verbeet : wined3d: Rename wined3d_format_desc to wined3d_format.
by Alexandre Julliard 31 Aug '10

31 Aug '10

Module: wine Branch: master Commit: 3a7f08a56f30310318df60311e2352a614e74654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7f08a56f30310318df60311… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 30 20:29:49 2010 +0200 wined3d: Rename wined3d_format_desc to wined3d_format. --- dlls/wined3d/arb_program_shader.c | 22 ++-- dlls/wined3d/basetexture.c | 10 +- dlls/wined3d/buffer.c | 20 ++-- dlls/wined3d/context.c | 52 +++--- dlls/wined3d/cubetexture.c | 8 +- dlls/wined3d/device.c | 65 ++++---- dlls/wined3d/directx.c | 216 +++++++++++++------------ dlls/wined3d/drawprim.c | 24 ++-- dlls/wined3d/resource.c | 4 +- dlls/wined3d/shader.c | 6 +- dlls/wined3d/state.c | 64 ++++---- dlls/wined3d/surface.c | 322 ++++++++++++++++++------------------- dlls/wined3d/surface_base.c | 99 ++++++------ dlls/wined3d/surface_gdi.c | 4 +- dlls/wined3d/swapchain.c | 14 +- dlls/wined3d/texture.c | 14 +- dlls/wined3d/utils.c | 270 ++++++++++++++++---------------- dlls/wined3d/vertexdeclaration.c | 4 +- dlls/wined3d/volume.c | 41 ++---- dlls/wined3d/volumetexture.c | 4 +- dlls/wined3d/wined3d_private.h | 46 +++--- 21 files changed, 644 insertions(+), 665 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a7f08a56f30310318df6…

1 0

Andrew Talbot : dinput: Constify some variables.
by Alexandre Julliard 31 Aug '10

31 Aug '10

Module: wine Branch: master Commit: e6649952faad3118a36a53c8599577f11391cf8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6649952faad3118a36a53c85… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 30 21:19:22 2010 +0100 dinput: Constify some variables. --- dlls/dinput/device_private.h | 2 +- dlls/dinput/joystick.c | 2 +- dlls/dinput/joystick_private.h | 2 +- dlls/dinput/mouse.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 43b28c9..fd5808d 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -94,7 +94,7 @@ typedef struct LONG lSaturation; } ObjProps; -extern DWORD joystick_map_pov(POINTL *p); +extern DWORD joystick_map_pov(const POINTL *p); extern LONG joystick_map_axis(ObjProps *props, int val); typedef struct diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 0f39a6d..7d781c9 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -434,7 +434,7 @@ LONG joystick_map_axis(ObjProps *props, int val) * 22500 13500 * 18000 */ -DWORD joystick_map_pov(POINTL *p) +DWORD joystick_map_pov(const POINTL *p) { if (p->x > 0) return p->y < 0 ? 4500 : !p->y ? 9000 : 13500; diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index aaa8294..0407e0a 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -55,7 +55,7 @@ typedef struct JoystickGenericImpl LONG joystick_map_axis(ObjProps *props, int val); HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_map); -DWORD joystick_map_pov(POINTL *p); +DWORD joystick_map_pov(const POINTL *p); HRESULT WINAPI JoystickWGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEOBJECTINSTANCEW pdidoi, DWORD dwObj, DWORD dwHow); diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index e05d9e2..1599157 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -84,7 +84,7 @@ const GUID DInput_Wine_Mouse_GUID = { /* 9e573ed8-7734-11d2-8d4a-23903fb6bdf7 */ 0x9e573ed8, 0x7734, 0x11d2, {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} }; -static void _dump_mouse_state(DIMOUSESTATE2 *m_state) +static void _dump_mouse_state(const DIMOUSESTATE2 *m_state) { int i;

1 0