June 2006 - Wine-Commits - list.winehq.org

Robert Shearman : atl: Implement AtlModuleGetClassObject.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: be35acf02ed382a5f4d043e0c4006ee29500b687 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=be35acf02ed382a5f4d043e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jun 12 01:34:53 2006 +0100 atl: Implement AtlModuleGetClassObject. --- dlls/atl/atl_main.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 1daff6c..e3aa9f3 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -299,7 +299,27 @@ HRESULT WINAPI AtlUnmarshalPtr(IStream * HRESULT WINAPI AtlModuleGetClassObject(_ATL_MODULEW *pm, REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - FIXME("%p %p %p %p\n", pm, rclsid, riid, ppv); + int i; + + TRACE("%p %s %s %p\n", pm, debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if (pm == NULL) + return E_INVALIDARG; + + for (i = 0; pm->m_pObjMap[i].pclsid != NULL; i++) + { + if (IsEqualCLSID(pm->m_pObjMap[i].pclsid, rclsid)) + { + _ATL_OBJMAP_ENTRYW *obj = &pm->m_pObjMap[i]; + + TRACE("found object %i\n", i); + if (obj->pfnGetClassObject) + return obj->pfnGetClassObject(obj->pfnCreateInstance, riid, ppv); + } + } + + WARN("no class object found for %s\n", debugstr_guid(rclsid)); + return E_FAIL; }

1 0

Robert Shearman : include: Add IXMLHttpRequest interface and XMLHttpRequest coclass to xmldoc.idl.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: f701435ca330f8f8dec48c9b14f30f8a904323aa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f701435ca330f8f8dec48c9… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jun 12 01:34:40 2006 +0100 include: Add IXMLHttpRequest interface and XMLHttpRequest coclass to xmldoc.idl. --- include/xmldom.idl | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/include/xmldom.idl b/include/xmldom.idl index 4675253..ebc1bd0 100644 --- a/include/xmldom.idl +++ b/include/xmldom.idl @@ -666,3 +666,66 @@ coclass DOMFreeThreadedDocument [default] interface IXMLDOMDocument; [default, source] dispinterface XMLDOMDocumentEvents; } + +[ +object, +uuid(ed8c108d-4349-11d2-91a4-00c04f7969e8), +odl, +dual, +oleautomation, +pointer_default(unique) +] +interface IXMLHttpRequest : IDispatch +{ + [id(1)] + HRESULT open([in] BSTR bstrMethod, [in] BSTR bstrUrl, + [in, optional] VARIANT varAsync, + [in, optional] VARIANT varUser, + [in, optional] VARIANT varPassword); + [id(2)] + HRESULT setRequestHeader([in] BSTR bstrHeader, [in] BSTR bstrValue); + + [id(3)] + HRESULT getResponseHeader([in] BSTR bstrHeader, [out, retval] BSTR *pbstrValue); + + [id(4)] + HRESULT getAllResponseHeaders([out, retval] BSTR *pbstrHeaders); + + [id(5)] + HRESULT send([in, optional] VARIANT varBody); + + [id(6)] + HRESULT abort(); + + [propget, id(7)] + HRESULT status([out, retval] long *plStatus); + + [propget, id(8)] + HRESULT statusText([out, retval] BSTR *bstrStatus); + + [propget, id(9)] + HRESULT responseXML([out, retval] IDispatch **ppBody); + + [propget, id(10)] + HRESULT responseText([out, retval] BSTR *pbstrBody); + + [propget, id(11)] + HRESULT responseBody([out, retval] VARIANT *pvarBody); + + [propget, id(12)] + HRESULT responseStream([out, retval] VARIANT *pvarBody); + + [propget, id(13)] + HRESULT readyState([out, retval] long *plState); + + [propput, id(14)] + HRESULT onreadystatechange([in] IDispatch *pReadyStateSink); +}; + +[ +uuid(ed8c108e-4349-11d2-91a4-00c04f7969e8) +] +coclass XMLHTTPRequest +{ + [default] interface IXMLHttpRequest; +};

1 0

Robert Shearman : msxml3: Initialise output interface pointers to NULL in xmlnodelist_QueryInterface and xmlnodelist_nextNode .
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 6dd935bc3314d5cb080b878464164af7aab5fcc4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6dd935bc3314d5cb080b878… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jun 12 01:34:17 2006 +0100 msxml3: Initialise output interface pointers to NULL in xmlnodelist_QueryInterface and xmlnodelist_nextNode. --- dlls/msxml3/nodelist.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index b85ce36..a4cf434 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -197,6 +197,7 @@ static HRESULT WINAPI xmlnodelist_QueryI else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } @@ -360,6 +361,8 @@ static HRESULT WINAPI xmlnodelist_nextNo TRACE("%p %p\n", This, nextItem ); + *nextItem = NULL; + if(This->enum_children) top_level_node = &This->top_level_node;

