February 2008 - Wine-Commits

James Hawkins : msi: Add tests for MsiGetFileVersion.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 8079d9f2abfc4abf94cc2d850d37b26b5c1b9bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8079d9f2abfc4abf94cc2d850… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 4 11:32:31 2008 -0600 msi: Add tests for MsiGetFileVersion. --- dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/msi.c | 296 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 297 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8079d9f2abfc4abf94cc2…

1 0

James Hawkins : msi: Implement the MSIMODIFY_ASSIGN action of MsiViewModify for the streams table .
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 146e34e662b299b0644ba4a3af0b58c65b5e61ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=146e34e662b299b0644ba4a3a… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 4 11:28:36 2008 -0600 msi: Implement the MSIMODIFY_ASSIGN action of MsiViewModify for the streams table. --- dlls/msi/streams.c | 89 +++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 74 insertions(+), 15 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 9828b7f..9950270 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -54,9 +54,9 @@ typedef struct tagMSISTREAMSVIEW UINT row_size; } MSISTREAMSVIEW; -static BOOL add_stream_to_table(MSISTREAMSVIEW *sv, STREAM *stream, int index) +static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, int size) { - if (index >= sv->max_streams) + if (size >= sv->max_streams) { sv->max_streams *= 2; sv->streams = msi_realloc(sv->streams, sv->max_streams * sizeof(STREAM *)); @@ -64,7 +64,6 @@ static BOOL add_stream_to_table(MSISTREAMSVIEW *sv, STREAM *stream, int index) return FALSE; } - sv->streams[index] = stream; return TRUE; } @@ -140,12 +139,6 @@ static UINT STREAMS_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask) { - FIXME("(%p, %d, %p, %d): stub!\n", view, row, rec, mask); - return ERROR_SUCCESS; -} - -static UINT STREAMS_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, BOOL temporary) -{ MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; STREAM *stream; IStream *stm; @@ -156,7 +149,10 @@ static UINT STREAMS_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, BOOL tem ULONG count; UINT r = ERROR_FUNCTION_FAILED; - TRACE("(%p, %p, %d)\n", view, rec, temporary); + TRACE("(%p, %p)\n", view, rec); + + if (row > sv->num_rows) + return ERROR_FUNCTION_FAILED; r = MSI_RecordGetIStream(rec, 2, &stm); if (r != ERROR_SUCCESS) @@ -201,8 +197,7 @@ static UINT STREAMS_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, BOOL tem IStorage_OpenStream(sv->db->storage, name, 0, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream->stream); - if (!add_stream_to_table(sv, stream, sv->num_rows++)) - goto done; + sv->streams[row] = stream; done: msi_free(name); @@ -213,6 +208,16 @@ done: return r; } +static UINT STREAMS_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, BOOL temporary) +{ + MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + + if (!streams_set_table_size(sv, ++sv->num_rows)) + return ERROR_FUNCTION_FAILED; + + return STREAMS_set_row(view, sv->num_rows - 1, rec, 0); +} + static UINT STREAMS_delete_row(struct tagMSIVIEW *view, UINT row) { FIXME("(%p %d): stub!\n", view, row); @@ -278,6 +283,52 @@ static UINT STREAMS_get_column_info(struct tagMSIVIEW *view, return ERROR_SUCCESS; } +static UINT streams_find_row(MSISTREAMSVIEW *sv, MSIRECORD *rec, UINT *row) +{ + LPCWSTR str; + UINT i, id, data; + + str = MSI_RecordGetString(rec, 1); + msi_string2idW(sv->db->strings, str, &id); + + for (i = 0; i < sv->num_rows; i++) + { + STREAMS_fetch_int(&sv->view, i, 1, &data); + + if (data == id) + { + *row = i; + return ERROR_SUCCESS; + } + } + + return ERROR_FUNCTION_FAILED; +} + +static UINT streams_modify_update(struct tagMSIVIEW *view, MSIRECORD *rec) +{ + MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + UINT r, row; + + r = streams_find_row(sv, rec, &row); + if (r != ERROR_SUCCESS) + return ERROR_FUNCTION_FAILED; + + return STREAMS_set_row(view, row, rec, 0); +} + +static UINT streams_modify_assign(struct tagMSIVIEW *view, MSIRECORD *rec) +{ + MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + UINT r, row; + + r = streams_find_row(sv, rec, &row); + if (r == ERROR_SUCCESS) + return streams_modify_update(view, rec); + + return STREAMS_insert_row(view, rec, FALSE); +} + static UINT STREAMS_modify(struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row) { UINT r; @@ -286,15 +337,21 @@ static UINT STREAMS_modify(struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRE switch (eModifyMode) { + case MSIMODIFY_ASSIGN: + r = streams_modify_assign(view, rec); + break; + case MSIMODIFY_INSERT: r = STREAMS_insert_row(view, rec, FALSE); break; + case MSIMODIFY_UPDATE: + r = streams_modify_update(view, rec); + break; + case MSIMODIFY_VALIDATE_NEW: case MSIMODIFY_INSERT_TEMPORARY: - case MSIMODIFY_UPDATE: case MSIMODIFY_REFRESH: - case MSIMODIFY_ASSIGN: case MSIMODIFY_REPLACE: case MSIMODIFY_MERGE: case MSIMODIFY_DELETE: @@ -425,11 +482,13 @@ static UINT add_streams_to_table(MSISTREAMSVIEW *sv) STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream->stream); CoTaskMemFree(stat.pwcsName); - if (!add_stream_to_table(sv, stream, count++)) + if (!streams_set_table_size(sv, ++count)) { count = -1; break; } + + sv->streams[count - 1] = stream; } IEnumSTATSTG_Release(stgenum);

1 0

James Hawkins : msi: Add tests for using single quotes in an INSERT query.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 56574c7c6e3c6674d4c821919592c4c9de206aa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56574c7c6e3c6674d4c821919… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 4 11:26:58 2008 -0600 msi: Add tests for using single quotes in an INSERT query. --- dlls/msi/tests/db.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 129 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 85b65d7..e40e867 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -5053,6 +5053,134 @@ static void test_deleterow() DeleteFileA(msifile); } +static const CHAR import_dat[] = "A\n" + "s72\n" + "Table\tA\n" + "This is a new 'string' ok\n"; + +static void test_quotes(void) +{ + MSIHANDLE hdb, hview, hrec; + const char *query; + char buf[MAX_PATH]; + UINT r; + DWORD size; + + DeleteFile(msifile); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "CREATE TABLE `Table` ( `A` CHAR(72) NOT NULL PRIMARY KEY `A` )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Table` ( `A` ) VALUES ( 'This is a 'string' ok' )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, + "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + query = "INSERT INTO `Table` ( `A` ) VALUES ( \"This is a 'string' ok\" )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, + "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + query = "INSERT INTO `Table` ( `A` ) VALUES ( \"test\" )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, + "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + query = "INSERT INTO `Table` ( `A` ) VALUES ( 'This is a ''string'' ok' )"; + r = run_query(hdb, 0, query); + todo_wine + { + ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + } + + query = "INSERT INTO `Table` ( `A` ) VALUES ( 'This is a '''string''' ok' )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + query = "INSERT INTO `Table` ( `A` ) VALUES ( 'This is a \'string\' ok' )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + query = "INSERT INTO `Table` ( `A` ) VALUES ( 'This is a \"string\" ok' )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "SELECT * FROM `Table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetString(hrec, 1, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmp(buf, "This is a \"string\" ok"), + "Expected \"This is a \"string\" ok\", got %s\n", buf); + } + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + todo_wine + { + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + } + + MsiCloseHandle(hview); + + write_file("import.idt", import_dat, (sizeof(import_dat) - 1) * sizeof(char)); + + r = MsiDatabaseImportA(hdb, CURR_DIR, "import.idt"); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + } + + DeleteFileA("import.idt"); + + query = "SELECT * FROM `Table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetString(hrec, 1, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmp(buf, "This is a new 'string' ok"), + "Expected \"This is a new 'string' ok\", got %s\n", buf); + } + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + todo_wine + { + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + } + + MsiCloseHandle(hview); + + MsiCloseHandle(hdb); + DeleteFileA(msifile); +} + START_TEST(db) { test_msidatabase(); @@ -5084,4 +5212,5 @@ START_TEST(db) test_order(); test_viewmodify_delete_temporary(); test_deleterow(); + test_quotes(); }

