December 2008 - Wine-Commits

Maarten Lankhorst : wineoss.drv: Get rid of sizeof in traces.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: 1470955cc50c8359f961910cefd312db8361d993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1470955cc50c8359f961910ce… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Dec 2 15:01:48 2008 +0100 wineoss.drv: Get rid of sizeof in traces. --- dlls/wineoss.drv/midi.c | 4 ++-- dlls/wineoss.drv/mixer.c | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index ade1928..15e0396 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -1620,8 +1620,8 @@ static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 || lpMidiHdr->dwBufferLength >= 0x10000ul) { - WARN("%p %p %08x %d/%d\n", lpMidiHdr, lpMidiHdr ? lpMidiHdr->lpData : NULL, - lpMidiHdr ? lpMidiHdr->dwFlags : 0, sizeof(MIDIHDR), dwSize); + WARN("%p %p %08x %d\n", lpMidiHdr, lpMidiHdr ? lpMidiHdr->lpData : NULL, + lpMidiHdr ? lpMidiHdr->dwFlags : 0, dwSize); return MMSYSERR_INVALPARAM; } diff --git a/dlls/wineoss.drv/mixer.c b/dlls/wineoss.drv/mixer.c index 34588f9..8eeb22b 100644 --- a/dlls/wineoss.drv/mixer.c +++ b/dlls/wineoss.drv/mixer.c @@ -787,8 +787,8 @@ static DWORD MIX_GetLineInfo(WORD wDevID, LPMIXERLINEW lpMl, DWORD fdwInfo) } if (lpMl->cbStruct != sizeof(*lpMl)) { - WARN("invalid parameter: lpMl->cbStruct = %d != %d\n", - lpMl->cbStruct, sizeof(*lpMl)); + WARN("invalid parameter: lpMl->cbStruct = %d\n", + lpMl->cbStruct); return MMSYSERR_INVALPARAM; } @@ -963,14 +963,14 @@ static DWORD MIX_GetLineControls(WORD wDevID, LPMIXERLINECONTROLSW lpMlc, } if (lpMlc->cbStruct < sizeof(*lpMlc)) { - WARN("invalid parameter: lpMlc->cbStruct = %d < %d\n", - lpMlc->cbStruct, sizeof(*lpMlc)); + WARN("invalid parameter: lpMlc->cbStruct = %d\n", + lpMlc->cbStruct); return MMSYSERR_INVALPARAM; } if (lpMlc->cbmxctrl < sizeof(MIXERCONTROLW)) { - WARN("invalid parameter: lpMlc->cbmxctrl = %d < %d\n", - lpMlc->cbmxctrl, sizeof(MIXERCONTROLW)); + WARN("invalid parameter: lpMlc->cbmxctrl = %d\n", + lpMlc->cbmxctrl); return MMSYSERR_INVALPARAM; } @@ -1098,8 +1098,8 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_UNSIGNED)) { - WARN("invalid parameter: cbDetails != %d\n", - sizeof(MIXERCONTROLDETAILS_UNSIGNED)); + WARN("invalid parameter: cbDetails = %d\n", + lpmcd->cbDetails); return MMSYSERR_INVALPARAM; } @@ -1145,8 +1145,8 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_BOOLEAN)) { - WARN("invalid parameter: cbDetails != %d\n", - sizeof(MIXERCONTROLDETAILS_BOOLEAN)); + WARN("invalid parameter: cbDetails = %d\n", + lpmcd->cbDetails); return MMSYSERR_INVALPARAM; } @@ -1167,8 +1167,8 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_BOOLEAN)) { - WARN("invalid parameter: cbDetails != %d\n", - sizeof(MIXERCONTROLDETAILS_BOOLEAN)); + WARN("invalid parameter: cbDetails = %d\n", + lpmcd->cbDetails); return MMSYSERR_INVALPARAM; } @@ -1299,8 +1299,8 @@ static DWORD MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_UNSIGNED)) { - WARN("invalid parameter: cbDetails != %d\n", - sizeof(MIXERCONTROLDETAILS_UNSIGNED)); + WARN("invalid parameter: cbDetails = %d\n", + lpmcd->cbDetails); return MMSYSERR_INVALPARAM; } @@ -1351,8 +1351,8 @@ static DWORD MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_BOOLEAN)) { - WARN("invalid parameter: cbDetails != %d\n", - sizeof(MIXERCONTROLDETAILS_BOOLEAN)); + WARN("invalid parameter: cbDetails = %d\n", + lpmcd->cbDetails); return MMSYSERR_INVALPARAM; } @@ -1395,8 +1395,8 @@ static DWORD MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_BOOLEAN)) { - WARN("invalid parameter: cbDetails != %d\n", - sizeof(MIXERCONTROLDETAILS_BOOLEAN)); + WARN("invalid parameter: cbDetails = %d\n", + lpmcd->cbDetails); return MMSYSERR_INVALPARAM; }