1 0

Robert Shearman : msxml3: Fix domelem_get_tagName to return a string with the namespace prefixed, if it is present.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 79b2742120fede9fb320cc4fd53765bbf0855802 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=79b2742120fede9fb320cc4… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jun 12 01:34:28 2006 +0100 msxml3: Fix domelem_get_tagName to return a string with the namespace prefixed, if it is present. --- dlls/msxml3/element.c | 19 +++++++++++++++++- dlls/msxml3/tests/domdoc.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index f70b409..89b35d4 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -26,6 +26,7 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "winnls.h" #include "ole2.h" #include "msxml2.h" @@ -440,6 +441,9 @@ static HRESULT WINAPI domelem_get_tagNam { domelem *This = impl_from_IXMLDOMElement( iface ); xmlNodePtr element; + DWORD len; + DWORD offset = 0; + LPWSTR str; TRACE("%p\n", This ); @@ -450,7 +454,20 @@ static HRESULT WINAPI domelem_get_tagNam if ( !element ) return E_FAIL; - *p = bstr_from_xmlChar( element->name ); + len = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->name, -1, NULL, 0 ); + if (element->ns) + len += MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->ns->prefix, -1, NULL, 0 ); + str = (LPWSTR) HeapAlloc( GetProcessHeap(), 0, len * sizeof (WCHAR) ); + if ( !str ) + return E_OUTOFMEMORY; + if (element->ns) + { + offset = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->ns->prefix, -1, str, len ); + str[offset - 1] = ':'; + } + MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->name, -1, str + offset, len - offset ); + *p = SysAllocString( str ); + HeapFree( GetProcessHeap(), 0, str ); return S_OK; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2f7c229..68f1d1b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -61,6 +61,20 @@ static const WCHAR szComplete4[] = { '<','e','m','p','t','y','>','<','/','e','m','p','t','y','>','\n', '<','/','l','c','>','\n',0 }; +static const WCHAR szComplete5[] = { + '<','S',':','s','e','a','r','c','h',' ','x','m','l','n','s',':','D','=','"','D','A','V',':','"',' ', + 'x','m','l','n','s',':','C','=','"','u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','o','f','f','i','c','e',':','c','l','i','p','g','a','l','l','e','r','y','"', + ' ','x','m','l','n','s',':','S','=','"','u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','o','f','f','i','c','e',':','c','l','i','p','g','a','l','l','e','r','y',':','s','e','a','r','c','h','"','>', + '<','S',':','s','c','o','p','e','>', + '<','S',':','d','e','e','p','>','/','<','/','S',':','d','e','e','p','>', + '<','/','S',':','s','c','o','p','e','>', + '<','S',':','c','o','n','t','e','n','t','f','r','e','e','t','e','x','t','>', + '<','C',':','t','e','x','t','o','r','p','r','o','p','e','r','t','y','/','>', + 'c','o','m','p','u','t','e','r', + '<','/','S',':','c','o','n','t','e','n','t','f','r','e','e','t','e','x','t','>', + '<','/','S',':','s','e','a','r','c','h','>',0 +}; + static const WCHAR szNonExistentFile[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; @@ -539,6 +553,38 @@ todo_wine IXMLDOMNodeList_Release( list ); if (element) IXMLDOMElement_Release( element ); + + b = FALSE; + str = SysAllocString( szComplete5 ); + r = IXMLDOMDocument_loadXML( doc, str, &b ); + ok( r == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + b = 1; + r = IXMLDOMNode_hasChildNodes( doc, &b ); + ok( r == S_OK, "hasChildNoes bad return\n"); + ok( b == VARIANT_TRUE, "hasChildNoes wrong result\n"); + + r = IXMLDOMDocument_get_documentElement( doc, &element ); + ok( r == S_OK, "should be a document element\n"); + ok( element != NULL, "should be an element\n"); + + if (element) + { + static const WCHAR szSSearch[] = {'S',':','s','e','a','r','c','h',0}; + BSTR tag = NULL; + + /* check if the tag is correct */ + r = IXMLDOMElement_get_tagName( element, &tag ); + ok( r == S_OK, "couldn't get tag name\n"); + ok( tag != NULL, "tag was null\n"); + ok( !lstrcmpW( tag, szSSearch ), "incorrect tag name\n"); + SysFreeString( tag ); + } + + if (element) + IXMLDOMElement_Release( element ); if (doc) IXMLDOMDocument_Release( doc ); }

