wine-commits May 2008

wine-commits@winehq.org

4 participants
722 discussions

Jacek Caban : mshtml: Added IHTMLDOMChildrenCollection:: get_length implementation.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 4ff929ebeb9ab1aff3fdc8b0dd2d3a2119096c72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff929ebeb9ab1aff3fdc8b0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 30 18:17:44 2008 +0200 mshtml: Added IHTMLDOMChildrenCollection::get_length implementation. --- dlls/mshtml/htmlnode.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 0f3e848..73c588a 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -134,8 +134,13 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_Invoke(IHTMLDOMChildrenCollectio static HRESULT WINAPI HTMLDOMChildrenCollection_get_length(IHTMLDOMChildrenCollection *iface, long *p) { HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRUint32 length=0; + + TRACE("(%p)->(%p)\n", This, p); + + nsIDOMNodeList_GetLength(This->nslist, &length); + *p = length; + return S_OK; } static HRESULT WINAPI HTMLDOMChildrenCollection__newEnum(IHTMLDOMChildrenCollection *iface, IUnknown **p)

1 0

Jacek Caban : mshtml: Added IHTMLDOMChildrenCollection::item implementation .
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 6da1c730476930f086286ef02de9aa71f6f79914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da1c730476930f086286ef02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 30 18:17:56 2008 +0200 mshtml: Added IHTMLDOMChildrenCollection::item implementation. --- dlls/mshtml/htmlnode.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 73c588a..dbb35e1 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -153,8 +153,25 @@ static HRESULT WINAPI HTMLDOMChildrenCollection__newEnum(IHTMLDOMChildrenCollect static HRESULT WINAPI HTMLDOMChildrenCollection_item(IHTMLDOMChildrenCollection *iface, long index, IDispatch **ppItem) { HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); - FIXME("(%p)->(%ld %p)\n", This, index, ppItem); - return E_NOTIMPL; + nsIDOMNode *nsnode = NULL; + PRUint32 length=0; + nsresult nsres; + + TRACE("(%p)->(%ld %p)\n", This, index, ppItem); + + nsIDOMNodeList_GetLength(This->nslist, &length); + if(index < 0 || index > length) + return E_INVALIDARG; + + nsres = nsIDOMNodeList_Item(This->nslist, index, &nsnode); + if(NS_FAILED(nsres) || !nsnode) { + ERR("Item failed: %08x\n", nsres); + return E_FAIL; + } + + *ppItem = (IDispatch*)get_node(This->doc, nsnode, TRUE); + IDispatch_AddRef(*ppItem); + return S_OK; } #undef HTMLCHILDCOL_THIS

1 0

Alex Villacís Lasso : richedit: Add tests for EM_FINDTEXT in 1.0 emulation, make them pass under Wine.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 2a4fc97c4c1b2654a7c2ba0ee7098b5aef8b6853 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a4fc97c4c1b2654a7c2ba0ee… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Apr 30 00:25:50 2008 -0500 richedit: Add tests for EM_FINDTEXT in 1.0 emulation, make them pass under Wine. --- dlls/riched20/editor.c | 19 +++++- dlls/riched20/tests/editor.c | 4 +- dlls/riched32/tests/editor.c | 164 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 185 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c867df9..9e93091 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1263,12 +1263,29 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH else nMax = chrg->cpMax > nTextLen ? nTextLen : chrg->cpMax; + /* In 1.0 emulation, if cpMax reaches end of text, add the FR_DOWN flag */ + if (editor->bEmulateVersion10 && nMax == nTextLen) + { + flags |= FR_DOWN; + } + + /* In 1.0 emulation, cpMin must always be no greater than cpMax */ + if (editor->bEmulateVersion10 && nMax < nMin) + { + if (chrgText) + { + chrgText->cpMin = -1; + chrgText->cpMax = -1; + } + return -1; + } + /* when searching up, if cpMin < cpMax, then instead of searching * on [cpMin,cpMax], we search on [0,cpMin], otherwise, search on * [cpMax, cpMin]. The exception is when cpMax is -1, in which * case, it is always bigger than cpMin. */ - if (!(flags & FR_DOWN)) + if (!editor->bEmulateVersion10 && !(flags & FR_DOWN)) { int nSwap = nMax; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index fff8119..0fe696f 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -127,7 +127,9 @@ struct find_s find_tests2[] = { /* The backwards case of bug 4479; bounds look right * Fails because backward find is wrong */ {19, 20, "WINE", FR_MATCHCASE, 0, 0}, - {0, 20, "WINE", FR_MATCHCASE, -1, 0} + {0, 20, "WINE", FR_MATCHCASE, -1, 0}, + + {0, -1, "wineWine wine", 0, -1, 0}, }; static void check_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *f, int id) { diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index b4082c4..9b12ba8 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -539,6 +539,169 @@ static void test_EM_GETSELTEXT(void) DestroyWindow(hwndRichEdit); } +static const char haystack[] = "WINEWine wineWine wine WineWine"; + /* ^0 ^10 ^20 ^30 */ + +struct find_s { + int start; + int end; + const char *needle; + int flags; + int expected_loc; + int _todo_wine; +}; + + +struct find_s find_tests[] = { + /* Find in empty text */ + {0, -1, "foo", FR_DOWN, -1, 0}, + {0, -1, "foo", 0, -1, 0}, + {0, -1, "", FR_DOWN, -1, 0}, + {20, 5, "foo", FR_DOWN, -1, 0}, + {5, 20, "foo", FR_DOWN, -1, 0} +}; + +struct find_s find_tests2[] = { + /* No-result find */ + {0, -1, "foo", FR_DOWN | FR_MATCHCASE, -1, 0}, + {5, 20, "WINE", FR_DOWN | FR_MATCHCASE, -1, 0}, + + /* Subsequent finds */ + {0, -1, "Wine", FR_DOWN | FR_MATCHCASE, 4, 0}, + {5, 31, "Wine", FR_DOWN | FR_MATCHCASE, 13, 0}, + {14, 31, "Wine", FR_DOWN | FR_MATCHCASE, 23, 0}, + {24, 31, "Wine", FR_DOWN | FR_MATCHCASE, 27, 0}, + + /* Find backwards */ + {19, 20, "Wine", FR_MATCHCASE, -1, 0}, + {10, 20, "Wine", FR_MATCHCASE, 13, 0}, + {20, 10, "Wine", FR_MATCHCASE, -1, 0}, + + /* Case-insensitive */ + {1, 31, "wInE", FR_DOWN, 4, 0}, + {1, 31, "Wine", FR_DOWN, 4, 0}, + + /* High-to-low ranges */ + {20, 5, "Wine", FR_DOWN, -1, 0}, + {2, 1, "Wine", FR_DOWN, -1, 0}, + {30, 29, "Wine", FR_DOWN, -1, 0}, + {20, 5, "Wine", 0, /*13*/ -1, 0}, + + /* Find nothing */ + {5, 10, "", FR_DOWN, -1, 0}, + {10, 5, "", FR_DOWN, -1, 0}, + {0, -1, "", FR_DOWN, -1, 0}, + {10, 5, "", 0, -1, 0}, + + /* Whole-word search */ + {0, -1, "wine", FR_DOWN | FR_WHOLEWORD, 18, 0}, + {0, -1, "win", FR_DOWN | FR_WHOLEWORD, -1, 0}, + {13, -1, "wine", FR_DOWN | FR_WHOLEWORD, 18, 0}, + {0, -1, "winewine", FR_DOWN | FR_WHOLEWORD, 0, 0}, + {10, -1, "winewine", FR_DOWN | FR_WHOLEWORD, 23, 0}, + {11, -1, "winewine", FR_WHOLEWORD, 23, 0}, + {31, -1, "winewine", FR_WHOLEWORD, -1, 0}, + + /* Bad ranges */ + {5, 200, "XXX", FR_DOWN, -1, 0}, + {-20, 20, "Wine", FR_DOWN, -1, 0}, + {-20, 20, "Wine", FR_DOWN, -1, 0}, + {-15, -20, "Wine", FR_DOWN, -1, 0}, + {1<<12, 1<<13, "Wine", FR_DOWN, -1, 0}, + + /* Check the case noted in bug 4479 where matches at end aren't recognized */ + {23, 31, "Wine", FR_DOWN | FR_MATCHCASE, 23, 0}, + {27, 31, "Wine", FR_DOWN | FR_MATCHCASE, 27, 0}, + {27, 32, "Wine", FR_DOWN | FR_MATCHCASE, 27, 0}, + {13, 31, "WineWine", FR_DOWN | FR_MATCHCASE, 23, 0}, + {13, 32, "WineWine", FR_DOWN | FR_MATCHCASE, 23, 0}, + + /* The backwards case of bug 4479; bounds look right + * Fails because backward find is wrong */ + {19, 20, "WINE", FR_MATCHCASE, -1, 0}, + {0, 20, "WINE", FR_MATCHCASE, 0, 0}, + + {0, -1, "wineWine wine", FR_DOWN, 0, 0}, + {0, -1, "wineWine wine", 0, 0, 0}, + {0, -1, "INEW", 0, 1, 0}, + {0, 31, "INEW", 0, 1, 0}, + {4, -1, "INEW", 0, 10, 0}, +}; + +static void check_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *f, int id) { + int findloc; + FINDTEXT ft; + memset(&ft, 0, sizeof(ft)); + ft.chrg.cpMin = f->start; + ft.chrg.cpMax = f->end; + ft.lpstrText = f->needle; + findloc = SendMessage(hwnd, EM_FINDTEXT, f->flags, (LPARAM) &ft); + ok(findloc == f->expected_loc, + "EM_FINDTEXT(%s,%d) '%s' in range(%d,%d), flags %08x, got start at %d, expected %d\n", + name, id, f->needle, f->start, f->end, f->flags, findloc, f->expected_loc); +} + +static void check_EM_FINDTEXTEX(HWND hwnd, const char *name, struct find_s *f, + int id) { + int findloc; + FINDTEXTEX ft; + int expected_end_loc; + + memset(&ft, 0, sizeof(ft)); + ft.chrg.cpMin = f->start; + ft.chrg.cpMax = f->end; + ft.lpstrText = f->needle; + findloc = SendMessage(hwnd, EM_FINDTEXTEX, f->flags, (LPARAM) &ft); + ok(findloc == f->expected_loc, + "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n", + name, id, f->needle, f->start, f->end, f->flags, findloc); + ok(ft.chrgText.cpMin == f->expected_loc, + "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d, expected %d\n", + name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMin, f->expected_loc); + expected_end_loc = ((f->expected_loc == -1) ? -1 + : f->expected_loc + strlen(f->needle)); + ok(ft.chrgText.cpMax == expected_end_loc, + "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, end at %d, expected %d\n", + name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMax, expected_end_loc); +} + +static void run_tests_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *find, + int num_tests) +{ + int i; + + for (i = 0; i < num_tests; i++) { + if (find[i]._todo_wine) { + todo_wine { + check_EM_FINDTEXT(hwnd, name, &find[i], i); + check_EM_FINDTEXTEX(hwnd, name, &find[i], i); + } + } else { + check_EM_FINDTEXT(hwnd, name, &find[i], i); + check_EM_FINDTEXTEX(hwnd, name, &find[i], i); + } + } +} + +static void test_EM_FINDTEXT(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + + /* Empty rich edit control */ + run_tests_EM_FINDTEXT(hwndRichEdit, "1", find_tests, + sizeof(find_tests)/sizeof(struct find_s)); + + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) haystack); + + /* Haystack text */ + run_tests_EM_FINDTEXT(hwndRichEdit, "2", find_tests2, + sizeof(find_tests2)/sizeof(struct find_s)); + + DestroyWindow(hwndRichEdit); +} + + + START_TEST( editor ) { MSG msg; @@ -557,6 +720,7 @@ START_TEST( editor ) test_EM_STREAMOUT(); test_EM_GETLINE(); test_EM_LINELENGTH(); + test_EM_FINDTEXT(); /* Set the environment variable WINETEST_RICHED32 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Nikolay Sivov : gdiplus: Implemented GdipCreateFontFromDC.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 37b8140f561f7ff9482c2483fc3e9385d47381bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b8140f561f7ff9482c2483f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 30 18:19:42 2008 +0400 gdiplus: Implemented GdipCreateFontFromDC. --- dlls/gdiplus/font.c | 18 ++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 6 +++--- include/gdiplusflat.h | 1 + 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index d5d7e94..a05ef75 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -88,6 +88,24 @@ GpStatus WINGDIPAPI GdipDeleteFont(GpFont* font) return Ok; } +GpStatus WINGDIPAPI GdipCreateFontFromDC(HDC hdc, GpFont **font) +{ + HFONT hfont; + LOGFONTW lfw; + + if(!font) + return InvalidParameter; + + hfont = (HFONT)GetCurrentObject(hdc, OBJ_FONT); + if(!hfont) + return GenericError; + + if(!GetObjectW(hfont, sizeof(LOGFONTW), &lfw)) + return GenericError; + + return GdipCreateFontFromLogfontW(hdc, &lfw, font); +} + /* FIXME: use graphics */ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW *lfw) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index bfab487..ec3897a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -86,9 +86,9 @@ @ stub GdipCreateEffect @ stub GdipCreateFont @ stub GdipCreateFontFamilyFromName -@ stub GdipCreateFontFromDC -@ stdcall GdipCreateFontFromLogfontA(ptr ptr ptr) -@ stdcall GdipCreateFontFromLogfontW(ptr ptr ptr) +@ stdcall GdipCreateFontFromDC(long ptr) +@ stdcall GdipCreateFontFromLogfontA(long ptr ptr) +@ stdcall GdipCreateFontFromLogfontW(long ptr ptr) @ stdcall GdipCreateFromHDC2(long long ptr) @ stdcall GdipCreateFromHDC(long ptr) @ stdcall GdipCreateFromHWND(long ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 2cecd99..ddd4914 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -330,6 +330,7 @@ GpStatus WINGDIPAPI GdipSetImageAttributesColorMatrix(GpImageAttributes*, GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes*,WrapMode, ARGB,BOOL); +GpStatus WINGDIPAPI GdipCreateFontFromDC(HDC,GpFont**); GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC,GDIPCONST LOGFONTA*,GpFont**); GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**); GpStatus WINGDIPAPI GdipDeleteFont(GpFont*);

