wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

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

31 Aug '10

Module: wine Branch: master Commit: 352a876f91ecb085c3e6ced50faffd2b7482ca3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=352a876f91ecb085c3e6ced50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 31 12:22:03 2010 +0200 dbghelp: Use int64 in the spec file for 64-bit integers. --- dlls/dbghelp/dbghelp.spec | 64 +++++++++++++++++++++--------------------- dlls/imagehlp/imagehlp.spec | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=352a876f91ecb085c3e6c…

1 0

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

31 Aug '10

Module: wine Branch: master Commit: cd3d46d178dc6e48a5814ee9885915fa00952e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd3d46d178dc6e48a5814ee98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 31 12:21:19 2010 +0200 comctl32: Use int64 in the spec file for 64-bit integers. --- dlls/comctl32/comctl32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index c2c76a3..438a4dc 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -15,7 +15,7 @@ 11 stdcall -noname DPA_Merge(ptr ptr long ptr ptr long) #12 stub Cctl1632_ThunkData32 13 stdcall MakeDragList(long) - 14 stdcall LBItemFromPt(long double long) + 14 stdcall LBItemFromPt(long int64 long) 15 stdcall DrawInsert(long long long) 16 stdcall CreateUpDownControl(long long long long long long long long long long long long) 17 stdcall InitCommonControls()

1 0

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

31 Aug '10

Module: wine Branch: master Commit: e598850cc3162b51d255697a86c22c60e37fd9ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=e598850cc3162b51d255697a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 31 12:21:11 2010 +0200 advapi32: Use int64 in the spec file for 64-bit integers. --- dlls/advapi32/advapi32.spec | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 0515b72..820d73c 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -65,8 +65,8 @@ @ stdcall CommandLineFromMsiDescriptor(wstr ptr ptr) # @ stub ComputeAccessTokenFromCodeAuthzLevel @ stdcall ControlService(long long ptr) -@ stdcall ControlTraceA(double str ptr long) -@ stdcall ControlTraceW(double wstr ptr long) +@ stdcall ControlTraceA(int64 str ptr long) +@ stdcall ControlTraceW(int64 wstr ptr long) # @ stub ConvertAccessToSecurityDescriptorA # @ stub ConvertAccessToSecurityDescriptorW # @ stub ConvertSDToStringSDRootDomainA @@ -200,7 +200,7 @@ @ stub ElfRegisterEventSourceW # @ stub ElfReportEventA @ stub ElfReportEventW -@ stdcall EnableTrace(long long long ptr double) +@ stdcall EnableTrace(long long long ptr int64) @ stdcall EncryptFileA(str) @ stdcall EncryptFileW(wstr) # @ stub EncryptedFileKeyInfo @@ -637,7 +637,7 @@ @ stdcall SystemFunction036(ptr long) # RtlGenRandom @ stdcall SystemFunction040(ptr long long) # RtlEncryptMemory @ stdcall SystemFunction041(ptr long long) # RtlDecryptMemory -@ stdcall TraceEvent(double ptr) +@ stdcall TraceEvent(int64 ptr) @ stub TraceEventInstance @ stub TraceMessage @ stub TraceMessageVa @@ -648,7 +648,7 @@ # @ stub UninstallApplication @ stdcall UnlockServiceDatabase (ptr) # @ stub UnregisterIdleTask -@ stdcall UnregisterTraceGuids(double) +@ stdcall UnregisterTraceGuids(int64) @ stub UpdateTraceA @ stub UpdateTraceW @ stub WdmWmiServiceMain

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

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 : 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 : 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 : 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 : comdlg32: Make FD31_FreeOfnW() and FD31_MapOfnStructA() static.
by Alexandre Julliard 31 Aug '10

31 Aug '10

Module: wine Branch: master Commit: b520cc1aed87d901ce506e1c240cd146dbe1bb73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b520cc1aed87d901ce506e1c2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 31 11:49:13 2010 +0200 comdlg32: Make FD31_FreeOfnW() and FD31_MapOfnStructA() static. --- dlls/comdlg32/filedlg31.c | 4 ++-- dlls/comdlg32/filedlg31.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 89ef0e3..d74b1be 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -738,7 +738,7 @@ static LPWSTR FD31_DupToW(LPCSTR str, DWORD size) * FD31_MapOfnStructA [internal] * map a 32 bits Ansi structure to a Unicode one */ -void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, BOOL open) +static void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, BOOL open) { UNICODE_STRING usBuffer; @@ -796,7 +796,7 @@ void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, BOOL op * FD31_FreeOfnW [internal] * Undo all allocations done by FD31_MapOfnStructA */ -void FD31_FreeOfnW(OPENFILENAMEW *ofnW) +static void FD31_FreeOfnW(OPENFILENAMEW *ofnW) { HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrFilter); HeapFree(GetProcessHeap(), 0, ofnW->lpstrCustomFilter); diff --git a/dlls/comdlg32/filedlg31.h b/dlls/comdlg32/filedlg31.h index 79faed7..bb22005 100644 --- a/dlls/comdlg32/filedlg31.h +++ b/dlls/comdlg32/filedlg31.h @@ -40,8 +40,6 @@ extern BOOL FD32_GetTemplate(PFD31_DATA lfs); extern BOOL FD31_Init(void); extern PFD31_DATA FD31_AllocPrivate(LPARAM lParam, UINT dlgType, BOOL IsUnicode); extern void FD31_DestroyPrivate(PFD31_DATA lfs); -extern void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, BOOL open); -extern void FD31_FreeOfnW(OPENFILENAMEW *ofnW); extern BOOL FD31_CallWindowProc(const FD31_DATA *lfs, UINT wMsg, WPARAM wParam, LPARAM lParam); extern LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam);

1 0

Francois Gouget : kernel32/tests: Fix compilation on systems that don' t support nameless unions or structs.
by Alexandre Julliard 31 Aug '10

31 Aug '10

Module: wine Branch: master Commit: f3c092f738d356dcdf111de772e7d0a7d106ea33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c092f738d356dcdf111de77… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 31 11:49:00 2010 +0200 kernel32/tests: Fix compilation on systems that don't support nameless unions or structs. --- dlls/kernel32/tests/process.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b4a048a..77a303c 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1810,11 +1810,11 @@ static void test_SystemInfo(void) pGetNativeSystemInfo(&nsi); if (is_wow64) { - if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) + if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) { - ok(nsi.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64, + ok(S(U(nsi)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64, "Expected PROCESSOR_ARCHITECTURE_AMD64, got %d\n", - nsi.wProcessorArchitecture); + S(U(nsi)).wProcessorArchitecture); ok(nsi.dwProcessorType == PROCESSOR_AMD_X8664, "Expected PROCESSOR_AMD_X8664, got %d\n", nsi.dwProcessorType); @@ -1822,9 +1822,9 @@ static void test_SystemInfo(void) } else { - ok(si.wProcessorArchitecture == nsi.wProcessorArchitecture, + ok(S(U(si)).wProcessorArchitecture == S(U(nsi)).wProcessorArchitecture, "Expected no difference for wProcessorArchitecture, got %d and %d\n", - si.wProcessorArchitecture, nsi.wProcessorArchitecture); + S(U(si)).wProcessorArchitecture, S(U(nsi)).wProcessorArchitecture); ok(si.dwProcessorType == nsi.dwProcessorType, "Expected no difference for dwProcessorType, got %d and %d\n", si.dwProcessorType, nsi.dwProcessorType);

1 0

← Newer
1
2
3
4
5
6
7
...
89
Older →

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 August 2010