May 2010 - Wine-Commits - list.winehq.org

Aurimas Fišeras : msi: Update Lithuanian translation.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: aa2542bfcd88cdcb92a582b8aee366f067ed9d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa2542bfcd88cdcb92a582b8a… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu May 6 19:27:43 2010 +0300 msi: Update Lithuanian translation. --- dlls/msi/msi_Lt.rc | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/msi/msi_Lt.rc b/dlls/msi/msi_Lt.rc index b1c027b..c88592c 100644 --- a/dlls/msi/msi_Lt.rc +++ b/dlls/msi/msi_Lt.rc @@ -30,31 +30,31 @@ STRINGTABLE DISCARDABLE 4 "Nepavyko atverti nurodyto diegimo paketo. Patikrinkite failo kelią ir mėginkite dar kartą." 5 "kelias %s nerastas" 9 "įdėkite diską %s" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ + 10 "Windows diegimo programa %s\n\n" \ + "Naudojimas:\n" \ + "msiexec komanda {būtinas parametras} [nebūtinas parametras]\n\n" \ + "Įdiegti produktą:\n" \ + "\t/i {paketas|produkto_kodas} [savybė]\n" \ + "\t/package {paketas|produkto_kodas} [savybė]\n" \ + "\t/a paketas [savybė]\n" \ + "Taisyti įdiegimą:\n" \ + "\t/f[p|o|e|d|c|a|u|m|s|v] {paketas|produkto_kodas}\n" \ + "Pašalinti produktą:\n" \ + "\t/uninstall {paketas|produkto_kodas} [savybė]\n" \ + "\t/x {paketas|produkto_kodas} [savybė]\n" \ + "Skelbti produktą:\n" \ + "\t/j[u|m] paketas [/t pakeitimas] [/g kalbos_identifikatorius]\n" \ + "Pritaikyti pataisą:\n" \ + "\t/p pataisos_paketas [savybė]\n" \ + "\t/p pataisos_paketas /a paketas [savybė]\n" \ + "Žurnalo ir sąsajos modifikatoriai aukščiau išvardintoms komandoms:\n" \ + "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] žurnalo_failas\n" \ "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ + "Registruoti MSI tarnybą:\n" \ "\t/y\n" \ - "Unregister MSI Service:\n" \ + "Išregistruoti MSI tarnybą:\n" \ "\t/z\n" \ - "Display this help:\n" \ + "Parodyti šią pagalbą:\n" \ "\t/help\n" \ "\t/?\n" 11 "įveskite aplanką, kuris turi %s"

1 0

Piotr Caban : msvcrt: Fix strtod and wcstod implementation.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 117faee955919598c85c575139fd0fc903364db4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=117faee955919598c85c57513… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun May 9 15:07:33 2010 +0200 msvcrt: Fix strtod and wcstod implementation. --- dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/string.c | 7 +++++++ dlls/msvcrt/wcs.c | 7 +++++++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 8d66eef..ed11d35 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -170,6 +170,8 @@ extern void msvcrt_free_signals(void); extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**); +extern unsigned int __cdecl _control87(unsigned int, unsigned int); + /* run-time error codes */ #define _RT_STACK 0 #define _RT_NULLPTR 1 diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index e1d9557..21dc29f 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -164,6 +164,7 @@ void CDECL MSVCRT__swab(char* src, char* dst, int len) double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t locale) { unsigned __int64 d=0, hlp; + unsigned fpcontrol; int exp=0, sign=1; const char *p; double ret; @@ -249,11 +250,17 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca } } + fpcontrol = _control87(0, 0); + _control87(MSVCRT__EM_DENORMAL|MSVCRT__EM_INVALID|MSVCRT__EM_ZERODIVIDE + |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT, 0xffffffff); + if(exp>0) ret = (double)sign*d*pow(10, exp); else ret = (double)sign*d/pow(10, -exp); + _control87(fpcontrol, 0xffffffff); + if((d && ret==0.0) || isinf(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 96a25e5..79be91a 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -129,6 +129,7 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, MSVCRT__locale_t locale) { unsigned __int64 d=0, hlp; + unsigned fpcontrol; int exp=0, sign=1; const MSVCRT_wchar_t *p; double ret; @@ -212,11 +213,17 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, } } + fpcontrol = _control87(0, 0); + _control87(MSVCRT__EM_DENORMAL|MSVCRT__EM_INVALID|MSVCRT__EM_ZERODIVIDE + |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT, 0xffffffff); + if(exp>0) ret = (double)sign*d*pow(10, exp); else ret = (double)sign*d/pow(10, -exp); + _control87(fpcontrol, 0xffffffff); + if((d && ret==0.0) || isinf(ret)) *MSVCRT__errno() = MSVCRT_ERANGE;