1 0

Rob Shearman : wininet: Don't crash in GetUrlCacheEntryInfoA/ W if lpdwCacheEntryInfoBufferSize is NULL.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 1ea7666c57e7420ae190008d52aeca1587cec8fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ea7666c57e7420ae190008d5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 30 15:23:44 2008 +0100 wininet: Don't crash in GetUrlCacheEntryInfoA/W if lpdwCacheEntryInfoBufferSize is NULL. --- dlls/wininet/urlcache.c | 46 ++++++++++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index ba16ed2..f34451a 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1526,18 +1526,21 @@ BOOL WINAPI GetUrlCacheEntryInfoA( if (pUrlEntry->dwOffsetHeaderInfo) TRACE("Header info: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); - if (!URLCache_CopyEntry( - pContainer, - pHeader, - lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, - pUrlEntry, - FALSE /* ANSI */)) - { - URLCacheContainer_UnlockIndex(pContainer, pHeader); - return FALSE; + if (lpdwCacheEntryInfoBufferSize) + { + if (!URLCache_CopyEntry( + pContainer, + pHeader, + lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, + pUrlEntry, + FALSE /* ANSI */)) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + return FALSE; + } + TRACE("Local File Name: %s\n", debugstr_a(lpCacheEntryInfo->lpszLocalFileName)); } - TRACE("Local File Name: %s\n", debugstr_a(lpCacheEntryInfo->lpszLocalFileName)); URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1590,18 +1593,21 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, TRACE("Found URL: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); TRACE("Header info: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); - if (!URLCache_CopyEntry( - pContainer, - pHeader, - (LPINTERNET_CACHE_ENTRY_INFOA)lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, - pUrlEntry, - TRUE /* UNICODE */)) + if (lpdwCacheEntryInfoBufferSize) { - URLCacheContainer_UnlockIndex(pContainer, pHeader); - return FALSE; + if (!URLCache_CopyEntry( + pContainer, + pHeader, + (LPINTERNET_CACHE_ENTRY_INFOA)lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, + pUrlEntry, + TRUE /* UNICODE */)) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + return FALSE; + } + TRACE("Local File Name: %s\n", debugstr_w(lpCacheEntryInfo->lpszLocalFileName)); } - TRACE("Local File Name: %s\n", debugstr_w(lpCacheEntryInfo->lpszLocalFileName)); URLCacheContainer_UnlockIndex(pContainer, pHeader);

1 0

Rob Shearman : wininet: Add tests for GetUrlCacheEntryInfoExA.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 64806e642ff770492494bac32551d17b724b8fdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=64806e642ff770492494bac32… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 30 15:24:40 2008 +0100 wininet: Add tests for GetUrlCacheEntryInfoExA. Factorise out bits of the other tests so that the code is cleaner and can be re-used. --- dlls/wininet/tests/urlcache.c | 134 +++++++++++++++++++++++++++-------------- 1 files changed, 88 insertions(+), 46 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 220036a..6570d5a 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -30,56 +30,25 @@ #define TEST_URL "http://urlcachetest.winehq.org/index.html" -static void test_urlcacheA(void) +static char filenameA[MAX_PATH + 1]; + +static void check_cache_entry_infoA(const char *returnedfrom, LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo) +{ + ok(lpCacheEntryInfo->dwStructSize == sizeof(*lpCacheEntryInfo), "%s: dwStructSize was %d\n", returnedfrom, lpCacheEntryInfo->dwStructSize); + ok(!strcmp(lpCacheEntryInfo->lpszSourceUrlName, TEST_URL), "%s: lpszSourceUrlName should be %s instead of %s\n", returnedfrom, TEST_URL, lpCacheEntryInfo->lpszSourceUrlName); + ok(!strcmp(lpCacheEntryInfo->lpszLocalFileName, filenameA), "%s: lpszLocalFileName should be %s instead of %s\n", returnedfrom, filenameA, lpCacheEntryInfo->lpszLocalFileName); + ok(!strcmp(lpCacheEntryInfo->lpszFileExtension, "html"), "%s: lpszFileExtension should be html instead of %s\n", returnedfrom, lpCacheEntryInfo->lpszFileExtension); +} + +static void test_find_url_cache_entriesA(void) { BOOL ret; - char filename[MAX_PATH + 1]; - HANDLE hFile; - DWORD written; - BYTE zero_byte = 0; - LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo; - DWORD cbCacheEntryInfo; - DWORD cbCacheEntryInfoSaved; - static const FILETIME filetime_zero; HANDLE hEnumHandle; BOOL found = FALSE; + DWORD cbCacheEntryInfo; + DWORD cbCacheEntryInfoSaved; + LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo; - ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filename, 0); - ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); - - hFile = CreateFileA(filename, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, - NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA failed with error %d\n", GetLastError()); - - ret = WriteFile(hFile, &zero_byte, sizeof(zero_byte), &written, NULL); - ok(ret, "WriteFile failed with error %d\n", GetLastError()); - - CloseHandle(hFile); - - ret = CommitUrlCacheEntry(TEST_URL, filename, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL); - ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); - - cbCacheEntryInfo = 0; - ret = RetrieveUrlCacheEntryFile(TEST_URL, NULL, &cbCacheEntryInfo, 0); - ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "RetrieveUrlCacheEntryFile should have set last error to ERROR_INSUFFICIENT_BUFFER instead of %d\n", GetLastError()); - - lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); - ret = RetrieveUrlCacheEntryFile(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo, 0); - ok(ret, "RetrieveUrlCacheEntryFile failed with error %d\n", GetLastError()); - - ok(lpCacheEntryInfo->dwStructSize == sizeof(*lpCacheEntryInfo), "lpCacheEntryInfo->dwStructSize was %d\n", lpCacheEntryInfo->dwStructSize); - ok(!strcmp(lpCacheEntryInfo->lpszSourceUrlName, TEST_URL), "lpCacheEntryInfo->lpszSourceUrlName should be %s instead of %s\n", TEST_URL, lpCacheEntryInfo->lpszSourceUrlName); - ok(!strcmp(lpCacheEntryInfo->lpszLocalFileName, filename), "lpCacheEntryInfo->lpszLocalFileName should be %s instead of %s\n", filename, lpCacheEntryInfo->lpszLocalFileName); - ok(!strcmp(lpCacheEntryInfo->lpszFileExtension, "html"), "lpCacheEntryInfo->lpszFileExtension should be html instead of %s\n", lpCacheEntryInfo->lpszFileExtension); - - HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); - - ret = UnlockUrlCacheEntryFile(TEST_URL, 0); - ok(ret, "UnlockUrlCacheEntryFile failed with error %d\n", GetLastError()); - - - /* test Find*UrlCacheEntry functions */ cbCacheEntryInfo = 0; hEnumHandle = FindFirstUrlCacheEntry(NULL, NULL, &cbCacheEntryInfo); ok(!hEnumHandle, "FindFirstUrlCacheEntry should have failed\n"); @@ -114,12 +83,85 @@ static void test_urlcacheA(void) ret = FindCloseUrlCache(hEnumHandle); ok(ret, "FindCloseUrlCache failed with error %d\n", GetLastError()); +} + +static void test_GetUrlCacheEntryInfoExA(void) +{ + BOOL ret; + DWORD cbCacheEntryInfo; + LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo; + + ret = GetUrlCacheEntryInfoEx(NULL, NULL, NULL, NULL, NULL, NULL, 0); + ok(!ret, "GetUrlCacheEntryInfoEx with NULL URL and NULL args should have failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetUrlCacheEntryInfoEx with NULL URL and NULL args should have set last error to ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); + + ret = GetUrlCacheEntryInfoEx(TEST_URL, NULL, NULL, NULL, NULL, NULL, 0); + ok(ret, "GetUrlCacheEntryInfoEx with NULL args failed with error %d\n", GetLastError()); + + cbCacheEntryInfo = 0; + ret = GetUrlCacheEntryInfoEx(TEST_URL, NULL, &cbCacheEntryInfo, NULL, NULL, NULL, 0); + ok(!ret, "GetUrlCacheEntryInfoEx with zero-length buffer should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetUrlCacheEntryInfoEx should have set last error to ERROR_INSUFFICIENT_BUFFER instead of %d\n", GetLastError()); + + lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); + ret = GetUrlCacheEntryInfoEx(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo, NULL, NULL, NULL, 0); + ok(ret, "GetUrlCacheEntryInfoEx failed with error %d\n", GetLastError()); + + check_cache_entry_infoA("GetUrlCacheEntryInfoEx", lpCacheEntryInfo); + + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); +} + +static void test_urlcacheA(void) +{ + BOOL ret; + HANDLE hFile; + DWORD written; + BYTE zero_byte = 0; + LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo; + DWORD cbCacheEntryInfo; + static const FILETIME filetime_zero; + + ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filenameA, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + + hFile = CreateFileA(filenameA, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA failed with error %d\n", GetLastError()); + + ret = WriteFile(hFile, &zero_byte, sizeof(zero_byte), &written, NULL); + ok(ret, "WriteFile failed with error %d\n", GetLastError()); + + CloseHandle(hFile); + + ret = CommitUrlCacheEntry(TEST_URL, filenameA, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL); + ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); + + cbCacheEntryInfo = 0; + ret = RetrieveUrlCacheEntryFile(TEST_URL, NULL, &cbCacheEntryInfo, 0); + ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "RetrieveUrlCacheEntryFile should have set last error to ERROR_INSUFFICIENT_BUFFER instead of %d\n", GetLastError()); + + lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); + ret = RetrieveUrlCacheEntryFile(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo, 0); + ok(ret, "RetrieveUrlCacheEntryFile failed with error %d\n", GetLastError()); + + check_cache_entry_infoA("RetrieveUrlCacheEntryFile", lpCacheEntryInfo); + + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + + ret = UnlockUrlCacheEntryFile(TEST_URL, 0); + ok(ret, "UnlockUrlCacheEntryFile failed with error %d\n", GetLastError()); + + /* test Find*UrlCacheEntry functions */ + test_find_url_cache_entriesA(); + test_GetUrlCacheEntryInfoExA(); ret = DeleteUrlCacheEntry(TEST_URL); ok(ret, "DeleteUrlCacheEntry failed with error %d\n", GetLastError()); - ret = DeleteFile(filename); + ret = DeleteFile(filenameA); todo_wine ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "local file should no longer exist\n"); }

1 0

Rob Shearman : cryptdlg: Add stubs for CertTrustInit, CertTrustCertPolicy, CertTrustCleanup and CertTrustFinalPolicy.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: bad1e17ee969bf6a9c616bb19727e0e132cef825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bad1e17ee969bf6a9c616bb19… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 30 15:23:36 2008 +0100 cryptdlg: Add stubs for CertTrustInit, CertTrustCertPolicy, CertTrustCleanup and CertTrustFinalPolicy. --- dlls/cryptdlg/cryptdlg.spec | 8 ++++---- dlls/cryptdlg/main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/cryptdlg/cryptdlg.spec b/dlls/cryptdlg/cryptdlg.spec index 70f38b9..135f803 100644 --- a/dlls/cryptdlg/cryptdlg.spec +++ b/dlls/cryptdlg/cryptdlg.spec @@ -1,9 +1,9 @@ 1 stub CertConfigureTrustA 2 stub CertConfigureTrustW -3 stub CertTrustCertPolicy -4 stub CertTrustCleanup -5 stub CertTrustFinalPolicy -6 stub CertTrustInit +3 stdcall CertTrustCertPolicy(ptr long long long) +4 stdcall CertTrustCleanup(ptr) +5 stdcall CertTrustFinalPolicy(ptr) +6 stdcall CertTrustInit(ptr) 7 stub DecodeAttrSequence 8 stub DecodeRecipientID 9 stub EncodeAttrSequence diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c index c3c2ae7..2a4a02e 100644 --- a/dlls/cryptdlg/main.c +++ b/dlls/cryptdlg/main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "wincrypt.h" +#include "wintrust.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(cryptdlg); @@ -46,6 +47,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +/*********************************************************************** + * GetFriendlyNameOfCertA (CRYPTDLG.@) + */ DWORD GetFriendlyNameOfCertA(PCCERT_CONTEXT pccert, LPSTR pchBuffer, DWORD cchBuffer) { @@ -53,9 +57,48 @@ DWORD GetFriendlyNameOfCertA(PCCERT_CONTEXT pccert, LPSTR pchBuffer, pchBuffer, cchBuffer); } +/*********************************************************************** + * GetFriendlyNameOfCertW (CRYPTDLG.@) + */ DWORD GetFriendlyNameOfCertW(PCCERT_CONTEXT pccert, LPWSTR pchBuffer, DWORD cchBuffer) { return CertGetNameStringW(pccert, CERT_NAME_FRIENDLY_DISPLAY_TYPE, 0, NULL, pchBuffer, cchBuffer); } + +/*********************************************************************** + * CertTrustInit (CRYPTDLG.@) + */ +HRESULT WINAPI CertTrustInit(CRYPT_PROVIDER_DATA *pProvData) +{ + FIXME("(%p)\n", pProvData); + return E_NOTIMPL; +} + +/*********************************************************************** + * CertTrustCertPolicy (CRYPTDLG.@) + */ +BOOL WINAPI CertTrustCertPolicy(CRYPT_PROVIDER_DATA *pProvData, DWORD idxSigner, BOOL fCounterSignerChain, DWORD idxCounterSigner) +{ + FIXME("(%p, %d, %s, %d)\n", pProvData, idxSigner, fCounterSignerChain ? "TRUE" : "FALSE", idxCounterSigner); + return FALSE; +} + +/*********************************************************************** + * CertTrustCleanup (CRYPTDLG.@) + */ +HRESULT WINAPI CertTrustCleanup(CRYPT_PROVIDER_DATA *pProvData) +{ + FIXME("(%p)\n", pProvData); + return E_NOTIMPL; +} + +/*********************************************************************** + * CertTrustFinalPolicy (CRYPTDLG.@) + */ +HRESULT WINAPI CertTrustFinalPolicy(CRYPT_PROVIDER_DATA *pProvData) +{ + FIXME("(%p)\n", pProvData); + return E_NOTIMPL; +}

1 0

Rob Shearman : widl: Add the parsing of storage classes into declaration-specifiers.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: e71219e66e1b76d0982cf3d18840e4fe693f3c40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71219e66e1b76d0982cf3d18… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 30 15:23:23 2008 +0100 widl: Add the parsing of storage classes into declaration-specifiers. Support the static and register keywords. This consolidates externdef and constdef rules into one declaration rule. --- tools/widl/header.c | 49 ++++++++++++++++++---- tools/widl/header.h | 4 +- tools/widl/parser.l | 2 + tools/widl/parser.y | 107 ++++++++++++++++++++++++++++++++---------------- tools/widl/widltypes.h | 3 +- 5 files changed, 116 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e71219e66e1b76d0982cf…

1 0

Rob Shearman : widl: Prepare for supporting storage classes in declaration statements.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: d64e4c26eee73ebb1c73241bad89cae05c384642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64e4c26eee73ebb1c73241ba… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 30 15:23:13 2008 +0100 widl: Prepare for supporting storage classes in declaration statements. Return a decl_spec_t structure from decl_spec rules so that the storage class and type qualifiers can both be returned. --- tools/widl/parser.y | 101 +++++++++++++++++++++++++++++++++++++----------- tools/widl/widltypes.h | 9 ++++ 2 files changed, 87 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d64e4c26eee73ebb1c732…

1 0

Alexandre Julliard : dxerr9: Don' t use Wine debugging macros in static libraries.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: a2073f2979ea9e440247ea0503be4dce840fc782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2073f2979ea9e440247ea050… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 30 14:24:49 2008 +0200 dxerr9: Don't use Wine debugging macros in static libraries. --- dlls/dxerr9/dxerr9.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/dxerr9/dxerr9.c b/dlls/dxerr9/dxerr9.c index 7939c99..7eabff1 100644 --- a/dlls/dxerr9/dxerr9.c +++ b/dlls/dxerr9/dxerr9.c @@ -42,10 +42,6 @@ #include "dxerr9.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dxerr); - typedef struct { HRESULT hr; const CHAR* resultA; @@ -59,7 +55,6 @@ typedef struct { const char * WINAPI DXGetErrorString9A(HRESULT hr) { unsigned int i, j, k = 0; - TRACE("(0x%08x)\n", hr); for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { j = k + (i / 2); @@ -78,7 +73,6 @@ const WCHAR * WINAPI DXGetErrorString9W(HRESULT hr) { static const WCHAR unknown[] = { 'U', 'n', 'k', 'n', 'o', 'w', 'n', 0 }; unsigned int i, j, k = 0; - TRACE("(0x%08x)\n", hr); for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { j = k + (i / 2); @@ -96,7 +90,6 @@ const WCHAR * WINAPI DXGetErrorString9W(HRESULT hr) const char * WINAPI DXGetErrorDescription9A(HRESULT hr) { unsigned int i, j, k = 0; - TRACE("(0x%08x)\n", hr); for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { j = k + (i / 2); @@ -115,7 +108,6 @@ const WCHAR * WINAPI DXGetErrorDescription9W(HRESULT hr) { static const WCHAR na[] = { 'n', '/', 'a', 0 }; unsigned int i, j, k = 0; - TRACE("(0x%08x)\n", hr); for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { j = k + (i / 2); @@ -133,7 +125,6 @@ const WCHAR * WINAPI DXGetErrorDescription9W(HRESULT hr) HRESULT WINAPI DXTraceA(const char* strFile, DWORD dwLine, HRESULT hr, const char* strMsg, BOOL bPopMsgBox) { char msg[1024]; - TRACE("(%p,%d,0x%08x,%p,%d)\n", strFile, dwLine, hr, strMsg, bPopMsgBox); if (bPopMsgBox) { snprintf(msg, sizeof(msg), "File: %s\nLine: %d\nError Code: %s (0x%08x)\nCalling: %s", @@ -151,7 +142,6 @@ HRESULT WINAPI DXTraceA(const char* strFile, DWORD dwLine, HRESULT hr, const cha HRESULT WINAPI DXTraceW(const char* strFile, DWORD dwLine, HRESULT hr, const WCHAR* strMsg, BOOL bPopMsgBox) { WCHAR msg[1024]; - TRACE("(%p,%d,0x%08x,%p,%d)\n", strFile, dwLine, hr, strMsg, bPopMsgBox); if (bPopMsgBox) { static const WCHAR format[] = { 'F','i','l','e',':',' ','%','s','\\','n','L','i','n',

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2008