wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Michael Stefaniuc : d3d9/tests: Remove stray ok() call.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 3d9a4e8921b62ab797dfadce23fccfee57c2e190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9a4e8921b62ab797dfadce2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 21 10:12:40 2012 +0200 d3d9/tests: Remove stray ok() call. --- dlls/d3d9/tests/visual.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0521791..be2d7dc 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8614,7 +8614,6 @@ static void stencil_cull_test(IDirect3DDevice9 *device) { ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); } - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILZFAIL, D3DSTENCILOP_KEEP); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILPASS, D3DSTENCILOP_KEEP);

1 0

Hans Leidekker : fusion: Add support for installing version 4.0 assemblies.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: fd1eab7f226550cc8bf6f0de5a2b31202dfecbc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd1eab7f226550cc8bf6f0de5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 21 11:26:07 2012 +0200 fusion: Add support for installing version 4.0 assemblies. --- dlls/fusion/asmcache.c | 45 +++++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index fdf8ab5..93047d4 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -94,39 +94,48 @@ static BOOL create_full_path(LPCWSTR path) return ret; } -static BOOL get_assembly_directory(LPWSTR dir, DWORD size, PEKIND architecture) +static BOOL get_assembly_directory(LPWSTR dir, DWORD size, const char *version, PEKIND architecture) { + static const WCHAR dotnet[] = {'\\','M','i','c','r','o','s','o','f','t','.','N','E','T','\\',0}; static const WCHAR gac[] = {'\\','a','s','s','e','m','b','l','y','\\','G','A','C',0}; - static const WCHAR msil[] = {'_','M','S','I','L',0}; static const WCHAR x86[] = {'_','3','2',0}; static const WCHAR amd64[] = {'_','6','4',0}; + DWORD len = GetWindowsDirectoryW(dir, size); - GetWindowsDirectoryW(dir, size); - strcatW(dir, gac); - + if (!strcmp(version, "v4.0.30319")) + { + strcpyW(dir + len, dotnet); + len += sizeof(dotnet)/sizeof(WCHAR) -1; + strcpyW(dir + len, gac + 1); + len += sizeof(gac)/sizeof(WCHAR) - 2; + } + else + { + strcpyW(dir + len, gac); + len += sizeof(gac)/sizeof(WCHAR) - 1; + } switch (architecture) { case peNone: break; case peMSIL: - strcatW(dir, msil); + strcpyW(dir + len, msil); break; case peI386: - strcatW(dir, x86); + strcpyW(dir + len, x86); break; case peAMD64: - strcatW(dir, amd64); + strcpyW(dir + len, amd64); break; default: WARN("unhandled architecture %u\n", architecture); return FALSE; } - return TRUE; } @@ -371,15 +380,11 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, static const WCHAR ext_dll[] = {'.','d','l','l',0}; IAssemblyCacheImpl *cache = impl_from_IAssemblyCache(iface); ASSEMBLY *assembly; - LPWSTR filename; - LPWSTR name = NULL; - LPWSTR token = NULL; - LPWSTR version = NULL; - LPWSTR asmpath = NULL; - WCHAR path[MAX_PATH]; - WCHAR asmdir[MAX_PATH]; - LPWSTR ext; + WCHAR *filename, *ext; + WCHAR *name = NULL, *token = NULL, *version = NULL, *asmpath = NULL; + WCHAR path[MAX_PATH], asmdir[MAX_PATH]; PEKIND architecture; + char *clr_version; HRESULT hr; TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, @@ -416,10 +421,14 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, if (FAILED(hr)) goto done; + hr = assembly_get_runtime_version(assembly, &clr_version); + if (FAILED(hr)) + goto done; + cache_lock( cache ); architecture = assembly_get_architecture(assembly); - get_assembly_directory(asmdir, MAX_PATH, architecture); + get_assembly_directory(asmdir, MAX_PATH, clr_version, architecture); sprintfW(path, format, asmdir, name, version, token);

1 0

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

21 May '12

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

