October 2012 - Wine-Commits

Nikolay Sivov : ole32: Fix debug output for user marshal flags.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: af5cee18624482b5d184a18cb24f06605c9eaaa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5cee18624482b5d184a18cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 14 10:27:22 2012 -0400 ole32: Fix debug output for user marshal flags. --- dlls/ole32/usrmarshal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 8f5feef..d1f56c7 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -74,9 +74,9 @@ static const char* debugstr_user_flags(ULONG *pFlags) } if (HIWORD(*pFlags) == NDR_LOCAL_DATA_REPRESENTATION) - return wine_dbg_sprintf("MAKELONG(NDR_LOCAL_REPRESENTATION, %s)", loword); + return wine_dbg_sprintf("MAKELONG(%s, NDR_LOCAL_DATA_REPRESENTATION)", loword); else - return wine_dbg_sprintf("MAKELONG(0x%04x, %s)", HIWORD(*pFlags), loword); + return wine_dbg_sprintf("MAKELONG(%s, 0x%04x)", loword, HIWORD(*pFlags)); } /******************************************************************************

1 0

Jason Edmeades : cmd: Support copy to an 'ascii' destination.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: 260210f6e60755e980a73870852bd837821a72d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=260210f6e60755e980a738708… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Fri Oct 12 00:37:24 2012 +0100 cmd: Support copy to an 'ascii' destination. --- programs/cmd/builtins.c | 49 ++++++++++++++++++++++++++---- programs/cmd/tests/test_builtins.cmd.exp | 10 +++--- 2 files changed, 48 insertions(+), 11 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 9e66cb0..c560602 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -371,6 +371,36 @@ void WCMD_choice (const WCHAR * command) { } /**************************************************************************** + * WCMD_AppendEOF + * + * Adds an EOF onto the end of a file + * Returns TRUE on success + */ +static BOOL WCMD_AppendEOF(WCHAR *filename) +{ + HANDLE h; + + char eof = '\x1a'; + + WINE_TRACE("Appending EOF to %s\n", wine_dbgstr_w(filename)); + h = CreateFileW(filename, GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + + if (h == NULL) { + WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); + return FALSE; + } else { + SetFilePointer (h, 0, NULL, FILE_END); + if (!WriteFile(h, &eof, 1, NULL, NULL)) { + WINE_ERR("Failed to append EOF to %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); + return FALSE; + } + CloseHandle(h); + } + return TRUE; +} + +/**************************************************************************** * WCMD_copy * * Copy a file or wildcarded set. @@ -800,10 +830,6 @@ void WCMD_copy(WCHAR * command) { WINE_FIXME("Need to ascii copy %s to %s - dropping to binary copy\n", wine_dbgstr_w(srcpath), wine_dbgstr_w(outname)); } - /* Append EOF if ascii destination and we are not going to add more onto the end */ - if (!destination->binarycopy && !anyconcats) { - WINE_FIXME("Need to ascii copy destination (append EOF)\n"); - } status = CopyFileW(srcpath, outname, FALSE); if (!status) { WCMD_print_error (); @@ -811,6 +837,14 @@ void WCMD_copy(WCHAR * command) { } else { WINE_TRACE("Copied successfully\n"); if (anyconcats) writtenoneconcat = TRUE; + + /* Append EOF if ascii destination and we are not going to add more onto the end */ + if (!destination->binarycopy && !anyconcats) { + if (!WCMD_AppendEOF(outname)) { + WCMD_print_error (); + errorlevel = 1; + } + } } } } @@ -829,8 +863,11 @@ void WCMD_copy(WCHAR * command) { } /* Append EOF if ascii destination and we were concatenating */ - if (!destination->binarycopy && anyconcats && writtenoneconcat) { - WINE_FIXME("Need to ascii copy destination (append EOF) to concatenated file\n"); + if (!errorlevel && !destination->binarycopy && anyconcats && writtenoneconcat) { + if (!WCMD_AppendEOF(destination->name)) { + WCMD_print_error (); + errorlevel = 1; + } } /* Exit out of the routine, freeing any remaing allocated memory */ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 9eebcdf..620e44b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -879,14 +879,14 @@ Passed: file size check on file2 [8]@or_broken(a)Skipping file size check on NT4 Passed: file size check on file3 [11]@or_broken(a)Skipping file size check on NT4 Passed: file size check on file1_default [5]@or_broken(a)Skipping file size check on NT4 Passed: file size check on file1_default2 [5]@or_broken(a)Skipping file size check on NT4 -(a)todo_wine@Passed: file size check on file1_plus_eof [6]@or_broken(a)Skipping file size check on NT4 -(a)todo_wine@Passed: file size check on file2_plus_eof [9]@or_broken(a)Skipping file size check on NT4 -(a)todo_wine@Passed: file size check on file3_plus_eof [12]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on file1_plus_eof [6]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on file2_plus_eof [9]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on file3_plus_eof [12]@or_broken(a)Skipping file size check on NT4 @todo_wine(a)Passed: file size check on file12_plus_eof [14]@or_broken(a)Skipping file size check on NT4 @todo_wine(a)Passed: file size check on file12_no_eof [13]@or_broken(a)Skipping file size check on NT4 @todo_wine(a)Passed: file size check on file12_eof2 [14]@or_broken(a)Skipping file size check on NT4 -(a)todo_wine@Passed: file size check on file1_binary_srccopy [6]@or_broken(a)Skipping file size check on NT4 -Passed: file size check on file1_ascii_srccopy [5]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on file1_binary_srccopy [6]@or_broken(a)Skipping file size check on NT4 +(a)todo_wine@Passed: file size check on file1_ascii_srccopy [5]@or_broken(a)Skipping file size check on NT4 @todo_wine(a)Passed: file size check on file123_default_copy [25]@or_broken(a)Skipping file size check on NT4 @todo_wine(a)Passed: file size check on file123_ascii_copy [25]@or_broken(a)Skipping file size check on NT4 @todo_wine(a)Passed: file size check on file123_binary_copy [27]@or_broken(a)Skipping file size check on NT4

1 0

Jason Edmeades : cmd: Fix some issues with ~ modifier expansion.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: 8f019b1111a0ad4523eed2ba93f16ef09ba350e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f019b1111a0ad4523eed2ba9… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Oct 11 22:53:38 2012 +0100 cmd: Fix some issues with ~ modifier expansion. --- programs/cmd/batch.c | 111 +++++++++++++++++------------ programs/cmd/tests/test_builtins.cmd | 1 + programs/cmd/tests/test_builtins.cmd.exp | 15 ++-- 3 files changed, 74 insertions(+), 53 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index b77931d..6fc9970 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -430,11 +430,6 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, modifierLen = lastModifier - firstModifier; finaloutput[0] = 0x00; - /* Useful for debugging purposes: */ - /*printf("Modifier string '%*.*s' and variable is %c\n Param starts as '%s'\n", - (modifierLen), (modifierLen), firstModifier, *lastModifier, - outputparam);*/ - /* 1. Handle '~' : Strip surrounding quotes */ if (outputparam[0]=='"' && memchrW(firstModifier, '~', modifierLen) != NULL) { @@ -477,64 +472,69 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, exists = GetFileAttributesExW(fullfilename, GetFileExInfoStandard, &fileInfo); - /* 2. Handle 'a' : Output attributes */ - if (exists && - memchrW(firstModifier, 'a', modifierLen) != NULL) { + /* 2. Handle 'a' : Output attributes (File doesn't have to exist) */ + if (memchrW(firstModifier, 'a', modifierLen) != NULL) { WCHAR defaults[] = {'-','-','-','-','-','-','-','-','-','\0'}; doneModifier = TRUE; - strcpyW(thisoutput, defaults); - if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - thisoutput[0]='d'; - if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_READONLY) - thisoutput[1]='r'; - if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE) - thisoutput[2]='a'; - if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) - thisoutput[3]='h'; - if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) - thisoutput[4]='s'; - if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED) - thisoutput[5]='c'; - /* FIXME: What are 6 and 7? */ - if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) - thisoutput[8]='l'; - strcatW(finaloutput, thisoutput); + + if (exists) { + strcpyW(thisoutput, defaults); + if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + thisoutput[0]='d'; + if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_READONLY) + thisoutput[1]='r'; + if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE) + thisoutput[2]='a'; + if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) + thisoutput[3]='h'; + if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) + thisoutput[4]='s'; + if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED) + thisoutput[5]='c'; + /* FIXME: What are 6 and 7? */ + if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) + thisoutput[8]='l'; + strcatW(finaloutput, thisoutput); + } } - /* 3. Handle 't' : Date+time */ - if (exists && - memchrW(firstModifier, 't', modifierLen) != NULL) { + /* 3. Handle 't' : Date+time (File doesn't have to exist) */ + if (memchrW(firstModifier, 't', modifierLen) != NULL) { SYSTEMTIME systime; int datelen; doneModifier = TRUE; - if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); - /* Format the time */ - FileTimeToSystemTime(&fileInfo.ftLastWriteTime, &systime); - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &systime, - NULL, thisoutput, MAX_PATH); - strcatW(thisoutput, spaceW); - datelen = strlenW(thisoutput); - GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &systime, - NULL, (thisoutput+datelen), MAX_PATH-datelen); - strcatW(finaloutput, thisoutput); + if (exists) { + if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); + + /* Format the time */ + FileTimeToSystemTime(&fileInfo.ftLastWriteTime, &systime); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &systime, + NULL, thisoutput, MAX_PATH); + strcatW(thisoutput, spaceW); + datelen = strlenW(thisoutput); + GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &systime, + NULL, (thisoutput+datelen), MAX_PATH-datelen); + strcatW(finaloutput, thisoutput); + } } - /* 4. Handle 'z' : File length */ - if (exists && - memchrW(firstModifier, 'z', modifierLen) != NULL) { + /* 4. Handle 'z' : File length (File doesn't have to exist) */ + if (memchrW(firstModifier, 'z', modifierLen) != NULL) { /* FIXME: Output full 64 bit size (sprintf does not support I64 here) */ ULONG/*64*/ fullsize = /*(fileInfo.nFileSizeHigh << 32) +*/ fileInfo.nFileSizeLow; static const WCHAR fmt[] = {'%','u','\0'}; doneModifier = TRUE; - if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); - wsprintfW(thisoutput, fmt, fullsize); - strcatW(finaloutput, thisoutput); + if (exists) { + if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); + wsprintfW(thisoutput, fmt, fullsize); + strcatW(finaloutput, thisoutput); + } } /* 4. Handle 's' : Use short paths (File doesn't have to exist) */ @@ -557,14 +557,18 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, WCHAR fname[MAX_PATH]; WCHAR ext[MAX_PATH]; BOOL doneFileModifier = FALSE; - - if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); + BOOL addSpace = (finaloutput[0] != 0x00); /* Split into components */ WCMD_splitpath(fullfilename, drive, dir, fname, ext); /* 5. Handle 'd' : Drive Letter */ if (memchrW(firstModifier, 'd', modifierLen) != NULL) { + if (addSpace) { + strcatW(finaloutput, spaceW); + addSpace = FALSE; + } + strcatW(finaloutput, drive); doneModifier = TRUE; doneFileModifier = TRUE; @@ -572,6 +576,11 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, /* 6. Handle 'p' : Path */ if (memchrW(firstModifier, 'p', modifierLen) != NULL) { + if (addSpace) { + strcatW(finaloutput, spaceW); + addSpace = FALSE; + } + strcatW(finaloutput, dir); doneModifier = TRUE; doneFileModifier = TRUE; @@ -579,6 +588,11 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, /* 7. Handle 'n' : Name */ if (memchrW(firstModifier, 'n', modifierLen) != NULL) { + if (addSpace) { + strcatW(finaloutput, spaceW); + addSpace = FALSE; + } + strcatW(finaloutput, fname); doneModifier = TRUE; doneFileModifier = TRUE; @@ -586,6 +600,11 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, /* 8. Handle 'x' : Ext */ if (memchrW(firstModifier, 'x', modifierLen) != NULL) { + if (addSpace) { + strcatW(finaloutput, spaceW); + addSpace = FALSE; + } + strcatW(finaloutput, ext); doneModifier = TRUE; doneFileModifier = TRUE; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 8a47238..44d7f2f 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -347,6 +347,7 @@ rem file attribute for %%i in ("U V" W) do echo '%%~ai' echo foo> foo for %%i in (foo) do echo '%%~ai' +for %%i in (foo) do echo '%%~zi' del foo rem file date/time rem Not fully testable, until we can grep dir's output to get foo's creation time in an envvar... diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 4bab1ef..ec11324 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -303,13 +303,14 @@ N @todo_wine@'@drive@@shortpath(a)R S'@or_broken@'' @todo_wine@'@drive@@shortpath(a)T'@or_broken@'' @todo_wine@'@drive@@shortpath(a)ABCDEFGHIJK.LMNOP'@or_broken@'' -(a)todo_wine@''@or_broken@'%~ai' -(a)todo_wine@''@or_broken@'%~ai' -(a)todo_wine@'--a------'@or_broken@'%~ai' -(a)todo_wine@''@or_broken@'%~ti' -(a)todo_wine@''@or_broken@'%~ti' -(a)todo_wine@''@or_broken@'%~zi' -(a)todo_wine@''@or_broken@'%~zi' +''@or_broken@'%~ai' +''@or_broken@'%~ai' +'--a------'@or_broken@'%~ai' +'5'@or_broken@'%~zi' +''@or_broken@'%~ti' +''@or_broken@'%~ti' +''@or_broken@'%~zi' +''@or_broken@'%~zi' @drive@@path@ @drive@@path@ @drive@

1 0

Jason Edmeades : cmd: Rework parameter parsing for WCMD_Copy.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: 89b8868ae057d25ebbfe420e157e05318d85a16d URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b8868ae057d25ebbfe420e1… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Oct 8 21:25:58 2012 +0100 cmd: Rework parameter parsing for WCMD_Copy. --- programs/cmd/builtins.c | 221 +++++++++++++++++++++++++++++++++++++++++++++-- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 214 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89b8868ae057d25ebbfe4…

1 0

Alexandre Julliard : winex11: Remove the no longer needed GetAsyncKeyState entry point.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: 710858abee7a1808c2b17ef00a69f284b342708b URL: http://source.winehq.org/git/wine.git/?a=commit;h=710858abee7a1808c2b17ef00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 12:21:05 2012 +0200 winex11: Remove the no longer needed GetAsyncKeyState entry point. --- dlls/winex11.drv/keyboard.c | 10 ---------- dlls/winex11.drv/winex11.drv.spec | 1 - 2 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index ae7e72b..039d15b 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1902,16 +1902,6 @@ static BOOL match_x11_keyboard_layout(HKL hkl) return (hkl == xHkl); } -/********************************************************************** - * GetAsyncKeyState (X11DRV.@) - */ -SHORT CDECL X11DRV_GetAsyncKeyState(INT key) -{ - /* Photoshop livelocks unless mouse events are included here */ - X11DRV_MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_KEY | QS_MOUSE, 0 ); - return -1; -} - /*********************************************************************** * GetKeyboardLayout (X11DRV.@) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 8f68a47..db3e4f5 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -6,7 +6,6 @@ @ cdecl ActivateKeyboardLayout(long long) X11DRV_ActivateKeyboardLayout @ cdecl Beep() X11DRV_Beep -@ cdecl GetAsyncKeyState(long) X11DRV_GetAsyncKeyState @ cdecl GetKeyNameText(long ptr long) X11DRV_GetKeyNameText @ cdecl GetKeyboardLayout(long) X11DRV_GetKeyboardLayout @ cdecl GetKeyboardLayoutName(ptr) X11DRV_GetKeyboardLayoutName

1 0

Jacek Caban : mshtml: Added IHTMLLinkElement::href property implementation.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: cfef60a30e8724335451e1aa203f609fb295ef25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfef60a30e8724335451e1aa2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 15 11:17:42 2012 +0200 mshtml: Added IHTMLLinkElement::href property implementation. --- dlls/mshtml/htmllink.c | 22 ++++++++++++++++++---- dlls/mshtml/tests/dom.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index a200b50..cfbdcb9 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -105,15 +105,29 @@ static HRESULT WINAPI HTMLLinkElement_Invoke(IHTMLLinkElement *iface, DISPID dis static HRESULT WINAPI HTMLLinkElement_put_href(IHTMLLinkElement *iface, BSTR v) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString href_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&href_str, v); + nsres = nsIDOMHTMLLinkElement_SetHref(This->nslink, &href_str); + nsAString_Finish(&href_str); + + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLLinkElement_get_href(IHTMLLinkElement *iface, BSTR *p) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString href_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&href_str, NULL); + nsres = nsIDOMHTMLLinkElement_GetHref(This->nslink, &href_str); + return return_nsstr(nsres, &href_str, p); } static HRESULT WINAPI HTMLLinkElement_put_rel(IHTMLLinkElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cc6c836..02ba3ef 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -64,7 +64,7 @@ static const char elem_test_str[] = "</body></html>"; static const char elem_test2_str[] = "<html><head><title>test</title><style>.body { margin-right: 0px; }</style>" - "<link id=\"linkid\" rel=\"stylesheet\" href=\"some.css\" type=\"text/css\"></head>" + "<link id=\"linkid\" rel=\"stylesheet\" href=\"about:blank\" type=\"text/css\"></head>" "<body><div id=\"divid\" emptyattr=\"\" onclick=\"parseInt();\"></div></body>" "</html>"; @@ -3515,6 +3515,37 @@ static void _link_put_type(unsigned line, IHTMLElement *elem, const char *v) _test_link_type(line, elem, v); } +#define test_link_href(a,b) _test_link_href(__LINE__,a,b) +static void _test_link_href(unsigned line, IHTMLElement *elem, const char *v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + BSTR href; + HRESULT hres; + + hres = IHTMLLinkElement_get_href(link, &href); + ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08x\n", hres); + if(v) + ok_(__FILE__,line)(!strcmp_wa(href, v), "href = %s, expected %s\n", wine_dbgstr_w(href), v); + else + ok_(__FILE__,line)(!href, "href = %s, expected NULL\n", wine_dbgstr_w(href)); + + IHTMLLinkElement_Release(link); +} + +#define link_put_href(a,b) _link_put_href(__LINE__,a,b) +static void _link_put_href(unsigned line, IHTMLElement *elem, const char *v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + BSTR str = a2bstr(v); + HRESULT hres; + + hres = IHTMLLinkElement_put_href(link, str); + ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08x\n", hres); + SysFreeString(str); + IHTMLLinkElement_Release(link); + _test_link_href(line, elem, v); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -6018,9 +6049,11 @@ static void test_elems2(IHTMLDocument2 *doc) test_link_disabled(elem, VARIANT_FALSE); test_link_rel(elem, "stylesheet"); test_link_type(elem, "text/css"); + test_link_href(elem, "about:blank"); link_put_disabled(elem, VARIANT_TRUE); link_put_rel(elem, "prev"); link_put_type(elem, "text/plain"); + link_put_href(elem, "about:prev"); IHTMLElement_Release(elem); }

1 0

Alexandre Julliard : user32: Flush window surfaces in all functions that are used to poll for input.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: d5244c3b242afda6c09dc95ae69b09dcde414f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5244c3b242afda6c09dc95ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 12:20:28 2012 +0200 user32: Flush window surfaces in all functions that are used to poll for input. --- dlls/user32/input.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 5a99201..3ca71a6 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -353,6 +353,12 @@ HWND WINAPI GetCapture(void) } +static void check_for_events( UINT flags ) +{ + if (USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, flags, 0 ) == WAIT_TIMEOUT) + flush_window_surfaces( TRUE ); +} + /********************************************************************** * GetAsyncKeyState (USER32.@) * @@ -367,6 +373,8 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) if (key < 0 || key >= 256) return 0; + check_for_events( QS_INPUT ); + if ((ret = USER_Driver->pGetAsyncKeyState( key )) == -1) { if (thread_info->key_state && @@ -400,7 +408,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) */ DWORD WINAPI GetQueueStatus( UINT flags ) { - DWORD ret = 0; + DWORD ret; if (flags & ~(QS_ALLINPUT | QS_ALLPOSTMESSAGE | QS_SMRESULT)) { @@ -408,8 +416,7 @@ DWORD WINAPI GetQueueStatus( UINT flags ) return 0; } - /* check for pending X events */ - USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, flags, 0 ); + check_for_events( flags ); SERVER_START_REQ( get_queue_status ) { @@ -427,10 +434,9 @@ DWORD WINAPI GetQueueStatus( UINT flags ) */ BOOL WINAPI GetInputState(void) { - DWORD ret = 0; + DWORD ret; - /* check for pending X events */ - USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_INPUT, 0 ); + check_for_events( QS_INPUT ); SERVER_START_REQ( get_queue_status ) {

1 0

Jacek Caban : mshtml: Added IHTMLLinkElement:: disabled property implementation.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: 9608714d04e786276652a16fed724d3bbf204bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9608714d04e786276652a16fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 15 11:16:51 2012 +0200 mshtml: Added IHTMLLinkElement::disabled property implementation. --- dlls/mshtml/htmllink.c | 48 +++++++++++++++++++++++++++++++++++++++------- dlls/mshtml/nsiface.idl | 27 ++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index 837538e..e23a808 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -34,6 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; IHTMLLinkElement IHTMLLinkElement_iface; + + nsIDOMHTMLLinkElement *nslink; } HTMLLinkElement; static inline HTMLLinkElement *impl_from_IHTMLLinkElement(IHTMLLinkElement *iface) @@ -214,15 +217,28 @@ static HRESULT WINAPI HTMLLinkElement_get_styleSheet(IHTMLLinkElement *iface, IH static HRESULT WINAPI HTMLLinkElement_put_disabled(IHTMLLinkElement *iface, VARIANT_BOOL v) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%x)\n", This, v); + + nsres = nsIDOMHTMLLinkElement_SetDisabled(This->nslink, !!v); + return SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLLinkElement_get_disabled(IHTMLLinkElement *iface, VARIANT_BOOL *p) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool ret; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLLinkElement_GetDisabled(This->nslink, &ret); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = ret ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLLinkElement_put_media(IHTMLLinkElement *iface, BSTR v) @@ -289,19 +305,28 @@ static HRESULT HTMLLinkElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } -static void HTMLLinkElement_destructor(HTMLDOMNode *iface) +static HRESULT HTMLLinkElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) { HTMLLinkElement *This = impl_from_HTMLDOMNode(iface); + return IHTMLLinkElement_put_disabled(&This->IHTMLLinkElement_iface, v); +} - HTMLElement_destructor(&This->element.node); +static HRESULT HTMLLinkElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOOL *p) +{ + HTMLLinkElement *This = impl_from_HTMLDOMNode(iface); + return IHTMLLinkElement_get_disabled(&This->IHTMLLinkElement_iface, p); } static const NodeImplVtbl HTMLLinkElementImplVtbl = { HTMLLinkElement_QI, - HTMLLinkElement_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_handle_event, - HTMLElement_get_attr_col + HTMLElement_get_attr_col, + NULL, + NULL, + HTMLLinkElementImpl_put_disabled, + HTMLLinkElementImpl_get_disabled, }; static const tid_t HTMLLinkElement_iface_tids[] = { @@ -319,6 +344,7 @@ static dispex_static_data_t HTMLLinkElement_dispex = { HRESULT HTMLLinkElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement **elem) { HTMLLinkElement *ret; + nsresult nsres; ret = heap_alloc_zero(sizeof(*ret)); if(!ret) @@ -329,6 +355,12 @@ HRESULT HTMLLinkElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement_Init(&ret->element, doc, nselem, &HTMLLinkElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLLinkElement, (void**)&ret->nslink); + + /* Share nslink reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nslink == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); + *elem = &ret->element; return S_OK; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 79b3eee..3dbcac0 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1902,6 +1902,33 @@ interface nsIDOMHTMLAnchorElement : nsIDOMHTMLElement [ object, + uuid(59ae3529-170a-41e4-8d7a-241dca6b5760), + local +] +interface nsIDOMHTMLLinkElement : nsIDOMHTMLElement +{ + nsresult GetDisabled(bool *aDisabled); + nsresult SetDisabled(bool aDisabled); + nsresult GetCharset(nsAString *aCharset); + nsresult SetCharset(const nsAString *aCharset); + nsresult GetHref(nsAString *aHref); + nsresult SetHref(const nsAString *aHref); + nsresult GetHreflang(nsAString *aHreflang); + nsresult SetHreflang(const nsAString *aHreflang); + nsresult GetMedia(nsAString *aMedia); + nsresult SetMedia(const nsAString *aMedia); + nsresult GetRel(nsAString *aRel); + nsresult SetRel(const nsAString *aRel); + nsresult GetRev(nsAString *aRev); + nsresult SetRev(const nsAString *aRev); + nsresult GetTarget(nsAString *aTarget); + nsresult SetTarget(const nsAString *aTarget); + nsresult GetType(nsAString *aType); + nsresult SetType(const nsAString *aType); +} + +[ + object, uuid(ae50de74-bc26-402e-85dc-a980f506b655), local ] diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7c84d0c..f6ce2f0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -64,6 +64,7 @@ static const char elem_test_str[] = "</body></html>"; static const char elem_test2_str[] = "<html><head><title>test</title><style>.body { margin-right: 0px; }</style>" + "<link id=\"linkid\" rel=\"stylesheet\" href=\"some.css\" type=\"text/css\"></head>" "<body><div id=\"divid\" emptyattr=\"\" onclick=\"parseInt();\"></div></body>" "</html>"; @@ -866,6 +867,17 @@ static IHTMLMetaElement *_get_metaelem_iface(unsigned line, IUnknown *unk) return ret; } +#define get_link_iface(u) _get_link_iface(__LINE__,u) +static IHTMLLinkElement *_get_link_iface(unsigned line, IUnknown *unk) +{ + IHTMLLinkElement *ret; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLLinkElement, (void**)&ret); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLLinkElement: %08x\n", hres); + return ret; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -3415,6 +3427,32 @@ static void _test_meta_httpequiv(unsigned line, IUnknown *unk, const char *exval IHTMLMetaElement_Release(meta); } +#define test_link_disabled(a,b) _test_link_disabled(__LINE__,a,b) +static void _test_link_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + VARIANT_BOOL b = 10; + HRESULT hres; + + hres = IHTMLLinkElement_get_disabled(link, &b); + ok_(__FILE__,line)(hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line)(b == v, "disabled = %x, expected %x\n", b, v); + + IHTMLLinkElement_Release(link); +} + +#define link_put_disabled(a,b) _link_put_disabled(__LINE__,a,b) +static void _link_put_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + HRESULT hres; + + hres = IHTMLLinkElement_put_disabled(link, v); + ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08x\n", hres); + IHTMLLinkElement_Release(link); + _test_link_disabled(line, elem, v); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -5913,6 +5951,13 @@ static void test_elems2(IHTMLDocument2 *doc) div = get_doc_elem_by_id(doc, "divid"); + elem = get_elem_by_id(doc, "linkid", TRUE); + if(elem) { + test_link_disabled(elem, VARIANT_FALSE); + link_put_disabled(elem, VARIANT_TRUE); + IHTMLElement_Release(elem); + } + test_elem_set_innerhtml((IUnknown*)div, "<div id=\"innerid\"></div>"); elem2 = get_doc_elem_by_id(doc, "innerid"); ok(elem2 != NULL, "elem2 == NULL\n");

