July 2008 - Wine-commits - list.winehq.org

Lei Zhang : user32: Add a test for SetWindowPos.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: ffd66dc6abddf9e6ae2414ed0dea46faa9aa6fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd66dc6abddf9e6ae2414ed0… Author: Lei Zhang <thestig(a)google.com> Date: Mon Jul 14 16:50:56 2008 -0700 user32: Add a test for SetWindowPos. --- dlls/user32/tests/msg.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index dfb6108..d79b2c4 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1777,6 +1777,8 @@ static void ok_sequence_(const struct message *expected, const char *context, in flush_sequence(); } +#define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) + /******************************** MDI test **********************************/ /* CreateWindow for MDI frame window, initially visible */ @@ -4081,6 +4083,23 @@ static const struct message WmInitEndSession_5[] = { { 0 } }; +static const struct message WmZOrder[] = { + { WM_WINDOWPOSCHANGING, sent|wparam, 0, 0 }, + { WM_GETMINMAXINFO, sent|defwinproc|wparam, 0, 0 }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|wparam, 3, 0 }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOREDRAW|SWP_NOMOVE|SWP_NOSIZE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE, 0 }, + { WM_ACTIVATEAPP, sent|wparam, 1, 0 }, + { WM_NCACTIVATE, sent|wparam|lparam, 1, 0 }, + { WM_ACTIVATE, sent|wparam|lparam, 1, 0 }, + { HCBT_SETFOCUS, hook }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { 0 } +}; + static void test_MsgWaitForMultipleObjects(HWND hwnd) { DWORD ret; @@ -4544,6 +4563,42 @@ static void test_messages(void) flush_sequence(); } +static void test_setwindowpos(void) +{ + HWND hwnd; + RECT rc; + LRESULT res; + const INT winX = 100; + const INT winY = 100; + const INT sysX = GetSystemMetrics(SM_CXMINTRACK); + + hwnd = CreateWindowExA(0, "TestWindowClass", NULL, 0, + 0, 0, winX, winY, 0, + NULL, NULL, 0); + + GetWindowRect(hwnd, &rc); + todo_wine expect(sysX, rc.right); + expect(winY, rc.bottom); + GetClientRect(hwnd, &rc); + todo_wine expect(sysX - 6, rc.right); + expect(winY - 25, rc.bottom); + + flush_events(); + flush_sequence(); + res = SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, winX, winY, 0); + ok_sequence(WmZOrder, "Z-Order", TRUE); + ok(res == TRUE, "SetWindowPos expected TRUE, got %ld\n", res); + + GetWindowRect(hwnd, &rc); + expect(sysX, rc.right); + expect(winY, rc.bottom); + GetClientRect(hwnd, &rc); + expect(sysX - 6, rc.right); + expect(winY - 25, rc.bottom); + + DestroyWindow(hwnd); +} + static void invisible_parent_tests(void) { HWND hparent, hchild; @@ -10962,6 +11017,7 @@ START_TEST(msg) test_PeekMessage2(); test_scrollwindowex(); test_messages(); + test_setwindowpos(); test_showwindow(); invisible_parent_tests(); test_mdi_messages();

1 0

