December 2008 - Wine-commits

Francois Gouget : gdi32: Make [GS]etDCState() static.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: cc6e4e955e05ac3189c7d8c6498042fc093fad26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc6e4e955e05ac3189c7d8c64… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 12:06:14 2008 +0100 gdi32: Make [GS]etDCState() static. --- dlls/gdi32/dc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 8e4601d..c8a3c4c 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -327,7 +327,7 @@ void DC_UpdateXforms( DC *dc ) /*********************************************************************** * GetDCState (Not a Windows API) */ -HDC WINAPI GetDCState( HDC hdc ) +static HDC GetDCState( HDC hdc ) { DC * newdc, * dc; HGDIOBJ handle; @@ -428,7 +428,7 @@ HDC WINAPI GetDCState( HDC hdc ) /*********************************************************************** * SetDCState (Not a Windows API) */ -void WINAPI SetDCState( HDC hdc, HDC hdcs ) +static void SetDCState( HDC hdc, HDC hdcs ) { DC *dc, *dcs;

1 0

Francois Gouget : gdi32: Export three implemented 16bit Engine*() functions .
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 52b4c7f26ded11689226c56ae23462dca58fa706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52b4c7f26ded11689226c56ae… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 12:06:48 2008 +0100 gdi32: Export three implemented 16bit Engine*() functions. --- dlls/gdi32/gdi.exe.spec | 6 +++--- dlls/gdi32/gdi16.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/gdi.exe.spec b/dlls/gdi32/gdi.exe.spec index 6c7aa67..cade1c2 100644 --- a/dlls/gdi32/gdi.exe.spec +++ b/dlls/gdi32/gdi.exe.spec @@ -231,9 +231,9 @@ 301 pascal -ret16 EngineDeleteFont(ptr) EngineDeleteFont16 302 pascal EngineRealizeFont(ptr ptr ptr) EngineRealizeFont16 303 pascal -ret16 EngineGetCharWidth(ptr word word ptr) EngineGetCharWidth16 -304 stub ENGINESETFONTCONTEXT -305 stub ENGINEGETGLYPHBMP -306 stub ENGINEMAKEFONTDIR +304 pascal -ret16 EngineSetFontContext(ptr word) EngineSetFontContext16 +305 pascal -ret16 EngineGetGlyphBMP(word ptr word word ptr long ptr) EngineGetGlyphBMP16 +306 pascal EngineMakeFontDir(word ptr ptr) EngineMakeFontDir16 307 pascal -ret16 GetCharABCWidths(word word word ptr) GetCharABCWidths16 308 pascal -ret16 GetOutlineTextMetrics(word word ptr) GetOutlineTextMetrics16 309 pascal GetGlyphOutline(word word word ptr long ptr ptr) GetGlyphOutline16 diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index a1bbe1c..b70b44e 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -1897,7 +1897,7 @@ WORD WINAPI EngineGetCharWidth16(LPFONTINFO16 lpFontInfo, BYTE firstChar, BYTE l /*********************************************************************** * EngineSetFontContext (GDI.304) */ -WORD WINAPI EngineSetFontContext(LPFONTINFO16 lpFontInfo, WORD data) +WORD WINAPI EngineSetFontContext16(LPFONTINFO16 lpFontInfo, WORD data) { FIXME("stub?\n"); return 0; @@ -1906,7 +1906,7 @@ WORD WINAPI EngineSetFontContext(LPFONTINFO16 lpFontInfo, WORD data) /*********************************************************************** * EngineGetGlyphBMP (GDI.305) */ -WORD WINAPI EngineGetGlyphBMP(WORD word, LPFONTINFO16 lpFontInfo, WORD w1, WORD w2, +WORD WINAPI EngineGetGlyphBMP16(WORD word, LPFONTINFO16 lpFontInfo, WORD w1, WORD w2, LPSTR string, DWORD dword, /*LPBITMAPMETRICS16*/ LPVOID metrics) { FIXME("stub?\n"); @@ -1917,7 +1917,7 @@ WORD WINAPI EngineGetGlyphBMP(WORD word, LPFONTINFO16 lpFontInfo, WORD w1, WORD /*********************************************************************** * EngineMakeFontDir (GDI.306) */ -DWORD WINAPI EngineMakeFontDir(HDC16 hdc, LPFONTDIR16 fontdir, LPCSTR string) +DWORD WINAPI EngineMakeFontDir16(HDC16 hdc, LPFONTDIR16 fontdir, LPCSTR string) { FIXME(" stub! (always fails)\n"); return ~0UL; /* error */

1 0

Francois Gouget : kernel32: Make some functions static.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 0f305929bc876264bfffa9df413ded299e2a2562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f305929bc876264bfffa9df4… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 11:59:48 2008 +0100 kernel32: Make some functions static. --- dlls/kernel32/instr.c | 2 +- dlls/kernel32/kernel_private.h | 1 - dlls/kernel32/snoop16.c | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/instr.c b/dlls/kernel32/instr.c index 757f0c5..73edf7b 100644 --- a/dlls/kernel32/instr.c +++ b/dlls/kernel32/instr.c @@ -895,7 +895,7 @@ LONG CALLBACK INSTR_vectored_handler( EXCEPTION_POINTERS *ptrs ) /*********************************************************************** * INSTR_CallBuiltinHandler */ -void INSTR_CallBuiltinHandler( CONTEXT86 *context, BYTE intnum ) +static void INSTR_CallBuiltinHandler( CONTEXT86 *context, BYTE intnum ) { if (!winedos.CallBuiltinHandler) load_winedos(); if (winedos.CallBuiltinHandler) winedos.CallBuiltinHandler( context, intnum ); diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 5ce1e32..f83b6c3 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -80,7 +80,6 @@ extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ); extern DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ); extern LONG CALLBACK INSTR_vectored_handler( EXCEPTION_POINTERS *ptrs ); -extern void INSTR_CallBuiltinHandler( CONTEXT86 *context, BYTE intnum ); /* return values for MODULE_GetBinaryType */ enum binary_type diff --git a/dlls/kernel32/snoop16.c b/dlls/kernel32/snoop16.c index b319088..8c79269 100644 --- a/dlls/kernel32/snoop16.c +++ b/dlls/kernel32/snoop16.c @@ -42,8 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(snoop); #include "pshpack1.h" -void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT86 *context); -void WINAPI SNOOP16_Return(FARPROC proc, LPBYTE args, CONTEXT86 *context); +static void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT86 *context); +static void WINAPI SNOOP16_Return(FARPROC proc, LPBYTE args, CONTEXT86 *context); typedef struct tagSNOOP16_FUN { /* code part */ @@ -241,7 +241,7 @@ SNOOP16_GetProcAddress16(HMODULE16 hmod,DWORD ordinal,FARPROC16 origfun) { } #define CALLER1REF (*(DWORD*)(MapSL( MAKESEGPTR(context->SegSs,LOWORD(context->Esp)+4)))) -void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT86 *context) { +static void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT86 *context) { DWORD ordinal=0; DWORD entry=(DWORD)MapSL( MAKESEGPTR(context->SegCs,LOWORD(context->Eip)) )-5; WORD xcs = context->SegCs; @@ -308,7 +308,7 @@ void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT86 *context) { DPRINTF(") ret=%04x:%04x\n",HIWORD(ret->origreturn),LOWORD(ret->origreturn)); } -void WINAPI SNOOP16_Return(FARPROC proc, LPBYTE args, CONTEXT86 *context) { +static void WINAPI SNOOP16_Return(FARPROC proc, LPBYTE args, CONTEXT86 *context) { SNOOP16_RETURNENTRY *ret = (SNOOP16_RETURNENTRY*)((char *) MapSL( MAKESEGPTR(context->SegCs,LOWORD(context->Eip)) )-5); /* We haven't found out the nrofargs yet. If we called a cdecl

1 0

Francois Gouget : ddraw/tests: Make some functions static.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: ab9f028958a3ba39b863c6b34e63022e4ec5962e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab9f028958a3ba39b863c6b34… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 12:03:57 2008 +0100 ddraw/tests: Make some functions static. --- dlls/ddraw/tests/dsurface.c | 6 +++--- dlls/ddraw/tests/visual.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 80cf9b1..1ad07ec 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1025,7 +1025,7 @@ static void EnumTest(void) IDirectDrawSurface_Release(surface); } -HRESULT WINAPI SurfaceCounter(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) +static HRESULT WINAPI SurfaceCounter(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) { UINT *num = context; (*num)++; @@ -1418,7 +1418,7 @@ struct compare UINT mips; }; -HRESULT WINAPI CubeTestLvl2Enum(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) +static HRESULT WINAPI CubeTestLvl2Enum(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) { UINT *mips = context; @@ -1430,7 +1430,7 @@ HRESULT WINAPI CubeTestLvl2Enum(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *de return DDENUMRET_OK; } -HRESULT WINAPI CubeTestLvl1Enum(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) +static HRESULT WINAPI CubeTestLvl1Enum(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) { UINT mips = 0; UINT *num = (UINT *) context; diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 185cc33..030354a 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1027,7 +1027,7 @@ out: ptr = ((D3DTRIANGLE*)(ptr))+1;\ } while (0) -HRESULT CALLBACK TextureFormatEnumCallback(LPDDSURFACEDESC lpDDSD, LPVOID lpContext) +static HRESULT CALLBACK TextureFormatEnumCallback(LPDDSURFACEDESC lpDDSD, LPVOID lpContext) { if (lpDDSD->ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) { *(BOOL*)lpContext = TRUE;

1 0

Francois Gouget : net: Make output_string() and output_error_string() static.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 7a71c5d3e3a14b542a23ee10d9342be837918b54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a71c5d3e3a14b542a23ee10d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 12:04:28 2008 +0100 net: Make output_string() and output_error_string() static. --- programs/net/net.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index 30337a6..89279fd 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -25,7 +25,7 @@ #define NET_START 0001 #define NET_STOP 0002 -int output_string(int msg, ...) +static int output_string(int msg, ...) { char msg_buffer[8192]; va_list arguments; @@ -37,7 +37,7 @@ int output_string(int msg, ...) return 0; } -BOOL output_error_string(DWORD error) +static BOOL output_error_string(DWORD error) { LPSTR pBuffer; if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM |

1 0

Francois Gouget : oleaut32/tests: Make the Widget_*() and KindaEnum_*() functions static.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: c597792400e2a9ec2f085b4cb21a246d69b8abf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c597792400e2a9ec2f085b4cb… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 12:05:41 2008 +0100 oleaut32/tests: Make the Widget_*() and KindaEnum_*() functions static. --- dlls/oleaut32/tests/tmarshal.c | 66 ++++++++++++++++++++-------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 04f0d4d..6193d80 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -297,7 +297,7 @@ typedef struct Widget IUnknown *pDispatchUnknown; } Widget; -HRESULT WINAPI Widget_QueryInterface( +static HRESULT WINAPI Widget_QueryInterface( IWidget *iface, /* [in] */ REFIID riid, /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject) @@ -315,7 +315,7 @@ HRESULT WINAPI Widget_QueryInterface( } } -ULONG WINAPI Widget_AddRef( +static ULONG WINAPI Widget_AddRef( IWidget *iface) { Widget *This = (Widget *)iface; @@ -323,7 +323,7 @@ ULONG WINAPI Widget_AddRef( return InterlockedIncrement(&This->refs); } -ULONG WINAPI Widget_Release( +static ULONG WINAPI Widget_Release( IWidget *iface) { Widget *This = (Widget *)iface; @@ -339,7 +339,7 @@ ULONG WINAPI Widget_Release( return refs; } -HRESULT WINAPI Widget_GetTypeInfoCount( +static HRESULT WINAPI Widget_GetTypeInfoCount( IWidget *iface, /* [out] */ UINT __RPC_FAR *pctinfo) { @@ -354,7 +354,7 @@ HRESULT WINAPI Widget_GetTypeInfoCount( return hr; } -HRESULT WINAPI Widget_GetTypeInfo( +static HRESULT WINAPI Widget_GetTypeInfo( IWidget __RPC_FAR * iface, /* [in] */ UINT iTInfo, /* [in] */ LCID lcid, @@ -371,7 +371,7 @@ HRESULT WINAPI Widget_GetTypeInfo( return hr; } -HRESULT WINAPI Widget_GetIDsOfNames( +static HRESULT WINAPI Widget_GetIDsOfNames( IWidget __RPC_FAR * iface, /* [in] */ REFIID riid, /* [size_is][in] */ LPOLESTR __RPC_FAR *rgszNames, @@ -390,7 +390,7 @@ HRESULT WINAPI Widget_GetIDsOfNames( return hr; } -HRESULT WINAPI Widget_Invoke( +static HRESULT WINAPI Widget_Invoke( IWidget __RPC_FAR * iface, /* [in] */ DISPID dispIdMember, /* [in] */ REFIID riid, @@ -412,7 +412,7 @@ HRESULT WINAPI Widget_Invoke( return hr; } -HRESULT WINAPI Widget_put_Name( +static HRESULT WINAPI Widget_put_Name( IWidget __RPC_FAR * iface, /* [in] */ BSTR name) { @@ -420,7 +420,7 @@ HRESULT WINAPI Widget_put_Name( return S_OK; } -HRESULT WINAPI Widget_get_Name( +static HRESULT WINAPI Widget_get_Name( IWidget __RPC_FAR * iface, /* [out] */ BSTR __RPC_FAR *name) { @@ -430,7 +430,7 @@ HRESULT WINAPI Widget_get_Name( return S_OK; } -HRESULT WINAPI Widget_DoSomething( +static HRESULT WINAPI Widget_DoSomething( IWidget __RPC_FAR * iface, /* [in] */ double number, /* [out] */ BSTR *str1, @@ -449,7 +449,7 @@ HRESULT WINAPI Widget_DoSomething( return S_FALSE; } -HRESULT WINAPI Widget_get_State( +static HRESULT WINAPI Widget_get_State( IWidget __RPC_FAR * iface, /* [retval][out] */ STATE __RPC_FAR *state) { @@ -458,7 +458,7 @@ HRESULT WINAPI Widget_get_State( return S_OK; } -HRESULT WINAPI Widget_put_State( +static HRESULT WINAPI Widget_put_State( IWidget __RPC_FAR * iface, /* [in] */ STATE state) { @@ -466,7 +466,7 @@ HRESULT WINAPI Widget_put_State( return S_OK; } -HRESULT WINAPI Widget_Map( +static HRESULT WINAPI Widget_Map( IWidget * iface, BSTR bstrId, BSTR *sValue) @@ -476,7 +476,7 @@ HRESULT WINAPI Widget_Map( return S_OK; } -HRESULT WINAPI Widget_SetOleColor( +static HRESULT WINAPI Widget_SetOleColor( IWidget * iface, OLE_COLOR val) { @@ -484,7 +484,7 @@ HRESULT WINAPI Widget_SetOleColor( return S_OK; } -HRESULT WINAPI Widget_GetOleColor( +static HRESULT WINAPI Widget_GetOleColor( IWidget * iface, OLE_COLOR *pVal) { @@ -493,7 +493,7 @@ HRESULT WINAPI Widget_GetOleColor( return S_FALSE; } -HRESULT WINAPI Widget_Clone( +static HRESULT WINAPI Widget_Clone( IWidget *iface, IWidget **ppVal) { @@ -501,7 +501,7 @@ HRESULT WINAPI Widget_Clone( return Widget_QueryInterface(iface, &IID_IWidget, (void **)ppVal); } -HRESULT WINAPI Widget_CloneDispatch( +static HRESULT WINAPI Widget_CloneDispatch( IWidget *iface, IDispatch **ppVal) { @@ -509,7 +509,7 @@ HRESULT WINAPI Widget_CloneDispatch( return Widget_QueryInterface(iface, &IID_IWidget, (void **)ppVal); } -HRESULT WINAPI Widget_CloneCoclass( +static HRESULT WINAPI Widget_CloneCoclass( IWidget *iface, ApplicationObject2 **ppVal) { @@ -517,7 +517,7 @@ HRESULT WINAPI Widget_CloneCoclass( return S_OK; } -HRESULT WINAPI Widget_Value( +static HRESULT WINAPI Widget_Value( IWidget __RPC_FAR * iface, VARIANT *value, VARIANT *retval) @@ -530,7 +530,7 @@ HRESULT WINAPI Widget_Value( return S_OK; } -HRESULT WINAPI Widget_Array( +static HRESULT WINAPI Widget_Array( IWidget * iface, SAFEARRAY * values) { @@ -538,7 +538,7 @@ HRESULT WINAPI Widget_Array( return S_OK; } -HRESULT WINAPI Widget_VariantArrayPtr( +static HRESULT WINAPI Widget_VariantArrayPtr( IWidget * iface, SAFEARRAY ** values) { @@ -546,7 +546,7 @@ HRESULT WINAPI Widget_VariantArrayPtr( return S_OK; } -void WINAPI Widget_Variant( +static void WINAPI Widget_Variant( IWidget __RPC_FAR * iface, VARIANT var) { @@ -556,7 +556,7 @@ void WINAPI Widget_Variant( ok(S(V_CY(&var)).Lo == 0xdeadbeef, "V_CY(&var).Lo was 0x%x\n", S(V_CY(&var)).Lo); } -void WINAPI Widget_VarArg( +static void WINAPI Widget_VarArg( IWidget * iface, int numexpect, SAFEARRAY * values) @@ -588,7 +588,7 @@ void WINAPI Widget_VarArg( ok(hr == S_OK, "SafeArrayUnaccessData failed with %x\n", hr); } -void WINAPI Widget_StructArgs( +static void WINAPI Widget_StructArgs( IWidget * iface, MYSTRUCT byval, MYSTRUCT *byptr, @@ -600,14 +600,14 @@ void WINAPI Widget_StructArgs( } -HRESULT WINAPI Widget_Error( +static HRESULT WINAPI Widget_Error( IWidget __RPC_FAR * iface) { trace("Error()\n"); return E_NOTIMPL; } -HRESULT WINAPI Widget_CloneInterface( +static HRESULT WINAPI Widget_CloneInterface( IWidget __RPC_FAR * iface, ISomethingFromDispatch **ppVal) { @@ -791,7 +791,7 @@ static IWidget *Widget_Create(void) } } -HRESULT WINAPI KindaEnum_QueryInterface( +static HRESULT WINAPI KindaEnum_QueryInterface( IKindaEnumWidget *iface, /* [in] */ REFIID riid, /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject) @@ -809,7 +809,7 @@ HRESULT WINAPI KindaEnum_QueryInterface( } } -ULONG WINAPI KindaEnum_AddRef( +static ULONG WINAPI KindaEnum_AddRef( IKindaEnumWidget *iface) { KindaEnum *This = (KindaEnum *)iface; @@ -817,7 +817,7 @@ ULONG WINAPI KindaEnum_AddRef( return InterlockedIncrement(&This->refs); } -ULONG WINAPI KindaEnum_Release( +static ULONG WINAPI KindaEnum_Release( IKindaEnumWidget *iface) { KindaEnum *This = (KindaEnum *)iface; @@ -832,7 +832,7 @@ ULONG WINAPI KindaEnum_Release( return refs; } -HRESULT WINAPI KindaEnum_Next( +static HRESULT WINAPI KindaEnum_Next( IKindaEnumWidget *iface, /* [out] */ IWidget __RPC_FAR *__RPC_FAR *widget) { @@ -843,20 +843,20 @@ HRESULT WINAPI KindaEnum_Next( return E_OUTOFMEMORY; } -HRESULT WINAPI KindaEnum_Count( +static HRESULT WINAPI KindaEnum_Count( IKindaEnumWidget *iface, /* [out] */ unsigned long __RPC_FAR *count) { return E_NOTIMPL; } -HRESULT WINAPI KindaEnum_Reset( +static HRESULT WINAPI KindaEnum_Reset( IKindaEnumWidget *iface) { return E_NOTIMPL; } -HRESULT WINAPI KindaEnum_Clone( +static HRESULT WINAPI KindaEnum_Clone( IKindaEnumWidget *iface, /* [out] */ IKindaEnumWidget __RPC_FAR *__RPC_FAR *ppenum) {

1 0

Francois Gouget : wineesd.drv: Make some functions static.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: d27396980f4d9deddb542b14dd612a162440255b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d27396980f4d9deddb542b14d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 12:04:46 2008 +0100 wineesd.drv: Make some functions static. --- dlls/wineesd.drv/audio.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index a48e277..8ec468d 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -241,7 +241,7 @@ static const char *wodPlayerCmdString[] = { /* Volume functions derived from Alsaplayer source */ /* length is the number of 16 bit samples */ -void volume_effect16(void *bufin, void* bufout, int length, int left, +static void volume_effect16(void *bufin, void* bufout, int length, int left, int right, int nChannels) { short *d_out = (short *)bufout; @@ -368,7 +368,7 @@ static BOOL supportedFormat(LPWAVEFORMATEX wf) return FALSE; } -void copy_format(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2) +static void copy_format(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2) { ZeroMemory(wf2, sizeof(wf2)); if (wf1->wFormatTag == WAVE_FORMAT_PCM) @@ -383,7 +383,7 @@ void copy_format(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2) * ESD_CloseWaveOutDevice * */ -void ESD_CloseWaveOutDevice(WINE_WAVEOUT* wwo) +static void ESD_CloseWaveOutDevice(WINE_WAVEOUT* wwo) { esd_close(wwo->esd_fd); /* close the esd socket fd */ wwo->esd_fd = -1; @@ -398,7 +398,7 @@ void ESD_CloseWaveOutDevice(WINE_WAVEOUT* wwo) * ESD_CloseWaveInDevice * */ -void ESD_CloseWaveInDevice(WINE_WAVEIN* wwi) +static void ESD_CloseWaveInDevice(WINE_WAVEIN* wwi) { esd_close(wwi->esd_fd); /* close the esd socket fd */ wwi->esd_fd = -1;

1 0

Francois Gouget : wineaudioio.drv: Export widMessage().
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 234fb77a9cd97252d898d54a783a25fd7378fc95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=234fb77a9cd97252d898d54a7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 12:05:20 2008 +0100 wineaudioio.drv: Export widMessage(). --- dlls/wineaudioio.drv/wineaudioio.drv.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wineaudioio.drv/wineaudioio.drv.spec b/dlls/wineaudioio.drv/wineaudioio.drv.spec index 0424687..174c49a 100644 --- a/dlls/wineaudioio.drv/wineaudioio.drv.spec +++ b/dlls/wineaudioio.drv/wineaudioio.drv.spec @@ -1,2 +1,3 @@ @ stdcall -private DriverProc(long long long long long) LIBAUDIOIO_DriverProc +@ stdcall -private widMessage(long long long long long) LIBAUDIOIO_widMessage @ stdcall -private wodMessage(long long long long long) LIBAUDIOIO_wodMessage

1 0

Francois Gouget : setupapi/tests: Make devinst_RegDeleteTreeW() static.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 8c8c0f71460fe79724188434524a911bcd5ca723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c8c0f71460fe797241884345… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 12:05:24 2008 +0100 setupapi/tests: Make devinst_RegDeleteTreeW() static. --- dlls/setupapi/tests/devinst.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index ada6027..78b2ca3 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -150,7 +150,7 @@ static BOOL remove_device(void) } /* RegDeleteTreeW from dlls/advapi32/registry.c */ -LSTATUS WINAPI devinst_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) +static LSTATUS devinst_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) { LONG ret; DWORD dwMaxSubkeyLen, dwMaxValueLen;

1 0

Francois Gouget : riched20/tests: Make keep_responsive() and customWordBreakProc() static.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 82f6b6ff41a0feda43721d5015c94fc02842ef28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f6b6ff41a0feda43721d501… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 12:05:29 2008 +0100 riched20/tests: Make keep_responsive() and customWordBreakProc() static. --- dlls/riched20/tests/editor.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index f4f5f1b..39d519b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -59,7 +59,7 @@ static HWND new_richedit(HWND parent) { /* Keeps the window reponsive for the deley_time in seconds. * This is useful for debugging a test to see what is happening. */ -void keep_responsive(time_t delay_time) +static void keep_responsive(time_t delay_time) { MSG msg; time_t end; @@ -5542,7 +5542,7 @@ static void test_undo_coalescing(void) DestroyWindow(hwnd); } -LONG CALLBACK customWordBreakProc(WCHAR *text, int pos, int bytes, int code) +static LONG CALLBACK customWordBreakProc(WCHAR *text, int pos, int bytes, int code) { int length;

1 0