1 0

James Hawkins : version: Return ERROR_RESOURCE_DATA_NOT_FOUND if the file does not have version information .
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 972c61d31146b1e7938a32fd4ed23058ecaa5b1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=972c61d31146b1e7938a32fd4… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 4 11:21:05 2008 -0600 version: Return ERROR_RESOURCE_DATA_NOT_FOUND if the file does not have version information. --- dlls/version/info.c | 4 ++++ dlls/version/tests/info.c | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index 935d0c1..2be1df7 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -252,6 +252,10 @@ static DWORD VERSION_GetFileVersionInfo_PE( LPCWSTR filename, DWORD datasize, LP if(!hModule) { WARN("Could not load %s\n", debugstr_w(filename)); + + if (GetLastError() == ERROR_BAD_EXE_FORMAT) + return 0xFFFFFFFF; + return 0; } hRsrc = FindResourceW(hModule, diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index be1852f..d31797a 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -44,6 +44,18 @@ "ERROR_PATH_NOT_FOUND (NT4)/ERROR_FILE_NOT_FOUND (2k3)" \ "expected, got %u\n", GetLastError()); +static void create_file(const CHAR *name) +{ + HANDLE file; + DWORD written; + + file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n", name); + WriteFile(file, name, strlen(name), &written, NULL); + WriteFile(file, "\n", strlen("\n"), &written, NULL); + CloseHandle(file); +} + static void test_info_size(void) { DWORD hdl, retval; char mypath[MAX_PATH] = ""; @@ -153,6 +165,19 @@ static void test_info_size(void) } else trace("skipping GetModuleFileNameA(NULL,..) failed\n"); + + create_file("test.txt"); + + /* no version info */ + SetLastError(0xdeadbeef); + hdl = 0xcafe; + retval = GetFileVersionInfoSizeA("test.txt", &hdl); + ok(retval == 0, "Expected 0, got %d\n", retval); + ok(hdl == 0, "Expected 0, got %d\n", hdl); + ok(GetLastError() == ERROR_RESOURCE_DATA_NOT_FOUND, + "Expected ERROR_RESOURCE_DATA_NOT_FOUND, got %d\n", GetLastError()); + + DeleteFileA("test.txt"); } static void VersionDwordLong2String(DWORDLONG Version, LPSTR lpszVerString)

1 0

James Hawkins : kernel32: Factor out the VerifyVersionInfo tests into their own function.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: ea41e863ad0a943af15dc8a0ea86f728c8155e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea41e863ad0a943af15dc8a0e… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 4 11:18:52 2008 -0600 kernel32: Factor out the VerifyVersionInfo tests into their own function. --- dlls/kernel32/tests/version.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index ac4d814..8aec42a 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -89,18 +89,13 @@ static void test_GetVersionEx(void) ok(ret, "Expected GetVersionExA to succeed\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - } -START_TEST(version) +static void test_VerifyVersionInfo(void) { OSVERSIONINFOEX info = { sizeof(info) }; BOOL ret; - init_function_pointers(); - - test_GetVersionEx(); - if(!pVerifyVersionInfoA || !pVerSetConditionMask) { skip("Needed functions not available\n"); @@ -237,3 +232,11 @@ START_TEST(version) pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL)); ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); } + +START_TEST(version) +{ + init_function_pointers(); + + test_GetVersionEx(); + test_VerifyVersionInfo(); +}

1 0

Reece H. Dunn : gdiplus: Fix the bezier arc path test on all Windows platforms.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 571a383d7e5cb8251be3cd6cfd85d08e8133fac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=571a383d7e5cb8251be3cd6cf… Author: Reece H. Dunn <msclrhd(a)hotmail.com> Date: Sun Feb 3 21:13:15 2008 +0000 gdiplus: Fix the bezier arc path test on all Windows platforms. --- dlls/gdiplus/tests/graphicspath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index b2d5ef9..3860a2e 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -224,7 +224,7 @@ static path_test_t arc_path[] = { {187.9, 716.5, PathPointTypeBezier, 0, 0}, /*34*/ {293.1, 841.8, PathPointTypeBezier, 0, 0}, /*35*/ {450.9, 824.1, PathPointTypeBezier, 0, 0}, /*36*/ - {540.4, 676.9, PathPointTypeBezier, 0, 0} /*37*/ + {540.4, 676.9, PathPointTypeBezier | PathPointTypeCloseSubpath, 0, 1} /*37*/ }; static void test_arc(void)

1 0

Reece H. Dunn : comctl32: Proper fix redrawing the trackbar background with themes enabled.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: af9c736f6bfee1edc18b98297be48417f3178057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af9c736f6bfee1edc18b98297… Author: Reece H. Dunn <msclrhd(a)hotmail.com> Date: Sun Feb 3 13:53:11 2008 +0000 comctl32: Proper fix redrawing the trackbar background with themes enabled. --- dlls/comctl32/trackbar.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index bbb48c9..56e7cd3 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -869,10 +869,7 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) if (gcdrf == CDRF_DODEFAULT || notify_customdraw(infoPtr, &nmcd, CDDS_PREERASE) != CDRF_SKIPDEFAULT) { if ((theme = GetWindowTheme (infoPtr->hwndSelf))) { - DrawThemeBackground (theme, hdc, - (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_VERT) ? - TKP_TRACKVERT : TKP_TRACK, TKS_NORMAL, &rcClient, 0); - DrawThemeParentBackground (infoPtr->hwndSelf, hdc, &rcClient); + DrawThemeParentBackground (infoPtr->hwndSelf, hdc, 0); } else FillRect (hdc, &rcClient, GetSysColorBrush(COLOR_BTNFACE));

1 0

Michael Stefaniuc : olecli: Remove duplicated typedefs/enums.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 0b5ebcf2fd2d94bf84d076fa7c1f695dd183c155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b5ebcf2fd2d94bf84d076fa7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 1 23:09:18 2008 +0100 olecli: Remove duplicated typedefs/enums. Use a local header file for them. --- dlls/olecli32/olecli.h | 129 +++++++++++++++++++++++++++++++++++++++++++ dlls/olecli32/olecli16.c | 111 +------------------------------------ dlls/olecli32/olecli_main.c | 111 +------------------------------------ 3 files changed, 131 insertions(+), 220 deletions(-) diff --git a/dlls/olecli32/olecli.h b/dlls/olecli32/olecli.h new file mode 100644 index 0000000..8430a7c --- /dev/null +++ b/dlls/olecli32/olecli.h @@ -0,0 +1,129 @@ +/* + * OLECLI library + * + * Copyright 1995 Martin von Loewis + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +typedef enum +{ + OLE_OK, + OLE_WAIT_FOR_RELEASE, + OLE_BUSY, + OLE_ERROR_PROTECT_ONLY, + OLE_ERROR_MEMORY, + OLE_ERROR_STREAM, + OLE_ERROR_STATIC, + OLE_ERROR_BLANK, + OLE_ERROR_DRAW, + OLE_ERROR_METAFILE, + OLE_ERROR_ABORT, + OLE_ERROR_CLIPBOARD, + OLE_ERROR_FORMAT, + OLE_ERROR_OBJECT, + OLE_ERROR_OPTION, + OLE_ERROR_PROTOCOL, + OLE_ERROR_ADDRESS, + OLE_ERROR_NOT_EQUAL, + OLE_ERROR_HANDLE, + OLE_ERROR_GENERIC, + OLE_ERROR_CLASS, + OLE_ERROR_SYNTAX, + OLE_ERROR_DATATYPE, + OLE_ERROR_PALETTE, + OLE_ERROR_NOT_LINK, + OLE_ERROR_NOT_EMPTY, + OLE_ERROR_SIZE, + OLE_ERROR_DRIVE, + OLE_ERROR_NETWORK, + OLE_ERROR_NAME, + OLE_ERROR_TEMPLATE, + OLE_ERROR_NEW, + OLE_ERROR_EDIT, + OLE_ERROR_OPEN, + OLE_ERROR_NOT_OPEN, + OLE_ERROR_LAUNCH, + OLE_ERROR_COMM, + OLE_ERROR_TERMINATE, + OLE_ERROR_COMMAND, + OLE_ERROR_SHOW, + OLE_ERROR_DOVERB, + OLE_ERROR_ADVISE_NATIVE, + OLE_ERROR_ADVISE_PICT, + OLE_ERROR_ADVISE_RENAME, + OLE_ERROR_POKE_NATIVE, + OLE_ERROR_REQUEST_NATIVE, + OLE_ERROR_REQUEST_PICT, + OLE_ERROR_SERVER_BLOCKED, + OLE_ERROR_REGISTRATION, + OLE_ERROR_ALREADY_REGISTERED, + OLE_ERROR_TASK, + OLE_ERROR_OUTOFDATE, + OLE_ERROR_CANT_UPDATE_CLIENT, + OLE_ERROR_UPDATE, + OLE_ERROR_SETDATA_FORMAT, + OLE_ERROR_STATIC_FROM_OTHER_OS, + OLE_WARN_DELETE_DATA = 1000 +} OLESTATUS; + +typedef enum +{ + olerender_none, + olerender_draw, + olerender_format +} OLEOPT_RENDER; + +typedef enum +{ + oleupdate_always, + oleupdate_onsave, + oleupdate_oncall, + oleupdate_onclose +} OLEOPT_UPDATE; + +typedef enum { + OLE_NONE, /* none */ + OLE_DELETE, /* delete object */ + OLE_LNKPASTE, /* link paste */ + OLE_EMBPASTE, /* paste(and update) */ + OLE_SHOW, + OLE_RUN, + OLE_ACTIVATE, + OLE_UPDATE, + OLE_CLOSE, + OLE_RECONNECT, + OLE_SETUPDATEOPTIONS, + OLE_SERVERRUNLAUNCH, /* unlaunch (terminate?) server */ + OLE_LOADFROMSTREAM, /* (auto reconnect) */ + OLE_SETDATA, /* OleSetData */ + OLE_REQUESTDATA, /* OleRequestData */ + OLE_OTHER, + OLE_CREATE, + OLE_CREATEFROMTEMPLATE, + OLE_CREATELINKFROMFILE, + OLE_COPYFROMLNK, + OLE_CREATREFROMFILE, + OLE_CREATEINVISIBLE +} OLE_RELEASE_METHOD; + +typedef LONG LHCLIENTDOC; +typedef struct _OLEOBJECT *_LPOLEOBJECT; +typedef struct _OLECLIENT *LPOLECLIENT; +typedef LONG OLECLIPFORMAT;/* dunno about this type, please change/add */ +typedef OLEOPT_UPDATE *LPOLEOPT_UPDATE; +typedef LPCSTR LPCOLESTR16; + +struct _OLESTREAM; diff --git a/dlls/olecli32/olecli16.c b/dlls/olecli32/olecli16.c index a1da30a..a37254b 100644 --- a/dlls/olecli32/olecli16.c +++ b/dlls/olecli32/olecli16.c @@ -31,120 +31,11 @@ #include "wingdi.h" #include "wownt32.h" #include "objbase.h" +#include "olecli.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); -typedef enum -{ - OLE_OK, - OLE_WAIT_FOR_RELEASE, - OLE_BUSY, - OLE_ERROR_PROTECT_ONLY, - OLE_ERROR_MEMORY, - OLE_ERROR_STREAM, - OLE_ERROR_STATIC, - OLE_ERROR_BLANK, - OLE_ERROR_DRAW, - OLE_ERROR_METAFILE, - OLE_ERROR_ABORT, - OLE_ERROR_CLIPBOARD, - OLE_ERROR_FORMAT, - OLE_ERROR_OBJECT, - OLE_ERROR_OPTION, - OLE_ERROR_PROTOCOL, - OLE_ERROR_ADDRESS, - OLE_ERROR_NOT_EQUAL, - OLE_ERROR_HANDLE, - OLE_ERROR_GENERIC, - OLE_ERROR_CLASS, - OLE_ERROR_SYNTAX, - OLE_ERROR_DATATYPE, - OLE_ERROR_PALETTE, - OLE_ERROR_NOT_LINK, - OLE_ERROR_NOT_EMPTY, - OLE_ERROR_SIZE, - OLE_ERROR_DRIVE, - OLE_ERROR_NETWORK, - OLE_ERROR_NAME, - OLE_ERROR_TEMPLATE, - OLE_ERROR_NEW, - OLE_ERROR_EDIT, - OLE_ERROR_OPEN, - OLE_ERROR_NOT_OPEN, - OLE_ERROR_LAUNCH, - OLE_ERROR_COMM, - OLE_ERROR_TERMINATE, - OLE_ERROR_COMMAND, - OLE_ERROR_SHOW, - OLE_ERROR_DOVERB, - OLE_ERROR_ADVISE_NATIVE, - OLE_ERROR_ADVISE_PICT, - OLE_ERROR_ADVISE_RENAME, - OLE_ERROR_POKE_NATIVE, - OLE_ERROR_REQUEST_NATIVE, - OLE_ERROR_REQUEST_PICT, - OLE_ERROR_SERVER_BLOCKED, - OLE_ERROR_REGISTRATION, - OLE_ERROR_ALREADY_REGISTERED, - OLE_ERROR_TASK, - OLE_ERROR_OUTOFDATE, - OLE_ERROR_CANT_UPDATE_CLIENT, - OLE_ERROR_UPDATE, - OLE_ERROR_SETDATA_FORMAT, - OLE_ERROR_STATIC_FROM_OTHER_OS, - OLE_WARN_DELETE_DATA = 1000 -} OLESTATUS; - -typedef enum -{ - olerender_none, - olerender_draw, - olerender_format -} OLEOPT_RENDER; - -typedef enum -{ - oleupdate_always, - oleupdate_onsave, - oleupdate_oncall, - oleupdate_onclose -} OLEOPT_UPDATE; - -typedef enum { - OLE_NONE, /* none */ - OLE_DELETE, /* delete object */ - OLE_LNKPASTE, /* link paste */ - OLE_EMBPASTE, /* paste(and update) */ - OLE_SHOW, - OLE_RUN, - OLE_ACTIVATE, - OLE_UPDATE, - OLE_CLOSE, - OLE_RECONNECT, - OLE_SETUPDATEOPTIONS, - OLE_SERVERRUNLAUNCH, /* unlaunch (terminate?) server */ - OLE_LOADFROMSTREAM, /* (auto reconnect) */ - OLE_SETDATA, /* OleSetData */ - OLE_REQUESTDATA, /* OleRequestData */ - OLE_OTHER, - OLE_CREATE, - OLE_CREATEFROMTEMPLATE, - OLE_CREATELINKFROMFILE, - OLE_COPYFROMLNK, - OLE_CREATREFROMFILE, - OLE_CREATEINVISIBLE -} OLE_RELEASE_METHOD; - -typedef LONG LHCLIENTDOC; -typedef struct _OLEOBJECT *_LPOLEOBJECT; -typedef struct _OLECLIENT *LPOLECLIENT; -typedef LONG OLECLIPFORMAT;/* dunno about this type, please change/add */ -typedef OLEOPT_UPDATE *LPOLEOPT_UPDATE; -typedef LPCSTR LPCOLESTR16; - -struct _OLESTREAM; - typedef struct _OLEOBJECTVTBL16 { void CALLBACK *(*QueryProtocol)(_LPOLEOBJECT,LPCOLESTR16); OLESTATUS (CALLBACK *Release)(_LPOLEOBJECT); diff --git a/dlls/olecli32/olecli_main.c b/dlls/olecli32/olecli_main.c index a36cb72..7abd438 100644 --- a/dlls/olecli32/olecli_main.c +++ b/dlls/olecli32/olecli_main.c @@ -31,120 +31,11 @@ #include "wingdi.h" #include "wownt32.h" #include "objbase.h" +#include "olecli.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); -typedef enum -{ - OLE_OK, - OLE_WAIT_FOR_RELEASE, - OLE_BUSY, - OLE_ERROR_PROTECT_ONLY, - OLE_ERROR_MEMORY, - OLE_ERROR_STREAM, - OLE_ERROR_STATIC, - OLE_ERROR_BLANK, - OLE_ERROR_DRAW, - OLE_ERROR_METAFILE, - OLE_ERROR_ABORT, - OLE_ERROR_CLIPBOARD, - OLE_ERROR_FORMAT, - OLE_ERROR_OBJECT, - OLE_ERROR_OPTION, - OLE_ERROR_PROTOCOL, - OLE_ERROR_ADDRESS, - OLE_ERROR_NOT_EQUAL, - OLE_ERROR_HANDLE, - OLE_ERROR_GENERIC, - OLE_ERROR_CLASS, - OLE_ERROR_SYNTAX, - OLE_ERROR_DATATYPE, - OLE_ERROR_PALETTE, - OLE_ERROR_NOT_LINK, - OLE_ERROR_NOT_EMPTY, - OLE_ERROR_SIZE, - OLE_ERROR_DRIVE, - OLE_ERROR_NETWORK, - OLE_ERROR_NAME, - OLE_ERROR_TEMPLATE, - OLE_ERROR_NEW, - OLE_ERROR_EDIT, - OLE_ERROR_OPEN, - OLE_ERROR_NOT_OPEN, - OLE_ERROR_LAUNCH, - OLE_ERROR_COMM, - OLE_ERROR_TERMINATE, - OLE_ERROR_COMMAND, - OLE_ERROR_SHOW, - OLE_ERROR_DOVERB, - OLE_ERROR_ADVISE_NATIVE, - OLE_ERROR_ADVISE_PICT, - OLE_ERROR_ADVISE_RENAME, - OLE_ERROR_POKE_NATIVE, - OLE_ERROR_REQUEST_NATIVE, - OLE_ERROR_REQUEST_PICT, - OLE_ERROR_SERVER_BLOCKED, - OLE_ERROR_REGISTRATION, - OLE_ERROR_ALREADY_REGISTERED, - OLE_ERROR_TASK, - OLE_ERROR_OUTOFDATE, - OLE_ERROR_CANT_UPDATE_CLIENT, - OLE_ERROR_UPDATE, - OLE_ERROR_SETDATA_FORMAT, - OLE_ERROR_STATIC_FROM_OTHER_OS, - OLE_WARN_DELETE_DATA = 1000 -} OLESTATUS; - -typedef enum -{ - olerender_none, - olerender_draw, - olerender_format -} OLEOPT_RENDER; - -typedef enum -{ - oleupdate_always, - oleupdate_onsave, - oleupdate_oncall, - oleupdate_onclose -} OLEOPT_UPDATE; - -typedef enum { - OLE_NONE, /* none */ - OLE_DELETE, /* delete object */ - OLE_LNKPASTE, /* link paste */ - OLE_EMBPASTE, /* paste(and update) */ - OLE_SHOW, - OLE_RUN, - OLE_ACTIVATE, - OLE_UPDATE, - OLE_CLOSE, - OLE_RECONNECT, - OLE_SETUPDATEOPTIONS, - OLE_SERVERRUNLAUNCH, /* unlaunch (terminate?) server */ - OLE_LOADFROMSTREAM, /* (auto reconnect) */ - OLE_SETDATA, /* OleSetData */ - OLE_REQUESTDATA, /* OleRequestData */ - OLE_OTHER, - OLE_CREATE, - OLE_CREATEFROMTEMPLATE, - OLE_CREATELINKFROMFILE, - OLE_COPYFROMLNK, - OLE_CREATREFROMFILE, - OLE_CREATEINVISIBLE -} OLE_RELEASE_METHOD; - -typedef LONG LHCLIENTDOC; -typedef struct _OLEOBJECT *_LPOLEOBJECT; -typedef struct _OLECLIENT *LPOLECLIENT; -typedef LONG OLECLIPFORMAT;/* dunno about this type, please change/add */ -typedef OLEOPT_UPDATE *LPOLEOPT_UPDATE; -typedef LPCSTR LPCOLESTR16; - -struct _OLESTREAM; - typedef struct _OLEOBJECTVTBL { void * (CALLBACK *QueryProtocol)(_LPOLEOBJECT,LPCOLESTR16); OLESTATUS (CALLBACK *Release)(_LPOLEOBJECT);

1 0

Stefan Leichter : advapi32: Fix the failing QueryServiceConfig2 test on platforms win2k3 and vista.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: f3f64c79396b23ea571be819726ea551e6c5ba4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3f64c79396b23ea571be8197… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Feb 1 22:24:00 2008 +0100 advapi32: Fix the failing QueryServiceConfig2 test on platforms win2k3 and vista. --- dlls/advapi32/tests/service.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index cf5b809..8c71715 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -938,7 +938,8 @@ static void test_queryconfig2(void) SetLastError(0xdeadbeef); ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,NULL,sizeof(SERVICE_DESCRIPTIONA),&needed); ok(!ret, "expected QueryServiceConfig2A to fail\n"); - ok(ERROR_INVALID_ADDRESS == GetLastError(), "expected error ERROR_INVALID_ADDRESS, got %d\n", GetLastError()); + ok((ERROR_INVALID_ADDRESS == GetLastError()) || (ERROR_INSUFFICIENT_BUFFER == GetLastError()), + "expected error ERROR_INVALID_ADDRESS or ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,NULL,sizeof(SERVICE_DESCRIPTIONA),NULL);

1 0

Alistair Leslie-Hughes : gdiplus: Add GdipSetStringFormatFlags stub.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 277817aad34670bc8481bf1caaebcbf35e361a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277817aad34670bc8481bf1ca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 30 15:47:38 2008 +1100 gdiplus: Add GdipSetStringFormatFlags stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/stringformat.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 2421b6a..33b474d 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -587,7 +587,7 @@ @ stdcall GdipSetSolidFillColor(ptr ptr) @ stdcall GdipSetStringFormatAlign(ptr long) @ stub GdipSetStringFormatDigitSubstitution -@ stub GdipSetStringFormatFlags +@ stdcall GdipSetStringFormatFlags(ptr long) @ stdcall GdipSetStringFormatHotkeyPrefix(ptr long) @ stdcall GdipSetStringFormatLineAlign(ptr long) @ stub GdipSetStringFormatMeasurableCharacterRanges diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index e328ffb..7de1c2c 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -28,6 +28,9 @@ #include "gdiplus.h" #include "gdiplus_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, GpStringFormat **format) @@ -142,3 +145,10 @@ GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat *format, return Ok; } + +GpStatus WINGDIPAPI GdipSetStringFormatFlags(GDIPCONST GpStringFormat *format, INT flags) +{ + FIXME("format (%p) flags (%d)\n", format, flags); + + return Ok; +}

1 0