March 2014 - Wine-commits - list.winehq.org

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 : 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

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 : 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::rowIndex property implementation.
by Alexandre Julliard 17 Mar '14

17 Mar '14

Module: wine Branch: master Commit: 0f8ae7bc4545a16cd878447f95cf45e170566259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f8ae7bc4545a16cd878447f9… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat Mar 15 11:23:10 2014 +0800 mshtml: Added IHTMLTableRow::rowIndex property implementation. --- dlls/mshtml/htmltablerow.c | 11 +++++++++-- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 832cb6c..b475e7d 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -226,8 +226,15 @@ static HRESULT WINAPI HTMLTableRow_get_borderColorDark(IHTMLTableRow *iface, VAR static HRESULT WINAPI HTMLTableRow_get_rowIndex(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_GetRowIndex(This->nsrow, p); + if(NS_FAILED(nsres)) { + ERR("Get rowIndex failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLTableRow_get_selectionRowIndex(IHTMLTableRow *iface, LONG *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 013a2a9..670f5c7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5577,6 +5577,7 @@ static void test_tr_elem(IHTMLElement *elem) IHTMLTableRow *row; HRESULT hres; BSTR bstr; + LONG lval; static const elem_type_t cell_types[] = {ET_TD,ET_TD}; @@ -5617,6 +5618,11 @@ static void test_tr_elem(IHTMLElement *elem) ok(!strcmp_wa(bstr, "top"), "get_valign returned %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + lval = 0xdeadbeef; + hres = IHTMLTableRow_get_rowIndex(row, &lval); + ok(hres == S_OK, "get_rowIndex failed: %08x\n", hres); + ok(lval == 1, "get_rowIndex returned %d\n", lval); + IHTMLTableRow_Release(row); }

1 0

Frédéric Delanoy : comctl32: Use BOOL type where appropriate.
by Alexandre Julliard 17 Mar '14

17 Mar '14

Module: wine Branch: master Commit: 1bf4e13b55fcfdcbaddea6bbcb2588d7e5d612a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf4e13b55fcfdcbaddea6bbc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Mar 15 13:05:35 2014 +0100 comctl32: Use BOOL type where appropriate. --- dlls/comctl32/datetime.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 9f91fd3..5c73a90 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -217,7 +217,7 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy return FALSE; /* Windows returns true if the date is valid but outside the limits set */ - if (DATETIME_IsDateInValidRange(infoPtr, systime) == FALSE) + if (!DATETIME_IsDateInValidRange(infoPtr, systime)) return TRUE; infoPtr->dateValid = TRUE; @@ -846,7 +846,8 @@ static void DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) { int fieldNum = infoPtr->select & DTHT_DATEFIELD; - int i, val=0, clamp_day=0; + int i, val = 0; + BOOL clamp_day = FALSE; SYSTEMTIME date = infoPtr->date; int oldyear; @@ -870,7 +871,7 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) date.wYear = date.wYear - (date.wYear%100) + val; if (DATETIME_IsDateInValidRange(infoPtr, &date)) - clamp_day = 1; + clamp_day = TRUE; else date.wYear = oldyear; @@ -881,7 +882,7 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) date.wYear = val; if (DATETIME_IsDateInValidRange(infoPtr, &date)) - clamp_day = 1; + clamp_day = TRUE; else date.wYear = oldyear; @@ -889,7 +890,7 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) case ONEDIGITMONTH: case TWODIGITMONTH: date.wMonth = val; - clamp_day = 1; + clamp_day = TRUE; break; case ONEDIGITDAY: case TWODIGITDAY:

1 0

Nikolay Sivov : scrrun: Implement CreateTextFile().
by Alexandre Julliard 17 Mar '14

17 Mar '14