1 0

Sven Baars : wineconsole: Fix Dutch translation.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 194f7318ce4ee7c688fc0b7674c5002222fd78e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=194f7318ce4ee7c688fc0b767… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun May 9 00:38:03 2010 +0200 wineconsole: Fix Dutch translation. --- programs/wineconsole/wineconsole_Nl.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wineconsole/wineconsole_Nl.rc b/programs/wineconsole/wineconsole_Nl.rc index df3556e..c42e80f 100644 --- a/programs/wineconsole/wineconsole_Nl.rc +++ b/programs/wineconsole/wineconsole_Nl.rc @@ -78,7 +78,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Aantal te bewaren opdrachten :", -1, 14, 67, 78, 18 EDITTEXT IDC_OPT_HIST_SIZE, 92, 69, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - AUTOCHECKBOX "&Verwijderen dubbelen", IDC_OPT_HIST_NODOUBLE, 130, 67, 50, 18, WS_TABSTOP|BS_MULTILINE + AUTOCHECKBOX "&Verwijder dubbelen", IDC_OPT_HIST_NODOUBLE, 130, 67, 50, 18, WS_TABSTOP|BS_MULTILINE } IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 @@ -102,7 +102,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION " Configuratie " FONT 8, "MS Shell Dlg" { - GROUPBOX "Buffer zone", -1, 10, 11, 100, 42, BS_GROUPBOX + GROUPBOX "Bufferzone", -1, 10, 11, 100, 42, BS_GROUPBOX LTEXT "&Breedte :", -1, 14, 25, 54, 9 EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 @@ -118,7 +118,7 @@ FONT 8, "MS Shell Dlg" EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - GROUPBOX "Programma is ge�indigd", -1, 115, 11, 80, 42, BS_GROUPBOX + GROUPBOX "Programma is be�indigd", -1, 115, 11, 80, 42, BS_GROUPBOX AUTOCHECKBOX "&Console afsluiten", IDC_CNF_CLOSE_EXIT, 119, 25, 75, 20, WS_TABSTOP GROUPBOX "Versie", -1, 115, 55, 80, 42

1 0

Alexander N. Sørnes : shell32: Update Norwegian Bokmål translation.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: ab81b053b03a018e3dae7a21d21a78ce47e28111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab81b053b03a018e3dae7a21d… Author: Alexander N. Sørnes <alex(a)thehandofagony.com> Date: Sun May 9 22:48:25 2010 +0200 shell32: Update Norwegian Bokmål translation. --- dlls/shell32/shell32_No.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_No.rc b/dlls/shell32/shell32_No.rc index 634c733..cdf9dbf 100644 --- a/dlls/shell32/shell32_No.rc +++ b/dlls/shell32/shell32_No.rc @@ -207,6 +207,10 @@ STRINGTABLE IDS_SHV_COLUMN11 "Gruppe" IDS_SHV_COLUMN_DELFROM "Opprinnelig plassering" IDS_SHV_COLUMN_DELDATE "Dato slettet" + IDS_SHV_COL_DOCS "Dokumenter" + IDS_SHV_COL_STATUS "Status" + IDS_SHV_COL_LOCATION "Plassering" + IDS_SHV_COL_MODEL "Modell" /* special folders */ IDS_DESKTOP "Skrivebord"

1 0

