January 2010 - Wine-commits

Łukasz Wojniłowicz : Polish translation for release 1.1.37
by Jeremy Newman 25 Jan '10

25 Jan '10

Module: website Branch: master Commit: 4d15e924e9bad53a8a7ab8165847846c21923f72 URL: http://source.winehq.org/git/website.git/?a=commit;h=4d15e924e9bad53a8a7ab8… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jan 23 16:41:56 2010 +0100 Polish translation for release 1.1.37 --- news/pl/2010012201.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pl/2010012201.xml b/news/pl/2010012201.xml new file mode 100644 index 0000000..537bcd0 --- /dev/null +++ b/news/pl/2010012201.xml @@ -0,0 +1,15 @@ +<news> +<date>Styczeń 22, 2010</date> +<title>Wydano Wine 1.1.37</title> +<body> + Wydanie rozwojowe Wine 1.1.37 jest już dostępne. + <a href="{$root}/announce/1.1.37">Co nowego</a> w tym wydaniu: +<ul> + <li>Spora liczba poprawek we wsparciu plików AVI.</li> + <li>Kilka ulepszeń w MSXML.</li> + <li>Kilka poprawek do MSI.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.37.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.1.37
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: website Branch: master Commit: c5cb1b1c4bf56134b503fba208d2b3a4b13c764e URL: http://source.winehq.org/git/website.git/?a=commit;h=c5cb1b1c4bf56134b503fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 18:00:45 2010 +0100 Wine release 1.1.37 --- news/en/2010012201.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2010012201.xml b/news/en/2010012201.xml new file mode 100644 index 0000000..5f0dbcd --- /dev/null +++ b/news/en/2010012201.xml @@ -0,0 +1,15 @@ +<news> +<date>January 22, 2010</date> +<title>Wine 1.1.37 Released</title> +<body> + The Wine development release 1.1.37 is now available. + <a href="{$root}/announce/1.1.37">What's new</a> in this release: +<ul> + <li>A number of fixes in AVI file support.</li> + <li>Several MSXML improvements.</li> + <li>A few MSI fixes.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.37.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.1.37.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: e2af560aa3c23a672d8680f91f3e1b8793d5827f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2af560aa3c23a672d8680f91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 17:54:11 2010 +0100 Release 1.1.37. --- ANNOUNCE | 1055 +++++++++++++++++++++---------------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 365 insertions(+), 710 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2af560aa3c23a672d868…

1 0

Tag wine-1.1.37 : Alexandre Julliard : Release 1.1.37
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: refs/tags/wine-1.1.37 Tag: a9724d0cc6d6a44246514077c7064ef64a2042ee URL: http://source.winehq.org/git/wine.git/?a=tag;h=a9724d0cc6d6a44246514077c706… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 17:54:12 2010 +0100 Release 1.1.37

1 0

Paul Vriens : msvcrtd/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: b3c38d3d340c4b8b7fe92443b0e364f028d6e528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c38d3d340c4b8b7fe92443b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jan 22 11:33:30 2010 +0100 msvcrtd/tests: Fix a memory leak (Valgrind). --- dlls/msvcrtd/tests/debug.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrtd/tests/debug.c b/dlls/msvcrtd/tests/debug.c index 71f6e4c..40fceac 100644 --- a/dlls/msvcrtd/tests/debug.c +++ b/dlls/msvcrtd/tests/debug.c @@ -60,6 +60,7 @@ static void test_new(void) mem = pMSVCRTD_operator_new_dbg(42, _NORMAL_BLOCK, __FILE__, __LINE__); ok(mem != NULL, "memory not allocated\n"); + HeapFree(GetProcessHeap(), 0, mem); } /**********************************************************************/

1 0