Dan Hipschman : kernel32/tests: Add tests for timer queues.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: fc325c7674297ddee4085e6d5f8faa2d95f26903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc325c7674297ddee4085e6d5… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Jul 16 17:42:32 2008 -0700 kernel32/tests: Add tests for timer queues. --- dlls/kernel32/tests/sync.c | 105 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 105 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 8d365ff..b01498b 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <stdio.h> #include <windef.h> +#define _WIN32_WINNT 0x500 #include <winbase.h> #include "wine/test.h" @@ -534,6 +535,109 @@ static void test_iocp_callback(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "Last error is %d\n", GetLastError()); } +static void CALLBACK timer_queue_cb1(PVOID p, BOOLEAN timedOut) +{ + int *pn = (int *) p; + ok(timedOut, "Timer callbacks should always time out\n"); + ++*pn; +} + +static void test_timer_queue(void) +{ + HANDLE q, t1, t2, t3, t4, t5; + int n1, n2, n3, n4, n5; + HANDLE e; + BOOL ret; + + /* Test asyncronous deletion of the queue. */ + q = CreateTimerQueue(); + todo_wine + ok(q != NULL, "CreateTimerQueue\n"); + + SetLastError(0xdeadbeef); + ret = DeleteTimerQueueEx(q, NULL); + ok(!ret, "DeleteTimerQueueEx\n"); + todo_wine + ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx\n"); + + /* Test syncronous deletion of the queue and running timers. */ + q = CreateTimerQueue(); + todo_wine + ok(q != NULL, "CreateTimerQueue\n"); + + /* Called once. */ + t1 = NULL; + n1 = 0; + ret = CreateTimerQueueTimer(&t1, q, timer_queue_cb1, &n1, 0, + 0, 0); + ok(ret, "CreateTimerQueueTimer\n"); + + /* A slow one. */ + t2 = NULL; + n2 = 0; + ret = CreateTimerQueueTimer(&t2, q, timer_queue_cb1, &n2, 0, + 100, 0); + ok(ret, "CreateTimerQueueTimer\n"); + + /* A fast one. */ + t3 = NULL; + n3 = 0; + ret = CreateTimerQueueTimer(&t3, q, timer_queue_cb1, &n3, 0, + 10, 0); + ok(ret, "CreateTimerQueueTimer\n"); + + /* Start really late (it won't start). */ + t4 = NULL; + n4 = 0; + ret = CreateTimerQueueTimer(&t4, q, timer_queue_cb1, &n4, 10000, + 10, 0); + ok(ret, "CreateTimerQueueTimer\n"); + + /* Start soon, but delay so long it won't run again. */ + t5 = NULL; + n5 = 0; + ret = CreateTimerQueueTimer(&t5, q, timer_queue_cb1, &n5, 0, + 10000, 0); + ok(ret, "CreateTimerQueueTimer\n"); + + /* Give them a chance to do some work. */ + Sleep(500); + + ret = DeleteTimerQueueEx(q, INVALID_HANDLE_VALUE); + todo_wine + { + ok(ret, "DeleteTimerQueueEx\n"); + ok(n1 == 1, "Timer callback 1\n"); + ok(n2 < n3, "Timer callback 2 should be much slower than 3\n"); + } + ok(n4 == 0, "Timer callback 4\n"); + todo_wine + ok(n5 == 1, "Timer callback 5\n"); + + /* Test syncronous deletion of the queue with event trigger. */ + e = CreateEvent(NULL, TRUE, FALSE, NULL); + if (!e) + { + skip("Failed to create timer queue descruction event\n"); + return; + } + + q = CreateTimerQueue(); + todo_wine + ok(q != NULL, "CreateTimerQueue\n"); + + SetLastError(0xdeadbeef); + ret = DeleteTimerQueueEx(q, e); + ok(!ret, "DeleteTimerQueueEx\n"); + todo_wine + { + ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx\n"); + ok(WaitForSingleObject(e, 250) == WAIT_OBJECT_0, + "Timer destruction event not triggered\n"); + } + CloseHandle(e); +} + START_TEST(sync) { HMODULE hdll = GetModuleHandle("kernel32"); @@ -547,4 +651,5 @@ START_TEST(sync) test_semaphore(); test_waitable_timer(); test_iocp_callback(); + test_timer_queue(); }

1 0