Alexander N. Sørnes : wineboot: Update Norwegian Bokmål translation.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 7492e773ecbf4f04ee6b0cb58a422871e1189a43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7492e773ecbf4f04ee6b0cb58… Author: Alexander N. Sørnes <alex(a)thehandofagony.com> Date: Sun May 9 23:02:32 2010 +0200 wineboot: Update Norwegian Bokmål translation. --- programs/wineboot/wineboot_No.rc | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/wineboot_No.rc b/programs/wineboot/wineboot_No.rc index d821945..1e7b90a 100644 --- a/programs/wineboot/wineboot_No.rc +++ b/programs/wineboot/wineboot_No.rc @@ -1,7 +1,7 @@ /* - * WineBoot Norwegian Bokm�l resources + * WineBoot Norwegian Bokmål resources * - * Copyright (C) 2007 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright (C) 2007-2010 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 @@ -21,17 +21,29 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Venter p� program" +CAPTION "Venter på program" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Avbryt",IDCANCEL,129,49,50,15 PUSHBUTTON "Avslutt programmet",IDOK,51,49,71,15 LTEXT "En simulert avlogging eller avslutting har startet, men dette programmet svarer ikke.", IDC_STATIC,7,7,172,19 - LTEXT "Hvis du avslutter programmet kan all ulagret data g� tapt.", + LTEXT "Hvis du avslutter programmet kan all ulagret data gå tapt.", IDC_STATIC,7,28,172,15 END + +IDD_WAITDLG DIALOG 0, 0, 200, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED +CAPTION "Wine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WAITICON, 3, 3, 10, 10 + LTEXT "Vent mes Wine-oppsettet i «%s» blir oppdatert ...", + IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX +END

1 0

Sven Baars : winecfg: Fix Dutch translation.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: d409c9650a0360e8f015022bb4cf82f3db7c18e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d409c9650a0360e8f015022bb… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun May 9 12:16:14 2010 +0200 winecfg: Fix Dutch translation. --- programs/winecfg/Nl.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index 5783033..9e02cde 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -224,14 +224,14 @@ BEGIN IDS_TAB_APPLICATIONS "Toepassingen" IDS_TAB_DLLS "Bibliotheken" IDS_TAB_DRIVES "Stations" - IDS_CHOOSE_PATH "Selecteer a.u.b. de unix map." + IDS_CHOOSE_PATH "Selecteer a.u.b. de Unix map." IDS_HIDE_ADVANCED "Verberg uitgebreid" IDS_SHOW_ADVANCED "Toon uitgebreid" IDS_NOTHEME "(Geen Thema)" IDS_TAB_GRAPHICS "Grafisch" IDS_TAB_DESKTOP_INTEGRATION "Desktop Integratie" IDS_TAB_AUDIO "Geluid" - IDS_TAB_ABOUT "Over wine" + IDS_TAB_ABOUT "Over Wine" IDS_WINECFG_TITLE "Wine configuratie" IDS_WINECFG_TITLE_APP "Wine configuratie voor %s" IDS_THEMEFILE "Thema-bestanden (*.msstyles; *.theme)" @@ -252,7 +252,7 @@ BEGIN IDS_DLL_DISABLED "uitgeschakeld" IDS_DEFAULT_SETTINGS "Standaardinstellingen" IDS_EXECUTABLE_FILTER "Wine toepassingen (*.exe,*.exe.so)\0*.exe;*.exe.so\0" - IDS_USE_GLOBAL_SETTINGS "Gebruike globale instellingen" + IDS_USE_GLOBAL_SETTINGS "Gebruik globale instellingen" IDS_SELECT_EXECUTABLE "Selecteer een uitvoerbaar bestand" END @@ -309,7 +309,7 @@ BEGIN IDC_SYSPARAMS_DESKTOP "Bureaublad" IDC_SYSPARAMS_MENU "Menu Achtergrond" IDC_SYSPARAMS_MENU_TEXT "Menu Tekst" - IDC_SYSPARAMS_SCROLLBAR "Scrollbar" + IDC_SYSPARAMS_SCROLLBAR "Scrollbalk" IDC_SYSPARAMS_SELECTION "Selectie Achtergrond" IDC_SYSPARAMS_SELECTION_TEXT "Selectie Tekst" IDC_SYSPARAMS_TOOLTIP "ToolTip Achtergrond"

1 0

Sven Baars : wineboot: Fix Dutch translation.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: c3cd733a3f66b2ba2d23e73b4fc4cdd3dfa73707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3cd733a3f66b2ba2d23e73b4… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun May 9 15:16:08 2010 +0200 wineboot: Fix Dutch translation. --- programs/wineboot/wineboot_Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot_Nl.rc b/programs/wineboot/wineboot_Nl.rc index b3d53cb..23d0fbf 100644 --- a/programs/wineboot/wineboot_Nl.rc +++ b/programs/wineboot/wineboot_Nl.rc @@ -34,7 +34,7 @@ BEGIN PUSHBUTTON "Beëindig Proces",IDOK,51,49,71,15 LTEXT "Een gesimuleerde uitlog- of afsluitactie is bezig, maar dit programma reageert niet.", IDC_STATIC,7,7,172,19 - LTEXT "Als u het proces beëindigt kun u alle niet-opgeslagen data verliezen.", + LTEXT "Als u het proces beëindigt kunt u alle niet-opgeslagen data verliezen.", IDC_STATIC,7,28,172,15 END

1 0

Nikolay Sivov : kernel32: Fix return code from LocalUnlock for pointer passed to it.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 0597e659bd76191ee42dc0691a1d26b050e0c712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0597e659bd76191ee42dc0691… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 9 02:21:50 2010 +0400 kernel32: Fix return code from LocalUnlock for pointer passed to it. --- dlls/kernel32/heap.c | 9 ++++++++- dlls/kernel32/tests/heap.c | 28 ++++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 4d36a1d..bdfa00b 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1116,7 +1116,14 @@ SIZE_T WINAPI LocalSize( */ BOOL WINAPI LocalUnlock( HLOCAL handle /* [in] Handle of memory object */ -) { +) +{ + if (ISPOINTER( handle )) + { + SetLastError( ERROR_NOT_LOCKED ); + return FALSE; + } + return GlobalUnlock( handle ); } diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index f7e985d..98c99d7 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -249,14 +249,27 @@ static void test_heap(void) res = GlobalUnlock(gbl); ok(res == 1 || - res == 0, /* win9x */ + broken(res == 0), /* win9x */ "Expected 1 or 0, got %d\n", res); res = GlobalUnlock(gbl); ok(res == 1 || - res == 0, /* win9x */ + broken(res == 0), /* win9x */ "Expected 1 or 0, got %d\n", res); + GlobalFree(gbl); + + gbl = GlobalAlloc(GMEM_FIXED, 100); + + SetLastError(0xdeadbeef); + res = GlobalUnlock(gbl); + ok(res == 1 || + broken(res == 0), /* win9x */ + "Expected 1 or 0, got %d\n", res); + ok(GetLastError() == 0xdeadbeef, "got %d\n", GetLastError()); + + GlobalFree(gbl); + /* GlobalSize on an invalid handle */ if (sizeof(void *) != 8) /* crashes on 64-bit Vista */ { @@ -268,8 +281,6 @@ static void test_heap(void) "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } - GlobalFree(gbl); - /* ####################################### */ /* Local*() functions */ gbl = LocalAlloc(LMEM_MOVEABLE, 0); @@ -371,6 +382,15 @@ static void test_heap(void) "returned %d with %d (expected '0' with ERROR_INVALID_HANDLE)\n", res, GetLastError()); + /* trying to unlock pointer from LocalAlloc */ + gbl = LocalAlloc(LMEM_FIXED, 100); + SetLastError(0xdeadbeef); + res = LocalUnlock(gbl); + ok(res == 0, "Expected 0, got %d\n", res); + ok(GetLastError() == ERROR_NOT_LOCKED || + broken(GetLastError() == 0xdeadbeef) /* win9x */, "got %d\n", GetLastError()); + LocalFree(gbl); + /* trying to lock empty memory should give an error */ gbl = GlobalAlloc(GMEM_MOVEABLE|GMEM_ZEROINIT,0); ok(gbl != NULL, "returned NULL\n");

1 0

Vincent Povirk : gdiplus: Implement bitmap color keying.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 15ebd84daf6d12afff78344a008d291420eb9450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15ebd84daf6d12afff78344a0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 8 12:26:02 2010 -0500 gdiplus: Implement bitmap color keying. --- dlls/gdiplus/graphics.c | 33 ++++++++++++++++++-- dlls/gdiplus/tests/image.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index eb24008..790e0fb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2083,9 +2083,36 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (imageAttributes->colorkeys[ColorAdjustTypeBitmap].enabled || imageAttributes->colorkeys[ColorAdjustTypeDefault].enabled) { - static int fixme; - if (!fixme++) - FIXME("Color keying not implemented\n"); + const struct color_key *key; + BYTE min_blue, min_green, min_red; + BYTE max_blue, max_green, max_red; + + if (imageAttributes->colorkeys[ColorAdjustTypeBitmap].enabled) + key = &imageAttributes->colorkeys[ColorAdjustTypeBitmap]; + else + key = &imageAttributes->colorkeys[ColorAdjustTypeDefault]; + + min_blue = key->low&0xff; + min_green = (key->low>>8)&0xff; + min_red = (key->low>>16)&0xff; + + max_blue = key->high&0xff; + max_green = (key->high>>8)&0xff; + max_red = (key->high>>16)&0xff; + + for (x=dst_area.left; x<dst_area.right; x++) + for (y=dst_area.top; y<dst_area.bottom; y++) + { + ARGB *src_color; + BYTE blue, green, red; + src_color = (ARGB*)(data + stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); + blue = *src_color&0xff; + green = (*src_color>>8)&0xff; + red = (*src_color>>16)&0xff; + if (blue >= min_blue && green >= min_green && red >= min_red && + blue <= max_blue && green <= max_green && red <= max_red) + *src_color = 0x00000000; + } } if (imageAttributes->colorremaptables[ColorAdjustTypeBitmap].enabled || diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 09ba8f0..a981bbf 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1999,6 +1999,76 @@ static void test_remaptable(void) GdipFree(map); } +static void test_colorkey(void) +{ + GpStatus stat; + GpImageAttributes *imageattr; + GpBitmap *bitmap1, *bitmap2; + GpGraphics *graphics; + ARGB color; + + stat = GdipSetImageAttributesColorKeys(NULL, ColorAdjustTypeDefault, TRUE, 0xff405060, 0xff708090); + expect(InvalidParameter, stat); + + stat = GdipCreateImageAttributes(&imageattr); + expect(Ok, stat); + + stat = GdipSetImageAttributesColorKeys(imageattr, ColorAdjustTypeCount, TRUE, 0xff405060, 0xff708090); + expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorKeys(imageattr, ColorAdjustTypeAny, TRUE, 0xff405060, 0xff708090); + expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesColorKeys(imageattr, ColorAdjustTypeDefault, TRUE, 0xff405060, 0xff708090); + expect(Ok, stat); + + stat = GdipCreateBitmapFromScan0(2, 2, 0, PixelFormat32bppARGB, NULL, &bitmap1); + expect(Ok, stat); + + stat = GdipCreateBitmapFromScan0(2, 2, 0, PixelFormat32bppARGB, NULL, &bitmap2); + expect(Ok, stat); + + stat = GdipBitmapSetPixel(bitmap1, 0, 0, 0x20405060); + expect(Ok, stat); + + stat = GdipBitmapSetPixel(bitmap1, 0, 1, 0x40506070); + expect(Ok, stat); + + stat = GdipBitmapSetPixel(bitmap1, 1, 0, 0x60708090); + expect(Ok, stat); + + stat = GdipBitmapSetPixel(bitmap1, 1, 1, 0xffffffff); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap2, &graphics); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage*)bitmap1, 0,0,2,2, 0,0,2,2, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0x00000000, color, 1), "Expected ffff00ff, got %.8x\n", color); + + stat = GdipBitmapGetPixel(bitmap2, 0, 1, &color); + expect(Ok, stat); + ok(color_match(0x00000000, color, 1), "Expected ffff00ff, got %.8x\n", color); + + stat = GdipBitmapGetPixel(bitmap2, 1, 0, &color); + expect(Ok, stat); + ok(color_match(0x00000000, color, 1), "Expected ffff00ff, got %.8x\n", color); + + stat = GdipBitmapGetPixel(bitmap2, 1, 1, &color); + expect(Ok, stat); + ok(color_match(0xffffffff, color, 1), "Expected ffff00ff, got %.8x\n", color); + + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap1); + GdipDisposeImage((GpImage*)bitmap2); + GdipDisposeImageAttributes(imageattr); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2036,6 +2106,7 @@ START_TEST(image) test_multiframegif(); test_rotateflip(); test_remaptable(); + test_colorkey(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Povirk : gdiplus: Add test for GdipGetImageThumbnail.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 635fe30eacded85fed671a6e4b8a65666fb44849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=635fe30eacded85fed671a6e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 8 13:16:33 2010 -0500 gdiplus: Add test for GdipGetImageThumbnail. --- dlls/gdiplus/tests/image.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index a981bbf..8abb40c 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1212,6 +1212,78 @@ static void test_createhbitmap(void) expect(Ok, stat); } +static void test_getthumbnail(void) +{ + GpStatus stat; + GpImage *bitmap1, *bitmap2; + UINT width, height; + + stat = GdipGetImageThumbnail(NULL, 0, 0, &bitmap2, NULL, NULL); + todo_wine expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromScan0(128, 128, 0, PixelFormat32bppRGB, NULL, (GpBitmap**)&bitmap1); + expect(Ok, stat); + + stat = GdipGetImageThumbnail(bitmap1, 0, 0, NULL, NULL, NULL); + todo_wine expect(InvalidParameter, stat); + + stat = GdipGetImageThumbnail(bitmap1, 0, 0, &bitmap2, NULL, NULL); + todo_wine expect(Ok, stat); + + if (stat == Ok) + { + stat = GdipGetImageWidth(bitmap2, &width); + expect(Ok, stat); + expect(120, width); + + stat = GdipGetImageHeight(bitmap2, &height); + expect(Ok, stat); + expect(120, height); + + GdipDisposeImage(bitmap2); + } + + GdipDisposeImage(bitmap1); + + + stat = GdipCreateBitmapFromScan0(64, 128, 0, PixelFormat32bppRGB, NULL, (GpBitmap**)&bitmap1); + expect(Ok, stat); + + stat = GdipGetImageThumbnail(bitmap1, 32, 32, &bitmap2, NULL, NULL); + todo_wine expect(Ok, stat); + + if (stat == Ok) + { + stat = GdipGetImageWidth(bitmap2, &width); + expect(Ok, stat); + expect(32, width); + + stat = GdipGetImageHeight(bitmap2, &height); + expect(Ok, stat); + expect(32, height); + + GdipDisposeImage(bitmap2); + } + + stat = GdipGetImageThumbnail(bitmap1, 0, 0, &bitmap2, NULL, NULL); + todo_wine expect(Ok, stat); + + if (stat == Ok) + { + stat = GdipGetImageWidth(bitmap2, &width); + expect(Ok, stat); + expect(120, width); + + stat = GdipGetImageHeight(bitmap2, &height); + expect(Ok, stat); + expect(120, height); + + GdipDisposeImage(bitmap2); + } + + GdipDisposeImage(bitmap1); +} + static void test_getsetpixel(void) { GpStatus stat; @@ -2099,6 +2171,7 @@ START_TEST(image) test_createfromwmf(); test_resolution(); test_createhbitmap(); + test_getthumbnail(); test_getsetpixel(); test_palette(); test_colormatrix();

1 0