September 2012 - Wine-commits

Nikolay Sivov : mlang: Forward ConvertStringToUnicode() to IMultiLanguage3 implementation.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: c8c624a9c3b10968012d6d5cc5c53d060adc1fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c624a9c3b10968012d6d5cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 26 17:41:39 2012 +0400 mlang: Forward ConvertStringToUnicode() to IMultiLanguage3 implementation. --- dlls/mlang/mlang.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index d56dd1a..1d82291 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2152,15 +2152,16 @@ static HRESULT WINAPI fnIMultiLanguage_ConvertString( static HRESULT WINAPI fnIMultiLanguage_ConvertStringToUnicode( IMultiLanguage* iface, - DWORD* pdwMode, - DWORD dwEncoding, - CHAR* pSrcStr, - UINT* pcSrcSize, - WCHAR* pDstStr, - UINT* pcDstSize) + DWORD* mode, + DWORD src_enc, + CHAR* src, + UINT* src_size, + WCHAR* dest, + UINT* dest_size) { - return ConvertINetMultiByteToUnicode(pdwMode, dwEncoding, - (LPCSTR)pSrcStr, (LPINT)pcSrcSize, pDstStr, (LPINT)pcDstSize); + MLang_impl *This = impl_from_IMultiLanguage( iface ); + return IMultiLanguage3_ConvertStringToUnicode(&This->IMultiLanguage3_iface, + mode, src_enc, src, src_size, dest, dest_size); } static HRESULT WINAPI fnIMultiLanguage_ConvertStringFromUnicode(

1 0

Nikolay Sivov : mlang: Forward ConvertStringReset() to IMultiLanguage3.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 1ed2bd14b71ebe140b2376570c01aa7f183344d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed2bd14b71ebe140b2376570… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 26 17:43:40 2012 +0400 mlang: Forward ConvertStringReset() to IMultiLanguage3. --- dlls/mlang/mlang.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 1d82291..67c318b 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2180,8 +2180,8 @@ static HRESULT WINAPI fnIMultiLanguage_ConvertStringFromUnicode( static HRESULT WINAPI fnIMultiLanguage_ConvertStringReset( IMultiLanguage* iface) { - FIXME("\n"); - return E_NOTIMPL; + MLang_impl *This = impl_from_IMultiLanguage( iface ); + return IMultiLanguage3_ConvertStringReset(&This->IMultiLanguage3_iface); } static HRESULT WINAPI fnIMultiLanguage_GetRfc1766FromLcid(

1 0

Jason Edmeades : cmd: Fix parameterization around delimiters.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: e35b239b41317e62659ab94534e34f029d26df3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35b239b41317e62659ab9453… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Wed Sep 26 00:07:20 2012 +0100 cmd: Fix parameterization around delimiters. --- programs/cmd/batch.c | 63 ++++++++++++++++++++++-------- programs/cmd/builtins.c | 36 +++++++++-------- programs/cmd/directory.c | 2 +- programs/cmd/tests/test_builtins.cmd | 44 +++++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 59 ++++++++++++++++++++-------- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 8 ++-- 7 files changed, 154 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e35b239b41317e62659ab…

1 0

Jason Edmeades : cmd: Add circumflex support into command shell.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: d8c0fbcedc266fadcb48cd560adcc909c9738d0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c0fbcedc266fadcb48cd560… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Sep 25 13:45:28 2012 +0100 cmd: Add circumflex support into command shell. --- programs/cmd/tests/test_builtins.cmd.exp | 34 +++++++++++++++--------------- programs/cmd/wcmdmain.c | 4 +++ 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index a4f874c..b019280 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -123,7 +123,7 @@ bar2 'a', '~`+', '.{}!+b' 'a', 'b', '' '"a;b"', '', '' -(a)todo_wine@'a', 'b', '' +'a', 'b', '' 'a[b]{c}(d)e', '', '' 'a', '', '' second line @@ -197,25 +197,25 @@ A B C ------------ Testing circumflex escape character ------------ -(a)todo_wine@hello, world -(a)todo_wine@hello, world -(a)todo_wine@hell^o, world -(a)todo_wine@hell^o, world +hello, world +hello, world +hell^o, world +hell^o, world +baz baz -(a)todo_wine@baz -(a)todo_wine@foo | echo bar -(a)todo_wine@foo & echo bar -(a)todo_wine@bak & +foo | echo bar +foo & echo bar +bak & baz(a)space@ 0(a)or_broken@1 -(a)todo_wine@foo > foo -(a)todo_wine@< -(a)todo_wine@ffoof -(a)todo_wine@FOO=bar | baz -(a)todo_wine@0 -(a)todo_wine@FOO=bar ^| baz -(a)todo_wine@bar | baz -(a)todo_wine@0 +foo > foo +< +ffoof +FOO=bar | baz +0 +FOO=bar ^| baz +bar | baz +0 ------------ Testing 'set' ------------ 1 0 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 94d2b76..a328f83 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2070,6 +2070,10 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE } break; + case '^': if (!inQuotes) curPos++; + curCopyTo[(*curLen)++] = *curPos; + break; + case '&': if (!inQuotes) { lastWasRedirect = FALSE;

1 0

Jason Edmeades : cmd: Support for ^ character at end of line.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 2ff533c1f2c6b6054260d7a448126a0d32015a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ff533c1f2c6b6054260d7a44… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Sep 25 21:02:09 2012 +0100 cmd: Support for ^ character at end of line. Based on a patch by John Chow. --- programs/cmd/tests/test_builtins.cmd | 9 +++++ programs/cmd/tests/test_builtins.cmd.exp | 6 +++ programs/cmd/wcmdmain.c | 52 +++++++++++++++++++++++++---- 3 files changed, 59 insertions(+), 8 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index e8ffe53..7c4b37f 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -197,6 +197,15 @@ echo ^hell^o, world echo hell^o, world echo hell^^o, world echo hell^^^o, world +echo hello^ +world +echo hello^ + +world +echo hello^ + + +echo finished mkdir foobar echo baz> foobar\baz type foobar\baz diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index b019280..2888ffc 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -201,6 +201,12 @@ hello, world hello, world hell^o, world hell^o, world +helloworld +hello +world +hello + +finished baz baz foo | echo bar diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index a328f83..b095deb 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1788,6 +1788,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE BOOL lastWasIn = FALSE; BOOL lastWasElse = FALSE; BOOL lastWasRedirect = TRUE; + BOOL lastWasCaret = FALSE; /* Allocate working space for a command read from keyboard, file etc */ if (!extraSpace) @@ -1856,6 +1857,12 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE lastWasWhiteSpace, onlyWhiteSpace); */ + /* Prevent overflow caused by the caret escape char*/ + if (*curLen >= MAXSTRING) { + WINE_ERR("Overflow detected in command\n"); + return NULL; + } + /* Certain commands need special handling */ if (curStringLen == 0 && curCopyTo == curString) { static const WCHAR forDO[] = {'d','o'}; @@ -1928,6 +1935,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE else thisChar = 'X'; /* Character with no special processing */ lastWasWhiteSpace = FALSE; /* Will be reset below */ + lastWasCaret = FALSE; switch (thisChar) { @@ -2070,7 +2078,15 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE } break; - case '^': if (!inQuotes) curPos++; + case '^': if (!inQuotes) { + /* If we reach the end of the input, we need to wait for more */ + if (*(curPos+1) == 0x00) { + lastWasCaret = TRUE; + WINE_TRACE("Caret found at end of line\n"); + break; + } + curPos++; + } curCopyTo[(*curLen)++] = *curPos; break; @@ -2147,8 +2163,9 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE lastWasIn = lastWasDo = FALSE; } - /* If we have reached the end, add this command into the list */ - if (*curPos == 0x00 && *curLen > 0) { + /* If we have reached the end, add this command into the list + Do not add command to list if escape char ^ was last */ + if (*curPos == 0x00 && !lastWasCaret && *curLen > 0) { /* Add an entry to the command list */ WCMD_addCommand(curString, &curStringLen, @@ -2158,19 +2175,38 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE &lastEntry, output); } - /* If we have reached the end of the string, see if bracketing outstanding */ - if (*curPos == 0x00 && curDepth > 0 && readFrom != INVALID_HANDLE_VALUE) { + /* If we have reached the end of the string, see if bracketing or + final caret is outstanding */ + if (*curPos == 0x00 && (curDepth > 0 || lastWasCaret) && + readFrom != INVALID_HANDLE_VALUE) { + WCHAR *extraData; + + WINE_TRACE("Need to read more data as outstanding brackets or carets\n"); inRem = FALSE; prevDelim = CMD_NONE; inQuotes = 0; memset(extraSpace, 0x00, (MAXSTRING+1) * sizeof(WCHAR)); + extraData = extraSpace; /* Read more, skipping any blank lines */ - while (*extraSpace == 0x00) { + do { + WINE_TRACE("Read more input\n"); if (!context) WCMD_output_asis( WCMD_LoadMessage(WCMD_MOREPROMPT)); - if (!WCMD_fgets(extraSpace, MAXSTRING, readFrom)) + if (!WCMD_fgets(extraData, MAXSTRING, readFrom)) break; - } + + /* Edge case for carets - a completely blank line (ie was just + CRLF) is oddly added as an LF but then more data is received (but + only once more!) */ + if (lastWasCaret) { + if (*extraSpace == 0x00) { + WINE_TRACE("Read nothing, so appending LF char and will try again\n"); + *extraData++ = '\r'; + *extraData = 0x00; + } else break; + } + + } while (*extraData == 0x00); curPos = extraSpace; if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); /* Continue to echo commands IF echo is on and in batch program */

1 0

Jason Edmeades : cmd: Echo back command with whitespace removed first.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: a810e41e47172f0929cce27c60147e2b72e5ba83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a810e41e47172f0929cce27c6… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Sep 25 22:05:03 2012 +0100 cmd: Echo back command with whitespace removed first. --- programs/cmd/tests/test_builtins.cmd | 5 +++++ programs/cmd/tests/test_builtins.cmd.exp | 9 +++++++-- programs/cmd/wcmdmain.c | 17 ++++++++++++----- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 7c4b37f..d3bdf04 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -30,6 +30,9 @@ echo @tab@ on @space@ @echo off echo off(a)tab@@space@ +(a)echo noecho1 + @echo noecho2 +@@@@@echo echo3 echo ------------ Testing 'echo' [OFF] ------------ echo word echo 'singlequotedword' @@ -324,6 +327,8 @@ set VAR= echo ------------ Testing variable substitution ------------ echo --- in FOR variables for %%i in ("A B" C) do echo %%i +rem check works when prefix with @ +(a)for %%i in ("A B" C) do echo %%i rem quotes removal for %%i in ("A B" C) do echo '%%~i' rem fully qualified path diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 2888ffc..d2938ce 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -51,7 +51,7 @@ word(a)space@ @pwd@>echo word(a)space@@space@@space@ word(a)space@@space@ -(a)todo_wine@@pwd@>echo word(a)space@ +(a)pwd@>echo word(a)space@ word @pwd@>echo(a)tab@word(a)space@ @@ -63,7 +63,7 @@ word(a)space@@tab@ @pwd@>echo(a)tab@word(a)tab@@space@@space@ word(a)tab@@space@ -(a)todo_wine@@pwd@>echo word(a)space@ +(a)pwd@>echo word(a)space@ word @pwd@>echo(a)space@@tab(a)word@space@ @@ -76,6 +76,9 @@ word @tab(a)word @pwd@>echo @tab@ on @space@@space@ +noecho1 +noecho2 +echo3 ------------ Testing 'echo' [OFF] ------------ word 'singlequotedword' @@ -282,6 +285,8 @@ r(a)or_broken@qwerty --- in FOR variables "A B" C +"A B" +C 'A B'@or_broken@'' 'C'@or_broken@'' @pwd@\C D(a)or_broken@%~ff diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b095deb..c0d4925 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1819,27 +1819,34 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Replace env vars if in a batch context */ if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); + + /* Skip preceeding whitespace */ + while (*curPos == ' ' || *curPos == '\t') curPos++; + /* Show prompt before batch line IF echo is on and in batch program */ - if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) { + if (context && echo_mode && *curPos && (*curPos != '@')) { static const WCHAR echoDot[] = {'e','c','h','o','.'}; static const WCHAR echoCol[] = {'e','c','h','o',':'}; const DWORD len = sizeof(echoDot)/sizeof(echoDot[0]); - DWORD curr_size = strlenW(extraSpace); + DWORD curr_size = strlenW(curPos); DWORD min_len = (curr_size < len ? curr_size : len); WCMD_show_prompt(); - WCMD_output_asis(extraSpace); + WCMD_output_asis(curPos); /* I don't know why Windows puts a space here but it does */ /* Except for lines starting with 'echo.' or 'echo:'. Ask MS why */ if (CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - extraSpace, min_len, echoDot, len) != CSTR_EQUAL + curPos, min_len, echoDot, len) != CSTR_EQUAL && CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - extraSpace, min_len, echoCol, len) != CSTR_EQUAL) + curPos, min_len, echoCol, len) != CSTR_EQUAL) { WCMD_output_asis(spaceW); } WCMD_output_asis(newlineW); } + /* Skip repeated 'no echo' characters */ + while (*curPos == '@') curPos++; + /* Start with an empty string, copying to the command string */ curStringLen = 0; curRedirsLen = 0;

