wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Jason Edmeades : cmd: Add full support for copy concatenation and ascii/ binary.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 130cdcd72704bda70c5f13c711cd3febdd151825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=130cdcd72704bda70c5f13c71… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Fri Oct 12 10:23:24 2012 +0100 cmd: Add full support for copy concatenation and ascii/binary. --- programs/cmd/builtins.c | 101 +++++++++++++++++++++++++---- programs/cmd/tests/test_builtins.cmd | 4 + programs/cmd/tests/test_builtins.cmd.exp | 29 +++++---- 3 files changed, 106 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=130cdcd72704bda70c5f1…

1 0

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

15 Oct '12

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@Skipping file size check on NT4 Passed: file size check on file3 [11]@or_broken@Skipping file size check on NT4 Passed: file size check on file1_default [5]@or_broken@Skipping file size check on NT4 Passed: file size check on file1_default2 [5]@or_broken@Skipping file size check on NT4 -@todo_wine@Passed: file size check on file1_plus_eof [6]@or_broken@Skipping file size check on NT4 -@todo_wine@Passed: file size check on file2_plus_eof [9]@or_broken@Skipping file size check on NT4 -@todo_wine@Passed: file size check on file3_plus_eof [12]@or_broken@Skipping file size check on NT4 +Passed: file size check on file1_plus_eof [6]@or_broken@Skipping file size check on NT4 +Passed: file size check on file2_plus_eof [9]@or_broken@Skipping file size check on NT4 +Passed: file size check on file3_plus_eof [12]@or_broken@Skipping file size check on NT4 @todo_wine@Passed: file size check on file12_plus_eof [14]@or_broken@Skipping file size check on NT4 @todo_wine@Passed: file size check on file12_no_eof [13]@or_broken@Skipping file size check on NT4 @todo_wine@Passed: file size check on file12_eof2 [14]@or_broken@Skipping file size check on NT4 -@todo_wine@Passed: file size check on file1_binary_srccopy [6]@or_broken@Skipping file size check on NT4 -Passed: file size check on file1_ascii_srccopy [5]@or_broken@Skipping file size check on NT4 +Passed: file size check on file1_binary_srccopy [6]@or_broken@Skipping file size check on NT4 +@todo_wine@Passed: file size check on file1_ascii_srccopy [5]@or_broken@Skipping file size check on NT4 @todo_wine@Passed: file size check on file123_default_copy [25]@or_broken@Skipping file size check on NT4 @todo_wine@Passed: file size check on file123_ascii_copy [25]@or_broken@Skipping file size check on NT4 @todo_wine@Passed: file size check on file123_binary_copy [27]@or_broken@Skipping file size check on NT4

1 0

Jason Edmeades : cmd: Add suite of tests for the copy command.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: a65314c8fa9bcfaad380261fd94e3ad35b7e955d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a65314c8fa9bcfaad380261fd… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Oct 11 23:40:21 2012 +0100 cmd: Add suite of tests for the copy command. --- programs/cmd/tests/test_builtins.cmd | 297 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 57 ++++++ 2 files changed, 354 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a65314c8fa9bcfaad3802…

1 0

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

15 Oct '12

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@R S'@or_broken@'' @todo_wine@'@drive@@shortpath@T'@or_broken@'' @todo_wine@'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' -@todo_wine@''@or_broken@'%~ai' -@todo_wine@''@or_broken@'%~ai' -@todo_wine@'--a------'@or_broken@'%~ai' -@todo_wine@''@or_broken@'%~ti' -@todo_wine@''@or_broken@'%~ti' -@todo_wine@''@or_broken@'%~zi' -@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 the body of WCMD_copy based on new parameter parsing.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 7b9971abf908409bd75e06b2efdb40f6f84e940d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b9971abf908409bd75e06b2e… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Oct 9 20:11:50 2012 +0100 cmd: Rework the body of WCMD_copy based on new parameter parsing. --- programs/cmd/builtins.c | 363 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 251 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b9971abf908409bd75e0…

1 0

Jason Edmeades : cmd: Rework parameter parsing for WCMD_Copy.
by Alexandre Julliard 15 Oct '12

15 Oct '12

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

Jason Edmeades : cmd: Fix regression around prompting during copy.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 270163f38086c231926f96516b9dca31097a90f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=270163f38086c231926f96516… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Oct 4 09:57:33 2012 +0100 cmd: Fix regression around prompting during copy. --- programs/cmd/wcmdmain.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 3c18356..5109ecf 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1162,7 +1162,10 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Special case BAT and CMD */ if (ext && (!strcmpiW(ext, batExt) || !strcmpiW(ext, cmdExt))) { + BOOL oldinteractive = interactive; + interactive = FALSE; WCMD_batch (thisDir, command, called, NULL, INVALID_HANDLE_VALUE); + interactive = oldinteractive; return; } else {

1 0

Alexandre Julliard : gdi32: Always return the full DIB surface in GetImage and adjust coordinates accordingly .
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 36f2b09632261d6f5467e4c4cc20e561f5baec4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=36f2b09632261d6f5467e4c4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 14:16:28 2012 +0200 gdi32: Always return the full DIB surface in GetImage and adjust coordinates accordingly. Based on a patch by Ken Thomases. --- dlls/gdi32/dibdrv/bitblt.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index ccddac9..e65dcbc 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -816,7 +816,7 @@ static DWORD get_image_dib_info( dib_info *dib, BITMAPINFO *info, info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrImportant = 0; info->bmiHeader.biWidth = dib->width; - info->bmiHeader.biHeight = dib->height - dib->rect.top; + info->bmiHeader.biHeight = dib->height; info->bmiHeader.biBitCount = dib->bit_count; info->bmiHeader.biSizeImage = info->bmiHeader.biHeight * abs( dib->stride ); if (dib->stride > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; @@ -825,14 +825,13 @@ static DWORD get_image_dib_info( dib_info *dib, BITMAPINFO *info, if (bits) { - if (dib->stride < 0) - bits->ptr = (char *)dib->bits.ptr + (dib->rect.bottom - 1) * dib->stride; - else - bits->ptr = (char *)dib->bits.ptr + dib->rect.top * dib->stride; + bits->ptr = dib->bits.ptr; bits->is_copy = FALSE; bits->free = NULL; + if (dib->stride < 0) bits->ptr = (char *)bits->ptr + (dib->height - 1) * dib->stride; src->x += dib->rect.left; - offset_rect( &src->visrect, dib->rect.left, 0 ); + src->y += dib->rect.top; + offset_rect( &src->visrect, dib->rect.left, dib->rect.top ); } return ERROR_SUCCESS; }

1 0

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

15 Oct '12

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 15 Oct '12

15 Oct '12

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

← Newer
1
...
50
51
52
53
54
55
56
...
96
Older →

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 October 2012