wine-commits March 2014

wine-commits@winehq.org

2 participants
530 discussions

Henri Verbeet : d3d9/tests: Use a separate device for depth_buffer2_test() .
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: 38e2f4ca05030fd2d88735c241cd72f6326b6663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38e2f4ca05030fd2d88735c24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 18 09:37:53 2014 +0100 d3d9/tests: Use a separate device for depth_buffer2_test(). --- dlls/d3d9/tests/visual.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 3065614..fd8eb6d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11869,7 +11869,7 @@ static void depth_buffer_test(IDirect3DDevice9 *device) /* Test that partial depth copies work the way they're supposed to. The clear * on rt2 only needs a partial copy of the onscreen depth/stencil buffer, and * the following draw should only copy back the part that was modified. */ -static void depth_buffer2_test(IDirect3DDevice9 *device) +static void depth_buffer2_test(void) { static const struct vertex quad[] = { @@ -11880,11 +11880,25 @@ static void depth_buffer2_test(IDirect3DDevice9 *device) }; IDirect3DSurface9 *backbuffer, *rt1, *rt2; + IDirect3DDevice9 *device; unsigned int i, j; D3DVIEWPORT9 vp; + IDirect3D9 *d3d; D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + vp.X = 0; vp.Y = 0; vp.Width = 640; @@ -11961,6 +11975,11 @@ static void depth_buffer2_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(backbuffer); IDirect3DSurface9_Release(rt2); IDirect3DSurface9_Release(rt1); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void depth_blit_test(void) @@ -15651,11 +15670,11 @@ START_TEST(visual) alphareplicate_test(device_ptr); dp3_alpha_test(device_ptr); depth_buffer_test(device_ptr); - depth_buffer2_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + depth_buffer2_test(); depth_blit_test(); intz_test(); shadow_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for depth_blit_test().
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: 421f925d5eae559b6bc2979715d2e6b00a6818f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=421f925d5eae559b6bc297971… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 18 09:37:52 2014 +0100 d3d9/tests: Use a separate device for depth_blit_test(). --- dlls/d3d9/tests/visual.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f970c34..3065614 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11963,7 +11963,7 @@ static void depth_buffer2_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(rt1); } -static void depth_blit_test(IDirect3DDevice9 *device) +static void depth_blit_test(void) { static const struct vertex quad1[] = { @@ -11988,12 +11988,26 @@ static void depth_blit_test(IDirect3DDevice9 *device) }; IDirect3DSurface9 *backbuffer, *ds1, *ds2, *ds3; + IDirect3DDevice9 *device; RECT src_rect, dst_rect; unsigned int i, j; D3DVIEWPORT9 vp; + IDirect3D9 *d3d; D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + vp.X = 0; vp.Y = 0; vp.Width = 640; @@ -12097,6 +12111,11 @@ static void depth_blit_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(ds3); IDirect3DSurface9_Release(ds2); IDirect3DSurface9_Release(ds1); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void intz_test(void) @@ -15633,11 +15652,11 @@ START_TEST(visual) dp3_alpha_test(device_ptr); depth_buffer_test(device_ptr); depth_buffer2_test(device_ptr); - depth_blit_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + depth_blit_test(); intz_test(); shadow_test(); fp_special_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for intz_test().
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: 424e069edc3b3a1ca902c25f8dac6f5b4ceb10e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=424e069edc3b3a1ca902c25f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 18 09:37:51 2014 +0100 d3d9/tests: Use a separate device for intz_test(). --- dlls/d3d9/tests/visual.c | 61 ++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 13d363b..f970c34 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12099,7 +12099,7 @@ static void depth_blit_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(ds1); } -static void intz_test(IDirect3DDevice9 *device) +static void intz_test(void) { static const DWORD ps_code[] = { @@ -12158,45 +12158,51 @@ static void intz_test(IDirect3DDevice9 *device) {560, 450, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)}, }; - IDirect3DSurface9 *original_ds, *original_rt, *rt; + IDirect3DSurface9 *original_rt, *rt; IDirect3DTexture9 *texture; IDirect3DPixelShader9 *ps; + IDirect3DDevice9 *device; IDirect3DSurface9 *ds; - IDirect3D9 *d3d9; + IDirect3D9 *d3d; + ULONG refcount; D3DCAPS9 caps; + HWND window; HRESULT hr; UINT i; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, MAKEFOURCC('I','N','T','Z')))) + { + skip("No INTZ support, skipping INTZ test.\n"); + goto done; + } + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "GetDeviceCaps failed, hr %#x.\n", hr); if (caps.PixelShaderVersion < D3DPS_VERSION(2, 0)) { skip("No pixel shader 2.0 support, skipping INTZ test.\n"); - return; + IDirect3DDevice9_Release(device); + goto done; } if (caps.TextureCaps & D3DPTEXTURECAPS_POW2) { skip("No unconditional NP2 texture support, skipping INTZ test.\n"); - return; - } - - hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); - ok(SUCCEEDED(hr), "GetDirect3D failed, hr %#x.\n", hr); - - hr = IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, MAKEFOURCC('I','N','T','Z')); - if (FAILED(hr)) - { - skip("No INTZ support, skipping INTZ test.\n"); - return; + IDirect3DDevice9_Release(device); + goto done; } - IDirect3D9_Release(d3d9); - hr = IDirect3DDevice9_GetRenderTarget(device, 0, &original_rt); ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_GetDepthStencilSurface(device, &original_ds); - ok(SUCCEEDED(hr), "GetDepthStencilSurface failed, hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 640, 480, 1, D3DUSAGE_DEPTHSTENCIL, MAKEFOURCC('I','N','T','Z'), D3DPOOL_DEFAULT, &texture, NULL); @@ -12396,18 +12402,15 @@ static void intz_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetDepthStencilSurface(device, original_ds); - ok(SUCCEEDED(hr), "SetDepthStencilSurface failed, hr %#x.\n", hr); - IDirect3DSurface9_Release(original_ds); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); IDirect3DTexture9_Release(texture); - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); IDirect3DPixelShader9_Release(ps); - IDirect3DSurface9_Release(original_rt); IDirect3DSurface9_Release(rt); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void shadow_test(void) @@ -15631,11 +15634,11 @@ START_TEST(visual) depth_buffer_test(device_ptr); depth_buffer2_test(device_ptr); depth_blit_test(device_ptr); - intz_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + intz_test(); shadow_test(); fp_special_test(); depth_bounds_test();

1 0

Nikolay Sivov : scrrun: Implement WriteLine/Write for ITextStream.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: abcffadbf1082f3aadf22264b0eea395f8436303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abcffadbf1082f3aadf22264b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 18 10:58:08 2014 +0400 scrrun: Implement WriteLine/Write for ITextStream. --- dlls/scrrun/filesystem.c | 95 ++++++++++++++++++++++++++++++++++++---- dlls/scrrun/scrrun.idl | 8 ++-- dlls/scrrun/tests/filesystem.c | 83 +++++++++++++++++++++++++++++++++++ 3 files changed, 174 insertions(+), 12 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 1d47d73..f1fea06 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -109,6 +109,8 @@ struct textstream { LONG ref; IOMode mode; + BOOL unicode; + BOOL first_write; HANDLE file; }; @@ -209,7 +211,7 @@ static BOOL textstream_check_iomode(struct textstream *This, enum iotype type) if (type == IORead) return This->mode == ForWriting || This->mode == ForAppending; else - return TRUE; + return This->mode == ForReading; } static HRESULT WINAPI textstream_QueryInterface(ITextStream *iface, REFIID riid, void **obj) @@ -374,18 +376,87 @@ static HRESULT WINAPI textstream_ReadAll(ITextStream *iface, BSTR *text) return E_NOTIMPL; } +static HRESULT textstream_writestr(struct textstream *stream, BSTR text) +{ + DWORD written = 0; + BOOL ret; + + if (stream->unicode) { + if (stream->first_write) { + static const WCHAR utf16bom = 0xfeff; + DWORD written = 0; + BOOL ret = WriteFile(stream->file, &utf16bom, sizeof(utf16bom), &written, NULL); + if (!ret || written != sizeof(utf16bom)) + return create_error(GetLastError()); + stream->first_write = FALSE; + } + + ret = WriteFile(stream->file, text, SysStringByteLen(text), &written, NULL); + return (ret && written == SysStringByteLen(text)) ? S_OK : create_error(GetLastError()); + } else { + DWORD len = WideCharToMultiByte(CP_ACP, 0, text, SysStringLen(text), NULL, 0, NULL, NULL); + char *buffA; + HRESULT hr; + + buffA = heap_alloc(len); + if (!buffA) + return E_OUTOFMEMORY; + + WideCharToMultiByte(CP_ACP, 0, text, SysStringLen(text), buffA, len, NULL, NULL); + ret = WriteFile(stream->file, buffA, len, &written, NULL); + hr = (ret && written == len) ? S_OK : create_error(GetLastError()); + heap_free(buffA); + return hr; + } +} + static HRESULT WINAPI textstream_Write(ITextStream *iface, BSTR text) { struct textstream *This = impl_from_ITextStream(iface); - FIXME("(%p)->(%s): stub\n", This, debugstr_w(text)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(text)); + + if (textstream_check_iomode(This, IOWrite)) + return CTL_E_BADFILEMODE; + + return textstream_writestr(This, text); +} + +static HRESULT textstream_writecrlf(struct textstream *stream) +{ + static const WCHAR crlfW[] = {'\r','\n'}; + static const char crlfA[] = {'\r','\n'}; + DWORD written = 0, len; + const void *ptr; + BOOL ret; + + if (stream->unicode) { + ptr = crlfW; + len = sizeof(crlfW); + } + else { + ptr = crlfA; + len = sizeof(crlfA); + } + + ret = WriteFile(stream->file, ptr, len, &written, NULL); + return (ret && written == len) ? S_OK : create_error(GetLastError()); } static HRESULT WINAPI textstream_WriteLine(ITextStream *iface, BSTR text) { struct textstream *This = impl_from_ITextStream(iface); - FIXME("(%p)->(%s): stub\n", This, debugstr_w(text)); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p)->(%s)\n", This, debugstr_w(text)); + + if (textstream_check_iomode(This, IOWrite)) + return CTL_E_BADFILEMODE; + + hr = textstream_writestr(This, text); + if (SUCCEEDED(hr)) + hr = textstream_writecrlf(This); + return hr; } static HRESULT WINAPI textstream_WriteBlankLines(ITextStream *iface, LONG lines) @@ -439,7 +510,7 @@ static const ITextStreamVtbl textstreamvtbl = { textstream_Close }; -static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMode mode, ITextStream **ret) +static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMode mode, BOOL unicode, ITextStream **ret) { struct textstream *stream; DWORD access = 0; @@ -466,6 +537,8 @@ static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMod stream->ITextStream_iface.lpVtbl = &textstreamvtbl; stream->ref = 1; stream->mode = mode; + stream->unicode = unicode; + stream->first_write = TRUE; stream->file = CreateFileW(filename, access, 0, NULL, disposition, FILE_ATTRIBUTE_NORMAL, NULL); if (stream->file == INVALID_HANDLE_VALUE) @@ -3295,7 +3368,7 @@ static HRESULT WINAPI filesys_CreateTextFile(IFileSystem3 *iface, BSTR filename, TRACE("%p %s %d %d %p\n", iface, debugstr_w(filename), overwrite, unicode, stream); disposition = overwrite == VARIANT_TRUE ? CREATE_ALWAYS : CREATE_NEW; - return create_textstream(filename, disposition, ForWriting, stream); + return create_textstream(filename, disposition, ForWriting, !!unicode, stream); } static HRESULT WINAPI filesys_OpenTextFile(IFileSystem3 *iface, BSTR filename, @@ -3306,7 +3379,13 @@ static HRESULT WINAPI filesys_OpenTextFile(IFileSystem3 *iface, BSTR filename, TRACE("(%p)->(%s %d %d %d %p)\n", iface, debugstr_w(filename), mode, create, format, stream); disposition = create == VARIANT_TRUE ? OPEN_ALWAYS : OPEN_EXISTING; - return create_textstream(filename, disposition, mode, stream); + + if (format == TristateUseDefault) { + FIXME("default format not handled, defaulting to unicode\n"); + format = TristateTrue; + } + + return create_textstream(filename, disposition, mode, format == TristateTrue, stream); } static HRESULT WINAPI filesys_GetStandardStream(IFileSystem3 *iface, diff --git a/dlls/scrrun/scrrun.idl b/dlls/scrrun/scrrun.idl index 33f1fbb..9cb9daf 100644 --- a/dlls/scrrun/scrrun.idl +++ b/dlls/scrrun/scrrun.idl @@ -54,10 +54,10 @@ library Scripting typedef enum Tristate { - TristateTrue = 0xffffffff, - TristateFalse = 0, - TristateUseDefault = 0xfffffffe, - TristateMixed = 0xfffffffe + TristateTrue = -1, + TristateFalse = 0, + TristateUseDefault = -2, + TristateMixed = -2 } Tristate; typedef enum FileAttribute diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 3e8d4bb..4897652 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -192,6 +192,13 @@ static void test_textstream(void) hr = IFileSystem3_OpenTextFile(fs3, name, ForReading, VARIANT_FALSE, TristateFalse, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); + /* try to write when open for reading */ + hr = ITextStream_WriteLine(stream, name); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + hr = ITextStream_Write(stream, name); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + b = 10; hr = ITextStream_get_AtEndOfStream(stream, &b); todo_wine { @@ -1265,6 +1272,81 @@ static void test_CreateTextFile(void) SysFreeString(nameW); } +static void test_WriteLine(void) +{ + static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; + static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; + static const WCHAR crlfW[] = {'\r','\n',0}; + WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; + WCHAR buffW[MAX_PATH], buff2W[MAX_PATH]; + char buffA[MAX_PATH]; + ITextStream *stream; + DWORD r, len; + HANDLE file; + BSTR nameW; + HRESULT hr; + BOOL ret; + + GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + lstrcatW(pathW, scrrunW); + lstrcpyW(dirW, pathW); + lstrcatW(pathW, testfileW); + + ret = CreateDirectoryW(dirW, NULL); + ok(ret, "got %d, %d\n", ret, GetLastError()); + + /* create as ASCII file first */ + nameW = SysAllocString(pathW); + hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextStream_WriteLine(stream, nameW); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStream_Release(stream); + + /* check contents */ + file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); + r = 0; + ret = ReadFile(file, buffA, sizeof(buffA), &r, NULL); + ok(ret && r, "read %d, got %d, %d\n", r, ret, GetLastError()); + + len = MultiByteToWideChar(CP_ACP, 0, buffA, r, buffW, sizeof(buffW)/sizeof(WCHAR)); + buffW[len] = 0; + lstrcpyW(buff2W, nameW); + lstrcatW(buff2W, crlfW); + ok(!lstrcmpW(buff2W, buffW), "got %s, expected %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(buff2W)); + CloseHandle(file); + DeleteFileW(nameW); + + /* same for unicode file */ + hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_FALSE, VARIANT_TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextStream_WriteLine(stream, nameW); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStream_Release(stream); + + /* check contents */ + file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); + r = 0; + ret = ReadFile(file, buffW, sizeof(buffW), &r, NULL); + ok(ret && r, "read %d, got %d, %d\n", r, ret, GetLastError()); + buffW[r/sizeof(WCHAR)] = 0; + + buff2W[0] = 0xfeff; + buff2W[1] = 0; + lstrcatW(buff2W, nameW); + lstrcatW(buff2W, crlfW); + ok(!lstrcmpW(buff2W, buffW), "got %s, expected %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(buff2W)); + CloseHandle(file); + DeleteFileW(nameW); + + RemoveDirectoryW(dirW); + SysFreeString(nameW); +} + START_TEST(filesystem) { HRESULT hr; @@ -1294,6 +1376,7 @@ START_TEST(filesystem) test_FileCollection(); test_DriveCollection(); test_CreateTextFile(); + test_WriteLine(); IFileSystem3_Release(fs3);

1 0

Zhenbo Li : mshtml: Added IHTMLTableRow:: sectionRowIndex property implementation.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: c32ae1b34a6738d18f571987c628170c15043fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c32ae1b34a6738d18f571987c… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Mar 18 13:14:07 2014 +0800 mshtml: Added IHTMLTableRow::sectionRowIndex property implementation. --- dlls/mshtml/htmltablerow.c | 15 +++++++++++---- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index b475e7d..f93a606 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -237,11 +237,18 @@ static HRESULT WINAPI HTMLTableRow_get_rowIndex(IHTMLTableRow *iface, LONG *p) return S_OK; } -static HRESULT WINAPI HTMLTableRow_get_selectionRowIndex(IHTMLTableRow *iface, LONG *p) +static HRESULT WINAPI HTMLTableRow_get_sectionRowIndex(IHTMLTableRow *iface, LONG *p) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + nsres = nsIDOMHTMLTableRowElement_GetSectionRowIndex(This->nsrow, p); + if(NS_FAILED(nsres)) { + ERR("Get selectionRowIndex failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLTableRow_get_cells(IHTMLTableRow *iface, IHTMLElementCollection **p) @@ -299,7 +306,7 @@ static const IHTMLTableRowVtbl HTMLTableRowVtbl = { HTMLTableRow_put_borderColorDark, HTMLTableRow_get_borderColorDark, HTMLTableRow_get_rowIndex, - HTMLTableRow_get_selectionRowIndex, + HTMLTableRow_get_sectionRowIndex, HTMLTableRow_get_cells, HTMLTableRow_insertCell, HTMLTableRow_deleteCell diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 670f5c7..2a96ad8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5623,6 +5623,11 @@ static void test_tr_elem(IHTMLElement *elem) ok(hres == S_OK, "get_rowIndex failed: %08x\n", hres); ok(lval == 1, "get_rowIndex returned %d\n", lval); + lval = 0xdeadbeef; + hres = IHTMLTableRow_get_sectionRowIndex(row, &lval); + ok(hres == S_OK, "get_sectionRowIndex failed: %08x\n", hres); + ok(lval == 1, "get_sectionRowIndex returned %d\n", lval); + IHTMLTableRow_Release(row); }

1 0

Nikolay Sivov : msi: 'optional' only applies to VARIANT and VARIANT* types.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: 0e90cebce0ed901828eedffce2a8397e3ddb8b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e90cebce0ed901828eedffce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 18 07:53:42 2014 +0400 msi: 'optional' only applies to VARIANT and VARIANT* types. --- dlls/msi/msiserver.idl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index f285005..f351ab1 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -251,14 +251,14 @@ library WindowsInstaller [id(DISPID_INSTALLER_OPENPACKAGE)] Session* OpenPackage( [in] VARIANT PackagePath, - [in, optional, defaultvalue(0)] long Options); + [in, defaultvalue(0)] long Options); [id(DISPID_INSTALLER_OPENPRODUCT)] Session* OpenProduct( [in] BSTR ProductCode); [id(DISPID_INSTALLER_SUMMARYINFORMATION)] SummaryInfo* SummaryInformation( [in] BSTR PackagePath, - [in, optional, defaultvalue(0)] long UpdateCount); + [in, defaultvalue(0)] long UpdateCount); [id(DISPID_INSTALLER_OPENDATABASE)] Database *OpenDatabase( [in] BSTR DatabasePath, @@ -270,7 +270,7 @@ library WindowsInstaller [id(DISPID_INSTALLER_INSTALLPRODUCT)] void InstallProduct( [in] BSTR PackagePath, - [in, optional, defaultvalue("0")] BSTR PropertyValues); + [in, defaultvalue("0")] BSTR PropertyValues); [id(DISPID_INSTALLER_VERSION)] BSTR Version(); [id(DISPID_INSTALLER_LASTERRORRECORD)] @@ -393,7 +393,7 @@ library WindowsInstaller properties: methods: [id(DISPID_VIEW_EXECUTE)] - void Execute([in, optional, defaultvalue(0)] Record *Params); + void Execute([in, defaultvalue(0)] Record *Params); [id(DISPID_VIEW_FETCH)] Record* Fetch(); [id(DISPID_VIEW_MODIFY)] @@ -412,7 +412,7 @@ library WindowsInstaller [id(DISPID_DATABASE_OPENVIEW)] View* OpenView([in] BSTR Sql); [id(DISPID_DATABASE_SUMMARYINFORMATION), propget] - SummaryInfo *SummaryInformation([in, optional, defaultvalue(0)] long UpdateCount); + SummaryInfo *SummaryInformation([in, defaultvalue(0)] long UpdateCount); } typedef enum {

1 0

André Hentschel : gdi32/tests: GetCharABCWidthsA is broken for johab charset on windows.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: 87d85357cdbd854665583efd299f6cfc2f3fefb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87d85357cdbd854665583efd2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 18 00:14:21 2014 +0100 gdi32/tests: GetCharABCWidthsA is broken for johab charset on windows. --- dlls/gdi32/tests/font.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index a9d2fb0..259f4a0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1190,8 +1190,6 @@ static void test_GetCharABCWidths(void) {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE}}, {HANGEUL_CHARSET, 0x8141, 0xac02, {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE}}, - {JOHAB_CHARSET, 0x8446, 0x3135, - {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE}}, {GB2312_CHARSET, 0x8141, 0x4e04, {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE}}, {CHINESEBIG5_CHARSET, 0xa142, 0x3001,

1 0

Nikolay Sivov : widl: Fix default value types.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: ea9e7b631832d892eeff1919c22f48f1c312620d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9e7b631832d892eeff1919c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 18 02:24:26 2014 +0400 widl: Fix default value types. --- tools/widl/write_msft.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 724be27..adffe85 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1191,6 +1191,8 @@ static void write_value(msft_typelib_t* typelib, int *out, int vt, const void *v case VT_UINT: case VT_HRESULT: case VT_PTR: + case VT_UNKNOWN: + case VT_DISPATCH: { const unsigned int lv = get_ulong_val(*(const unsigned int *)value, vt); if((lv & 0x3ffffff) == lv) { @@ -1257,6 +1259,33 @@ static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, return S_OK; } +/* It's possible to have a default value for pointer arguments too. + In this case default value has a referenced type, e.g. + 'LONG*' argument gets VT_I4, 'DOUBLE*' - VT_R8. IUnknown* and IDispatch* + are recognised too and stored as VT_UNKNOWN and VT_DISPATCH. + But IUnknown/IDispatch arguments can only have default value of 0 + (or expression that resolves to zero) while other pointers can have + any default value. */ +static int get_defaultvalue_vt(type_t *type) +{ + int vt = get_type_vt(type); + if (type_get_type(type) == TYPE_ENUM) + vt = VT_I4; + else + { + vt = get_type_vt(type); + if (vt == VT_PTR && is_ptr(type)) { + vt = get_type_vt(type_pointer_get_ref(type)); + /* The only acceptable value for pointers to non-basic types + is NULL, it's stored as VT_I4 for both 32 and 64 bit typelibs. */ + if (vt == VT_USERDEFINED) + vt = VT_I4; + } + } + + return vt; +} + static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) { int offset, name_offset; @@ -1481,10 +1510,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) { int vt; expr_t *expr = (expr_t *)attr->u.pval; - if (type_get_type(arg->type) == TYPE_ENUM) - vt = VT_INT; - else - vt = get_type_vt(arg->type); + vt = get_defaultvalue_vt(arg->type); paramflags |= 0x30; /* PARAMFLAG_FHASDEFAULT | PARAMFLAG_FOPT */ if (expr->type == EXPR_STRLIT || expr->type == EXPR_WSTRLIT) {

1 0

Matteo Bruni : d3dx9: Copy the entire matrix at once if there is no need of type conversions.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: 5cfca92c5329bb795f5b619a7687a9602ab3f45f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cfca92c5329bb795f5b619a7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 17 20:22:56 2014 +0100 d3dx9: Copy the entire matrix at once if there is no need of type conversions. --- dlls/d3dx9_36/effect.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f505736..f136fb7 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -768,6 +768,16 @@ static void set_matrix(struct d3dx_parameter *param, const D3DXMATRIX *matrix) { UINT i, k; + if (param->type == D3DXPT_FLOAT) + { + if (param->columns == 4) + memcpy(param->data, matrix->u.m, param->rows * 4 * sizeof(float)); + else + for (i = 0; i < param->rows; ++i) + memcpy((float *)param->data + i * param->columns, matrix->u.m + i, param->columns * sizeof(float)); + return; + } + for (i = 0; i < param->rows; ++i) { for (k = 0; k < param->columns; ++k)

1 0

Matteo Bruni : d3dx9: Split out set_matrix_transpose from set_matrix.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: 1e2fbcc99b745fe6b636d41a4b64225286882bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e2fbcc99b745fe6b636d41a4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 17 20:22:55 2014 +0100 d3dx9: Split out set_matrix_transpose from set_matrix. --- dlls/d3dx9_36/effect.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d5258e9..f505736 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -764,7 +764,7 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix, BOOL tr } } -static void set_matrix(struct d3dx_parameter *param, const D3DXMATRIX *matrix, BOOL transpose) +static void set_matrix(struct d3dx_parameter *param, const D3DXMATRIX *matrix) { UINT i, k; @@ -773,7 +773,21 @@ static void set_matrix(struct d3dx_parameter *param, const D3DXMATRIX *matrix, B for (k = 0; k < param->columns; ++k) { set_number((FLOAT *)param->data + i * param->columns + k, param->type, - transpose ? &matrix->u.m[k][i] : &matrix->u.m[i][k], D3DXPT_FLOAT); + &matrix->u.m[i][k], D3DXPT_FLOAT); + } + } +} + +static void set_matrix_transpose(struct d3dx_parameter *param, const D3DXMATRIX *matrix) +{ + UINT i, k; + + for (i = 0; i < param->rows; ++i) + { + for (k = 0; k < param->columns; ++k) + { + set_number((FLOAT *)param->data + i * param->columns + k, param->type, + &matrix->u.m[k][i], D3DXPT_FLOAT); } } } @@ -1916,7 +1930,7 @@ static HRESULT d3dx9_base_effect_set_matrix(struct d3dx9_base_effect *base, switch (param->class) { case D3DXPC_MATRIX_ROWS: - set_matrix(param, matrix, FALSE); + set_matrix(param, matrix); return D3D_OK; case D3DXPC_SCALAR: @@ -1984,7 +1998,7 @@ static HRESULT d3dx9_base_effect_set_matrix_array(struct d3dx9_base_effect *base case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - set_matrix(&param->members[i], &matrix[i], FALSE); + set_matrix(&param->members[i], &matrix[i]); } return D3D_OK; @@ -2058,7 +2072,7 @@ static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effe case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - set_matrix(&param->members[i], matrix[i], FALSE); + set_matrix(&param->members[i], matrix[i]); } return D3D_OK; @@ -2128,7 +2142,7 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose(struct d3dx9_base_effect * switch (param->class) { case D3DXPC_MATRIX_ROWS: - set_matrix(param, matrix, TRUE); + set_matrix_transpose(param, matrix); return D3D_OK; case D3DXPC_SCALAR: @@ -2199,7 +2213,7 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose_array(struct d3dx9_base_ef case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - set_matrix(&param->members[i], &matrix[i], TRUE); + set_matrix_transpose(&param->members[i], &matrix[i]); } return D3D_OK; @@ -2273,7 +2287,7 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose_pointer_array(struct d3dx9 case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - set_matrix(&param->members[i], matrix[i], TRUE); + set_matrix_transpose(&param->members[i], matrix[i]); } return D3D_OK;

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
53
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 March 2014