1 0

Jacek Caban : vbscript: Added Chr implementation.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: 02f6ea925ec898aaca72b80e473fb7ea100a3e5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f6ea925ec898aaca72b80e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 15 11:15:51 2012 +0200 vbscript: Added Chr implementation. --- dlls/vbscript/global.c | 25 +++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 4 ++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 7d60a49..4a4dd8e 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1070,8 +1070,29 @@ static HRESULT Global_Asc(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Chr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int c; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + hres = to_int(arg, &c); + if(FAILED(hres)) + return hres; + + if(c <= 0 || c >= 0x100) { + FIXME("invalid arg\n"); + return E_FAIL; + } + + if(res) { + WCHAR ch = c; + + V_VT(res) = VT_BSTR; + V_BSTR(res) = SysAllocStringLen(&ch, 1); + if(!V_BSTR(res)) + return E_OUTOFMEMORY; + } + return S_OK; } static HRESULT Global_AscW(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 7ccbaa1..e986362 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -50,6 +50,10 @@ TestCStr 3, "3" if isEnglishLang then TestCStr 3.5, "3.5" if isEnglishLang then TestCStr true, "True" +Call ok(getVT(Chr(120)) = "VT_BSTR", "getVT(Chr(120)) = " & getVT(Chr(120))) +Call ok(getVT(Chr(255)) = "VT_BSTR", "getVT(Chr(255)) = " & getVT(Chr(255))) +Call ok(Chr(120) = "x", "Chr(120) = " & Chr(120)) + Call ok(isObject(new EmptyClass), "isObject(new EmptyClass) is not true?") Set x = new EmptyClass Call ok(isObject(x), "isObject(x) is not true?")

1 0

Jacek Caban : mshtml: Added IHTMLLinkElement stub implementation.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: b75e2c4ddefd0842146d62f7addfe84d30f57f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75e2c4ddefd0842146d62f7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 15 11:16:30 2012 +0200 mshtml: Added IHTMLLinkElement stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem.c | 2 + dlls/mshtml/htmllink.c | 334 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/tests/dom.c | 15 ++- 5 files changed, 353 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b75e2c4ddefd0842146d6…

1 0