March 2011 - Wine-commits - list.winehq.org

Francois Gouget : mscoree: Force_get_runtime_info() is not used so remove it.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: d007d9feeaecee144802648e85011cc81c1fe20b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d007d9feeaecee144802648e8… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:59:13 2011 +0100 mscoree: Force_get_runtime_info() is not used so remove it. --- dlls/mscoree/metahost.c | 5 ----- dlls/mscoree/mscoree_private.h | 2 -- 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index fb03fb1..878cdee 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1316,8 +1316,3 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, return CLR_E_SHIM_RUNTIME; } - -HRESULT force_get_runtime_info(ICLRRuntimeInfo **result) -{ - return IUnknown_QueryInterface((IUnknown*)&runtimes[0], &IID_ICLRRuntimeInfo, (void**)result); -} diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index aa0ee2e..5428f17 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -51,8 +51,6 @@ typedef struct CLRRuntimeInfo extern HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, ICLRRuntimeInfo **result); -extern HRESULT force_get_runtime_info(ICLRRuntimeInfo **result); - extern HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **result); extern HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk);

1 0

Francois Gouget : qcap: Make VfwPin_GetMediaTypeVersion() static.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: a3029f01d7b3a2d1ff3687645511539458530fc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3029f01d7b3a2d1ff3687645… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:32:51 2011 +0100 qcap: Make VfwPin_GetMediaTypeVersion() static. --- dlls/qcap/vfwcapture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 4492eab..8997480 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -684,7 +684,7 @@ static HRESULT WINAPI VfwPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDI return hr; } -LONG WINAPI VfwPin_GetMediaTypeVersion(BasePin *iface) +static LONG WINAPI VfwPin_GetMediaTypeVersion(BasePin *iface) { return 1; }

1 0

Francois Gouget : msxml3: Make element_get_dt() static and move it around to avoid a forward declaration.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 11d1ff154f2ebf7665ee01501269319ce25999d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d1ff154f2ebf7665ee01501… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:30:26 2011 +0100 msxml3: Make element_get_dt() static and move it around to avoid a forward declaration. --- dlls/msxml3/element.c | 92 +++++++++++++++++++++--------------------- dlls/msxml3/msxml_private.h | 1 - 2 files changed, 46 insertions(+), 47 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 18a2577..61afb2d 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -671,6 +671,52 @@ static inline HRESULT VARIANT_from_DT(XDR_DT dt, xmlChar* str, VARIANT* v) return hr; } +static XDR_DT element_get_dt(xmlNodePtr node) +{ + XDR_DT dt = DT_INVALID; + + TRACE("(%p)\n", node); + if(node->type != XML_ELEMENT_NODE) + { + FIXME("invalid element node\n"); + return dt; + } + + if (node->ns && xmlStrEqual(node->ns->href, DT_nsURI)) + { + dt = str_to_dt(node->name, -1); + } + else + { + xmlChar* pVal = xmlGetNsProp(node, BAD_CAST "dt", DT_nsURI); + if (pVal) + { + dt = str_to_dt(pVal, -1); + xmlFree(pVal); + } + else if (node->doc) + { + IXMLDOMDocument3* doc = (IXMLDOMDocument3*)create_domdoc((xmlNodePtr)node->doc); + if (doc) + { + VARIANT v; + VariantInit(&v); + + if (IXMLDOMDocument3_get_schemas(doc, &v) == S_OK && + V_VT(&v) == VT_DISPATCH) + { + dt = SchemaCache_get_node_dt((IXMLDOMSchemaCollection2*)V_DISPATCH(&v), node); + } + VariantClear(&v); + IXMLDOMDocument3_Release(doc); + } + } + } + + TRACE("=> dt:%s\n", dt_to_str(dt)); + return dt; +} + static HRESULT WINAPI domelem_get_nodeTypedValue( IXMLDOMElement *iface, VARIANT* var1) @@ -730,52 +776,6 @@ static HRESULT WINAPI domelem_put_nodeTypedValue( return hr; } -XDR_DT element_get_dt(xmlNodePtr node) -{ - XDR_DT dt = DT_INVALID; - - TRACE("(%p)\n", node); - if(node->type != XML_ELEMENT_NODE) - { - FIXME("invalid element node\n"); - return dt; - } - - if (node->ns && xmlStrEqual(node->ns->href, DT_nsURI)) - { - dt = str_to_dt(node->name, -1); - } - else - { - xmlChar* pVal = xmlGetNsProp(node, BAD_CAST "dt", DT_nsURI); - if (pVal) - { - dt = str_to_dt(pVal, -1); - xmlFree(pVal); - } - else if (node->doc) - { - IXMLDOMDocument3* doc = (IXMLDOMDocument3*)create_domdoc((xmlNodePtr)node->doc); - if (doc) - { - VARIANT v; - VariantInit(&v); - - if (IXMLDOMDocument3_get_schemas(doc, &v) == S_OK && - V_VT(&v) == VT_DISPATCH) - { - dt = SchemaCache_get_node_dt((IXMLDOMSchemaCollection2*)V_DISPATCH(&v), node); - } - VariantClear(&v); - IXMLDOMDocument3_Release(doc); - } - } - } - - TRACE("=> dt:%s\n", dt_to_str(dt)); - return dt; -} - static HRESULT WINAPI domelem_get_dataType( IXMLDOMElement *iface, VARIANT* typename) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 756d8c1..5fb113a 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -317,7 +317,6 @@ extern XDR_DT str_to_dt(xmlChar const* str, int len /* calculated if -1 */); extern XDR_DT bstr_to_dt(OLECHAR const* bstr, int len /* calculated if -1 */); extern xmlChar const* dt_to_str(XDR_DT dt); extern OLECHAR const* dt_to_bstr(XDR_DT dt); -extern XDR_DT element_get_dt(xmlNodePtr node); extern HRESULT dt_validate(XDR_DT dt, xmlChar const* content); extern BSTR EnsureCorrectEOL(BSTR);