1 0

Maarten Lankhorst : winealsa.drv: Get rid of sizeof in traces.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: 1d9637f5cd0e167537d5c571f625636b6037deda URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9637f5cd0e167537d5c571f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Dec 2 15:07:36 2008 +0100 winealsa.drv: Get rid of sizeof in traces. --- dlls/winealsa.drv/alsa.c | 2 +- dlls/winealsa.drv/midi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 0623244..3a2633c 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -389,7 +389,7 @@ void ALSA_copyFormat(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2) else iLength = sizeof(WAVEFORMATEX) + wf1->cbSize; if (iLength > sizeof(WAVEFORMATPCMEX)) { - ERR("calculated %u bytes, capping to %u bytes\n", iLength, sizeof(WAVEFORMATPCMEX)); + ERR("calculated %u bytes, capping\n", iLength); iLength = sizeof(WAVEFORMATPCMEX); } memcpy(wf2, wf1, iLength); diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index c9710a2..7eb9a80 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -1050,8 +1050,8 @@ static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 || lpMidiHdr->dwBufferLength >= 0x10000ul) { - WARN("%p %p %08x %d/%d\n", lpMidiHdr, lpMidiHdr ? lpMidiHdr->lpData : NULL, - lpMidiHdr ? lpMidiHdr->dwFlags : 0, sizeof(MIDIHDR), dwSize); + WARN("%p %p %08x %d\n", lpMidiHdr, lpMidiHdr ? lpMidiHdr->lpData : NULL, + lpMidiHdr ? lpMidiHdr->dwFlags : 0, dwSize); return MMSYSERR_INVALPARAM; }

1 0

Maarten Lankhorst : winealsa.drv: Fix 64-bits incompatibilities.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: 2614269d93d782321515863c488d626e8631d7a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2614269d93d782321515863c4… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Dec 2 15:07:58 2008 +0100 winealsa.drv: Fix 64-bits incompatibilities. --- dlls/winealsa.drv/alsa.c | 14 +++++++------- dlls/winealsa.drv/alsa.h | 12 ++++++------ dlls/winealsa.drv/midi.c | 22 +++++++++++----------- dlls/winealsa.drv/wavein.c | 32 ++++++++++++++++---------------- dlls/winealsa.drv/waveout.c | 24 ++++++++++++------------ 5 files changed, 52 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2614269d93d7823215158…

1 0

Maarten Lankhorst : wineoss.drv: Fix 64-bits incompatibilities.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: c4b5233974007d74636e0e7fbe7144bd03ac5428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4b5233974007d74636e0e7fb… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Dec 2 15:40:52 2008 +0100 wineoss.drv: Fix 64-bits incompatibilities. --- dlls/wineoss.drv/audio.c | 66 +++++++++++++++++++++--------------------- dlls/wineoss.drv/audio.h | 2 +- dlls/wineoss.drv/dscapture.c | 4 +- dlls/wineoss.drv/dsrender.c | 4 +- dlls/wineoss.drv/midi.c | 18 ++++++------ dlls/wineoss.drv/mixer.c | 8 ++-- dlls/wineoss.drv/mmaux.c | 6 ++-- 7 files changed, 54 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4b5233974007d74636e0…

1 0

Alexandre Julliard : wined3d: Make some functions and variables static.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: 9c306e98710253389c3c9fe24d8cdf50db365c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c306e98710253389c3c9fe24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 2 15:31:17 2008 +0100 wined3d: Make some functions and variables static. --- dlls/wined3d/directx.c | 6 +++--- dlls/wined3d/nvidia_texture_shader.c | 6 +++--- dlls/wined3d/state.c | 2 +- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/surface_base.c | 7 ++++--- dlls/wined3d/surface_gdi.c | 20 ++++++++++---------- dlls/wined3d/vertexbuffer.c | 6 +++--- 7 files changed, 26 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c306e98710253389c3c9…

1 0

