May 2012 - Wine-Commits - list.winehq.org

Hans Leidekker : fusion: Add support for enumerating version 4.0 assemblies .
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 0c6ab2464fec5c41a21e1a52d5d10eee5bc0a48f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c6ab2464fec5c41a21e1a52d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 21 11:25:43 2012 +0200 fusion: Add support for enumerating version 4.0 assemblies. --- dlls/fusion/asmenum.c | 38 ++++++++++++++++++++++++++++---------- 1 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index 52229a8..e4f73e8 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -382,32 +382,50 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) { - WCHAR path[MAX_PATH]; - WCHAR buf[MAX_PATH]; + static const WCHAR gac[] = {'\\','G','A','C',0}; + static const WCHAR gac_32[] = {'\\','G','A','C','_','3','2',0}; + static const WCHAR gac_msil[] = {'\\','G','A','C','_','M','S','I','L',0}; + WCHAR path[MAX_PATH], buf[MAX_PATH]; HRESULT hr; DWORD size; - static WCHAR under32[] = {'_','3','2',0}; - static WCHAR msil[] = {'_','M','S','I','L',0}; + size = MAX_PATH; + hr = GetCachePath(ASM_CACHE_ROOT_EX, buf, &size); + if (FAILED(hr)) + return hr; + + strcpyW(path, buf); + strcpyW(path + size - 1, gac_32); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + if (FAILED(hr)) + return hr; + + strcpyW(path, buf); + strcpyW(path + size - 1, gac_msil); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + if (FAILED(hr)) + return hr; size = MAX_PATH; - hr = GetCachePath(ASM_CACHE_GAC, buf, &size); + hr = GetCachePath(ASM_CACHE_ROOT, buf, &size); if (FAILED(hr)) return hr; - lstrcpyW(path, buf); - lstrcatW(path, under32); + strcpyW(path, buf); + strcpyW(path + size - 1, gac_32); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; - lstrcpyW(path, buf); - lstrcatW(path, msil); + strcpyW(path, buf); + strcpyW(path + size - 1, gac_msil); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; - hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, buf); + strcpyW(path, buf); + strcpyW(path + size - 1, gac); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr;

1 0

Michael Stefaniuc : mshtml/tests: Remove duplicated ok() call.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: fc999cb362c9ac8b7210d32a5c92435807c32039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc999cb362c9ac8b7210d32a5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 21 10:15:10 2012 +0200 mshtml/tests: Remove duplicated ok() call. --- dlls/mshtml/tests/protocol.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 5825015..7e66347 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -478,7 +478,6 @@ static void test_res_protocol(void) memset(buf, '?', sizeof(buf)); hres = IInternetProtocolInfo_QueryInfo(protocol_info, NULL, QUERY_USES_NETWORK, 0, buf, sizeof(buf), &size, 0); - ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x, expected E_FAIL\n", hres); ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x\n", hres); ok(size == sizeof(DWORD), "size=%d\n", size); ok(!*(DWORD*)buf, "buf=%d\n", *(DWORD*)buf);

1 0