1 0

Jason Edmeades : cmd: Display 'set' sort ordering correctly.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: cd9451c4993ae852df69cac4fe22e2838ae9fbe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd9451c4993ae852df69cac4f… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Sep 25 23:16:54 2012 +0100 cmd: Display 'set' sort ordering correctly. --- programs/cmd/builtins.c | 5 ++++- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ad9d40c..8421194 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2234,13 +2234,16 @@ void WCMD_setshow_date (void) { /**************************************************************************** * WCMD_compare + * Note: Native displays 'fred' before 'fred ', so need to only compare up to + * the equals sign. */ static int WCMD_compare( const void *a, const void *b ) { int r; const WCHAR * const *str_a = a, * const *str_b = b; + static const WCHAR eqW[] = {'=','\0'}; r = CompareStringW( LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - *str_a, -1, *str_b, -1 ); + *str_a, strcspnW(*str_a, eqW), *str_b, strcspnW(*str_b, eqW) ); if( r == CSTR_LESS_THAN ) return -1; if( r == CSTR_GREATER_THAN ) return 1; return 0; diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d2938ce..57bc82a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -235,8 +235,8 @@ FOOBAR = baz baz2 0 bar -(a)todo_wine@FOOBAR= bar -(a)todo_wine@FOOBAR = baz2 +FOOBAR= bar +FOOBAR = baz2 FOOBAR = baz2 FOOBAR not defined 1

1 0

Alexandre Julliard : winex11: Create a default colormap along with the default visual info.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 3c57f11374998d560ddd5c355736f2c6c47d7d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c57f11374998d560ddd5c355… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 26 12:53:16 2012 +0200 winex11: Create a default colormap along with the default visual info. --- dlls/winex11.drv/palette.c | 47 +++++++++++++++------------------------ dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 3 ++ 4 files changed, 23 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c57f11374998d560ddd5…

1 0

Alexandre Julliard : winex11: Remove some unused palette code.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 014ec638d6ba50c68dd41edd3a4a33bf03cbe8a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=014ec638d6ba50c68dd41edd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 26 13:08:40 2012 +0200 winex11: Remove some unused palette code. --- dlls/winex11.drv/palette.c | 48 ++++++------------------------------------- dlls/winex11.drv/x11drv.h | 2 - 2 files changed, 7 insertions(+), 43 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index f5f8628..91476d4 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -134,20 +134,12 @@ static void palette_set_mapping( HPALETTE hpal, int *mapping ) */ int X11DRV_PALETTE_Init(void) { - int mask, white, black; - int monoPlane; int *mapping; PALETTEENTRY sys_pal_template[NB_RESERVED_COLORS]; TRACE("initializing palette manager...\n"); palette_context = XUniqueContext(); - white = WhitePixel( gdi_display, DefaultScreen(gdi_display) ); - black = BlackPixel( gdi_display, DefaultScreen(gdi_display) ); - monoPlane = 1; - for( mask = 1; !((white & mask)^(black & mask)); mask <<= 1 ) - monoPlane++; - X11DRV_PALETTE_PaletteFlags = (white & mask) ? X11DRV_PALETTE_WHITESET : 0; palette_size = default_visual.colormap_size; switch(default_visual.class) @@ -165,11 +157,7 @@ int X11DRV_PALETTE_Init(void) default_visual.visual, AllocAll ); if (default_colormap) { - X11DRV_PALETTE_PaletteFlags |= (X11DRV_PALETTE_PRIVATE | X11DRV_PALETTE_WHITESET); - - monoPlane = 1; - for( white = palette_size - 1; !(white & 1); white >>= 1 ) - monoPlane++; + X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_PRIVATE; if( root_window != DefaultRootWindow(gdi_display) ) { @@ -187,36 +175,20 @@ int X11DRV_PALETTE_Init(void) case TrueColor: X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_VIRTUAL; - case StaticColor: { - int *depths,nrofdepths; - /* FIXME: hack to detect XFree32 XF_VGA16 ... We just have - * depths 1 and 4 - */ - depths = XListDepths(gdi_display,DefaultScreen(gdi_display),&nrofdepths); - if ((nrofdepths==2) && ((depths[0]==4) || depths[1]==4)) { - monoPlane = 1; - for( white = palette_size - 1; !(white & 1); white >>= 1 ) - monoPlane++; - X11DRV_PALETTE_PaletteFlags = (white & mask) ? X11DRV_PALETTE_WHITESET : 0; - } - else - { - X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_FIXED; - X11DRV_PALETTE_ComputeColorShifts(&X11DRV_PALETTE_default_shifts, default_visual.red_mask, default_visual.green_mask, default_visual.blue_mask); - } - XFree(depths); + case StaticColor: + X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_FIXED; + X11DRV_PALETTE_ComputeColorShifts(&X11DRV_PALETTE_default_shifts, default_visual.red_mask, default_visual.green_mask, default_visual.blue_mask); break; - } } - GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, NB_RESERVED_COLORS, sys_pal_template ); - if( X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_VIRTUAL ) { palette_size = 0; } else { + GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, NB_RESERVED_COLORS, sys_pal_template ); + if ((mapping = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(int) * NB_RESERVED_COLORS ))) palette_set_mapping( GetStockObject(DEFAULT_PALETTE), mapping ); @@ -743,12 +715,6 @@ COLORREF X11DRV_PALETTE_ToLogical(X11DRV_PDEVICE *physDev, int pixel) { XColor color; -#if 0 - /* truecolor visual */ - - if (screen_depth >= 24) return pixel; -#endif - /* check for hicolor visuals first */ if ( (X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_FIXED) && !X11DRV_PALETTE_Graymax ) @@ -969,7 +935,7 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) /*********************************************************************** * X11DRV_PALETTE_LookupPixel */ -int X11DRV_PALETTE_LookupPixel(ColorShifts *shifts, COLORREF color ) +static int X11DRV_PALETTE_LookupPixel(ColorShifts *shifts, COLORREF color ) { unsigned char spec_type = color >> 24; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5f5aab0..7a7cfd3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -243,7 +243,6 @@ extern Display *gdi_display DECLSPEC_HIDDEN; /* display to use for all GDI func #define X11DRV_PALETTE_VIRTUAL 0x0002 /* no mapping needed - pixel == pixel color */ #define X11DRV_PALETTE_PRIVATE 0x1000 /* private colormap, identity mapping */ -#define X11DRV_PALETTE_WHITESET 0x2000 extern UINT16 X11DRV_PALETTE_PaletteFlags DECLSPEC_HIDDEN; @@ -259,7 +258,6 @@ extern BOOL X11DRV_IsSolidColor(COLORREF color) DECLSPEC_HIDDEN; extern COLORREF X11DRV_PALETTE_ToLogical(X11DRV_PDEVICE *physDev, int pixel) DECLSPEC_HIDDEN; extern int X11DRV_PALETTE_ToPhysical(X11DRV_PDEVICE *physDev, COLORREF color) DECLSPEC_HIDDEN; extern COLORREF X11DRV_PALETTE_GetColor( X11DRV_PDEVICE *physDev, COLORREF color ) DECLSPEC_HIDDEN; -extern int X11DRV_PALETTE_LookupPixel(ColorShifts *shifts, COLORREF color) DECLSPEC_HIDDEN; extern void X11DRV_PALETTE_ComputeColorShifts(ColorShifts *shifts, unsigned long redMask, unsigned long greenMask, unsigned long blueMask) DECLSPEC_HIDDEN; /* GDI escapes */

1 0

Alexandre Julliard : winex11: Recreate the graphics context when setting the drawable.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 7ee7d3a83f9d9b1ab926aad25e86aadbdca78662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ee7d3a83f9d9b1ab926aad25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 26 12:14:03 2012 +0200 winex11: Recreate the graphics context when setting the drawable. --- dlls/winex11.drv/init.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index a876d39..d6b45d8 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -334,6 +334,9 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d const struct x11drv_escape_set_drawable *data = in_data; physDev->dc_rect = data->dc_rect; physDev->drawable = data->drawable; + XFreeGC( gdi_display, physDev->gc ); + physDev->gc = XCreateGC( gdi_display, physDev->drawable, 0, NULL ); + XSetGraphicsExposures( gdi_display, physDev->gc, False ); XSetSubwindowMode( gdi_display, physDev->gc, data->mode ); TRACE( "SET_DRAWABLE hdc %p drawable %lx dc_rect %s\n", dev->hdc, physDev->drawable, wine_dbgstr_rect(&physDev->dc_rect) );

1 0