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

Henri Verbeet : d3d9: Implement d3d9_device_ResetEx().
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 73eceafb17b66e957ffedb338513949e78806133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73eceafb17b66e957ffedb338… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 8 16:06:37 2012 +0200 d3d9: Implement d3d9_device_ResetEx(). --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 30 +++++++++++++++++++++++++++--- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/device.c | 35 ++++++++++++++++++++--------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 6 files changed, 52 insertions(+), 22 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e3fee4a..c135012 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -598,7 +598,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, wined3d_mutex_lock(); wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); - if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, reset_enum_callback))) + if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback))) { hr = wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); device->lost = FALSE; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 67a2aad..04a073d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -583,7 +583,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *if wined3d_mutex_lock(); wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); - hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, reset_enum_callback); + hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback); if (FAILED(hr)) device->not_reset = TRUE; else @@ -2954,9 +2954,33 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex static HRESULT WINAPI d3d9_device_ResetEx(IDirect3DDevice9Ex *iface, D3DPRESENT_PARAMETERS *present_parameters, D3DDISPLAYMODEEX *mode) { - FIXME("iface %p, present_parameters %p, mode %p stub!\n", iface, present_parameters, mode); + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + struct wined3d_swapchain_desc swapchain_desc; + struct wined3d_display_mode wined3d_mode; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, present_parameters %p, mode %p.\n", iface, present_parameters, mode); + + if (mode) + { + wined3d_mode.width = mode->Width; + wined3d_mode.height = mode->Height; + wined3d_mode.refresh_rate = mode->RefreshRate; + wined3d_mode.format_id = wined3dformat_from_d3dformat(mode->Format); + wined3d_mode.scanline_ordering = mode->ScanLineOrdering; + } + + wined3d_mutex_lock(); + wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); + hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, + mode ? &wined3d_mode : NULL, reset_enum_callback); + if (FAILED(hr)) + device->not_reset = TRUE; + else + device->not_reset = FALSE; + wined3d_mutex_unlock(); + + return hr; } static HRESULT WINAPI d3d9_device_GetDisplayModeEx(IDirect3DDevice9Ex *iface, diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 356d726..d628629 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3020,7 +3020,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, swapchain_desc.backbuffer_format = mode.format_id; hr = wined3d_device_reset(ddraw->wined3d_device, - &swapchain_desc, ddraw_reset_enum_callback); + &swapchain_desc, NULL, ddraw_reset_enum_callback); if (FAILED(hr)) { ERR("Failed to reset device.\n"); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b73f01..0acbded 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5136,18 +5136,18 @@ err: /* Do not call while under the GL lock. */ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, - const struct wined3d_swapchain_desc *swapchain_desc, + const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback) { struct wined3d_resource *resource, *cursor; struct wined3d_swapchain *swapchain; - struct wined3d_display_mode mode; + struct wined3d_display_mode m; BOOL DisplayModeChanged = FALSE; BOOL update_desc = FALSE; unsigned int i; HRESULT hr; - TRACE("device %p, swapchain_desc %p.\n", device, swapchain_desc); + TRACE("device %p, swapchain_desc %p, mode %p, callback %p.\n", device, swapchain_desc, mode, callback); if (FAILED(hr = wined3d_device_get_swapchain(device, 0, &swapchain))) { @@ -5254,21 +5254,26 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (swapchain_desc->enable_auto_depth_stencil) wined3d_device_set_depth_stencil(device, device->auto_depth_stencil); - if (swapchain_desc->windowed) + if (mode) + { + DisplayModeChanged = TRUE; + m = *mode; + } + else if (swapchain_desc->windowed) { - mode.width = swapchain->orig_width; - mode.height = swapchain->orig_height; - mode.refresh_rate = 0; - mode.format_id = swapchain->desc.backbuffer_format; - mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + m.width = swapchain->orig_width; + m.height = swapchain->orig_height; + m.refresh_rate = 0; + m.format_id = swapchain->desc.backbuffer_format; + m.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; } else { - mode.width = swapchain_desc->backbuffer_width; - mode.height = swapchain_desc->backbuffer_height; - mode.refresh_rate = swapchain_desc->refresh_rate; - mode.format_id = swapchain_desc->backbuffer_format; - mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + m.width = swapchain_desc->backbuffer_width; + m.height = swapchain_desc->backbuffer_height; + m.refresh_rate = swapchain_desc->refresh_rate; + m.format_id = swapchain_desc->backbuffer_format; + m.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; } /* Should Width == 800 && Height == 0 set 800x600? */ @@ -5339,7 +5344,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (!swapchain_desc->windowed != !swapchain->desc.windowed || DisplayModeChanged) { - if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, &mode))) + if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, &m))) { WARN("Failed to set display mode, hr %#x.\n", hr); wined3d_swapchain_decref(swapchain); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 5b358b8..3a0ac25 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -101,7 +101,7 @@ @ cdecl wined3d_device_present(ptr ptr ptr ptr ptr long) @ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) -@ cdecl wined3d_device_reset(ptr ptr ptr) +@ cdecl wined3d_device_reset(ptr ptr ptr ptr) @ cdecl wined3d_device_restore_fullscreen_window(ptr ptr) @ cdecl wined3d_device_set_base_vertex_index(ptr long) @ cdecl wined3d_device_set_clip_plane(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b85b257..4576937 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2188,7 +2188,8 @@ HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device, const struct wined3d_vertex_declaration *declaration, DWORD flags, DWORD dst_fvf); void __cdecl wined3d_device_release_focus_window(struct wined3d_device *device); HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, - const struct wined3d_swapchain_desc *swapchain_desc, wined3d_device_reset_cb callback); + const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, + wined3d_device_reset_cb callback); void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window); HRESULT __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device,

1 0

Hans Leidekker : ntdll: Report 3dnow and sse features if the processor supports them.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 700eec9687139fa9793ee038393ea8cc8d0e72fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=700eec9687139fa9793ee0383… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 9 11:07:05 2012 +0200 ntdll: Report 3dnow and sse features if the processor supports them. --- dlls/ntdll/nt.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index b90672b..6d6e0b0 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -920,9 +920,9 @@ void fill_cpu_info(void) #else #error Unknown CPU #endif - cached_sci.Revision = 0; - cached_sci.Reserved = 0; - cached_sci.FeatureSet = 0x1fff; /* FIXME: set some sensible defaults out of ProcessFeatures[] */ + cached_sci.Revision = 0; + cached_sci.Reserved = 0; + cached_sci.FeatureSet = 0x1fff; NtCurrentTeb()->Peb->NumberOfProcessors = 1; @@ -1049,13 +1049,22 @@ void fill_cpu_info(void) if (strstr(value, "tsc")) user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = TRUE; if (strstr(value, "3dnow")) + { user_shared_data->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = TRUE; + cached_sci.FeatureSet |= CPU_FEATURE_3DNOW; + } /* This will also catch sse2, but we have sse itself * if we have sse2, so no problem */ if (strstr(value, "sse")) + { user_shared_data->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = TRUE; + cached_sci.FeatureSet |= CPU_FEATURE_SSE; + } if (strstr(value, "sse2")) + { user_shared_data->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = TRUE; + cached_sci.FeatureSet |= CPU_FEATURE_SSE2; + } if (strstr(value, "pni")) user_shared_data->ProcessorFeatures[PF_SSE3_INSTRUCTIONS_AVAILABLE] = TRUE; if (strstr(value, "pae"))

1 0

Nikolay Sivov : msxml3: Add VT_I1 type to variant dump helper.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: ec8ec0fa9bf6259331527fd1c2e72ef0ddc5d80b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8ec0fa9bf6259331527fd1c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 8 22:54:20 2012 +0400 msxml3: Add VT_I1 type to variant dump helper. --- 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 6ecfdbc..3debd06 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -267,6 +267,8 @@ const char *debugstr_variant(const VARIANT *v) return "{VT_EMPTY}"; case VT_NULL: return "{VT_NULL}"; + case VT_I1: + return wine_dbg_sprintf("{VT_I1: %d}", V_I1(v)); case VT_I2: return wine_dbg_sprintf("{VT_I2: %d}", V_I2(v)); case VT_I4:

1 0

Hans Leidekker : msi: Don' t crash if no working directory is specified for custom action type 34.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: f55ee1a21291ab1f0ad3c4cf010fecd4d95b5e92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55ee1a21291ab1f0ad3c4cf0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 9 11:08:06 2012 +0200 msi: Don't crash if no working directory is specified for custom action type 34. --- dlls/msi/custom.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index c1aa627..88dcf87 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -935,13 +935,15 @@ static UINT HANDLE_CustomType50(MSIPACKAGE *package, LPCWSTR source, static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { - const WCHAR *workingdir; + const WCHAR *workingdir = NULL; HANDLE handle; WCHAR *cmd; - workingdir = msi_get_target_folder( package, source ); - if (!workingdir) return ERROR_FUNCTION_FAILED; - + if (source) + { + workingdir = msi_get_target_folder( package, source ); + if (!workingdir) return ERROR_FUNCTION_FAILED; + } deformat_string( package, target, &cmd ); if (!cmd) return ERROR_FUNCTION_FAILED;

1 0

Nikolay Sivov : msxml3: Fix xml declaration output when it' s specified in loaded document (in case of stream).
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 46d08bb6cefa6372ef3f597a130d14ee62c662dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=46d08bb6cefa6372ef3f597a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 8 22:49:43 2012 +0400 msxml3: Fix xml declaration output when it's specified in loaded document (in case of stream). --- dlls/msxml3/domdoc.c | 13 +++++++--- dlls/msxml3/main.c | 1 - dlls/msxml3/tests/domdoc.c | 55 ++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 59 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 0c0df36..5ac03e1 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -371,13 +371,17 @@ void xmldoc_link_xmldecl(xmlDocPtr doc, xmlNodePtr node) /* unlinks a first "<?xml" child if it was created */ xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc) { - xmlNodePtr node; + static const xmlChar xmlA[] = "xml"; + xmlNodePtr node, first_child; assert(doc != NULL); - if (doc->standalone != -1) + /* xml declaration node could be created automatically after parsing or added + to a tree later */ + first_child = doc->children; + if (first_child && first_child->type == XML_PI_NODE && xmlStrEqual(first_child->name, xmlA)) { - node = doc->children; + node = first_child; xmlUnlinkNode( node ); } else @@ -2383,8 +2387,9 @@ static HRESULT WINAPI domdoc_save( ret = IUnknown_QueryInterface(pUnk, &IID_IStream, (void**)&stream); if(ret == S_OK) { + int options = get_doc(This)->standalone == -1 ? XML_SAVE_NO_DECL : 0; ctx = xmlSaveToIO(domdoc_stream_save_writecallback, - domdoc_stream_save_closecallback, stream, NULL, XML_SAVE_NO_DECL); + domdoc_stream_save_closecallback, stream, NULL, options); if(!ctx) { diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 1553e77..6ecfdbc 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -209,7 +209,6 @@ static void init_libxslt(void) #endif } - BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { MSXML_hInstance = hInstDLL; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d51b863..46b628f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1504,9 +1504,16 @@ static const WCHAR szComplete6[] = { '<','o','p','e','n','>','<','/','o','p','e','n','>','\n',0 }; -static const CHAR szNonUnicodeXML[] = -"<?xml version='1.0' encoding='Windows-1252'?>\n" -"<open></open>\n"; +#define DECL_WIN_1252 \ +"<?xml version=\"1.0\" encoding=\"Windows-1252\"?>" + +static const char win1252xml[] = +DECL_WIN_1252 +"<open></open>"; + +static const char win1252decl[] = +DECL_WIN_1252 +; static const char szExampleXML[] = "<?xml version='1.0' encoding='utf-8'?>\n" @@ -2327,7 +2334,7 @@ if (0) /* try a BSTR containing a Windows-1252 document */ b = VARIANT_TRUE; - str = SysAllocStringByteLen( szNonUnicodeXML, sizeof(szNonUnicodeXML) - 1 ); + str = SysAllocStringByteLen( win1252xml, strlen(win1252xml) ); r = IXMLDOMDocument_loadXML( doc, str, &b ); ok( r == S_FALSE, "loadXML succeeded\n"); ok( b == VARIANT_FALSE, "succeeded in loading XML string\n"); @@ -7238,10 +7245,14 @@ static void test_save(void) IXMLDOMElement *root; BSTR sOrig, sNew, filename; char buffer[100]; + IStream *stream; + HGLOBAL global; + VARIANT_BOOL b; DWORD read = 0; VARIANT dest; HANDLE hfile; HRESULT hr; + char *ptr; doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; @@ -7327,6 +7338,40 @@ static void test_save(void) hr = IXMLDOMDocument_save(doc, dest); EXPECT_HR(hr, S_OK); + /* loaded data contains xml declaration */ + hr = IXMLDOMDocument_loadXML(doc, _bstr_(win1252xml), &b); + EXPECT_HR(hr, S_OK); + + CreateStreamOnHGlobal(NULL, TRUE, &stream); + V_VT(&dest) = VT_UNKNOWN; + V_UNKNOWN(&dest) = (IUnknown*)stream; + hr = IXMLDOMDocument_save(doc, dest); + EXPECT_HR(hr, S_OK); + + hr = GetHGlobalFromStream(stream, &global); + EXPECT_HR(hr, S_OK); + ptr = GlobalLock(global); + ok(!memcmp(ptr, win1252decl, strlen(win1252decl)), "got wrong xml declaration\n"); + GlobalUnlock(global); + IStream_Release(stream); + + /* loaded data without xml declaration */ + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<a/>"), &b); + EXPECT_HR(hr, S_OK); + + CreateStreamOnHGlobal(NULL, TRUE, &stream); + V_VT(&dest) = VT_UNKNOWN; + V_UNKNOWN(&dest) = (IUnknown*)stream; + hr = IXMLDOMDocument_save(doc, dest); + EXPECT_HR(hr, S_OK); + + hr = GetHGlobalFromStream(stream, &global); + EXPECT_HR(hr, S_OK); + ptr = GlobalLock(global); + ok(ptr[0] == '<' && ptr[1] != '?', "got wrong start tag %c%c\n", ptr[0], ptr[1]); + GlobalUnlock(global); + IStream_Release(stream); + IXMLDOMDocument_Release(doc); free_bstrs(); } @@ -10697,7 +10742,7 @@ static void test_load(void) ok(hfile != INVALID_HANDLE_VALUE, "failed to create test file\n"); if(hfile == INVALID_HANDLE_VALUE) return; - ret = WriteFile(hfile, szNonUnicodeXML, sizeof(szNonUnicodeXML)-1, &written, NULL); + ret = WriteFile(hfile, win1252xml, strlen(win1252xml), &written, NULL); ok(ret, "WriteFile failed\n"); CloseHandle(hfile);

1 0

Nikolay Sivov : msxml3: Don' t use stream written value when saving to stream.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 1a0552443ce8c2392a3d2cbe296a392b6741b0fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0552443ce8c2392a3d2cbe2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 7 12:13:08 2012 +0400 msxml3: Don't use stream written value when saving to stream. --- dlls/msxml3/domdoc.c | 3 +- dlls/msxml3/tests/domdoc.c | 156 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 141 insertions(+), 18 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 080eb3d..0c0df36 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2328,13 +2328,14 @@ static int XMLCALL domdoc_stream_save_writecallback(void *ctx, const char *buffe HRESULT hr; hr = IStream_Write((IStream*)ctx, buffer, len, &written); + TRACE("0x%08x %p %d %u\n", hr, buffer, len, written); if (hr != S_OK) { WARN("stream write error: 0x%08x\n", hr); return -1; } else - return written; + return len; } static int XMLCALL domdoc_stream_save_closecallback(void *ctx) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9919f4e..d51b863 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1288,6 +1288,118 @@ static const IServiceProviderVtbl testprovVtbl = testprov_t testprov = { { &testprovVtbl } }; +/* IStream */ +static HRESULT WINAPI istream_QueryInterface(IStream *iface, REFIID riid, void **ppvObject) +{ + *ppvObject = NULL; + + if (IsEqualGUID(riid, &IID_IStream) || + IsEqualGUID(riid, &IID_IUnknown)) + *ppvObject = iface; + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI istream_AddRef(IStream *iface) +{ + return 2; +} + +static ULONG WINAPI istream_Release(IStream *iface) +{ + return 1; +} + +static HRESULT WINAPI istream_Read(IStream *iface, void *ptr, ULONG len, ULONG *pread) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Write(IStream *iface, const void *ptr, ULONG len, ULONG *written) +{ + *written = len/2; + return S_OK; +} + +static HRESULT WINAPI istream_Seek(IStream *iface, LARGE_INTEGER move, DWORD origin, ULARGE_INTEGER *new_pos) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_SetSize(IStream *iface, ULARGE_INTEGER size) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_CopyTo(IStream *iface, IStream *stream, ULARGE_INTEGER len, + ULARGE_INTEGER *pread, ULARGE_INTEGER *written) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Commit(IStream *iface, DWORD flags) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Revert(IStream *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_LockRegion(IStream *iface, ULARGE_INTEGER offset, + ULARGE_INTEGER len, DWORD locktype) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_UnlockRegion(IStream *iface, ULARGE_INTEGER offset, + ULARGE_INTEGER len, DWORD locktype) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Stat(IStream *iface, STATSTG *pstatstg, DWORD flag) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Clone(IStream *iface, IStream **stream) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IStreamVtbl StreamVtbl = { + istream_QueryInterface, + istream_AddRef, + istream_Release, + istream_Read, + istream_Write, + istream_Seek, + istream_SetSize, + istream_CopyTo, + istream_Commit, + istream_Revert, + istream_LockRegion, + istream_UnlockRegion, + istream_Stat, + istream_Clone +}; + +static IStream savestream = { &StreamVtbl }; + #define EXPECT_CHILDREN(node) _expect_children((IXMLDOMNode*)node, __LINE__) static void _expect_children(IXMLDOMNode *node, int line) { @@ -7124,10 +7236,10 @@ static void test_save(void) { IXMLDOMDocument *doc, *doc2; IXMLDOMElement *root; - VARIANT file, vDoc; BSTR sOrig, sNew, filename; char buffer[100]; DWORD read = 0; + VARIANT dest; HANDLE hfile; HRESULT hr; @@ -7148,10 +7260,10 @@ static void test_save(void) hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL); EXPECT_HR(hr, S_OK); - V_VT(&vDoc) = VT_UNKNOWN; - V_UNKNOWN(&vDoc) = (IUnknown*)doc2; + V_VT(&dest) = VT_UNKNOWN; + V_UNKNOWN(&dest) = (IUnknown*)doc2; - hr = IXMLDOMDocument_save(doc, vDoc); + hr = IXMLDOMDocument_save(doc, dest); EXPECT_HR(hr, S_OK); hr = IXMLDOMDocument_get_xml(doc, &sOrig); @@ -7169,10 +7281,10 @@ static void test_save(void) IXMLDOMDocument_Release(doc2); /* save to path */ - V_VT(&file) = VT_BSTR; - V_BSTR(&file) = _bstr_("test.xml"); + V_VT(&dest) = VT_BSTR; + V_BSTR(&dest) = _bstr_("test.xml"); - hr = IXMLDOMDocument_save(doc, file); + hr = IXMLDOMDocument_save(doc, dest); EXPECT_HR(hr, S_OK); hfile = CreateFileA("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); @@ -7188,24 +7300,34 @@ static void test_save(void) /* save to path VT_BSTR | VT_BYREF */ filename = _bstr_("test.xml"); - V_VT(&file) = VT_BSTR | VT_BYREF; - V_BSTRREF(&file) = &filename; + V_VT(&dest) = VT_BSTR | VT_BYREF; + V_BSTRREF(&dest) = &filename; - hr = IXMLDOMDocument_save(doc, file); + hr = IXMLDOMDocument_save(doc, dest); EXPECT_HR(hr, S_OK); - IXMLDOMDocument_Release(doc); - hfile = CreateFileA("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); ok(hfile != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError()); if(hfile == INVALID_HANDLE_VALUE) return; - ReadFile(hfile, buffer, sizeof(buffer), &read, NULL); - ok(read != 0, "could not read file\n"); - ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n"); + if (hfile != INVALID_HANDLE_VALUE) + { + ReadFile(hfile, buffer, sizeof(buffer), &read, NULL); + ok(read != 0, "could not read file\n"); + ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n"); - CloseHandle(hfile); - DeleteFile("test.xml"); + CloseHandle(hfile); + DeleteFile("test.xml"); + } + + /* save to stream */ + V_VT(&dest) = VT_UNKNOWN; + V_UNKNOWN(&dest) = (IUnknown*)&savestream; + + hr = IXMLDOMDocument_save(doc, dest); + EXPECT_HR(hr, S_OK); + + IXMLDOMDocument_Release(doc); free_bstrs(); }

1 0

Henri Verbeet : wined3d: Fix the .spec.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 3543e1d198cbc63ec3094cf8eac0d698454fb292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3543e1d198cbc63ec3094cf8e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 8 16:06:36 2012 +0200 wined3d: Fix the .spec. --- dlls/wined3d/wined3d.spec | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 9e0cb65..5b358b8 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -8,11 +8,11 @@ @ cdecl wined3d_check_device_type(ptr long long long long long) @ cdecl wined3d_create(long long) @ cdecl wined3d_decref(ptr) -@ cdecl wined3d_enum_adapter_modes(ptr long long long ptr) +@ cdecl wined3d_enum_adapter_modes(ptr long long long long ptr) @ cdecl wined3d_get_adapter_count(ptr) -@ cdecl wined3d_get_adapter_display_mode(ptr long ptr) +@ cdecl wined3d_get_adapter_display_mode(ptr long ptr ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) -@ cdecl wined3d_get_adapter_mode_count(ptr long long) +@ cdecl wined3d_get_adapter_mode_count(ptr long long long) @ cdecl wined3d_get_adapter_monitor(ptr long) @ cdecl wined3d_get_device_caps(ptr long long ptr) @ cdecl wined3d_incref(ptr) @@ -35,7 +35,7 @@ @ cdecl wined3d_device_acquire_focus_window(ptr ptr) @ cdecl wined3d_device_begin_scene(ptr) @ cdecl wined3d_device_begin_stateblock(ptr) -@ cdecl wined3d_device_clear(ptr long ptr long long float long) +@ cdecl wined3d_device_clear(ptr long ptr long ptr float long) @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr) @ cdecl wined3d_device_color_fill(ptr ptr ptr ptr) @ cdecl wined3d_device_create(ptr long long ptr long long ptr ptr) @@ -60,7 +60,7 @@ @ cdecl wined3d_device_get_creation_parameters(ptr ptr) @ cdecl wined3d_device_get_depth_stencil(ptr ptr) @ cdecl wined3d_device_get_device_caps(ptr ptr) -@ cdecl wined3d_device_get_display_mode(ptr long ptr) +@ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) @ cdecl wined3d_device_get_front_buffer_data(ptr long ptr) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_index_buffer(ptr ptr) @@ -98,7 +98,7 @@ @ cdecl wined3d_device_init_3d(ptr ptr) @ cdecl wined3d_device_init_gdi(ptr ptr) @ cdecl wined3d_device_multiply_transform(ptr long ptr) -@ cdecl wined3d_device_present(ptr ptr ptr ptr ptr) +@ cdecl wined3d_device_present(ptr ptr ptr ptr ptr long) @ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) @ cdecl wined3d_device_reset(ptr ptr ptr) @@ -174,9 +174,9 @@ @ cdecl wined3d_rendertarget_view_get_resource(ptr) @ cdecl wined3d_rendertarget_view_incref(ptr) -@ cdecl wined3d_shader_create_gs(ptr ptr ptr ptr ptr ptr) -@ cdecl wined3d_shader_create_ps(ptr ptr ptr ptr ptr ptr) -@ cdecl wined3d_shader_create_vs(ptr ptr ptr ptr ptr ptr) +@ cdecl wined3d_shader_create_gs(ptr ptr ptr ptr ptr ptr long) +@ cdecl wined3d_shader_create_ps(ptr ptr ptr ptr ptr ptr long) +@ cdecl wined3d_shader_create_vs(ptr ptr ptr ptr ptr ptr long) @ cdecl wined3d_shader_decref(ptr) @ cdecl wined3d_shader_get_byte_code(ptr ptr ptr) @ cdecl wined3d_shader_get_parent(ptr) @@ -190,7 +190,7 @@ @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) -@ cdecl wined3d_surface_create(ptr long long long long long long long long long long long ptr ptr ptr) +@ cdecl wined3d_surface_create(ptr long long long long long long long long long long ptr ptr ptr) @ cdecl wined3d_surface_decref(ptr) @ cdecl wined3d_surface_flip(ptr ptr long) @ cdecl wined3d_surface_get_blt_status(ptr long) @@ -223,7 +223,7 @@ @ cdecl wined3d_swapchain_decref(ptr) @ cdecl wined3d_swapchain_get_back_buffer(ptr long long ptr) @ cdecl wined3d_swapchain_get_device(ptr) -@ cdecl wined3d_swapchain_get_display_mode(ptr ptr) +@ cdecl wined3d_swapchain_get_display_mode(ptr ptr ptr) @ cdecl wined3d_swapchain_get_front_buffer_data(ptr ptr) @ cdecl wined3d_swapchain_get_gamma_ramp(ptr ptr) @ cdecl wined3d_swapchain_get_parent(ptr)

1 0

Marcus Meissner : setupx.dll16: Avoid strcmp() result truncation (Coverity) .
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: a181e4dfe9e7a4c9644194fc8a5748d52ba2a53f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a181e4dfe9e7a4c9644194fc8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 7 11:52:22 2012 +0200 setupx.dll16: Avoid strcmp() result truncation (Coverity). --- dlls/setupx.dll16/virtcopy.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index a718ac9..141fbd2 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -591,9 +591,17 @@ static void VCP_UI_RegisterProgressClass(void) static RETERR16 VCP_UI_NodeCompare(LPVIRTNODE vn1, LPVIRTNODE vn2) { LPCSTR file1, file2; + int ret; file1 = vsmGetStringRawName16(vn1->vfsSrc.vhstrFileName); file2 = vsmGetStringRawName16(vn2->vfsSrc.vhstrFileName); - return (RETERR16)strcmp(file1, file2); + + ret = strcmp(file1, file2); + /* Looks too complicated, but in optimized strcpy we might get + * a 32bit wide difference and would truncate it to 16 bit, so + * erroneously returning equality. */ + if (ret < 0) return -1; + if (ret > 0) return 1; + return 0; } static RETERR16 VCP_UI_CopyStart(void)

1 0

Marcus Meissner : shell32: Avoid memcmp result truncation (Coverity).
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 0ef705fb69903d68c53a77700e167f68f9b8c55c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef705fb69903d68c53a77700… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 7 11:52:23 2012 +0200 shell32: Avoid memcmp result truncation (Coverity). --- dlls/shell32/recyclebin.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 6b7d4aa..a10bffa 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -457,12 +457,19 @@ static HRESULT WINAPI RecycleBin_BindToStorage(IShellFolder2 *This, LPCITEMIDLIS static HRESULT WINAPI RecycleBin_CompareIDs(IShellFolder2 *iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) { RecycleBin *This = impl_from_IShellFolder2(iface); + int ret; /* TODO */ TRACE("(%p, %p, %p, %p)\n", This, (void *)lParam, pidl1, pidl2); if (pidl1->mkid.cb != pidl2->mkid.cb) return MAKE_HRESULT(SEVERITY_SUCCESS, 0, pidl1->mkid.cb - pidl2->mkid.cb); - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (unsigned short)memcmp(pidl1->mkid.abID, pidl2->mkid.abID, pidl1->mkid.cb)); + /* Looks too complicated, but in optimized memcpy we might get + * a 32bit wide difference and would truncate it to 16 bit, so + * erroneously returning equality. */ + ret = memcmp(pidl1->mkid.abID, pidl2->mkid.abID, pidl1->mkid.cb); + if (ret < 0) ret = -1; + if (ret > 0) ret = 1; + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (unsigned short)ret); } static HRESULT WINAPI RecycleBin_CreateViewObject(IShellFolder2 *iface, HWND hwndOwner, REFIID riid, void **ppv)

1 0

Marcus Meissner : user.exe: Avoid truncating strcmp result (Coverity).
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: f917cd0e42642aefc8924379f4dacacb6563bc24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f917cd0e42642aefc8924379f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 7 11:52:24 2012 +0200 user.exe: Avoid truncating strcmp result (Coverity). --- dlls/user.exe16/user.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 705620b..7f184a2 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -2557,7 +2557,14 @@ INT16 WINAPIV wsprintf16( LPSTR buffer, LPCSTR spec, VA_LIST16 valist ) */ INT16 WINAPI lstrcmp16( LPCSTR str1, LPCSTR str2 ) { - return strcmp( str1, str2 ); + int ret; + /* Looks too complicated, but in optimized strcpy we might get + * a 32bit wide difference and would truncate it to 16 bit, so + * erroneously returning equality. */ + ret = strcmp( str1, str2 ); + if (ret < 0) return -1; + if (ret > 0) return 1; + return 0; }

1 0