Christian Costa : d3drm: Improve IDirect3DRMMeshBuilder3_CreateMesh and forward IDirect3DRMMeshBuilder2_CreateMesh to it .
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 8bba7cd226c88f6ec0f81eda850f4f0029798969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bba7cd226c88f6ec0f81eda8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon May 21 09:42:48 2012 +0200 d3drm: Improve IDirect3DRMMeshBuilder3_CreateMesh and forward IDirect3DRMMeshBuilder2_CreateMesh to it. --- dlls/d3drm/meshbuilder.c | 56 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 50 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 8045857..bbe927d 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -855,13 +855,13 @@ static D3DCOLOR WINAPI IDirect3DRMMeshBuilder2Impl_GetVertexColor(IDirect3DRMMes } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_CreateMesh(IDirect3DRMMeshBuilder2* iface, - LPDIRECT3DRMMESH* ppMesh) + LPDIRECT3DRMMESH* mesh) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - TRACE("(%p)->(%p)\n", This, ppMesh); + TRACE("(%p)->(%p)\n", This, mesh); - return Direct3DRMMesh_create(ppMesh); + return IDirect3DRMMeshBuilder3_CreateMesh(&This->IDirect3DRMMeshBuilder3_iface, mesh); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GenerateNormals2(IDirect3DRMMeshBuilder2* iface, @@ -1812,13 +1812,57 @@ static D3DCOLOR WINAPI IDirect3DRMMeshBuilder3Impl_GetVertexColor(IDirect3DRMMes } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuilder3* iface, - LPDIRECT3DRMMESH* Mesh) + LPDIRECT3DRMMESH* mesh) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); + HRESULT hr; + D3DRMGROUPINDEX group; + + TRACE("(%p)->(%p)\n", This, mesh); + + if (!mesh) + return E_POINTER; + + hr = Direct3DRMMesh_create(mesh); + if (FAILED(hr)) + return hr; + + /* If there is mesh data, create a group and put data inside */ + if (This->nb_vertices) + { + unsigned* face_data; + unsigned* out_ptr; + DWORD* in_ptr = This->pFaceData; + int i, j; - TRACE("(%p)->(%p)\n", This, Mesh); + face_data = HeapAlloc(GetProcessHeap(), 0, This->face_data_size * sizeof(DWORD)); + if (!face_data) + { + IDirect3DRMMesh_Release(*mesh); + return E_OUTOFMEMORY; + } + out_ptr = face_data; + + /* Put only vertex indices */ + for (i = 0; i < This->nb_faces; i++) + { + DWORD nb_indices = *out_ptr++ = *in_ptr++; + for (j = 0; j < nb_indices; j++) + { + *out_ptr++ = *in_ptr++; + /* Skip normal index */ + in_ptr++; + } + } + + hr = IDirect3DRMMesh_AddGroup(*mesh, This->nb_vertices, This->nb_faces, 0, face_data, &group); + if (FAILED(hr)) + IDirect3DRMMesh_Release(*mesh); + + HeapFree(GetProcessHeap(), 0, face_data); + } - return Direct3DRMMesh_create(Mesh); + return hr; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetFace(IDirect3DRMMeshBuilder3* iface,

1 0

Hans Leidekker : fusion: Use the PEKIND type where appropriate.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 08cbe5d26f112c5ebae579d3364a98a3da358b52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08cbe5d26f112c5ebae579d33… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 21 11:24:41 2012 +0200 fusion: Use the PEKIND type where appropriate. --- dlls/fusion/asmcache.c | 13 +++++++++++-- dlls/fusion/assembly.c | 4 ++-- dlls/fusion/fusionpriv.h | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index c6f7ca9..fdf8ab5 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -94,7 +94,7 @@ static BOOL create_full_path(LPCWSTR path) return ret; } -static BOOL get_assembly_directory(LPWSTR dir, DWORD size, BYTE architecture) +static BOOL get_assembly_directory(LPWSTR dir, DWORD size, PEKIND architecture) { static const WCHAR gac[] = {'\\','a','s','s','e','m','b','l','y','\\','G','A','C',0}; @@ -107,6 +107,9 @@ static BOOL get_assembly_directory(LPWSTR dir, DWORD size, BYTE architecture) switch (architecture) { + case peNone: + break; + case peMSIL: strcatW(dir, msil); break; @@ -118,6 +121,10 @@ static BOOL get_assembly_directory(LPWSTR dir, DWORD size, BYTE architecture) case peAMD64: strcatW(dir, amd64); break; + + default: + WARN("unhandled architecture %u\n", architecture); + return FALSE; } return TRUE; @@ -372,6 +379,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, WCHAR path[MAX_PATH]; WCHAR asmdir[MAX_PATH]; LPWSTR ext; + PEKIND architecture; HRESULT hr; TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, @@ -410,7 +418,8 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, cache_lock( cache ); - get_assembly_directory(asmdir, MAX_PATH, assembly_get_architecture(assembly)); + architecture = assembly_get_architecture(assembly); + get_assembly_directory(asmdir, MAX_PATH, architecture); sprintfW(path, format, asmdir, name, version, token); diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 418d3b1..46c4db4 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -811,10 +811,10 @@ HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) return S_OK; } -BYTE assembly_get_architecture(ASSEMBLY *assembly) +PEKIND assembly_get_architecture(ASSEMBLY *assembly) { if ((assembly->corhdr->MajorRuntimeVersion == 2) && (assembly->corhdr->MinorRuntimeVersion == 0)) - return 0; /* .NET 1.x assembly */ + return peNone; /* .NET 1.x assembly */ if (assembly->nthdr->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) return peAMD64; /* AMD64/IA64 assembly */ diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index a262d72..3d538e3 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -433,7 +433,7 @@ HRESULT assembly_release(ASSEMBLY *assembly) DECLSPEC_HIDDEN; HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name) DECLSPEC_HIDDEN; HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path) DECLSPEC_HIDDEN; HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) DECLSPEC_HIDDEN; -BYTE assembly_get_architecture(ASSEMBLY *assembly) DECLSPEC_HIDDEN; +PEKIND assembly_get_architecture(ASSEMBLY *assembly) DECLSPEC_HIDDEN; HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) DECLSPEC_HIDDEN; HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : msxml3: Use constant to store supported safety options.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 84863dfff739276880152a9fc5074aa543e537d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84863dfff739276880152a9fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 11:43:54 2012 +0400 msxml3: Use constant to store supported safety options. --- dlls/msxml3/httprequest.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 16e2446..0abe2ff 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -55,6 +55,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); static const WCHAR colspaceW[] = {':',' ',0}; static const WCHAR crlfW[] = {'\r','\n',0}; +static const DWORD safety_supported_options = + INTERFACESAFE_FOR_UNTRUSTED_CALLER | + INTERFACESAFE_FOR_UNTRUSTED_DATA | + INTERFACE_USES_SECURITY_MANAGER; typedef struct BindStatusCallback BindStatusCallback; @@ -1495,8 +1499,6 @@ static ULONG WINAPI httprequest_Safety_Release(IObjectSafety *iface) return IXMLHTTPRequest_Release((IXMLHTTPRequest *)This); } -#define SAFETY_SUPPORTED_OPTIONS (INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_SECURITY_MANAGER) - static HRESULT WINAPI httprequest_Safety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, DWORD *supported, DWORD *enabled) { @@ -1506,7 +1508,7 @@ static HRESULT WINAPI httprequest_Safety_GetInterfaceSafetyOptions(IObjectSafety if(!supported || !enabled) return E_POINTER; - *supported = SAFETY_SUPPORTED_OPTIONS; + *supported = safety_supported_options; *enabled = This->safeopt; return S_OK; @@ -1518,7 +1520,7 @@ static HRESULT WINAPI httprequest_Safety_SetInterfaceSafetyOptions(IObjectSafety httprequest *This = impl_from_IObjectSafety(iface); TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), mask, enabled); - if ((mask & ~SAFETY_SUPPORTED_OPTIONS) != 0) + if ((mask & ~safety_supported_options)) return E_FAIL; This->safeopt = (This->safeopt & ~mask) | (mask & enabled); @@ -1526,8 +1528,6 @@ static HRESULT WINAPI httprequest_Safety_SetInterfaceSafetyOptions(IObjectSafety return S_OK; } -#undef SAFETY_SUPPORTED_OPTIONS - static const IObjectSafetyVtbl ObjectSafetyVtbl = { httprequest_Safety_QueryInterface, httprequest_Safety_AddRef,

