April 2008 - Wine-Commits - list.winehq.org

Alex Villacís Lasso : uxtheme: Speed up UXTHEME_SizedBlt in the ST_TILE by building an appropriately-sized memory bitmap out of the tile instead of iterating with UXTHEME_Blt () directly.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: 1706d0d63ed972147eeed6992868f7ea3af8649e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1706d0d63ed972147eeed6992… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 21 09:55:12 2008 -0500 uxtheme: Speed up UXTHEME_SizedBlt in the ST_TILE by building an appropriately-sized memory bitmap out of the tile instead of iterating with UXTHEME_Blt() directly. --- dlls/uxtheme/draw.c | 72 +++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 56 insertions(+), 16 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 73b9615..ca3d903 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -340,27 +340,67 @@ static inline BOOL UXTHEME_SizedBlt (HDC hdcDst, int nXOriginDst, int nYOriginDs { if (sizingtype == ST_TILE) { - int yOfs = nYOriginDst; - int yRemaining = nHeightDst; - while (yRemaining > 0) + HDC hdcTemp; + BOOL result = FALSE; + + /* Create a DC with a bitmap consisting of a tiling of the source + bitmap, with standard GDI functions. This is faster than an + iteration with UXTHEME_Blt(). */ + hdcTemp = CreateCompatibleDC(hdcSrc); + if (hdcTemp != 0) { - int bltHeight = min (yRemaining, nHeightSrc); - int xOfs = nXOriginDst; - int xRemaining = nWidthDst; + HBITMAP bitmapTemp; + HBITMAP bitmapOrig; + int nWidthTemp, nHeightTemp; + int xOfs, xRemaining; + int yOfs, yRemaining; + int growSize; + + /* Calculate temp dimensions of integer multiples of source dimensions */ + nWidthTemp = ((nWidthDst + nWidthSrc - 1) / nWidthSrc) * nWidthSrc; + nHeightTemp = ((nHeightDst + nHeightSrc - 1) / nHeightSrc) * nHeightSrc; + bitmapTemp = CreateCompatibleBitmap(hdcSrc, nWidthTemp, nHeightTemp); + bitmapOrig = SelectObject(hdcTemp, bitmapTemp); + + /* Initial copy of bitmap */ + BitBlt(hdcTemp, 0, 0, nWidthSrc, nHeightSrc, hdcSrc, nXOriginSrc, nYOriginSrc, SRCCOPY); + + /* Extend bitmap in the X direction. Growth of width is exponential */ + xOfs = nWidthSrc; + xRemaining = nWidthTemp - nWidthSrc; + growSize = nWidthSrc; while (xRemaining > 0) { - int bltWidth = min (xRemaining, nWidthSrc); - if (!UXTHEME_Blt (hdcDst, xOfs, yOfs, bltWidth, bltHeight, - hdcSrc, nXOriginSrc, nYOriginSrc, - transparent, transcolor)) - return FALSE; - xOfs += nWidthSrc; - xRemaining -= nWidthSrc; + growSize = min(growSize, xRemaining); + BitBlt(hdcTemp, xOfs, 0, growSize, nHeightSrc, hdcTemp, 0, 0, SRCCOPY); + xOfs += growSize; + xRemaining -= growSize; + growSize *= 2; } - yOfs += nHeightSrc; - yRemaining -= nHeightSrc; + + /* Extend bitmap in the Y direction. Growth of height is exponential */ + yOfs = nHeightSrc; + yRemaining = nHeightTemp - nHeightSrc; + growSize = nHeightSrc; + while (yRemaining > 0) + { + growSize = min(growSize, yRemaining); + BitBlt(hdcTemp, 0, yOfs, nWidthTemp, growSize, hdcTemp, 0, 0, SRCCOPY); + yOfs += growSize; + yRemaining -= growSize; + growSize *= 2; + } + + /* Use temporary hdc for source */ + result = UXTHEME_Blt (hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, + hdcTemp, 0, 0, + transparent, transcolor); + + SelectObject(hdcTemp, bitmapOrig); + DeleteObject(bitmapTemp); } - return TRUE; + DeleteDC(hdcTemp); + return result; } else {

1 0

Alexander Nicolaysen Sørnes : xcopy: Add Norwegian Bokmål resource.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: 2e798b52ef8aaf8e99f450fe7de0d2382d9465c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e798b52ef8aaf8e99f450fe7… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Apr 21 22:12:29 2008 +0200 xcopy: Add Norwegian Bokmål resource. --- programs/xcopy/No.rc | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ programs/xcopy/rsrc.rc | 1 + 2 files changed, 80 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/No.rc b/programs/xcopy/No.rc new file mode 100644 index 0000000..561b53c --- /dev/null +++ b/programs/xcopy/No.rc @@ -0,0 +1,79 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Norwegian Bokm�l language support + * + * Copyright (C) 2008 Alexander N. S�rnes <alex(a)thehandofagony.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE +{ + STRING_INVPARMS, "Ugyldig antall parametere; bruk �xcopy /?� for hjelp\n" + STRING_INVPARM, "Ugyldig parameter �%s�; bruk �xcopy /?� for hjelp\n" + STRING_PAUSE, "Trykk Enter for � begynne � kopiere\n" + STRING_SIMCOPY, "%d fil(er) ville blitt kopiert\n" + STRING_COPY, "%d fil(er) kopiert\n" + STRING_QISDIR, "Eer �%s� et filnevn eller katalog\n" \ + "i m�let?\n" \ + "(F - Fil, K - Katalog)\n" + STRING_SRCPROMPT,"%s? (Ja|Nei)\n" + STRING_OVERWRITE,"Skrive over �%s�? (Ja|Nei|Alle)\n" + STRING_COPYFAIL, "Klarte ikke kopiere �%s� til �%s�; feilet med r/c %d\n" + STRING_OPENFAIL, "Klarte ikke �pne �%s�\n" + STRING_READFAIL, "Klarte ikke lese �%s�\n" + STRING_YES_CHAR, "J" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "K" + + STRING_HELP, +"XCOPY - Kopierer filer eller katalogtre til en m�lplassering\n\ +\n\ +Syntax:\n\ +XCOPY kilde [m�l] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Where:\n\ +\n\ +[/I] Anta at m�let er en katalog hvis m�let ikke finnes og 2 eller\n\ + \tflere filer blir kopiert\n\ +[/S] Kopier kataloger og underkataloger\n\ +[/E] Kopier kataloger og underkataloger, ta med tomme kataloger\n\ +[/Q] Stille modus: ikke vis filnavn under kopiering\n\ +[/F] Fil hele kilde- og m�lnavn under kopiering\n\ +[/L] Simuler operasjonen; vis bare hva som ville blitt kopiert\n\ +[/W] Sp�r for koperingen starter\n\ +[/T] Lag tom katalogstruktur; ikke kopier filer\n\ +[/Y] Ikke sp�r n�r filer skal overskrives\n\ +[/-Y] Sp�r f�r filer skal overskrives\n\ +[/P] Sp�r for hver kildefil som skal kopieres\n\ +[/N] Kopier som korte filnavn (8.3 tegn)\n\ +[/U] Bare kopier filer som allerede finnes i m�let\n\ +[/R] Skriv over filer som er skrivebeskyttet\n\ +[/H] Kopier skjulte filer og systemfiler\n\ +[/C] Fortsett selv om det oppst�r feil under kopieringen\n\ +[/A] Ikke kopier filer som er markert som arkiv\n\ +[/M] Bare kopier filer som er markert som akriv; fjerner denne merkingen \n\ +[/D | /D:m-d-�] Kopier nye filer eller de som er endret etter\n\ + \t\tden oppgitte datoen.\n\ + \t\tHvis ingen dato oppgis kopieres bare de filene som er\n\ + \t\teldre i m�let enn i kilden\n\n" + +} diff --git a/programs/xcopy/rsrc.rc b/programs/xcopy/rsrc.rc index aa3346c..3087216 100644 --- a/programs/xcopy/rsrc.rc +++ b/programs/xcopy/rsrc.rc @@ -26,6 +26,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Fr.rc" #include "Ko.rc" #include "Nl.rc" +#include "No.rc" #include "Pl.rc" #include "Ru.rc" #include "Si.rc"

1 0

Alexander Nicolaysen Sørnes : start: Update Norwegian Bokmål resource.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: 69cf2fc5c1322f674ac49056493ed561a6702e5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=69cf2fc5c1322f674ac490564… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Apr 21 21:48:31 2008 +0200 start: Update Norwegian Bokmål resource. --- programs/start/No.rc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/start/No.rc b/programs/start/No.rc index 6d33f86..8b2b651 100644 --- a/programs/start/No.rc +++ b/programs/start/No.rc @@ -2,7 +2,7 @@ * Start * Norwegian Bokm�l Language Support * - * Copyright 2005 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2008 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,6 +33,7 @@ Valg: \n\ /MAX[imized] Start programmet maksimert. \n\ /R[estored] Start programmet normalt (hverken minimert eller maksimert). \n\ /W[ait] Vent til programmet avslutter, og avslutt med programmets \n\ avsluttingskode. \n\ +/Unix Bruk et Unix-filnavn og start filen som Windows Utforsker (explorer). \n\ /L Vis sluttbruker-lisensen. \n\ \n\ start.exe versjon 0.2 Kopirett for 2003 tilh�rer Dan Kegel \n\ @@ -61,4 +62,6 @@ Se filen 'COPYING.LIB' for lisensinformasjon. \n\ " STRING_EXECFAIL "Kunne ikke starte programmet, eller intet program er tilknyttet den oppgitte filen.\n'ShellExecuteEx' feilet" + +STRING_UNIXFAIL "Klarte ikke � konvertere Unix-filnavnet til et DOS-filnavn." }

1 0

Lei Zhang : gdiplus: Do not access freed memory in a test.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: 321dfcc7a987d0be5738bdc8642d0531fb6db7d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=321dfcc7a987d0be5738bdc86… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 21 16:15:58 2008 -0700 gdiplus: Do not access freed memory in a test. --- dlls/gdiplus/tests/graphics.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index edd98d7..77f1597 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -72,20 +72,30 @@ static void check_no_duplicates(node * log) { INT dups = 0; node * temp = NULL; + node * temp2 = NULL; + node * orig = log; if(!log) goto end; do{ - HeapFree(GetProcessHeap(), 0, temp); temp = log; - while((temp = temp->next)) - if(log->data == temp->data) + while((temp = temp->next)){ + if(log->data == temp->data){ dups++; - + break; + } + if(dups > 0) + break; + } }while((log = log->next)); - HeapFree(GetProcessHeap(), 0, temp); + temp = orig; + do{ + temp2 = temp->next; + HeapFree(GetProcessHeap(), 0, temp); + temp = temp2; + }while(temp); end: expect(0, dups);

1 0

Lei Zhang : gdiplus: Initialize variables in the graphics test.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: 9c9209ac0b45a7ca01ca42b04aeadb0a2219f9bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9209ac0b45a7ca01ca42b04… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 21 16:08:47 2008 -0700 gdiplus: Initialize variables in the graphics test. --- dlls/gdiplus/tests/graphics.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 6a6bc3d..edd98d7 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -99,6 +99,7 @@ static void test_save_restore(void) GpGraphics *graphics1, *graphics2; node * state_log = NULL; HDC hdc = GetDC(0); + state_a = state_b = state_c = 0xdeadbeef; /* Invalid saving. */ GdipCreateFromHDC(hdc, &graphics1);

1 0

Michael Stefaniuc : winecfg: Update and fix the Romanian translation.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: 92a8beb7cf321130ac08c85f81b2d8ae7c37742f URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a8beb7cf321130ac08c85f8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 22 00:51:06 2008 +0200 winecfg: Update and fix the Romanian translation. --- programs/winecfg/Ro.rc | 181 ++++++++++++++++++++++++++---------------------- 1 files changed, 99 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92a8beb7cf321130ac08c…

1 0

Michael Stefaniuc : winecfg: Fix typos in the En(US) resource.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: f12034b31e1ba98a868c0ea885e9977072569fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12034b31e1ba98a868c0ea88… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 22 00:50:39 2008 +0200 winecfg: Fix typos in the En(US) resource. --- programs/winecfg/En.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index f31a0a9..65b6fd1 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -316,13 +316,13 @@ BEGIN IDC_SYSPARAMS_INACTIVE_BORDER "Inactive Border" IDC_SYSPARAMS_BUTTON_SHADOW "Controls Shadow" IDC_SYSPARAMS_GRAY_TEXT "Gray Text" - IDC_SYSPARAMS_BUTTON_HILIGHT "Controls Hilight" + IDC_SYSPARAMS_BUTTON_HILIGHT "Controls Highlight" IDC_SYSPARAMS_BUTTON_DARK_SHADOW "Controls Dark Shadow" IDC_SYSPARAMS_BUTTON_LIGHT "Controls Light" IDC_SYSPARAMS_BUTTON_ALTERNATE "Controls Alternate Background" IDC_SYSPARAMS_HOT_TRACKING "Hot Tracked Item" IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "Active Title Bar Gradient" - IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Inactive Tile Bar Gradient" - IDC_SYSPARAMS_MENU_HILIGHT "Menu Hilight" + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Inactive Title Bar Gradient" + IDC_SYSPARAMS_MENU_HILIGHT "Menu Highlight" IDC_SYSPARAMS_MENUBAR "Menu Bar" END

1 0

Alex Villacís Lasso : richedit: Accept RTF stream that does not start with {\rtf1 in 1.0 emulation.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: e0af297466b0c12ab8ba78e359d6a46ffd5eca8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0af297466b0c12ab8ba78e35… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 21 17:50:14 2008 -0500 richedit: Accept RTF stream that does not start with {\rtf1 in 1.0 emulation. --- dlls/riched20/editor.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 42f7216..9c4a013 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1068,7 +1068,8 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ME_StreamInFill(&inStream); if (!inStream.editstream->dwError) { - if (strncmp(inStream.buffer, "{\\rtf", 5) && strncmp(inStream.buffer, "{\\urtf", 6)) + if ((!editor->bEmulateVersion10 && strncmp(inStream.buffer, "{\\rtf", 5) && strncmp(inStream.buffer, "{\\urtf", 6)) + || (editor->bEmulateVersion10 && *inStream.buffer != '{')) { format &= ~SF_RTF; format |= SF_TEXT;

1 0

Alex Villacís Lasso : richedit: EM_STREAMIN tests for richedit 2.0.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: 2353e1d2808b186b7469e4077d55002d4b4efdf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2353e1d2808b186b7469e4077… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 21 17:31:28 2008 -0500 richedit: EM_STREAMIN tests for richedit 2.0. --- dlls/riched20/tests/editor.c | 92 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 92 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index dd7640c..69d9ac3 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -2302,6 +2302,97 @@ static DWORD CALLBACK EditStreamCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, return 1; /* indicates callback failed */ } +static DWORD CALLBACK test_EM_STREAMIN_esCallback(DWORD_PTR dwCookie, + LPBYTE pbBuff, + LONG cb, + LONG *pcb) +{ + const char** str = (const char**)dwCookie; + int size = strlen(*str); + *pcb = cb; + if (*pcb > size) { + *pcb = size; + } + if (*pcb > 0) { + memcpy(pbBuff, *str, *pcb); + *str += *pcb; + } + return 0; +} + + +static void test_EM_STREAMIN(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + LRESULT result; + EDITSTREAM es; + char buffer[1024] = {0}; + + const char * streamText1 = + "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang12298{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset0 System;}}\r\n" \ + "\\viewkind4\\uc1\\pard\\f0\\fs17 TestSomeText\\par\r\n" \ + "}\r\n"; + + /* In richedit 2.0 mode, this should NOT be accepted, unlike 1.0 */ + const char * streamText2 = + "{{\\colortbl;\\red0\\green255\\blue102;\\red255\\green255\\blue255;" \ + "\\red170\\green255\\blue255;\\red255\\green238\\blue0;\\red51\\green255" \ + "\\blue221;\\red238\\green238\\blue238;}\\tx0 \\tx424 \\tx848 \\tx1272 " \ + "\\tx1696 \\tx2120 \\tx2544 \\tx2968 \\tx3392 \\tx3816 \\tx4240 \\tx4664 " \ + "\\tx5088 \\tx5512 \\tx5936 \\tx6360 \\tx6784 \\tx7208 \\tx7632 \\tx8056 " \ + "\\tx8480 \\tx8904 \\tx9328 \\tx9752 \\tx10176 \\tx10600 \\tx11024 " \ + "\\tx11448 \\tx11872 \\tx12296 \\tx12720 \\tx13144 \\cf2 RichEdit1\\line }"; + + const char * streamText3 = "RichEdit1"; + + es.dwCookie = (DWORD_PTR)&streamText1; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_RTF), (LPARAM)&es); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + todo_wine { + ok (result == 12, + "EM_STREAMIN: Test 1 returned %ld, expected 12\n", result); + } + result = strcmp (buffer,"TestSomeText"); + todo_wine { + ok (result == 0, + "EM_STREAMIN: Test 1 set wrong text: Result: %s\n",buffer); + } + + es.dwCookie = (DWORD_PTR)&streamText2; + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_RTF), (LPARAM)&es); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + todo_wine { + ok (result == 0, + "EM_STREAMIN: Test 2 returned %ld, expected 0\n", result); + } + todo_wine { + ok (strlen(buffer) == 0, + "EM_STREAMIN: Test 2 set wrong text: Result: %s\n",buffer); + } + + es.dwCookie = (DWORD_PTR)&streamText3; + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_RTF), (LPARAM)&es); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + todo_wine { + ok (result == 0, + "EM_STREAMIN: Test 3 returned %ld, expected 9\n", result); + } + todo_wine { + ok (strlen(buffer) == 0, + "EM_STREAMIN: Test 3 set wrong text: Result: %s\n",buffer); + } + + DestroyWindow(hwndRichEdit); +} + static void test_EM_StreamIn_Undo(void) { /* The purpose of this test is to determine when a EM_StreamIn should be @@ -2820,6 +2911,7 @@ START_TEST( editor ) test_EM_GETMODIFY(); test_EM_EXSETSEL(); test_WM_PASTE(); + test_EM_STREAMIN(); test_EM_StreamIn_Undo(); test_EM_FORMATRANGE(); test_unicode_conversions();

1 0

Alex Villacís Lasso : richedit: EM_STREAMIN tests for richedit 1.0 emulation.
by Alexandre Julliard April 22, 2008

April 22, 2008

Module: wine Branch: master Commit: 54bc660d954ab2021e08de8c7b651c7c0134f3bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=54bc660d954ab2021e08de8c7… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 21 17:29:29 2008 -0500 richedit: EM_STREAMIN tests for richedit 1.0 emulation. --- dlls/riched32/tests/editor.c | 95 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 906623f..ac53572 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -153,6 +153,100 @@ static void test_WM_GETTEXTLENGTH(void) DestroyWindow(hwndRichEdit); } +static DWORD CALLBACK test_EM_STREAMIN_esCallback(DWORD_PTR dwCookie, + LPBYTE pbBuff, + LONG cb, + LONG *pcb) +{ + const char** str = (const char**)dwCookie; + int size = strlen(*str); + *pcb = cb; + if (*pcb > size) { + *pcb = size; + } + if (*pcb > 0) { + memcpy(pbBuff, *str, *pcb); + *str += *pcb; + } + return 0; +} + + +static void test_EM_STREAMIN(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + LRESULT result; + EDITSTREAM es; + char buffer[1024] = {0}; + + const char * streamText1 = + "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang12298{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset0 System;}}\r\n" \ + "\\viewkind4\\uc1\\pard\\f0\\fs17 TestSomeText\\par\r\n" \ + "}\r\n"; + + /* This should be accepted in richedit 1.0 emulation. See bug #8326 */ + const char * streamText2 = + "{{\\colortbl;\\red0\\green255\\blue102;\\red255\\green255\\blue255;" \ + "\\red170\\green255\\blue255;\\red255\\green238\\blue0;\\red51\\green255" \ + "\\blue221;\\red238\\green238\\blue238;}\\tx0 \\tx424 \\tx848 \\tx1272 " \ + "\\tx1696 \\tx2120 \\tx2544 \\tx2968 \\tx3392 \\tx3816 \\tx4240 \\tx4664 " \ + "\\tx5088 \\tx5512 \\tx5936 \\tx6360 \\tx6784 \\tx7208 \\tx7632 \\tx8056 " \ + "\\tx8480 \\tx8904 \\tx9328 \\tx9752 \\tx10176 \\tx10600 \\tx11024 " \ + "\\tx11448 \\tx11872 \\tx12296 \\tx12720 \\tx13144 \\cf2 RichEdit1\\line }"; + + const char * streamText3 = "RichEdit1"; + + es.dwCookie = (DWORD_PTR)&streamText1; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_RTF), (LPARAM)&es); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + todo_wine { + ok (result == 12, + "EM_STREAMIN: Test 1 returned %ld, expected 12\n", result); + } + result = strcmp (buffer,"TestSomeText"); + todo_wine { + ok (result == 0, + "EM_STREAMIN: Test 1 set wrong text: Result: %s\n",buffer); + } + + + es.dwCookie = (DWORD_PTR)&streamText2; + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_RTF), (LPARAM)&es); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + todo_wine { + ok (result == 9, + "EM_STREAMIN: Test 2 returned %ld, expected 9\n", result); + } + result = strcmp (buffer,"RichEdit1"); + todo_wine { + ok (result == 0, + "EM_STREAMIN: Test 2 set wrong text: Result: %s\n",buffer); + } + + es.dwCookie = (DWORD_PTR)&streamText3; + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_RTF), (LPARAM)&es); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + todo_wine { + ok (result == 0, + "EM_STREAMIN: Test 3 returned %ld, expected 9\n", result); + } + todo_wine { + ok (strlen(buffer) == 0, + "EM_STREAMIN: Test 3 set wrong text: Result: %s\n",buffer); + } + + DestroyWindow(hwndRichEdit); +} + + START_TEST( editor ) { MSG msg; @@ -165,6 +259,7 @@ START_TEST( editor ) test_WM_SETTEXT(); test_WM_GETTEXTLENGTH(); + test_EM_STREAMIN(); /* Set the environment variable WINETEST_RICHED32 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0