Alexandre Julliard : devenum: Make some functions static.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: 7f66623d493915936fad574116d985fa6df4e919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f66623d493915936fad57411… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 2 15:27:15 2008 +0100 devenum: Make some functions static. --- dlls/devenum/createdevenum.c | 4 ++-- dlls/devenum/devenum_private.h | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index d62c090..e64b27b 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -318,7 +318,7 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2) rgf2->u.s.rgPins = rgPins; } -static HRESULT DEVENUM_RegisterLegacyAmFilters() +static HRESULT DEVENUM_RegisterLegacyAmFilters(void) { HKEY hkeyFilter = NULL; DWORD dwFilterSubkeys, i; @@ -453,7 +453,7 @@ static HRESULT DEVENUM_RegisterLegacyAmFilters() /********************************************************************** * DEVENUM_ICreateDevEnum_CreateClassEnumerator */ -HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( +static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( ICreateDevEnum * iface, REFCLSID clsidDeviceClass, IEnumMoniker **ppEnumMoniker, diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index b50afb8..5266d03 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -82,11 +82,6 @@ typedef struct MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void); HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker); -HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( - ICreateDevEnum * iface, - REFCLSID clsidDeviceClass, - IEnumMoniker **ppEnumMoniker, - DWORD dwFlags); extern ClassFactoryImpl DEVENUM_ClassFactory; extern CreateDevEnumImpl DEVENUM_CreateDevEnum;

1 0

Alexandre Julliard : mshtml: Make some functions static.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: e9832a068c8d8f89163191b2c7a5c6b5f2831aeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9832a068c8d8f89163191b2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 2 15:28:04 2008 +0100 mshtml: Make some functions static. --- dlls/mshtml/dispex.c | 2 +- dlls/mshtml/htmlcomment.c | 4 ++-- dlls/mshtml/htmlstyle.c | 4 ++-- dlls/mshtml/htmltextnode.c | 4 ++-- dlls/mshtml/mshtml_private.h | 1 - 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 6bc27bc..526fdea 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -119,7 +119,7 @@ static REFIID tid_ids[] = { &IID_IOmNavigator }; -HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) { HRESULT hres; diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index a589d7d..4578361 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -139,7 +139,7 @@ static const IHTMLCommentElementVtbl HTMLCommentElementVtbl = { #define HTMLCOMMENT_NODE_THIS(iface) DEFINE_THIS2(HTMLCommentElement, element.node, iface) -HRESULT HTMLCommentElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) +static HRESULT HTMLCommentElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { HTMLCommentElement *This = HTMLCOMMENT_NODE_THIS(iface); @@ -156,7 +156,7 @@ HRESULT HTMLCommentElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } -void HTMLCommentElement_destructor(HTMLDOMNode *iface) +static void HTMLCommentElement_destructor(HTMLDOMNode *iface) { HTMLCommentElement *This = HTMLCOMMENT_NODE_THIS(iface); diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index b88437d..ee14bb9 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -281,7 +281,7 @@ HRESULT get_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, BSTR return S_OK; } -HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *p, DWORD flags) +static HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *p, DWORD flags) { nsAString str_value; const PRUnichar *value; @@ -366,7 +366,7 @@ static inline HRESULT set_style_pos(HTMLStyle *This, styleid_t sid, float value) return set_style_attr(This, sid, szValue, 0); } -HRESULT get_nsstyle_pos(HTMLStyle *This, styleid_t sid, float *p) +static HRESULT get_nsstyle_pos(HTMLStyle *This, styleid_t sid, float *p) { nsAString str_value; HRESULT hres; diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index d0a0866..d6453b1 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -149,7 +149,7 @@ static const IHTMLDOMTextNodeVtbl HTMLDOMTextNodeVtbl = { #define HTMLTEXT_NODE_THIS(iface) DEFINE_THIS2(HTMLDOMTextNode, node, iface) -HRESULT HTMLDOMTextNode_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) +static HRESULT HTMLDOMTextNode_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { HTMLDOMTextNode *This = HTMLTEXT_NODE_THIS(iface); @@ -166,7 +166,7 @@ HRESULT HTMLDOMTextNode_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } -void HTMLDOMTextNode_destructor(HTMLDOMNode *iface) +static void HTMLDOMTextNode_destructor(HTMLDOMNode *iface) { HTMLDOMTextNode *This = HTMLTEXT_NODE_THIS(iface); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6c6ab33..a6e8783 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -655,7 +655,6 @@ void remove_doc_tasks(const HTMLDocument*); DWORD set_task_timer(HTMLDocument*,DWORD,BOOL,IDispatch*); HRESULT clear_task_timer(HTMLDocument*,BOOL,DWORD); -HRESULT get_typeinfo(tid_t,ITypeInfo**); void release_typelib(void); void call_disp_func(HTMLDocument*,IDispatch*,IDispatch*);

1 0

Alexandre Julliard : ddraw: Make some functions static.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: 23abbcb9b3eb72a7f1eae6e48162d222269340ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=23abbcb9b3eb72a7f1eae6e48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 2 15:27:08 2008 +0100 ddraw: Make some functions static. --- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/utils.c | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7a5eadb..fe2e20d 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -633,7 +633,6 @@ const IDirect3DVertexBufferVtbl IDirect3DVertexBuffer1_Vtbl; void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, WINED3DFORMAT WineD3DFormat); WINED3DFORMAT PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat); void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd); -void DDRAW_dump_pixelformat(const DDPIXELFORMAT *PixelFormat); void dump_D3DMATRIX(const D3DMATRIX *mat); void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps); DWORD get_flexible_vertex_size(DWORD d3dvtVertexType); diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index b07ebd8..e3dadce 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); +static void DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf); /***************************************************************************** * PixelFormat_WineD3DtoDD @@ -724,7 +725,7 @@ void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in) DDRAW_dump_flags(in->dwCaps2, flags2, sizeof(flags2)/sizeof(flags2[0])); } -void +static void DDRAW_dump_DDSCAPS(const DDSCAPS *in) { DDSCAPS2 in_bis; @@ -779,7 +780,7 @@ DDRAW_dump_members(DWORD flags, } } -void +static void DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf) { TRACE("( ");

1 0

Alexandre Julliard : crypt32: Make some functions and variables static.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: 7d4bc8503b3276f92e32c205b32a5847890affc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d4bc8503b3276f92e32c205b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 2 15:27:40 2008 +0100 crypt32: Make some functions and variables static. --- dlls/crypt32/encode.c | 2 +- dlls/crypt32/msg.c | 2 +- dlls/crypt32/rootstore.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 08120ff..12ab05f 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -3164,7 +3164,7 @@ static BOOL WINAPI CRYPT_AsnEncodeBitsSwapBytes(DWORD dwCertEncodingType, return ret; } -BOOL WINAPI CRYPT_AsnEncodeInt(DWORD dwCertEncodingType, +static BOOL WINAPI CRYPT_AsnEncodeInt(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index ca94a2e..7c90d75 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -46,7 +46,7 @@ typedef BOOL (*CryptMsgUpdateFunc)(HCRYPTMSG hCryptMsg, const BYTE *pbData, typedef BOOL (*CryptMsgControlFunc)(HCRYPTMSG hCryptMsg, DWORD dwFlags, DWORD dwCtrlType, const void *pvCtrlPara); -BOOL CRYPT_DefaultMsgControl(HCRYPTMSG hCryptMsg, DWORD dwFlags, +static BOOL CRYPT_DefaultMsgControl(HCRYPTMSG hCryptMsg, DWORD dwFlags, DWORD dwCtrlType, const void *pvCtrlPara) { TRACE("(%p, %08x, %d, %p)\n", hCryptMsg, dwFlags, dwCtrlType, pvCtrlPara); diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index c3d4794..116c934 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -663,7 +663,7 @@ static const BYTE rootcertauthority[] = { 0xf8,0x04,0x4d,0x30,0x92,0x3d,0x6e,0x21,0x14,0x21,0xc9,0x3d,0xe0,0xc3,0xfd,0x8a, 0x6b,0x9d,0x4a,0xfd,0xd1,0xa1,0x9d,0x99,0x43,0x77,0x3f,0xb0,0xda }; -struct CONST_BLOB { +static const struct CONST_BLOB { const BYTE *pb; DWORD cb; } msRootCerts[] = {

1 0

Alexandre Julliard : dxdiagn: Make some functions static.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: 8449f63ccf3042359a30702a18dd83808bc0cc84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8449f63ccf3042359a30702a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 2 15:27:24 2008 +0100 dxdiagn: Make some functions static. --- dlls/dxdiagn/dxdiag_private.h | 1 - dlls/dxdiagn/provider.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dxdiagn/dxdiag_private.h b/dlls/dxdiagn/dxdiag_private.h index 6449b32..4b6288b 100644 --- a/dlls/dxdiagn/dxdiag_private.h +++ b/dlls/dxdiagn/dxdiag_private.h @@ -97,7 +97,6 @@ extern HRESULT DXDiag_CreateDXDiagProvider(LPCLASSFACTORY iface, LPUNKNOWN punkO /** internal factory */ extern HRESULT DXDiag_CreateDXDiagContainer(REFIID riid, LPVOID *ppobj); -extern HRESULT DXDiag_InitRootDXDiagContainer(IDxDiagContainer* pRootCont); /********************************************************************** * Dll lifetime tracking declaration for dxdiagn.dll diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index e3bb044..bc4d1a6 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -37,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); +static HRESULT DXDiag_InitRootDXDiagContainer(IDxDiagContainer* pRootCont); + /* IDxDiagProvider IUnknown parts follow: */ static HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(PDXDIAGPROVIDER iface, REFIID riid, LPVOID *ppobj) { @@ -699,7 +701,7 @@ out_show_filters: return hr; } -HRESULT DXDiag_InitRootDXDiagContainer(IDxDiagContainer* pRootCont) { +static HRESULT DXDiag_InitRootDXDiagContainer(IDxDiagContainer* pRootCont) { HRESULT hr = S_OK; static const WCHAR DxDiag_SystemInfo[] = {'D','x','D','i','a','g','_','S','y','s','t','e','m','I','n','f','o',0}; static const WCHAR DxDiag_SystemDevices[] = {'D','x','D','i','a','g','_','S','y','s','t','e','m','D','e','v','i','c','e','s',0};

1 0