1 0

Alexandre Julliard : wineps.drv: Make some variables static.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 276e223bcb2ebf54a423532a3e3e2d98958d0db2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=276e223bcb2ebf54a423532… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 13:46:17 2006 +0200 wineps.drv: Make some variables static. --- dlls/wineps.drv/type42.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/type42.c b/dlls/wineps.drv/type42.c index d3cbea8..b4cbca9 100644 --- a/dlls/wineps.drv/type42.c +++ b/dlls/wineps.drv/type42.c @@ -57,7 +57,7 @@ typedef struct { BOOL write; } OTTable; -const OTTable tables_templ[] = { +static const OTTable tables_templ[] = { { MS_MAKE_TAG('c','v','t',' '), 0, 0, NULL, TRUE }, { MS_MAKE_TAG('f','p','g','m'), 0, 0, NULL, TRUE }, { MS_MAKE_TAG('g','d','i','r'), 0, 0, NULL, TRUE },

1 0

Alexandre Julliard : crypt32: Make some variables static and/or const.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 11b9d020483fe102fc169e3be571ef6b62343a94 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=11b9d020483fe102fc169e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 13:45:11 2006 +0200 crypt32: Make some variables static and/or const. --- dlls/crypt32/oid.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 7e5b0fa..7bc7aad 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -50,8 +50,8 @@ void crypt_oid_free(void) free_oid_info(); } -CRITICAL_SECTION funcSetCS; -struct list funcSets; +static CRITICAL_SECTION funcSetCS; +static struct list funcSets; struct OIDFunctionSet { @@ -578,8 +578,8 @@ BOOL WINAPI CryptSetOIDFunctionValue(DWO return rc ? FALSE : TRUE; } -CRITICAL_SECTION oidInfoCS; -struct list oidInfo; +static CRITICAL_SECTION oidInfoCS; +static struct list oidInfo; static const WCHAR tripledes[] = { '3','d','e','s',0 }; static const WCHAR cms3deswrap[] = { 'C','M','S','3','D','E','S','w','r','a', @@ -677,7 +677,7 @@ static const CRYPT_DATA_BLOB printableSt static const CRYPT_DATA_BLOB domainCompTypesBlob = { sizeof(domainCompTypes), (LPBYTE)domainCompTypes }; -struct OIDInfoConstructor { +static const struct OIDInfoConstructor { DWORD dwGroupId; LPCSTR pszOID; UINT Algid;

1 0

Alexandre Julliard : shell32: Make some variables static and/or const.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 7a0396afd1c37df665b061090bc39a3af0c9a3c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a0396afd1c37df665b0610… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 13:44:21 2006 +0200 shell32: Make some variables static and/or const. --- dlls/shell32/brsfolder.c | 2 +- dlls/shell32/shellole.c | 7 +++---- dlls/shell32/shlview.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 3d84d00..88516a2 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -64,7 +64,7 @@ static void FillTreeView(browse_info*, L static HTREEITEM InsertTreeViewItem( browse_info*, IShellFolder *, LPCITEMIDLIST, LPCITEMIDLIST, IEnumIDList*, HTREEITEM); -const WCHAR szBrowseFolderInfo[] = { +static const WCHAR szBrowseFolderInfo[] = { '_','_','W','I','N','E','_', 'B','R','S','F','O','L','D','E','R','D','L','G','_', 'I','N','F','O',0 diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 01336d1..d154cbe 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -49,10 +49,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); extern HRESULT WINAPI IFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); -const WCHAR sShell32[12] = {'S','H','E','L','L','3','2','.','D','L','L','\0'}; -const WCHAR sOLE32[10] = {'O','L','E','3','2','.','D','L','L','\0'}; +static const WCHAR sShell32[12] = {'S','H','E','L','L','3','2','.','D','L','L','\0'}; +static const WCHAR sOLE32[10] = {'O','L','E','3','2','.','D','L','L','\0'}; -HINSTANCE hShellOle32 = 0; /************************************************************************** * Default ClassFactory types */ @@ -60,7 +59,7 @@ typedef HRESULT (CALLBACK *LPFNCREATEINS IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, REFIID riidInst); /* this table contains all CLSID's of shell32 objects */ -struct { +static const struct { REFIID riid; LPFNCREATEINSTANCE lpfnCI; } InterfaceTable[] = { diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 7eecb61..639306d 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -167,7 +167,7 @@ typedef struct BYTE bStyle; } MYTOOLINFO, *LPMYTOOLINFO; -MYTOOLINFO Tools[] = +static const MYTOOLINFO Tools[] = { { FCIDM_SHVIEW_BIGICON, 0, 0, IDS_VIEW_LARGE, TBSTATE_ENABLED, BTNS_BUTTON }, { FCIDM_SHVIEW_SMALLICON, 0, 0, IDS_VIEW_SMALL, TBSTATE_ENABLED, BTNS_BUTTON },

1 0

Alexandre Julliard : kernel32: Make some variables static.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: ec6a1653aaf31400457c3acc5e6970a85a8d0cad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ec6a1653aaf31400457c3ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 13:41:45 2006 +0200 kernel32: Make some variables static. --- dlls/kernel/registry16.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel/registry16.c b/dlls/kernel/registry16.c index ac7febf..5295bbc 100644 --- a/dlls/kernel/registry16.c +++ b/dlls/kernel/registry16.c @@ -31,18 +31,18 @@ #include "wine/winbase16.h" WINE_DEFAULT_DEBUG_CHANNEL(reg); -DWORD (WINAPI *pRegCloseKey)(HKEY); -DWORD (WINAPI *pRegCreateKeyA)(HKEY,LPCSTR,PHKEY); -DWORD (WINAPI *pRegDeleteKeyA)(HKEY,LPCSTR); -DWORD (WINAPI *pRegDeleteValueA)(HKEY,LPCSTR); -DWORD (WINAPI *pRegEnumKeyA)(HKEY,DWORD,LPSTR,DWORD); -DWORD (WINAPI *pRegEnumValueA)(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD); -DWORD (WINAPI *pRegFlushKey)(HKEY); -DWORD (WINAPI *pRegOpenKeyA)(HKEY,LPCSTR,PHKEY); -DWORD (WINAPI *pRegQueryValueA)(HKEY,LPCSTR,LPSTR,LPLONG); -DWORD (WINAPI *pRegQueryValueExA)(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); -DWORD (WINAPI *pRegSetValueA)(HKEY,LPCSTR,DWORD,LPCSTR,DWORD); -DWORD (WINAPI *pRegSetValueExA)(HKEY,LPCSTR,DWORD,DWORD,CONST BYTE*,DWORD); +static DWORD (WINAPI *pRegCloseKey)(HKEY); +static DWORD (WINAPI *pRegCreateKeyA)(HKEY,LPCSTR,PHKEY); +static DWORD (WINAPI *pRegDeleteKeyA)(HKEY,LPCSTR); +static DWORD (WINAPI *pRegDeleteValueA)(HKEY,LPCSTR); +static DWORD (WINAPI *pRegEnumKeyA)(HKEY,DWORD,LPSTR,DWORD); +static DWORD (WINAPI *pRegEnumValueA)(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD); +static DWORD (WINAPI *pRegFlushKey)(HKEY); +static DWORD (WINAPI *pRegOpenKeyA)(HKEY,LPCSTR,PHKEY); +static DWORD (WINAPI *pRegQueryValueA)(HKEY,LPCSTR,LPSTR,LPLONG); +static DWORD (WINAPI *pRegQueryValueExA)(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); +static DWORD (WINAPI *pRegSetValueA)(HKEY,LPCSTR,DWORD,LPCSTR,DWORD); +static DWORD (WINAPI *pRegSetValueExA)(HKEY,LPCSTR,DWORD,DWORD,CONST BYTE*,DWORD); static HMODULE advapi32;

1 0

Alexandre Julliard : advapi32: Make some variables static and/or const.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 7bbc1d68c596be402c9ec74da79838cc5cb0c973 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7bbc1d68c596be402c9ec74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 13:41:15 2006 +0200 advapi32: Make some variables static and/or const. --- dlls/advapi32/crypt.c | 2 +- dlls/advapi32/security.c | 12 ++++++------ dlls/advapi32/service.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index e6c3988..893bdc9 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -50,7 +50,7 @@ #include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); -HWND crypt_hWindow = 0; +static HWND crypt_hWindow; #define CRYPT_ReturnLastError(err) do {SetLastError(err); return FALSE;} while(0) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 03a8eaa..2630606 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2567,7 +2567,7 @@ static DWORD ParseAclStringFlags(LPCWSTR /****************************************************************************** * ParseAceStringType */ -ACEFLAG AceType[] = +static const ACEFLAG AceType[] = { { SDDL_ACCESS_ALLOWED, ACCESS_ALLOWED_ACE_TYPE }, { SDDL_ALARM, SYSTEM_ALARM_ACE_TYPE }, @@ -2586,7 +2586,7 @@ static BYTE ParseAceStringType(LPCWSTR* { UINT len = 0; LPCWSTR szAcl = *StringAcl; - LPACEFLAG lpaf = AceType; + const ACEFLAG *lpaf = AceType; while (lpaf->wstr && (len = strlenW(lpaf->wstr)) && @@ -2604,7 +2604,7 @@ static BYTE ParseAceStringType(LPCWSTR* /****************************************************************************** * ParseAceStringFlags */ -ACEFLAG AceFlags[] = +static const ACEFLAG AceFlags[] = { { SDDL_CONTAINER_INHERIT, CONTAINER_INHERIT_ACE }, { SDDL_AUDIT_FAILURE, FAILED_ACCESS_ACE_FLAG }, @@ -2624,7 +2624,7 @@ static BYTE ParseAceStringFlags(LPCWSTR* while (*szAcl != ';') { - LPACEFLAG lpaf = AceFlags; + const ACEFLAG *lpaf = AceFlags; while (lpaf->wstr && (len = strlenW(lpaf->wstr)) && @@ -2646,7 +2646,7 @@ static BYTE ParseAceStringFlags(LPCWSTR* /****************************************************************************** * ParseAceStringRights */ -ACEFLAG AceRights[] = +static const ACEFLAG AceRights[] = { { SDDL_GENERIC_ALL, GENERIC_ALL }, { SDDL_GENERIC_READ, GENERIC_READ }, @@ -2684,7 +2684,7 @@ static DWORD ParseAceStringRights(LPCWST { while (*szAcl != ';') { - LPACEFLAG lpaf = AceRights; + const ACEFLAG *lpaf = AceRights; while (lpaf->wstr && (len = strlenW(lpaf->wstr)) && diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index b7863c7..cd12416 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -79,7 +79,7 @@ static CRITICAL_SECTION_DEBUG service_cs }; static CRITICAL_SECTION service_cs = { &service_cs_debug, -1, 0, 0, 0, 0 }; -service_data *service_list; +static service_data *service_list; /****************************************************************************** * SC_HANDLEs

1 0

Alexandre Julliard : winemp3.acm: Make some variables static and/or const.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: b5878798fdd822b4a32267d23dbee8a670f5b0b9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b5878798fdd822b4a32267d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 13:40:34 2006 +0200 winemp3.acm: Make some variables static and/or const. --- dlls/winemp3.acm/common.c | 6 +++--- dlls/winemp3.acm/huffman.h | 42 +++++++++++++++++++++--------------------- dlls/winemp3.acm/l2tables.h | 10 +++++----- dlls/winemp3.acm/layer2.c | 16 ++++++++-------- dlls/winemp3.acm/layer3.c | 40 +++++++++++++++++++++------------------- dlls/winemp3.acm/mpegl3.c | 6 +++--- dlls/winemp3.acm/mpg123.h | 6 +++--- dlls/winemp3.acm/tabinit.c | 2 +- 8 files changed, 65 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b5878798fdd822b4a32…

1 0