Peter Dons Tychsen : comctl32: Handle WM_NOTIFY correctly when the parent returns zero.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: a3528a764223cce6613a464588c4bc5202f6cebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3528a764223cce6613a46458… Author: Peter Dons Tychsen <donpedro(a)tdcadsl.dk> Date: Thu Jan 21 02:45:46 2010 +0100 comctl32: Handle WM_NOTIFY correctly when the parent returns zero. --- dlls/comctl32/status.c | 17 ++++++--- dlls/comctl32/tests/status.c | 79 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index cc29990..d0675da 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -1162,7 +1162,7 @@ STATUSBAR_NotifyFormat (STATUS_INFO *infoPtr, HWND from, INT cmd) static LRESULT -STATUSBAR_SendMouseNotify(const STATUS_INFO *infoPtr, UINT code, LPARAM lParam) +STATUSBAR_SendMouseNotify(const STATUS_INFO *infoPtr, UINT code, UINT msg, WPARAM wParam, LPARAM lParam) { NMMOUSE nm; @@ -1175,7 +1175,12 @@ STATUSBAR_SendMouseNotify(const STATUS_INFO *infoPtr, UINT code, LPARAM lParam) nm.dwItemSpec = STATUSBAR_InternalHitTest(infoPtr, &nm.pt); nm.dwItemData = 0; nm.dwHitInfo = 0x30000; /* seems constant */ - SendMessageW(infoPtr->Notify, WM_NOTIFY, 0, (LPARAM)&nm); + + /* Do default processing if WM_NOTIFY returns zero */ + if(!SendMessageW(infoPtr->Notify, WM_NOTIFY, nm.hdr.idFrom, (LPARAM)&nm)) + { + return DefWindowProcW(infoPtr->Self, msg, wParam, lParam); + } return 0; } @@ -1276,10 +1281,10 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) return STATUSBAR_GetTextLength (infoPtr, 0); case WM_LBUTTONDBLCLK: - return STATUSBAR_SendMouseNotify(infoPtr, NM_DBLCLK, lParam); + return STATUSBAR_SendMouseNotify(infoPtr, NM_DBLCLK, msg, wParam, lParam); case WM_LBUTTONUP: - return STATUSBAR_SendMouseNotify(infoPtr, NM_CLICK, lParam); + return STATUSBAR_SendMouseNotify(infoPtr, NM_CLICK, msg, wParam, lParam); case WM_MOUSEMOVE: return STATUSBAR_Relay2Tip (infoPtr, msg, wParam, lParam); @@ -1303,10 +1308,10 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) return STATUSBAR_WMPaint (infoPtr, (HDC)wParam); case WM_RBUTTONDBLCLK: - return STATUSBAR_SendMouseNotify(infoPtr, NM_RDBLCLK, lParam); + return STATUSBAR_SendMouseNotify(infoPtr, NM_RDBLCLK, msg, wParam, lParam); case WM_RBUTTONUP: - return STATUSBAR_SendMouseNotify(infoPtr, NM_RCLICK, lParam); + return STATUSBAR_SendMouseNotify(infoPtr, NM_RCLICK, msg, wParam, lParam); case WM_SETFONT: return STATUSBAR_WMSetFont (infoPtr, (HFONT)wParam, LOWORD(lParam)); diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index c721c96..06e7b87 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -494,6 +494,84 @@ static void test_gettext(void) DestroyWindow(hwndStatus); } +/* Notify events to parent */ +static BOOL g_got_dblclk; +static BOOL g_got_click; +static BOOL g_got_rdblclk; +static BOOL g_got_rclick; + +/* Messages to parent */ +static BOOL g_got_contextmenu; + +static LRESULT WINAPI test_notify_parent_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) + { + case WM_NOTIFY: + { + NMHDR *hdr = ((LPNMHDR)lParam); + switch(hdr->code) + { + case NM_DBLCLK: g_got_dblclk = TRUE; break; + case NM_CLICK: g_got_click = TRUE; break; + case NM_RDBLCLK: g_got_rdblclk = TRUE; break; + case NM_RCLICK: g_got_rclick = TRUE; break; + } + + /* Return zero to indicate default processing */ + return 0; + } + + case WM_CONTEXTMENU: g_got_contextmenu = TRUE; return 0; + + default: + return( DefWindowProcA(hwnd, msg, wParam, lParam)); + } + + return 0; +} + +/* Test that WM_NOTIFY messages from the status control works correctly */ +static void test_notify(void) +{ + HWND hwndParent; + HWND hwndStatus; + ATOM atom; + WNDCLASSA wclass = {0}; + wclass.lpszClassName = "TestNotifyParentClass"; + wclass.lpfnWndProc = test_notify_parent_proc; + atom = RegisterClassA(&wclass); + ok(atom, "RegisterClass failed!n"); + + /* create parent */ + hwndParent = CreateWindow(wclass.lpszClassName, "parent", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, 0, 300, 20, NULL, NULL, NULL, NULL); + ok(hwndParent != NULL, "Parent creation failed!\n"); + + /* create status bar */ + hwndStatus = CreateWindow(STATUSCLASSNAME, NULL, WS_VISIBLE | WS_CHILD, + 0, 0, 300, 20, hwndParent, NULL, NULL, NULL); + ok(hwndStatus != NULL, "Status creation failed!\n"); + + /* Send various mouse event, and check that we get them */ + g_got_dblclk = FALSE; + SendMessage(hwndStatus, WM_LBUTTONDBLCLK, 0, 0); + ok(g_got_dblclk, "WM_LBUTTONDBLCLK was not processed correctly!\n"); + g_got_rdblclk = FALSE; + SendMessage(hwndStatus, WM_RBUTTONDBLCLK, 0, 0); + ok(g_got_rdblclk, "WM_RBUTTONDBLCLK was not processed correctly!\n"); + g_got_click = FALSE; + SendMessage(hwndStatus, WM_LBUTTONUP, 0, 0); + ok(g_got_click, "WM_LBUTTONUP was not processed correctly!\n"); + + /* For R-UP, check that we also get the context menu from the default processing */ + g_got_contextmenu = FALSE; + g_got_rclick = FALSE; + SendMessage(hwndStatus, WM_RBUTTONUP, 0, 0); + ok(g_got_rclick, "WM_RBUTTONUP was not processed correctly!\n"); + ok(g_got_contextmenu, "WM_RBUTTONUP did not activate the context menu!\n"); +} + START_TEST(status) { hinst = GetModuleHandleA(NULL); @@ -512,4 +590,5 @@ START_TEST(status) test_height(); test_status_ownerdraw(); test_gettext(); + test_notify(); }