Hans Leidekker : fusion: Add support for ASM_CACHE_ROOT_EX in GetCachePath.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: f408fa83eebce7c93160ae2502f66bcbbe9bc4e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f408fa83eebce7c93160ae250… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 21 11:25:12 2012 +0200 fusion: Add support for ASM_CACHE_ROOT_EX in GetCachePath. --- dlls/fusion/fusion.c | 51 ++++++++++++++++++++++++------------------------- include/fusion.idl | 3 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c index ad77233..6ace81f 100644 --- a/dlls/fusion/fusion.c +++ b/dlls/fusion/fusion.c @@ -90,32 +90,26 @@ static HRESULT get_corversion(LPWSTR version, DWORD size) HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath, PDWORD pcchPath) { - WCHAR path[MAX_PATH]; - WCHAR windir[MAX_PATH]; - WCHAR version[MAX_PATH]; - DWORD len; - HRESULT hr = S_OK; - - static const WCHAR backslash[] = {'\\',0}; - static const WCHAR assembly[] = {'a','s','s','e','m','b','l','y',0}; - static const WCHAR gac[] = {'G','A','C',0}; - static const WCHAR nativeimg[] = { - 'N','a','t','i','v','e','I','m','a','g','e','s','_',0}; + static const WCHAR assembly[] = {'\\','a','s','s','e','m','b','l','y',0}; + static const WCHAR gac[] = {'\\','G','A','C',0}; + static const WCHAR nativeimg[] = {'N','a','t','i','v','e','I','m','a','g','e','s','_',0}; + static const WCHAR dotnet[] = {'\\','M','i','c','r','o','s','o','f','t','.','N','E','T',0}; #ifdef _WIN64 static const WCHAR zapfmt[] = {'%','s','\\','%','s','\\','%','s','%','s','_','6','4',0}; #else static const WCHAR zapfmt[] = {'%','s','\\','%','s','\\','%','s','%','s','_','3','2',0}; #endif + WCHAR path[MAX_PATH], windir[MAX_PATH], version[MAX_PATH]; + DWORD len; + HRESULT hr = S_OK; TRACE("(%08x, %p, %p)\n", dwCacheFlags, pwzCachePath, pcchPath); if (!pcchPath) return E_INVALIDARG; - GetWindowsDirectoryW(windir, MAX_PATH); - lstrcpyW(path, windir); - lstrcatW(path, backslash); - lstrcatW(path, assembly); + len = GetWindowsDirectoryW(windir, MAX_PATH); + strcpyW(path, windir); switch (dwCacheFlags) { @@ -125,37 +119,42 @@ HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath, if (FAILED(hr)) return hr; - sprintfW(path, zapfmt, windir, assembly, nativeimg, version); + len = sprintfW(path, zapfmt, windir, assembly + 1, nativeimg, version); break; } - case ASM_CACHE_GAC: { - lstrcatW(path, backslash); - lstrcatW(path, gac); + strcpyW(path + len, assembly); + len += sizeof(assembly)/sizeof(WCHAR) - 1; + strcpyW(path + len, gac); + len += sizeof(gac)/sizeof(WCHAR) - 1; break; } - case ASM_CACHE_DOWNLOAD: { FIXME("Download cache not implemented\n"); return E_FAIL; } - case ASM_CACHE_ROOT: - break; /* already set */ - + strcpyW(path + len, assembly); + len += sizeof(assembly)/sizeof(WCHAR) - 1; + break; + case ASM_CACHE_ROOT_EX: + strcpyW(path + len, dotnet); + len += sizeof(dotnet)/sizeof(WCHAR) - 1; + strcpyW(path + len, assembly); + len += sizeof(assembly)/sizeof(WCHAR) - 1; + break; default: return E_INVALIDARG; } - len = lstrlenW(path) + 1; + len++; if (*pcchPath <= len || !pwzCachePath) hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); else if (pwzCachePath) - lstrcpyW(pwzCachePath, path); + strcpyW(pwzCachePath, path); *pcchPath = len; - return hr; } diff --git a/include/fusion.idl b/include/fusion.idl index d645662..cff1e6c 100644 --- a/include/fusion.idl +++ b/include/fusion.idl @@ -28,7 +28,8 @@ typedef enum ASM_CACHE_ZAP = 0x1, ASM_CACHE_GAC = 0x2, ASM_CACHE_DOWNLOAD = 0x4, - ASM_CACHE_ROOT = 0x8 + ASM_CACHE_ROOT = 0x8, + ASM_CACHE_ROOT_EX = 0x80 } ASM_CACHE_FLAGS; typedef enum

1 0

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

21 May '12

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

Hans Leidekker : fusion: Add a helper to retrieve the runtime version for an assembly.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 2ed8056a2bfb0ed835bac33d4121a38795cd023f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed8056a2bfb0ed835bac33d4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 21 11:24:21 2012 +0200 fusion: Add a helper to retrieve the runtime version for an assembly. --- dlls/fusion/assembly.c | 8 +++++++- dlls/fusion/fusionpriv.h | 1 + 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index a3abc4e..418d3b1 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -567,7 +567,7 @@ static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz) size = FIELD_OFFSET(METADATAHDR, Version); memcpy(assembly->metadatahdr, metadatahdr, size); - /* we don't care about the version string */ + assembly->metadatahdr->Version = (LPSTR)&metadatahdr->Version; ofs = FIELD_OFFSET(METADATAHDR, Flags); ptr += FIELD_OFFSET(METADATAHDR, Version) + metadatahdr->VersionLength + 1; @@ -901,3 +901,9 @@ done: return hr; } + +HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) +{ + *version = assembly->metadatahdr->Version; + return S_OK; +} diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index 8d51f5d..a262d72 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -435,6 +435,7 @@ HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path) DECLSPEC_HIDDE HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) DECLSPEC_HIDDEN; BYTE 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; extern HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) DECLSPEC_HIDDEN; extern HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len) DECLSPEC_HIDDEN;