Module: wine Branch: master Commit: 63db2d2e922b2b796f4d37202579a4f1220e236b URL: http://source.winehq.org/git/wine.git/?a=commit;h=63db2d2e922b2b796f4d37202… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 16 16:06:28 2014 +0400 scrrun: Implement CreateTextFile(). --- dlls/scrrun/filesystem.c | 51 ++++++++++++++++++++++----- dlls/scrrun/tests/filesystem.c | 74 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 8 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index d87ba30..1d47d73 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -109,6 +109,7 @@ struct textstream { LONG ref; IOMode mode; + HANDLE file; }; enum iotype { @@ -245,7 +246,10 @@ static ULONG WINAPI textstream_Release(ITextStream *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) + { + CloseHandle(This->file); heap_free(This); + } return ref; } @@ -435,9 +439,26 @@ static const ITextStreamVtbl textstreamvtbl = { textstream_Close }; -static HRESULT create_textstream(IOMode mode, ITextStream **ret) +static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMode mode, ITextStream **ret) { struct textstream *stream; + DWORD access = 0; + + /* map access mode */ + switch (mode) + { + case ForReading: + access = GENERIC_READ; + break; + case ForWriting: + access = GENERIC_WRITE; + break; + case ForAppending: + access = FILE_APPEND_DATA; + break; + default: + return E_INVALIDARG; + } stream = heap_alloc(sizeof(struct textstream)); if (!stream) return E_OUTOFMEMORY; @@ -446,6 +467,14 @@ static HRESULT create_textstream(IOMode mode, ITextStream **ret) stream->ref = 1; stream->mode = mode; + stream->file = CreateFileW(filename, access, 0, NULL, disposition, FILE_ATTRIBUTE_NORMAL, NULL); + if (stream->file == INVALID_HANDLE_VALUE) + { + HRESULT hr = create_error(GetLastError()); + heap_free(stream); + return hr; + } + *ret = &stream->ITextStream_iface; return S_OK; } @@ -3257,21 +3286,27 @@ static HRESULT WINAPI filesys_CreateFolder(IFileSystem3 *iface, BSTR path, return create_folder(path, folder); } -static HRESULT WINAPI filesys_CreateTextFile(IFileSystem3 *iface, BSTR FileName, - VARIANT_BOOL Overwrite, VARIANT_BOOL Unicode, - ITextStream **ppts) +static HRESULT WINAPI filesys_CreateTextFile(IFileSystem3 *iface, BSTR filename, + VARIANT_BOOL overwrite, VARIANT_BOOL unicode, + ITextStream **stream) { - FIXME("%p %s %d %d %p\n", iface, debugstr_w(FileName), Overwrite, Unicode, ppts); + DWORD disposition; - return E_NOTIMPL; + 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); } static HRESULT WINAPI filesys_OpenTextFile(IFileSystem3 *iface, BSTR filename, IOMode mode, VARIANT_BOOL create, Tristate format, ITextStream **stream) { - FIXME("(%p)->(%s %d %d %d %p)\n", iface, debugstr_w(filename), mode, create, format, stream); - return create_textstream(mode, stream); + DWORD disposition; + + 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); } static HRESULT WINAPI filesys_GetStandardStream(IFileSystem3 *iface, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index c62b2bc..3e8d4bb 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -167,6 +167,28 @@ static void test_textstream(void) ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); ok(b == VARIANT_TRUE, "got %x\n", b); + /* different mode combinations */ + hr = IFileSystem3_OpenTextFile(fs3, name, ForWriting | ForAppending, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IFileSystem3_OpenTextFile(fs3, name, ForReading | ForAppending, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IFileSystem3_OpenTextFile(fs3, name, ForWriting | ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IFileSystem3_OpenTextFile(fs3, name, ForAppending, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ITextStream_Read(stream, 1, &data); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, name, ForWriting, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ITextStream_Read(stream, 1, &data); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ITextStream_Release(stream); + hr = IFileSystem3_OpenTextFile(fs3, name, ForReading, VARIANT_FALSE, TristateFalse, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1192,6 +1214,57 @@ static void test_DriveCollection(void) IDriveCollection_Release(drives); } +static void test_CreateTextFile(void) +{ + static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; + static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; + WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; + ITextStream *stream; + BSTR nameW, str; + HANDLE file; + HRESULT hr; + BOOL ret; + + GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + lstrcatW(pathW, scrrunW); + lstrcpyW(dirW, pathW); + lstrcatW(pathW, testfileW); + + /* dir doesn't exist */ + nameW = SysAllocString(pathW); + hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == CTL_E_PATHNOTFOUND, "got 0x%08x\n", hr); + + ret = CreateDirectoryW(dirW, NULL); + ok(ret, "got %d, %d\n", ret, GetLastError()); + + hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextStream_Read(stream, 1, &str); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + ITextStream_Release(stream); + + /* check it's created */ + file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); + CloseHandle(file); + + /* try to create again with no-overwrite mode */ + hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == CTL_E_FILEALREADYEXISTS, "got 0x%08x\n", hr); + + /* now overwrite */ + hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStream_Release(stream); + + DeleteFileW(nameW); + RemoveDirectoryW(dirW); + SysFreeString(nameW); +} + START_TEST(filesystem) { HRESULT hr; @@ -1220,6 +1293,7 @@ START_TEST(filesystem) test_FolderCollection(); test_FileCollection(); test_DriveCollection(); + test_CreateTextFile(); IFileSystem3_Release(fs3);