1 0

Nikolay Sivov : msxml3: Support dumping VT_VARIANT|VT_BYREF variants.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 08d3b4b9fc0c17be3d03d3c428a92a8f708e5414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08d3b4b9fc0c17be3d03d3c42… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 11:52:14 2012 +0400 msxml3: Support dumping VT_VARIANT|VT_BYREF variants. --- dlls/msxml3/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 93b5b10..bfb301e 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -287,6 +287,8 @@ const char *debugstr_variant(const VARIANT *v) V_BSTRREF(v), debugstr_w(V_BSTRREF(v) ? *V_BSTRREF(v) : NULL)); case VT_ERROR: return wine_dbg_sprintf("{VT_ERROR: 0x%08x}", V_ERROR(v)); + case VT_VARIANT|VT_BYREF: + return wine_dbg_sprintf("{VT_VARIANT|VT_BYREF: %s}", debugstr_variant(V_VARIANTREF(v))); default: return wine_dbg_sprintf("{vt %d}", V_VT(v)); }

1 0

Michael Stefaniuc : jscript/tests: Check the correct return value.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 8f4512f76324e27e8f84f82ecf4565860dfe6c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f4512f76324e27e8f84f82ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 21 10:02:02 2012 +0200 jscript/tests: Check the correct return value. --- dlls/jscript/tests/jscript.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 0ffb2a5..cdd29b6 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -255,7 +255,7 @@ static IDispatchEx *get_script_dispatch(IActiveScript *script) hres = IActiveScript_GetScriptDispatch(script, NULL, &disp); ok(hres == S_OK, "GetScriptDispatch failed: %08x\n", hres); - IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); IDispatch_Release(disp); ok(hres == S_OK, "Could not get IDispatch iface: %08x\n", hres); return dispex;

