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

Francois Gouget : d3drm: Make load_data() static.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 2b89bc528cca8054effcf7dba9de11e4511d297a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b89bc528cca8054effcf7dba… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 20 17:51:37 2012 +0200 d3drm: Make load_data() static. --- dlls/d3drm/d3drm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index f13effc..31edd46 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1255,7 +1255,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_EnumerateObjects(IDirect3DRM3* iface, D3D return E_NOTIMPL; } -HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUIDs, DWORD nb_GUIDs, D3DRMLOADCALLBACK LoadProc, +static HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUIDs, DWORD nb_GUIDs, D3DRMLOADCALLBACK LoadProc, LPVOID ArgLP, D3DRMLOADTEXTURECALLBACK LoadTextureProc, LPVOID ArgLTP, LPDIRECT3DRMFRAME3 parent_frame) { HRESULT ret = D3DRMERR_BADOBJECT;

1 0

Nikolay Sivov : msxml3/tests: A test to show that writer flushes buffer to stream automatically.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 9a4d8c30d1b00d51bd74a366580cd485586828fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a4d8c30d1b00d51bd74a3665… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 14:43:56 2012 +0400 msxml3/tests: A test to show that writer flushes buffer to stream automatically. --- dlls/msxml3/tests/saxreader.c | 82 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index b4d6f7f..003446f 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2813,6 +2813,7 @@ static void test_mxwriter_properties(void) static void test_mxwriter_flush(void) { + static const WCHAR emptyW[] = {0}; ISAXContentHandler *content; IMXWriter *writer; LARGE_INTEGER pos; @@ -2820,6 +2821,7 @@ static void test_mxwriter_flush(void) IStream *stream; VARIANT dest; HRESULT hr; + char *buff; hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); @@ -2886,9 +2888,89 @@ static void test_mxwriter_flush(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(pos2.QuadPart != 0, "expected stream position moved\n"); + IStream_Release(stream); + + /* auto-flush feature */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + EXPECT_HR(hr, S_OK); + EXPECT_REF(stream, 1); + + V_VT(&dest) = VT_UNKNOWN; + V_UNKNOWN(&dest) = (IUnknown*)stream; + hr = IMXWriter_put_output(writer, dest); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_byteOrderMark(writer, VARIANT_FALSE); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("a"), -1, NULL); + EXPECT_HR(hr, S_OK); + + /* internal buffer is flushed automatically on certain threshold */ + pos.QuadPart = 0; + pos2.QuadPart = 1; + hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); + EXPECT_HR(hr, S_OK); + ok(pos2.QuadPart == 0, "expected stream beginning\n"); + + buff = HeapAlloc(GetProcessHeap(), 0, 2048); + memset(buff, 'A', 2048); + hr = ISAXContentHandler_characters(content, _bstr_(buff), 2048); + EXPECT_HR(hr, S_OK); + + pos.QuadPart = 0; + pos2.QuadPart = 0; + hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); + EXPECT_HR(hr, S_OK); +todo_wine + ok(pos2.QuadPart != 0, "unexpected stream beginning\n"); + + hr = ISAXContentHandler_endDocument(content); + EXPECT_HR(hr, S_OK); + + IStream_Release(stream); + + /* test char count lower than threshold */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + EXPECT_HR(hr, S_OK); + EXPECT_REF(stream, 1); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("a"), -1, NULL); + EXPECT_HR(hr, S_OK); + + pos.QuadPart = 0; + pos2.QuadPart = 1; + hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); + EXPECT_HR(hr, S_OK); + ok(pos2.QuadPart == 0, "expected stream beginning\n"); + + memset(buff, 'A', 2048); + hr = ISAXContentHandler_characters(content, _bstr_(buff), 2040); + EXPECT_HR(hr, S_OK); + + pos.QuadPart = 0; + pos2.QuadPart = 1; + hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); + EXPECT_HR(hr, S_OK); + ok(pos2.QuadPart == 0, "expected stream beginning\n"); + + hr = ISAXContentHandler_endDocument(content); + EXPECT_HR(hr, S_OK); + + HeapFree(GetProcessHeap(), 0, buff); ISAXContentHandler_Release(content); IStream_Release(stream); IMXWriter_Release(writer); + free_bstrs(); } static void test_mxwriter_startenddocument(void)

1 0

Nikolay Sivov : msxml3: Added IDispatch support for IServerXMLHTTPRequest.
by Alexandre Julliard May 21, 2012

May 21, 2012

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

Eric Pouech : winedbg: In the gdb remote protocol implementation, correctly manage the size of registers on the wire (esp. for 64bit ones).
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 8308c35ec5e67f9c51eb41ce6b80abd7986ae56b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8308c35ec5e67f9c51eb41ce6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 20 09:45:26 2012 +0200 winedbg: In the gdb remote protocol implementation, correctly manage the size of registers on the wire (esp. for 64bit ones). --- programs/winedbg/gdbproxy.c | 436 ++++++++++++++++++++++++------------------- 1 files changed, 247 insertions(+), 189 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8308c35ec5e67f9c51eb4…

1 0

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

May 21, 2012

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: Add a helper to retrieve the runtime version for an assembly.
by Alexandre Julliard May 21, 2012

May 21, 2012

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: Stub support for IServerXMLHTTPRequest.
by Alexandre Julliard May 21, 2012

May 21, 2012

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 May 21, 2012

May 21, 2012

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

Nikolay Sivov : msxml3/tests: Fix test crashes running old versions.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: cce2b95a8f7dc1f8f74437a8822cfd1149a4dd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cce2b95a8f7dc1f8f74437a88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 14:38:30 2012 +0400 msxml3/tests: Fix test crashes running old versions. --- dlls/msxml3/tests/saxreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 49a6cb0..b4d6f7f 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3760,7 +3760,7 @@ static void test_mxwriter_encoding(void) "%s: encoding not accepted\n", enc); if (hr != S_OK) { - enc = encoding_names[i++]; + enc = encoding_names[++i]; IStream_Release(stream); continue; }

1 0

Michael Stefaniuc : ddraw/tests: Remove some stray ok() calls.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 7fcbf0736e5800fbd117cd994f600f342adcdd34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fcbf0736e5800fbd117cd994… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 21 10:03:57 2012 +0200 ddraw/tests: Remove some stray ok() calls. --- dlls/ddraw/tests/d3d.c | 2 -- dlls/ddraw/tests/visual.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index d4a344d..bdac379 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2849,9 +2849,7 @@ static void ComputeSphereVisibility(void) ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); ok(result[0] == 0x103d, "Expected 0x103d, got %x\n", result[0]); - ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); ok(result[1] == 0x3f, "Expected 0x3f, got %x\n", result[1]); - ok(rc == D3D_OK, "Expected D3D_OK, received %x\n", rc); ok(result[2] == 0x3f, "Expected 0x3f, got %x\n", result[2]); view._11=1.0; view._12=0.0; view._13=0.0; view._14=0.0; diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 73d2b1a..1571b3a 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -560,8 +560,6 @@ static void fog_test(IDirect3DDevice7 *device) untransformed_2, 4, Indices, 6, 0); ok(hr == D3D_OK, "DrawIndexedPrimitive returned %08x\n", hr); - /* transformed verts */ - ok( hr == D3D_OK, "SetFVF returned %08x\n", hr); /* Transformed, vertex fog != NONE, pixel fog == NONE: Use specular color alpha component */ hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR, transformed_1, 4, Indices, 6, 0);

1 0