Vladimir Pankratov : winhlp32: Update Russian translation.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: d168078fe0cfbebd65ff6cad564c303657882819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d168078fe0cfbebd65ff6cad5… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 17 13:27:49 2008 +0500 winhlp32: Update Russian translation. --- programs/winhlp32/Ru.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/Ru.rc b/programs/winhlp32/Ru.rc index b2ea9ad..78aa481 100644 --- a/programs/winhlp32/Ru.rc +++ b/programs/winhlp32/Ru.rc @@ -85,13 +85,13 @@ STID_INFO, " STID_NOT_IMPLEMENTED, "�� " STID_HLPFILE_ERROR_s, "�� `%s'" STID_INDEX, "&��" -STID_CONTENTS, "Summary" +STID_CONTENTS, "��" STID_BACK, "&��" STID_ALL_FILES, "�� (*.*)" STID_HELP_FILES_HLP, "�� (*.hlp)" STID_FILE_NOT_FOUND_s "�� '%s'. �� ?" STID_NO_RICHEDIT "�� richedit" -STID_PSH_INDEX, "Help topics: " +STID_PSH_INDEX, "��: " } CONTEXT_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

1 0

Gal Topper : comdlg32: PrintDlgEx: Add support for RETURNDEFAULT.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: a675c0168d4ea6e6b062034fe15018b9290cb19b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a675c0168d4ea6e6b062034fe… Author: Gal Topper <galt280(a)gmail.com> Date: Thu Jul 10 20:19:27 2008 +0300 comdlg32: PrintDlgEx: Add support for RETURNDEFAULT. --- dlls/comdlg32/printdlg.c | 78 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 2e81627..52ac3c6 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3749,13 +3749,16 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd) * driver-specific property pages. * * BUGS - * Only a Stub + * Not fully implemented * */ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd) { + DWORD ret = E_FAIL; + LPVOID ptr; + + FIXME("(%p) not fully implemented\n", lppd); - FIXME("(%p) stub\n", lppd); if ((lppd == NULL) || (lppd->lStructSize != sizeof(PRINTDLGEXW))) { return E_INVALIDARG; } @@ -3764,5 +3767,76 @@ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd) return E_HANDLE; } + if (lppd->Flags & PD_RETURNDEFAULT) { + PRINTER_INFO_2W *pbuf; + DRIVER_INFO_2W *dbuf; + HANDLE hprn; + DWORD needed = 1024; + BOOL bRet; + + if (lppd->hDevMode || lppd->hDevNames) { + WARN("hDevMode or hDevNames non-zero for PD_RETURNDEFAULT\n"); + COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); + return E_INVALIDARG; + } + if (!PRINTDLG_OpenDefaultPrinter(&hprn)) { + WARN("Can't find default printer\n"); + COMDLG32_SetCommDlgExtendedError(PDERR_NODEFAULTPRN); + return E_FAIL; + } + + pbuf = HeapAlloc(GetProcessHeap(), 0, needed); + bRet = GetPrinterW(hprn, 2, (LPBYTE)pbuf, needed, &needed); + if (!bRet && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + HeapFree(GetProcessHeap(), 0, pbuf); + pbuf = HeapAlloc(GetProcessHeap(), 0, needed); + bRet = GetPrinterW(hprn, 2, (LPBYTE)pbuf, needed, &needed); + } + if (!bRet) { + HeapFree(GetProcessHeap(), 0, pbuf); + ClosePrinter(hprn); + return E_FAIL; + } + + needed = 1024; + dbuf = HeapAlloc(GetProcessHeap(), 0, needed); + bRet = GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed); + if (!bRet && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + HeapFree(GetProcessHeap(), 0, dbuf); + dbuf = HeapAlloc(GetProcessHeap(), 0, needed); + bRet = GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed); + } + if (!bRet) { + ERR("GetPrinterDriverW failed, last error %d, fix your config for printer %s!\n", + GetLastError(), debugstr_w(pbuf->pPrinterName)); + HeapFree(GetProcessHeap(), 0, dbuf); + HeapFree(GetProcessHeap(), 0, pbuf); + COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); + ClosePrinter(hprn); + return E_FAIL; + } + ClosePrinter(hprn); + + PRINTDLG_CreateDevNamesW(&(lppd->hDevNames), + dbuf->pDriverPath, + pbuf->pPrinterName, + pbuf->pPortName); + lppd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, pbuf->pDevMode->dmSize + + pbuf->pDevMode->dmDriverExtra); + if (lppd->hDevMode) { + ptr = GlobalLock(lppd->hDevMode); + if (ptr) { + memcpy(ptr, pbuf->pDevMode, pbuf->pDevMode->dmSize + + pbuf->pDevMode->dmDriverExtra); + GlobalUnlock(lppd->hDevMode); + ret = S_OK; + } + } + HeapFree(GetProcessHeap(), 0, pbuf); + HeapFree(GetProcessHeap(), 0, dbuf); + + return ret; + } + return E_NOTIMPL; }

1 0

Gal Topper : comdlg32: PrintDlgEx: Change scope of strings for later reuse.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: ef397a5607b71fd05217e63fe485b28e733dab97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef397a5607b71fd05217e63fe… Author: Gal Topper <galt280(a)gmail.com> Date: Thu Jul 10 20:18:37 2008 +0300 comdlg32: PrintDlgEx: Change scope of strings for later reuse. --- dlls/comdlg32/printdlg.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 808a33c..2e81627 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -75,6 +75,11 @@ static const struct pd_flags psd_flags[] = { static WNDPROC lpfnStaticWndProc; /* the text of the fake document to render for the Page Setup dialog */ static WCHAR wszFakeDocumentText[1024]; +static const WCHAR pd32_collateW[] = { 'P', 'D', '3', '2', '_', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 }; +static const WCHAR pd32_nocollateW[] = { 'P', 'D', '3', '2', '_', 'N', 'O', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 }; +static const WCHAR pd32_portraitW[] = { 'P', 'D', '3', '2', '_', 'P', 'O', 'R', 'T', 'R', 'A', 'I', 'T', 0 }; +static const WCHAR pd32_landscapeW[] = { 'P', 'D', '3', '2', '_', 'L', 'A', 'N', 'D', 'S', 'C', 'A', 'P', 'E', 0 }; +static const WCHAR propW[] = {'_','_','W','I','N','E','_','P','R','I','N','T','D','L','G','D','A','T','A',0}; /*********************************************************************** * PRINTDLG_OpenDefaultPrinter @@ -1378,10 +1383,6 @@ static LRESULT PRINTDLG_WMInitDialog(HWND hDlg, WPARAM wParam, static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, WPARAM wParam, PRINT_PTRW* PrintStructures) { - static const WCHAR PD32_COLLATE[] = { 'P', 'D', '3', '2', '_', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 }; - static const WCHAR PD32_NOCOLLATE[] = { 'P', 'D', '3', '2', '_', 'N', 'O', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 }; - static const WCHAR PD32_PORTRAIT[] = { 'P', 'D', '3', '2', '_', 'P', 'O', 'R', 'T', 'R', 'A', 'I', 'T', 0 }; - static const WCHAR PD32_LANDSCAPE[] = { 'P', 'D', '3', '2', '_', 'L', 'A', 'N', 'D', 'S', 'C', 'A', 'P', 'E', 0 }; LPPRINTDLGW lppd = PrintStructures->lpPrintDlg; DEVNAMES *pdn; DEVMODEW *pdm; @@ -1392,15 +1393,15 @@ static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, WPARAM wParam, /* We load these with LoadImage because they are not a standard size and we don't want them rescaled */ PrintStructures->hCollateIcon = - LoadImageW(COMDLG32_hInstance, PD32_COLLATE, IMAGE_ICON, 0, 0, 0); + LoadImageW(COMDLG32_hInstance, pd32_collateW, IMAGE_ICON, 0, 0, 0); PrintStructures->hNoCollateIcon = - LoadImageW(COMDLG32_hInstance, PD32_NOCOLLATE, IMAGE_ICON, 0, 0, 0); + LoadImageW(COMDLG32_hInstance, pd32_nocollateW, IMAGE_ICON, 0, 0, 0); /* These can be done with LoadIcon */ PrintStructures->hPortraitIcon = - LoadIconW(COMDLG32_hInstance, PD32_PORTRAIT); + LoadIconW(COMDLG32_hInstance, pd32_portraitW); PrintStructures->hLandscapeIcon = - LoadIconW(COMDLG32_hInstance, PD32_LANDSCAPE); + LoadIconW(COMDLG32_hInstance, pd32_landscapeW); /* display the collate/no_collate icon */ SendDlgItemMessageW(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, @@ -1882,7 +1883,6 @@ static INT_PTR CALLBACK PrintDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, static INT_PTR CALLBACK PrintDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - static const WCHAR propW[] = {'_','_','W','I','N','E','_','P','R','I','N','T','D','L','G','D','A','T','A',0}; PRINT_PTRW* PrintStructures; INT_PTR res = FALSE;

1 0

Piotr Caban : msxml3/tests: Added more tests for ISAXXMLReader_parse and ISAXLocator.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 1547a9de4760bd71e1782f683a67632ad91b91a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1547a9de4760bd71e1782f683… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 17 00:42:14 2008 +0200 msxml3/tests: Added more tests for ISAXXMLReader_parse and ISAXLocator. --- dlls/msxml3/tests/saxreader.c | 176 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 169 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 20a3326..5547d72 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -29,6 +29,21 @@ #include "wine/test.h" +typedef enum _CH { + CH_ENDTEST, + CH_PUTDOCUMENTLOCATOR, + CH_STARTDOCUMENT, + CH_ENDDOCUMENT, + CH_STARTPREFIXMAPPING, + CH_ENDPREFIXMAPPING, + CH_STARTELEMENT, + CH_ENDELEMENT, + CH_CHARACTERS, + CH_IGNORABLEWHITESPACE, + CH_PROCESSINGINSTRUCTION, + CH_SKIPPEDENTITY +} CH; + static const WCHAR szSimpleXML[] = { '<','?','x','m','l',' ','v','e','r','s','i','o','n','=','\"','1','.','0','\"',' ','?','>','\n', '<','B','a','n','k','A','c','c','o','u','n','t','>','\n', @@ -37,14 +52,80 @@ static const WCHAR szSimpleXML[] = { '<','/','B','a','n','k','A','c','c','o','u','n','t','>','\n','\0' }; -typedef struct _contenthandler +typedef struct _contenthandlercheck { + CH id; + int line; + int column; + const char *arg1; + const char *arg2; + const char *arg3; +} content_handler_test; + +static content_handler_test contentHandlerTest1[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0 }, + { CH_STARTDOCUMENT, 0, 0 }, + { CH_STARTELEMENT, 2, 14, "", "BankAccount", "BankAccount" }, + { CH_CHARACTERS, 2, 14, "\n " }, + { CH_STARTELEMENT, 3, 12, "", "Number", "Number" }, + { CH_CHARACTERS, 3, 12, "1234" }, + { CH_ENDELEMENT, 3, 18, "", "Number", "Number" }, + { CH_CHARACTERS, 3, 25, "\n " }, + { CH_STARTELEMENT, 4, 10, "", "Name", "Name" }, + { CH_CHARACTERS, 4, 10, "Captain Ahab" }, + { CH_ENDELEMENT, 4, 24, "", "Name", "Name" }, + { CH_CHARACTERS, 4, 29, "\n" }, + { CH_ENDELEMENT, 5, 3, "", "BankAccount", "BankAccount" }, + { CH_ENDDOCUMENT, 0, 0 }, + { CH_ENDTEST } +}; + +static content_handler_test *expectCall; +static ISAXLocator *locator; + +static const char *debugstr_wn(const WCHAR *szStr, int len) +{ + static char buf[1024]; + WideCharToMultiByte(CP_ACP, 0, szStr, len, buf, sizeof(buf), NULL, NULL); + return buf; +} + +static void test_saxstr(unsigned line, const WCHAR *szStr, int nStr, const char *szTest) +{ + WCHAR buf[1024]; + int len; + + if(!szTest) { + ok_(__FILE__,line) (szStr == NULL, "szStr != NULL\n"); + ok_(__FILE__,line) (nStr == 0, "nStr = %d, expected 0\n", nStr); + return; + } + + len = strlen(szTest); + ok_(__FILE__,line) (len == nStr, "nStr = %d, expected %d (%s)\n", nStr, len, szTest); + if(len != nStr) + return; + + MultiByteToWideChar(CP_ACP, 0, szTest, -1, buf, sizeof(buf)); + ok_(__FILE__,line) (!memcmp(szStr, buf, len*sizeof(WCHAR)), "unexpected szStr %s, expected %s\n", + debugstr_wn(szStr, nStr), szTest); +} + +static BOOL test_expect_call(CH id) { - const struct ISAXContentHandlerVtbl *lpContentHandlerVtbl; -} contenthandler; + ok(expectCall->id == id, "unexpected call %d, expected %d\n", id, expectCall->id); + return expectCall->id == id; +} -static inline contenthandler *impl_from_ISAXContentHandler(ISAXContentHandler *iface) +static void test_locator(unsigned line, int loc_line, int loc_column) { - return (contenthandler *)((char*)iface - FIELD_OFFSET(contenthandler, lpContentHandlerVtbl)); + int rcolumn, rline; + ISAXLocator_getLineNumber(locator, &rline); + ISAXLocator_getColumnNumber(locator, &rcolumn); + + ok_(__FILE__,line) (rline == loc_line, + "unexpected line %d, expected %d\n", rline, loc_line); + ok_(__FILE__,line) (rcolumn == loc_column, + "unexpected columnt %d, expected %d\n", rcolumn, loc_column); } static HRESULT WINAPI contentHandler_QueryInterface( @@ -82,18 +163,37 @@ static HRESULT WINAPI contentHandler_putDocumentLocator( ISAXContentHandler* iface, ISAXLocator *pLocator) { + if(!test_expect_call(CH_PUTDOCUMENTLOCATOR)) + return E_FAIL; + + locator = pLocator; + test_locator(__LINE__, expectCall->line, expectCall->column); + + expectCall++; return S_OK; } static HRESULT WINAPI contentHandler_startDocument( ISAXContentHandler* iface) { + if(!test_expect_call(CH_STARTDOCUMENT)) + return E_FAIL; + + test_locator(__LINE__, expectCall->line, expectCall->column); + + expectCall++; return S_OK; } static HRESULT WINAPI contentHandler_endDocument( ISAXContentHandler* iface) { + if(!test_expect_call(CH_ENDDOCUMENT)) + return E_FAIL; + + test_locator(__LINE__, expectCall->line, expectCall->column); + + expectCall++; return S_OK; } @@ -104,6 +204,14 @@ static HRESULT WINAPI contentHandler_startPrefixMapping( const WCHAR *pUri, int nUri) { + if(!test_expect_call(CH_ENDDOCUMENT)) + return E_FAIL; + + test_saxstr(__LINE__, pPrefix, nPrefix, expectCall->arg1); + test_saxstr(__LINE__, pUri, nUri, expectCall->arg2); + test_locator(__LINE__, expectCall->line, expectCall->column); + + expectCall++; return S_OK; } @@ -112,6 +220,13 @@ static HRESULT WINAPI contentHandler_endPrefixMapping( const WCHAR *pPrefix, int nPrefix) { + if(!test_expect_call(CH_ENDPREFIXMAPPING)) + return E_FAIL; + + test_saxstr(__LINE__, pPrefix, nPrefix, expectCall->arg1); + test_locator(__LINE__, expectCall->line, expectCall->column); + + expectCall++; return S_OK; } @@ -125,6 +240,15 @@ static HRESULT WINAPI contentHandler_startElement( int nQName, ISAXAttributes *pAttr) { + if(!test_expect_call(CH_STARTELEMENT)) + return E_FAIL; + + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, expectCall->arg1); + test_saxstr(__LINE__, pLocalName, nLocalName, expectCall->arg2); + test_saxstr(__LINE__, pQName, nQName, expectCall->arg3); + test_locator(__LINE__, expectCall->line, expectCall->column); + + expectCall++; return S_OK; } @@ -137,6 +261,15 @@ static HRESULT WINAPI contentHandler_endElement( const WCHAR *pQName, int nQName) { + if(!test_expect_call(CH_ENDELEMENT)) + return E_FAIL; + + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, expectCall->arg1); + test_saxstr(__LINE__, pLocalName, nLocalName, expectCall->arg2); + test_saxstr(__LINE__, pQName, nQName, expectCall->arg3); + test_locator(__LINE__, expectCall->line, expectCall->column); + + expectCall++; return S_OK; } @@ -145,6 +278,13 @@ static HRESULT WINAPI contentHandler_characters( const WCHAR *pChars, int nChars) { + if(!test_expect_call(CH_CHARACTERS)) + return E_FAIL; + + test_saxstr(__LINE__, pChars, nChars, expectCall->arg1); + test_locator(__LINE__, expectCall->line, expectCall->column); + + expectCall++; return S_OK; } @@ -153,6 +293,13 @@ static HRESULT WINAPI contentHandler_ignorableWhitespace( const WCHAR *pChars, int nChars) { + if(!test_expect_call(CH_IGNORABLEWHITESPACE)) + return E_FAIL; + + test_saxstr(__LINE__, pChars, nChars, expectCall->arg1); + test_locator(__LINE__, expectCall->line, expectCall->column); + + expectCall++; return S_OK; } @@ -163,6 +310,14 @@ static HRESULT WINAPI contentHandler_processingInstruction( const WCHAR *pData, int nData) { + if(!test_expect_call(CH_PROCESSINGINSTRUCTION)) + return E_FAIL; + + test_saxstr(__LINE__, pTarget, nTarget, expectCall->arg1); + test_saxstr(__LINE__, pData, nData, expectCall->arg2); + test_locator(__LINE__, expectCall->line, expectCall->column); + + expectCall++; return S_OK; } @@ -171,6 +326,13 @@ static HRESULT WINAPI contentHandler_skippedEntity( const WCHAR *pName, int nName) { + if(!test_expect_call(CH_SKIPPEDENTITY)) + return E_FAIL; + + test_saxstr(__LINE__, pName, nName, expectCall->arg1); + test_locator(__LINE__, expectCall->line, expectCall->column); + + expectCall++; return S_OK; } @@ -232,10 +394,10 @@ static void test_saxreader(void) V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(szSimpleXML); + expectCall = contentHandlerTest1; hr = ISAXXMLReader_parse(reader, var); - todo_wine { ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - } + test_expect_call(CH_ENDTEST); ISAXXMLReader_Release(reader); }

1 0

Piotr Caban : msxml3: Added ISAXLocator_getSystemId.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 3196f7801c6887d66d2609c4307c5888017d3af5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3196f7801c6887d66d2609c43… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 17 00:42:07 2008 +0200 msxml3: Added ISAXLocator_getSystemId. --- dlls/msxml3/saxreader.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 3d807bb..5fbcf89 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -63,6 +63,7 @@ typedef struct _saxlocator HRESULT ret; xmlParserCtxtPtr pParserCtxt; WCHAR *publicId; + WCHAR *systemId; int lastLine; int lastColumn; } saxlocator; @@ -310,6 +311,8 @@ static ULONG WINAPI isaxlocator_Release( { if(This->publicId) SysFreeString(This->publicId); + if(This->systemId) + SysFreeString(This->systemId); ISAXXMLReader_Release((ISAXXMLReader*)&This->saxreader->lpSAXXMLReaderVtbl); HeapFree( GetProcessHeap(), 0, This ); @@ -365,10 +368,22 @@ static HRESULT WINAPI isaxlocator_getSystemId( ISAXLocator* iface, const WCHAR ** ppwchSystemId) { + BSTR systemId; saxlocator *This = impl_from_ISAXLocator( iface ); - FIXME("(%p)->(%p) stub\n", This, ppwchSystemId); - return E_NOTIMPL; + if(This->systemId) SysFreeString(This->systemId); + + systemId = bstr_from_xmlChar(xmlSAX2GetSystemId(This->pParserCtxt)); + if(SysStringLen(systemId)) + This->systemId = (WCHAR*)&systemId; + else + { + SysFreeString(systemId); + This->systemId = NULL; + } + + *ppwchSystemId = This->systemId; + return S_OK; } static const struct ISAXLocatorVtbl isaxlocator_vtbl = @@ -398,6 +413,7 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator) locator->pParserCtxt = NULL; locator->publicId = NULL; + locator->systemId = NULL; locator->lastLine = 0; locator->lastColumn = 0; locator->ret = S_OK;

1 0

Piotr Caban : msxml3: Added ISAXLocator_getPublicId.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 60ca0a7b5358c6e2b9d2ac9cb6f08327ff950d0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ca0a7b5358c6e2b9d2ac9cb… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 17 00:42:01 2008 +0200 msxml3: Added ISAXLocator_getPublicId. --- dlls/msxml3/saxreader.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 16f1f23..3d807bb 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -62,6 +62,7 @@ typedef struct _saxlocator saxreader *saxreader; HRESULT ret; xmlParserCtxtPtr pParserCtxt; + WCHAR *publicId; int lastLine; int lastColumn; } saxlocator; @@ -307,6 +308,9 @@ static ULONG WINAPI isaxlocator_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { + if(This->publicId) + SysFreeString(This->publicId); + ISAXXMLReader_Release((ISAXXMLReader*)&This->saxreader->lpSAXXMLReaderVtbl); HeapFree( GetProcessHeap(), 0, This ); } @@ -339,10 +343,22 @@ static HRESULT WINAPI isaxlocator_getPublicId( ISAXLocator* iface, const WCHAR ** ppwchPublicId) { + BSTR publicId; saxlocator *This = impl_from_ISAXLocator( iface ); - FIXME("(%p)->(%p) stub\n", This, ppwchPublicId); - return E_NOTIMPL; + if(This->publicId) SysFreeString(This->publicId); + + publicId = bstr_from_xmlChar(xmlSAX2GetPublicId(This->pParserCtxt)); + if(SysStringLen(publicId)) + This->publicId = (WCHAR*)&publicId; + else + { + SysFreeString(publicId); + This->publicId = NULL; + } + + *ppwchPublicId = This->publicId; + return S_OK; } static HRESULT WINAPI isaxlocator_getSystemId( @@ -381,6 +397,7 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator) ISAXXMLReader_AddRef((ISAXXMLReader*)&reader->lpSAXXMLReaderVtbl); locator->pParserCtxt = NULL; + locator->publicId = NULL; locator->lastLine = 0; locator->lastColumn = 0; locator->ret = S_OK;

1 0

Piotr Caban : msxml3: Added ISAXContentHandler_characters event.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 40388631f8536462ace8708c15f1eb858bf7b14b URL: http://source.winehq.org/git/wine.git/?a=commit;h=40388631f8536462ace8708c1… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 17 00:41:40 2008 +0200 msxml3: Added ISAXContentHandler_characters event. --- dlls/msxml3/saxreader.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 854584f..41c419c 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -202,6 +202,50 @@ static void libxmlEndElementNS( } } +static void libxmlCharacters( + void *ctx, + const xmlChar *ch, + int len) +{ + BSTR Chars; + saxlocator *This = ctx; + const xmlChar *cur; + int pos; + HRESULT hr; + + This->lastColumn = 1; + This->lastLine = xmlSAX2GetLineNumber(This->pParserCtxt); + + cur = This->pParserCtxt->input->cur; + if(*cur != '<') + { + for(pos=0; pos<len; pos++) + if(*(cur+pos) == '\n') This->lastLine--; + cur--; + } + else + { + for(pos=0; pos<len; pos++) + if(*(cur-pos-1) == '\n') This->lastLine--; + cur = cur-len-1; + } + for(; *cur!='\n' && cur!=This->pParserCtxt->input->base; cur--) + This->lastColumn++; + + if(This->saxreader->contentHandler) + { + Chars = bstr_from_xmlChar(ch); + hr = ISAXContentHandler_characters(This->saxreader->contentHandler, Chars, len); + SysFreeString(Chars); + + if(FAILED(hr)) + { + xmlStopParser(This->pParserCtxt); + This->ret = hr; + } + } +} + /*** ISAXLocator interface ***/ /*** IUnknown methods ***/ static HRESULT WINAPI isaxlocator_QueryInterface(ISAXLocator* iface, REFIID riid, void **ppvObject) @@ -1004,6 +1048,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->sax.endDocument = libxmlEndDocument; reader->sax.startElementNs = libxmlStartElementNS; reader->sax.endElementNs = libxmlEndElementNS; + reader->sax.characters = libxmlCharacters; *ppObj = &reader->lpVtbl;

1 0

Piotr Caban : msxml3: Added ISAXContentHandler_putDocumentLocator event.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: e47cbd1e5de2d8d28cc8bd316ffb581b877b1548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e47cbd1e5de2d8d28cc8bd316… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 17 00:41:52 2008 +0200 msxml3: Added ISAXContentHandler_putDocumentLocator event. --- dlls/msxml3/saxreader.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 41c419c..16f1f23 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -246,6 +246,23 @@ static void libxmlCharacters( } } +static void libxmlSetDocumentLocator( + void *ctx, + xmlSAXLocatorPtr loc) +{ + saxlocator *This = ctx; + HRESULT hr; + + hr = ISAXContentHandler_putDocumentLocator(This->saxreader->contentHandler, + (ISAXLocator*)&This->lpSAXLocatorVtbl); + + if(FAILED(hr)) + { + xmlStopParser(This->pParserCtxt); + This->ret = hr; + } +} + /*** ISAXLocator interface ***/ /*** IUnknown methods ***/ static HRESULT WINAPI isaxlocator_QueryInterface(ISAXLocator* iface, REFIID riid, void **ppvObject) @@ -1049,6 +1066,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->sax.startElementNs = libxmlStartElementNS; reader->sax.endElementNs = libxmlEndElementNS; reader->sax.characters = libxmlCharacters; + reader->sax.setDocumentLocator = libxmlSetDocumentLocator; *ppObj = &reader->lpVtbl;

1 0