1 0

Francois Gouget : mshtml: Make get_pos_rect() static.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 09149640ba93f73bea9f83ae280c35dbb3f453b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09149640ba93f73bea9f83ae2… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:30:33 2011 +0100 mshtml: Make get_pos_rect() static. --- dlls/mshtml/pluginhost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 5c8e953..1cfae5f 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -125,7 +125,7 @@ static void update_readystate(PluginHost *host) } /* FIXME: We shouldn't need this function and we should embed plugin directly in the main document */ -void get_pos_rect(PluginHost *host, RECT *ret) +static void get_pos_rect(PluginHost *host, RECT *ret) { ret->top = 0; ret->left = 0;

1 0

Francois Gouget : sxs: The sxs debug channel is unused so remove it.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 489a8554cbdaca7dc398bc5304bfbd8f6ef66e5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=489a8554cbdaca7dc398bc530… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:31:23 2011 +0100 sxs: The sxs debug channel is unused so remove it. --- dlls/sxs/sxs.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index f4fdd6c..06e6672 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -22,9 +22,7 @@ #include "windef.h" #include "winbase.h" -#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(sxs); /*********************************************************************** * DllMain (SXS.@)

1 0

Francois Gouget : npmshtml: The npmshtml debug channel is unused so remove it.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 07c14831e657ee7ea86f49bf6c7659d9e6b6dd4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c14831e657ee7ea86f49bf6… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:31:53 2011 +0100 npmshtml: The npmshtml debug channel is unused so remove it. --- dlls/npmshtml/main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/npmshtml/main.c b/dlls/npmshtml/main.c index 9beaa35f..f3124c9 100644 --- a/dlls/npmshtml/main.c +++ b/dlls/npmshtml/main.c @@ -21,9 +21,6 @@ #include "windef.h" #include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(npmshtml); /*********************************************************************** * NP_Initialize (npmshtml.@)

1 0

Francois Gouget : hhctrl.ocx: Make AppendFullPathURL() static.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: f814b5af688dbb060a69efcc191681943daf3194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f814b5af688dbb060a69efcc1… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:32:01 2011 +0100 hhctrl.ocx: Make AppendFullPathURL() static. --- dlls/hhctrl.ocx/help.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 4c6196e..61d90f6 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -111,7 +111,7 @@ BOOL NavigateToUrl(HHInfo *info, LPCWSTR surl) return ret; } -BOOL AppendFullPathURL(LPCWSTR file, LPWSTR buf, LPCWSTR index) +static BOOL AppendFullPathURL(LPCWSTR file, LPWSTR buf, LPCWSTR index) { static const WCHAR url_format[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':','%','s',':',':','%','s','%','s',0};

1 0

Francois Gouget : wininet/tests: Make test_InternetErrorDlg() static.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: d705465de87e3079d79907464d512f080b1b8211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d705465de87e3079d79907464… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:32:17 2011 +0100 wininet/tests: Make test_InternetErrorDlg() static. --- dlls/wininet/tests/internet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 48379f7..0b5f6ea 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1148,7 +1148,7 @@ static void test_Option_PerConnectionOptionA(void) #define FLAG_NEEDREQ 0x2 #define FLAG_UNIMPL 0x4 -void test_InternetErrorDlg(void) +static void test_InternetErrorDlg(void) { HINTERNET ses, con, req; DWORD res, flags;

1 0

Francois Gouget : dxdiagn: Make IDxDiagContainerImpl_QueryInterface() static.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: ef934e757f40aecf4e07d6d7ad220fbc1e2bb6f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef934e757f40aecf4e07d6d7a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:32:12 2011 +0100 dxdiagn: Make IDxDiagContainerImpl_QueryInterface() static. --- dlls/dxdiagn/container.c | 2 +- dlls/dxdiagn/dxdiag_private.h | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 40ced54..96ba10a 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); /* IDxDiagContainer IUnknown parts follow: */ -HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(PDXDIAGCONTAINER iface, REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(PDXDIAGCONTAINER iface, REFIID riid, LPVOID *ppobj) { IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; diff --git a/dlls/dxdiagn/dxdiag_private.h b/dlls/dxdiagn/dxdiag_private.h index 79a11f2..76d6058 100644 --- a/dlls/dxdiagn/dxdiag_private.h +++ b/dlls/dxdiagn/dxdiag_private.h @@ -85,9 +85,6 @@ struct IDxDiagContainerImpl { IDxDiagProvider *pProv; }; -/* IUnknown: */ -extern HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(PDXDIAGCONTAINER iface, REFIID riid, LPVOID *ppobj); - /** * factories */

1 0

Francois Gouget : msi: Make get_assembly_record() static.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: f7f9f5be12ad7bad04b39f179c583eb7be6b26ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7f9f5be12ad7bad04b39f179… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:32:32 2011 +0100 msi: Make get_assembly_record() static. --- dlls/msi/assembly.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index ad5e3a5..5199a31 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -99,7 +99,7 @@ static BOOL init_assembly_caches( MSIPACKAGE *package ) return FALSE; } -MSIRECORD *get_assembly_record( MSIPACKAGE *package, const WCHAR *comp ) +static MSIRECORD *get_assembly_record( MSIPACKAGE *package, const WCHAR *comp ) { static const WCHAR query[] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',

1 0