1 0

Hans Leidekker : msi: Add support for updating rows in join tables.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: 882e4fb2339d2c570ee1ccfcad146346cf820c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=882e4fb2339d2c570ee1ccfca… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 22 12:49:11 2010 +0100 msi: Add support for updating rows in join tables. --- dlls/msi/join.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 109 insertions(+), 3 deletions(-) diff --git a/dlls/msi/join.c b/dlls/msi/join.c index b4685b5..f787c30 100644 --- a/dlls/msi/join.c +++ b/dlls/msi/join.c @@ -222,13 +222,119 @@ static UINT JOIN_get_column_info( struct tagMSIVIEW *view, return ERROR_FUNCTION_FAILED; } -static UINT JOIN_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, - MSIRECORD *rec, UINT row ) +static UINT join_find_row( MSIJOINVIEW *jv, MSIRECORD *rec, UINT *row ) { - TRACE("%p %d %p\n", view, eModifyMode, rec); + LPCWSTR str; + UINT i, id, data; + + str = MSI_RecordGetString( rec, 1 ); + msi_string2idW( jv->db->strings, str, &id ); + + for (i = 0; i < jv->rows; i++) + { + JOIN_fetch_int( &jv->view, i, 1, &data ); + + if (data == id) + { + *row = i; + return ERROR_SUCCESS; + } + } + return ERROR_FUNCTION_FAILED; } +static UINT JOIN_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask ) +{ + MSIJOINVIEW *jv = (MSIJOINVIEW*)view; + JOINTABLE *table; + UINT i, reduced_mask = 0, r = ERROR_SUCCESS, offset = 0, col_count; + MSIRECORD *reduced; + + TRACE("%p %d %p %u %08x\n", jv, row, rec, rec->count, mask ); + + if (mask >= 1 << jv->columns) + return ERROR_INVALID_PARAMETER; + + LIST_FOR_EACH_ENTRY(table, &jv->tables, JOINTABLE, entry) + { + r = table->view->ops->get_dimensions( table->view, NULL, &col_count ); + if (r != ERROR_SUCCESS) + return r; + + reduced = MSI_CreateRecord( col_count ); + if (!reduced) + return ERROR_FUNCTION_FAILED; + + for (i = 0; i < col_count; i++) + { + r = MSI_RecordCopyField( rec, i + offset + 1, reduced, i + 1 ); + if (r != ERROR_SUCCESS) + break; + } + + offset += col_count; + reduced_mask = mask >> (jv->columns - offset) & ((1 << col_count) - 1); + + if (r == ERROR_SUCCESS) + r = table->view->ops->set_row( table->view, row, reduced, reduced_mask ); + + msiobj_release( &reduced->hdr ); + } + + return r; +} + +static UINT join_modify_update( struct tagMSIVIEW *view, MSIRECORD *rec ) +{ + MSIJOINVIEW *jv = (MSIJOINVIEW *)view; + UINT r, row; + + r = join_find_row( jv, rec, &row ); + if (r != ERROR_SUCCESS) + return r; + + return JOIN_set_row( view, row, rec, (1 << jv->columns) - 1 ); +} + +static UINT JOIN_modify( struct tagMSIVIEW *view, MSIMODIFY mode, MSIRECORD *rec, UINT row ) +{ + UINT r; + + TRACE("%p %d %p %u\n", view, mode, rec, row); + + switch (mode) + { + case MSIMODIFY_UPDATE: + return join_modify_update( view, rec ); + + case MSIMODIFY_ASSIGN: + case MSIMODIFY_DELETE: + case MSIMODIFY_INSERT: + case MSIMODIFY_INSERT_TEMPORARY: + case MSIMODIFY_MERGE: + case MSIMODIFY_REPLACE: + case MSIMODIFY_SEEK: + case MSIMODIFY_VALIDATE: + case MSIMODIFY_VALIDATE_DELETE: + case MSIMODIFY_VALIDATE_FIELD: + case MSIMODIFY_VALIDATE_NEW: + r = ERROR_FUNCTION_FAILED; + break; + + case MSIMODIFY_REFRESH: + r = ERROR_CALL_NOT_IMPLEMENTED; + break; + + default: + WARN("%p %d %p %u - unknown mode\n", view, mode, rec, row ); + r = ERROR_INVALID_PARAMETER; + break; + } + + return r; +} + static UINT JOIN_delete( struct tagMSIVIEW *view ) { MSIJOINVIEW *jv = (MSIJOINVIEW*)view;

1 0

Hans Leidekker : msi: Add tests for updating rows in join tables.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: 36b654e69561f0df77a3cfc384c48a79392449b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36b654e69561f0df77a3cfc38… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 22 12:49:44 2010 +0100 msi: Add tests for updating rows in join tables. --- dlls/msi/tests/db.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 6a2852d..79d0d77 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3218,9 +3218,6 @@ static void test_join(void) ok( !lstrcmp( buf, join_res_first[i].two ), "For (row %d, column 2) expected '%s', got %s\n", i, join_res_first[i].two, buf ); - r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); - todo_wine ok( r == ERROR_SUCCESS, "failed to modiy view: %d\n", r ); - i++; MsiCloseHandle(hrec); } @@ -3648,6 +3645,63 @@ static void test_join(void) ok( r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r ); + /* try updating a row in a join table */ + query = "SELECT `Component`.`ComponentId`, `FeatureComponents`.`Feature_` " + "FROM `Component`, `FeatureComponents` " + "WHERE `Component`.`Component` = `FeatureComponents`.`Component_` " + "ORDER BY `Feature_`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok( r == ERROR_SUCCESS, "failed to open view: %d\n", r ); + + r = MsiViewExecute(hview, 0); + ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); + + r = MsiViewFetch(hview, &hrec); + ok( r == ERROR_SUCCESS, "failed to fetch view: %d\n", r ); + + r = MsiRecordSetString( hrec, 1, "epicranius" ); + ok( r == ERROR_SUCCESS, "failed to set string: %d\n", r ); + + r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); + ok( r == ERROR_SUCCESS, "failed to update row: %d\n", r ); + + /* try another valid operation for joins */ + r = MsiViewModify(hview, MSIMODIFY_REFRESH, hrec); + todo_wine ok( r == ERROR_SUCCESS, "failed to refresh row: %d\n", r ); + + /* try an invalid operation for joins */ + r = MsiViewModify(hview, MSIMODIFY_DELETE, hrec); + ok( r == ERROR_FUNCTION_FAILED, "unexpected result: %d\n", r ); + + r = MsiRecordSetString( hrec, 2, "epicranius" ); + ok( r == ERROR_SUCCESS, "failed to set string: %d\n", r ); + + /* primary key cannot be updated */ + r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); + todo_wine ok( r == ERROR_FUNCTION_FAILED, "failed to update row: %d\n", r ); + + MsiCloseHandle(hrec); + MsiViewClose(hview); + MsiCloseHandle(hview); + + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + + size = MAX_PATH; + r = MsiRecordGetString( hrec, 1, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, "epicranius" ), "expected 'epicranius', got %s\n", buf ); + + MsiCloseHandle(hrec); + MsiViewClose(hview); + MsiCloseHandle(hview); + MsiCloseHandle(hdb); DeleteFile(msifile); }