1 0

Francois Gouget : quartz/tests: Fix compilation on systems that don' t support nameless structs.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 0f504a17ced3bd7a481f5b1f217796d04c3cb60b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f504a17ced3bd7a481f5b1f2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 20 18:01:52 2012 +0200 quartz/tests: Fix compilation on systems that don't support nameless structs. --- dlls/quartz/tests/filtergraph.c | 6 +++--- dlls/quartz/tests/filtermapper.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 967a4ac..ea37b2f 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1798,8 +1798,8 @@ static void test_render_filter_priority(void) rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; - S1(U(rgf2)).cPins2 = 1; - S1(U(rgf2)).rgPins2 = rgPins2; + S2(U(rgf2)).cPins2 = 1; + S2(U(rgf2)).rgPins2 = rgPins2; rgPins2[0].dwFlags = REG_PINFLAG_B_RENDERER; rgPins2[0].cInstances = 1; rgPins2[0].nMediaTypes = 1; @@ -1825,7 +1825,7 @@ static void test_render_filter_priority(void) &CLSID_LegacyAmFilterCategory, NULL, &rgf2); ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); - S1(U(rgf2)).cPins2 = 2; + S2(U(rgf2)).cPins2 = 2; rgPins2[0].dwFlags = 0; rgPinType[0].clsMinorType = &mediasubtype1; diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 68918f2..b52d17e 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -104,8 +104,8 @@ static void test_fm2_enummatchingfilters(void) /* Test that a test renderer filter is returned when enumerating filters with bRender=FALSE */ rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; - S1(U(rgf2)).cPins2 = 1; - S1(U(rgf2)).rgPins2 = rgPins2; + S2(U(rgf2)).cPins2 = 1; + S2(U(rgf2)).rgPins2 = rgPins2; rgPins2[0].dwFlags = REG_PINFLAG_B_RENDERER; rgPins2[0].cInstances = 1; @@ -136,7 +136,7 @@ static void test_fm2_enummatchingfilters(void) rgPins2[1].lpMedium = NULL; rgPins2[1].clsPinCategory = NULL; - S1(U(rgf2)).cPins2 = 2; + S2(U(rgf2)).cPins2 = 2; hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter2, wszFilterName2, NULL, &CLSID_LegacyAmFilterCategory, NULL, &rgf2); @@ -418,8 +418,8 @@ static void test_register_filter_with_null_clsMinorType(void) ZeroMemory(&rgf2, sizeof(rgf2)); rgf2.dwVersion = 1; rgf2.dwMerit = MERIT_UNLIKELY; - S(U(rgf2)).cPins = 1; - S(U(rgf2)).rgPins = &rgPins; + S1(U(rgf2)).cPins = 1; + S1(U(rgf2)).rgPins = &rgPins; rgPins.strName = wszPinName; rgPins.bRendered = 1; @@ -447,8 +447,8 @@ static void test_register_filter_with_null_clsMinorType(void) ZeroMemory(&rgf2, sizeof(rgf2)); rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; - S1(U(rgf2)).cPins2 = 1; - S1(U(rgf2)).rgPins2 = &rgPins2; + S2(U(rgf2)).cPins2 = 1; + S2(U(rgf2)).rgPins2 = &rgPins2; rgPins2.dwFlags = REG_PINFLAG_B_RENDERER; rgPins2.cInstances = 1;