1 0

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

21 May '12

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: Added IDispatch support for IServerXMLHTTPRequest.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: ec2114e66e7ec033bd8dacb06ce6e5f509b435f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec2114e66e7ec033bd8dacb06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 11:35:16 2012 +0400 msxml3: Added IDispatch support for IServerXMLHTTPRequest. --- dlls/msxml3/dispex.c | 3 ++- dlls/msxml3/httprequest.c | 39 +++++++++++++++++++++++++++++++-------- dlls/msxml3/msxml_private.h | 1 + 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 23b8805..3aafc44 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -150,7 +150,8 @@ static tid_id_t tid_ids[] = { { &IID_IMXAttributes, LibXml2 }, { &IID_IMXReaderControl, LibXml2 }, { &IID_IMXWriter, LibXml2 }, - { &IID_IVBMXNamespaceManager, LibXml2 } + { &IID_IVBMXNamespaceManager, LibXml2 }, + { &IID_IServerXMLHTTPRequest, LibXml2 } }; const IID *get_riid_from_tid(tid_t tid) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 385908a..16e2446 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -1590,9 +1590,10 @@ static HRESULT WINAPI ServerXMLHTTPRequest_GetTypeInfoCount(IServerXMLHTTPReques { serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); - FIXME("(%p)->(%p): stub\n", This, pctinfo); + TRACE("(%p)->(%p)\n", This, pctinfo); + *pctinfo = 1; - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI ServerXMLHTTPRequest_GetTypeInfo(IServerXMLHTTPRequest *iface, UINT iTInfo, @@ -1600,20 +1601,32 @@ static HRESULT WINAPI ServerXMLHTTPRequest_GetTypeInfo(IServerXMLHTTPRequest *if { serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); - FIXME("(%p)->(%u %u %p): stub\n", This, iTInfo, lcid, ppTInfo); + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return get_typeinfo(IServerXMLHTTPRequest_tid, ppTInfo); } static HRESULT WINAPI ServerXMLHTTPRequest_GetIDsOfNames(IServerXMLHTTPRequest *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("(%p)->(%s %p %u %u %p): stub\n", This, debugstr_guid(riid), rgszNames, cNames, + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + if(!rgszNames || cNames == 0 || !rgDispId) + return E_INVALIDARG; + + hr = get_typeinfo(IServerXMLHTTPRequest_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI ServerXMLHTTPRequest_Invoke(IServerXMLHTTPRequest *iface, DISPID dispIdMember, REFIID riid, @@ -1621,11 +1634,21 @@ static HRESULT WINAPI ServerXMLHTTPRequest_Invoke(IServerXMLHTTPRequest *iface, EXCEPINFO *pExcepInfo, UINT *puArgErr) { serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("(%p)->(%d %s %d %d %p %p %p %p): stub\n", This, dispIdMember, debugstr_guid(riid), + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + hr = get_typeinfo(IServerXMLHTTPRequest_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &This->IServerXMLHTTPRequest_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI ServerXMLHTTPRequest_open(IServerXMLHTTPRequest *iface, BSTR method, BSTR url, diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 1c58730..3a2efb0 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -80,6 +80,7 @@ typedef enum tid_t { IMXReaderControl_tid, IMXWriter_tid, IVBMXNamespaceManager_tid, + IServerXMLHTTPRequest_tid, LAST_tid } tid_t;

1 0

Nikolay Sivov : msxml3: Stub support for IServerXMLHTTPRequest.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 1a94d8f3c1f09c925f7c3db82da90df68f9c2faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a94d8f3c1f09c925f7c3db82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 11:24:50 2012 +0400 msxml3: Stub support for IServerXMLHTTPRequest. --- dlls/msxml3/factory.c | 8 ++ dlls/msxml3/httprequest.c | 290 +++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/msxml_private.h | 1 + 3 files changed, 299 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a94d8f3c1f09c925f7c3…

1 0

Nikolay Sivov : msxml3: Move methods implementation to separate functions, so it can be reused.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 82fe81c404f857ad8dde70bdeee0f3dc92019ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82fe81c404f857ad8dde70bde… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 11:23:39 2012 +0400 msxml3: Move methods implementation to separate functions, so it can be reused. --- dlls/msxml3/httprequest.c | 597 +++++++++++++++++++++++++-------------------- 1 files changed, 327 insertions(+), 270 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82fe81c404f857ad8dde7…

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2012