1 0

Huw Davies : shell32: Add a test to show the IShellLink_GetIDList returns a copy of the IDList, remove an incorrect comment and fix a memory leak.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: 06ad4ce1c879ae0cd93acedddaeb7938e67b856a URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ad4ce1c879ae0cd93aceddd… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 22 12:08:47 2010 +0000 shell32: Add a test to show the IShellLink_GetIDList returns a copy of the IDList, remove an incorrect comment and fix a memory leak. Found by Valgrind. --- dlls/shell32/tests/shelllink.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 2535471..bb2d5b3 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -207,6 +207,7 @@ static void test_get_set(void) } if (ret) ok(lstrcmpi(buffer,str)==0, "GetIDList returned '%s'\n", buffer); + pILFree(tmp_pidl); } pidl=path_to_pidl(mypath); @@ -214,6 +215,8 @@ static void test_get_set(void) if (pidl) { + LPITEMIDLIST second_pidl; + r = IShellLinkA_SetIDList(sl, pidl); ok(SUCCEEDED(r), "SetIDList failed (0x%08x)\n", r); @@ -223,7 +226,14 @@ static void test_get_set(void) ok(tmp_pidl && pILIsEqual(pidl, tmp_pidl), "GetIDList returned an incorrect pidl\n"); - /* tmp_pidl is owned by IShellLink so we don't free it */ + r = IShellLinkA_GetIDList(sl, &second_pidl); + ok(SUCCEEDED(r), "GetIDList failed (0x%08x)\n", r); + ok(second_pidl && pILIsEqual(pidl, second_pidl), + "GetIDList returned an incorrect pidl\n"); + ok(second_pidl != tmp_pidl, "pidls are the same\n"); + + pILFree(second_pidl); + pILFree(tmp_pidl); pILFree(pidl); strcpy(buffer,"garbage");

1 0

Nikolay Sivov : xmllite: Basic input object creation on IXmlReader:: SetInput().
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: 89092c928ac7d8c38aef8a8db5cab5d6109dc628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89092c928ac7d8c38aef8a8db… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jan 21 21:05:25 2010 +0300 xmllite: Basic input object creation on IXmlReader::SetInput(). --- dlls/xmllite/reader.c | 39 +++++++++++++++++++++++++++++++++++++-- dlls/xmllite/tests/reader.c | 8 ++++++-- include/xmllite.idl | 5 ++++- 3 files changed, 47 insertions(+), 5 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 2c7d3f1..97476d9 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -38,6 +38,7 @@ typedef struct _xmlreader { const IXmlReaderVtbl *lpVtbl; LONG ref; + IXmlReaderInput *input; } xmlreader; typedef struct _xmlreaderinput @@ -95,6 +96,7 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) ref = InterlockedDecrement(&This->ref); if (ref == 0) { + if (This->input) IUnknown_Release(This->input); HeapFree(GetProcessHeap(), 0, This); } @@ -103,8 +105,40 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) { - FIXME("(%p %p): stub\n", iface, input); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + HRESULT hr; + + TRACE("(%p %p)\n", This, input); + + if (This->input) + { + IUnknown_Release(This->input); + This->input = NULL; + } + + /* just reset current input */ + if (!input) return S_OK; + + /* now try IXmlReaderInput, ISequentialStream, IStream */ + hr = IUnknown_QueryInterface(input, &IID_IXmlReaderInput, (void**)&This->input); + if (hr != S_OK) + { + IUnknown *stream_input = NULL; + + hr = IUnknown_QueryInterface(input, &IID_ISequentialStream, (void**)&stream_input); + if (hr != S_OK) + { + hr = IUnknown_QueryInterface(input, &IID_IStream, (void**)&stream_input); + if (hr != S_OK) return hr; + } + + /* create IXmlReaderInput basing on supplied interface */ + IUnknown_Release(stream_input); + return CreateXmlReaderInputWithEncodingName(stream_input, + NULL, NULL, FALSE, NULL, &This->input); + } + + return S_OK; } static HRESULT WINAPI xmlreader_GetProperty(IXmlReader* iface, UINT property, LONG_PTR *value) @@ -357,6 +391,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc) reader->lpVtbl = &xmlreader_vtbl; reader->ref = 1; + reader->input = NULL; *pObject = &reader->lpVtbl; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 5585853..27dae53 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -195,14 +195,18 @@ static void test_reader_create(void) hr = IMalloc_DidAlloc(imalloc, reader); ok(hr != 1, "Expected 0 or -1, got %08x\n", hr); + /* Null input pointer, releases previous input */ + hr = IXmlReader_SetInput(reader, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + /* test input interface selection sequence */ hr = testinput_createinstance((void**)&input); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); input_iids.count = 0; hr = IXmlReader_SetInput(reader, input); - todo_wine ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); - ok_iids(&input_iids, setinput_full, sizeof(setinput_full)/sizeof(REFIID), TRUE); + ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); + ok_iids(&input_iids, setinput_full, sizeof(setinput_full)/sizeof(REFIID), FALSE); IUnknown_Release(input); diff --git a/include/xmllite.idl b/include/xmllite.idl index e00d8c8..dbbb0d9 100644 --- a/include/xmllite.idl +++ b/include/xmllite.idl @@ -81,4 +81,7 @@ interface IXmlReader : IUnknown /* IXmlReader construction */ cpp_quote("STDAPI CreateXmlReader(REFIID riid, void **ppvObject, IMalloc *pMalloc);") -typedef IUnknown IXmlReaderInput; +cpp_quote("typedef IUnknown IXmlReaderInput;") +cpp_quote("STDAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, IMalloc *pMalloc,") +cpp_quote(" LPCWSTR encoding, BOOL hint,") +cpp_quote(" LPCWSTR base_uri, IXmlReaderInput **ppInput);")

1 0