1 0

Francois Gouget : secur32: Make some SecurityFunction methods static.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 71945b76356c4772bd2d8012477755b22714aa1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=71945b76356c4772bd2d80124… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 20 17:51:53 2012 +0200 secur32: Make some SecurityFunction methods static. --- dlls/secur32/negotiate.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index ac48a77..bf16258 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -407,7 +407,7 @@ static SECURITY_STATUS SEC_ENTRY nego_VerifySignature(PCtxtHandle phContext, /*********************************************************************** * FreeCredentialsHandle */ -SECURITY_STATUS SEC_ENTRY nego_FreeCredentialsHandle(PCredHandle phCredential) +static SECURITY_STATUS SEC_ENTRY nego_FreeCredentialsHandle(PCredHandle phCredential) { TRACE("%p\n", phCredential); @@ -417,7 +417,7 @@ SECURITY_STATUS SEC_ENTRY nego_FreeCredentialsHandle(PCredHandle phCredential) /*********************************************************************** * EncryptMessage */ -SECURITY_STATUS SEC_ENTRY nego_EncryptMessage(PCtxtHandle phContext, +static SECURITY_STATUS SEC_ENTRY nego_EncryptMessage(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { TRACE("%p, 0x%08x, %p, %u\n", phContext, fQOP, pMessage, MessageSeqNo); @@ -428,7 +428,7 @@ SECURITY_STATUS SEC_ENTRY nego_EncryptMessage(PCtxtHandle phContext, /*********************************************************************** * DecryptMessage */ -SECURITY_STATUS SEC_ENTRY nego_DecryptMessage(PCtxtHandle phContext, +static SECURITY_STATUS SEC_ENTRY nego_DecryptMessage(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { TRACE("%p, %p, %u, %p\n", phContext, pMessage, MessageSeqNo, pfQOP);

1 0

Eric Pouech : dbghelp: Protect COFF line number parsing against out of bounds access.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: dbd70d09176129b5f76c921e1c6c1e18075319c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd70d09176129b5f76c921e1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 20 09:43:52 2012 +0200 dbghelp: Protect COFF line number parsing against out of bounds access. --- dlls/dbghelp/coff.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c index 54bd278..9f01fd2 100644 --- a/dlls/dbghelp/coff.c +++ b/dlls/dbghelp/coff.c @@ -424,26 +424,26 @@ DECLSPEC_HIDDEN BOOL coff_process_info(const struct msc_debug_info* msc_dbg) * If we have spilled onto the next entrypoint, then * bump the counter.. */ - for (;;) + for (; l+1 < coff_files.files[j].neps; l++) { - if (l+1 >= coff_files.files[j].neps) break; - symt_get_address(coff_files.files[j].entries[l+1], &addr); - if (((msc_dbg->module->module.BaseOfImage + linepnt->Type.VirtualAddress) < addr)) + if (symt_get_address(coff_files.files[j].entries[l+1], &addr) && + msc_dbg->module->module.BaseOfImage + linepnt->Type.VirtualAddress < addr) + { + if (coff_files.files[j].entries[l+1]->tag == SymTagFunction) + { + /* + * Add the line number. This is always relative to the + * start of the function, so we need to subtract that offset + * first. + */ + symt_add_func_line(msc_dbg->module, + (struct symt_function*)coff_files.files[j].entries[l+1], + coff_files.files[j].compiland->source, + linepnt->Linenumber, + msc_dbg->module->module.BaseOfImage + linepnt->Type.VirtualAddress - addr); + } break; - l++; - } - - if (coff_files.files[j].entries[l+1]->tag == SymTagFunction) - { - /* - * Add the line number. This is always relative to the - * start of the function, so we need to subtract that offset - * first. - */ - symt_get_address(coff_files.files[j].entries[l+1], &addr); - symt_add_func_line(msc_dbg->module, (struct symt_function*)coff_files.files[j].entries[l+1], - coff_files.files[j].compiland->source, linepnt->Linenumber, - msc_dbg->module->module.BaseOfImage + linepnt->Type.VirtualAddress - addr); + } } } }

1 0