1 0

Nikolay Sivov : winedump: Improve typelib header dumping.
by Alexandre Julliard 17 Mar '14

17 Mar '14

Module: wine Branch: master Commit: 74f39d20d55ec6c163ea0517eba62bc0c1ea0c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f39d20d55ec6c163ea0517e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 16 18:35:04 2014 +0400 winedump: Improve typelib header dumping. --- tools/winedump/tlb.c | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 9c3067b..bcaa859 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -214,6 +214,29 @@ static void dump_binary(int n) printf("\n"); } +static int dump_msft_varflags(void) +{ + static const char *syskind[] = { + "SYS_WIN16", "SYS_WIN32", "SYS_MAC", "SYS_WIN64", "unknown" + }; + int kind, flags; + + print_offset(); + flags = tlb_read_int(); + kind = flags & 0xf; + if (kind > 3) kind = 4; + printf("varflags = %08x, syskind = %s\n", flags, syskind[kind]); + return flags; +} + +static void dump_msft_version(void) +{ + int version; + print_offset(); + version = tlb_read_int(); + printf("version = %d.%d\n", version & 0xff, version >> 16); +} + static void dump_msft_header(void) { print_begin_block("Header"); @@ -222,15 +245,15 @@ static void dump_msft_header(void) print_hex("magic2"); print_hex("posguid"); print_hex("lcid"); - print_hex("lsid2"); - header_flags = print_hex("varflags"); - print_hex("version"); + print_hex("lcid2"); + header_flags = dump_msft_varflags(); + dump_msft_version(); print_hex("flags"); typeinfo_cnt = print_dec("ntypeinfos"); - print_hex("helpstring"); - print_hex("helpstringcontext"); - print_hex("helpcontext"); - print_dec("nametablecont"); + print_dec("helpstring"); + print_dec("helpstringcontext"); + print_dec("helpcontext"); + print_dec("nametablecount"); print_dec("nametablechars"); print_hex("NameOffset"); print_hex("helpfile");

1 0

Nikolay Sivov : winedump: Output parameters and default values type for methods.
by Alexandre Julliard 17 Mar '14

17 Mar '14

Module: wine Branch: master Commit: 39a347945da91ec16848c31aaf4276f06e763c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a347945da91ec16848c31aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 16 18:35:17 2014 +0400 winedump: Output parameters and default values type for methods. --- tools/winedump/tlb.c | 190 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 184 insertions(+), 6 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index bcaa859..26da2a4 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -44,6 +44,61 @@ enum TYPEKIND { TKIND_MAX }; +enum VARENUM { + VT_EMPTY = 0, + VT_NULL = 1, + VT_I2 = 2, + VT_I4 = 3, + VT_R4 = 4, + VT_R8 = 5, + VT_CY = 6, + VT_DATE = 7, + VT_BSTR = 8, + VT_DISPATCH = 9, + VT_ERROR = 10, + VT_BOOL = 11, + VT_VARIANT = 12, + VT_UNKNOWN = 13, + VT_DECIMAL = 14, + VT_I1 = 16, + VT_UI1 = 17, + VT_UI2 = 18, + VT_UI4 = 19, + VT_I8 = 20, + VT_UI8 = 21, + VT_INT = 22, + VT_UINT = 23, + VT_VOID = 24, + VT_HRESULT = 25, + VT_PTR = 26, + VT_SAFEARRAY = 27, + VT_CARRAY = 28, + VT_USERDEFINED = 29, + VT_LPSTR = 30, + VT_LPWSTR = 31, + VT_RECORD = 36, + VT_INT_PTR = 37, + VT_UINT_PTR = 38, + VT_FILETIME = 64, + VT_BLOB = 65, + VT_STREAM = 66, + VT_STORAGE = 67, + VT_STREAMED_OBJECT = 68, + VT_STORED_OBJECT = 69, + VT_BLOB_OBJECT = 70, + VT_CF = 71, + VT_CLSID = 72, + VT_VERSIONED_STREAM = 73, + VT_BSTR_BLOB = 0xfff, + VT_VECTOR = 0x1000, + VT_ARRAY = 0x2000, + VT_BYREF = 0x4000, + VT_RESERVED = 0x8000, + VT_ILLEGAL = 0xffff, + VT_ILLEGALMASKED = 0xfff, + VT_TYPEMASK = 0xfff +}; + struct seg_t; typedef BOOL (*dump_seg_t)(struct seg_t*); @@ -54,6 +109,25 @@ typedef struct seg_t { int offset; int length; } seg_t; +static seg_t segdir[]; + +enum SEGDIRTYPE { + SEGDIR_TYPEINFO, + SEGDIR_IMPINFO, + SEGDIR_IMPFILES, + SEGDIR_REF, + SEGDIR_GUIDHASH, + SEGDIR_GUID, + SEGDIR_NAMEHASH, + SEGDIR_NAME, + SEGDIR_STRING, + SEGDIR_TYPEDESC, + SEGDIR_ARRAYDESC, + SEGDIR_CUSTDATA, + SEGDIR_CDGUID, + SEGDIR_res0e, + SEGDIR_res0f +}; static int offset=0; static int indent; @@ -172,6 +246,25 @@ static void print_guid(const char *name) guid.Data4[5], guid.Data4[6], guid.Data4[7]); } +static void print_vartype(int vartype) +{ + static const char *vartypes[VT_LPWSTR+1] = { + "VT_EMPTY", "VT_NULL", "VT_I2", "VT_I4", "VT_R4", + "VT_R8", "VT_CY", "VT_DATE", "VT_BSTR", "VT_DISPATCH", + "VT_ERROR", "VT_BOOL", "VT_VARIANT", "VT_UNKNOWN","VT_DECIMAL", + "unk 15", "VT_I1", "VT_UI1", "VT_UI2", "VT_UI4", + "VT_I8", "VT_UI8", "VT_INT", "VT_UINT", "VT_VOID", + "VT_HRESULT", "VT_PTR", "VT_SAFEARRAY","VT_CARRAY", "VT_USERDEFINED", + "VT_LPSTR", "VT_LPWSTR" + }; + + vartype &= VT_TYPEMASK; + if (vartype >= VT_EMPTY && vartype <= VT_LPWSTR) + printf("%s\n", vartypes[vartype]); + else + printf("unk %d\n", vartype); +} + static void print_ctl2(const char *name) { int len; @@ -266,11 +359,27 @@ static void dump_msft_header(void) print_end_block(); } +static int dump_msft_typekind(void) +{ + static const char *tkind[TKIND_MAX] = { + "TKIND_ENUM", "TKIND_RECORD", "TKIND_MODULE", + "TKIND_INTERFACE", "TKIND_DISPATCH", "TKIND_COCLASS", + "TKIND_ALIAS", "TKIND_UNION" + }; + int ret, typekind; + + print_offset(); + ret = tlb_read_int(); + typekind = ret & 0xf; + printf("typekind = %s, align = %d\n", typekind < TKIND_MAX ? tkind[typekind] : "unknown", (ret >> 11) & 0x1f); + return ret; +} + static void dump_msft_typeinfobase(void) { print_begin_block_id("TypeInfoBase", msft_typeinfo_cnt); - msft_typeinfo_kind[msft_typeinfo_cnt] = print_hex("typekind"); + msft_typeinfo_kind[msft_typeinfo_cnt] = dump_msft_typekind(); msft_typeinfo_offs[msft_typeinfo_cnt] = print_hex("memoffset"); print_hex("res2"); print_hex("res3"); @@ -531,7 +640,7 @@ static BOOL dump_msft_custdata(seg_t *seg) n = tlb_read_int(); switch(vt) { - case 8 /* VT_BSTR */: + case VT_BSTR: printf(" len %d: ", n); dump_string(n, 2); printf("\n"); @@ -586,6 +695,75 @@ static BOOL dump_msft_res0f(seg_t *seg) return TRUE; } +/* Used for function return value and arguments type */ +static void dump_msft_datatype(const char *name) +{ + int datatype; + + print_offset(); + datatype = tlb_read_int(); + printf("%s = %08x", name, datatype); + if (datatype < 0) { + printf(", "); + print_vartype(datatype); + } + else { + const short *vt; + + if (datatype > segdir[SEGDIR_TYPEDESC].length) { + printf(", invalid offset\n"); + return; + } + + /* FIXME: in case of VT_USERDEFINED use hreftype */ + vt = PRD(segdir[SEGDIR_TYPEDESC].offset + datatype, 4*sizeof(short)); + datatype = vt[0] & VT_TYPEMASK; + if (datatype == VT_PTR) { + printf(", VT_PTR -> "); + if (vt[3] < 0) + datatype = vt[2]; + else { + vt = PRD(segdir[SEGDIR_TYPEDESC].offset + vt[2], 4*sizeof(short)); + datatype = *vt; + } + } + else { + printf(", "); + datatype = *vt; + } + + print_vartype(datatype); + } +} + +static void dump_defaultvalue(int id) +{ + int offset; + + print_offset(); + offset = tlb_read_int(); + + printf("default value[%d] = %08x", id, offset); + if (offset == -1) + printf("\n"); + else if (offset < 0) { + printf(", "); + print_vartype((offset & 0x7c000000) >> 26); + } + else { + const unsigned short *vt; + + if (offset > segdir[SEGDIR_CUSTDATA].length) { + printf(", invalid offset\n"); + return; + } + + vt = PRD(segdir[SEGDIR_CUSTDATA].offset + offset, sizeof(*vt)); + printf(", "); + print_vartype(*vt); + } +} + static void dump_msft_func(int n) { int size, args_cnt, i, extra_attr, fkccic; @@ -594,7 +772,7 @@ static void dump_msft_func(int n) size = print_short_hex("size"); print_short_hex("index"); - print_hex("DataType"); + dump_msft_datatype("retval type"); print_hex("flags"); print_short_hex("VtableOffset"); print_short_hex("funcdescsize"); @@ -623,16 +801,16 @@ static void dump_msft_func(int n) if(fkccic & 0x1000) { for(i=0; i < args_cnt; i++) - print_hex_id("default value[%d]", i); + dump_defaultvalue(i); } for(i=0; i < args_cnt; i++) { print_begin_block_id("param", i); /* FIXME: Handle default values */ - print_hex("data[0]"); + dump_msft_datatype("datatype"); + print_hex("name"); print_hex("paramflags"); - print_hex("data[2]"); print_end_block(); }

1 0

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

17 Mar '14

Module: wine Branch: master Commit: cfbb16ad496a16fb0d9330b327cee5abd173a7f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfbb16ad496a16fb0d9330b32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 17 08:47:25 2014 +0100 d3d9/tests: Use a separate device for update_surface_test(). --- dlls/d3d9/tests/visual.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 069642b..bb42e7a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13309,7 +13309,7 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(ps_volume); } -static void update_surface_test(IDirect3DDevice9 *device) +static void update_surface_test(void) { static const BYTE blocks[][8] = { @@ -13367,23 +13367,28 @@ static void update_surface_test(IDirect3DDevice9 *device) IDirect3DSurface9 *src_surface, *dst_surface; IDirect3DTexture9 *src_tex, *dst_tex; + IDirect3DDevice9 *device; IDirect3D9 *d3d; + ULONG refcount; UINT count, i; + HWND window; HRESULT hr; - hr = IDirect3DDevice9_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "GetDirect3D failed, hr %#x.\n", hr); - - hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_DXT1); - IDirect3D9_Release(d3d); - if (FAILED(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 (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_DXT1))) { - skip("DXT1 not supported, skipping test.\n"); - return; + skip("DXT1 not supported, skipping tests.\n"); + goto done; + } + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; } - - IDirect3D9_Release(d3d); hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, 0, D3DFMT_DXT1, D3DPOOL_SYSTEMMEM, &src_tex, NULL); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); @@ -13488,12 +13493,13 @@ static void update_surface_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(SUCCEEDED(hr), "SetTextureStageState failed, hr %#x.\n", hr); IDirect3DTexture9_Release(dst_tex); IDirect3DTexture9_Release(src_tex); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void multisample_get_rtdata_test(void) @@ -15574,11 +15580,11 @@ START_TEST(visual) fp_special_test(device_ptr); depth_bounds_test(device_ptr); srgbwrite_format_test(device_ptr); - update_surface_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + update_surface_test(); multisample_get_rtdata_test(); zenable_test(); fog_special_test();

1 0