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

Henri Verbeet : wined3d: Sampler states are 1-based.
by Alexandre Julliard June 2, 2010

June 2, 2010

Module: wine Branch: master Commit: eb3c81fd6913385174202a37f47af052b8185d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb3c81fd6913385174202a37f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 2 11:24:54 2010 +0200 wined3d: Sampler states are 1-based. 0 isn't a valid sampler state, and including it would overflow the stateblock's contained_sampler_states array in stateblock_init_contained_states(). --- dlls/wined3d/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1696646..181b357 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -262,7 +262,7 @@ static void stateblock_savedstates_set_all(SAVEDSTATES *states, DWORD vs_consts, stateblock_set_bits(states->transform, HIGHEST_TRANSFORMSTATE + 1); stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); for (i = 0; i < MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3fff; + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3ffe; states->clipplane = 0xffffffff; states->pixelShaderConstantsB = 0xffff; states->pixelShaderConstantsI = 0xffff;

1 0

Alexandre Julliard : comctl32: Load comctl32 builtin bitmaps as 32-bit DIBs .
by Alexandre Julliard June 2, 2010

June 2, 2010

Module: wine Branch: master Commit: 48e396ea6cdba2cac3d0c1ea3df44c9f3b879f35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e396ea6cdba2cac3d0c1ea3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 2 15:51:39 2010 +0200 comctl32: Load comctl32 builtin bitmaps as 32-bit DIBs. --- dlls/comctl32/toolbar.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 684406b..fe782c3 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2710,6 +2710,9 @@ TOOLBAR_AddBitmapToImageList(TOOLBAR_INFO *infoPtr, HIMAGELIST himlDef, const TB /* Add bitmaps to the default image list */ if (bitmap->hInst == NULL) /* a handle was passed */ hbmLoad = CopyImage(ULongToHandle(bitmap->nID), IMAGE_BITMAP, 0, 0, 0); + else if (bitmap->hInst == COMCTL32_hModule) + hbmLoad = LoadImageW( bitmap->hInst, MAKEINTRESOURCEW(bitmap->nID), + IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION ); else hbmLoad = CreateMappedBitmap(bitmap->hInst, bitmap->nID, 0, NULL, 0);

1 0

John Voltz : gdi32: Fix typo in enhanced metafile Arc function.
by Alexandre Julliard June 2, 2010

June 2, 2010

Module: wine Branch: master Commit: c9f729c2f7b4017eb136da2bfd285fa1cacae4f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f729c2f7b4017eb136da2bf… Author: John Voltz <john.voltz(a)gmail.com> Date: Tue Jun 1 09:16:23 2010 -0400 gdi32: Fix typo in enhanced metafile Arc function. --- dlls/gdi32/enhmfdrv/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 9c9cf6b..e066d0d 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -114,7 +114,7 @@ EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, emr.ptlStart.x = xstart; emr.ptlStart.y = ystart; emr.ptlEnd.x = xend; - emr.ptlEnd.x = yend; + emr.ptlEnd.y = yend; /* Now calculate the BBox */

1 0

Jose Rostagno : wininet: Update Spanish translation.
by Alexandre Julliard June 2, 2010

June 2, 2010

Module: wine Branch: master Commit: 2a52bb82f2a4d18c500e2f0d4077140656edd55b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a52bb82f2a4d18c500e2f0d4… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Tue Jun 1 16:19:47 2010 -0300 wininet: Update Spanish translation. --- dlls/wininet/wininet_Es.rc | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/wininet_Es.rc b/dlls/wininet/wininet_Es.rc index c9ce2ce..8704db6 100644 --- a/dlls/wininet/wininet_Es.rc +++ b/dlls/wininet/wininet_Es.rc @@ -40,6 +40,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Autentificaci�n Requerida" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Por favor introduzca su nombre de usuario y contrase�a:", -1, 40, 6, 150, 15 + LTEXT "Servidor", -1, 40, 26, 50, 10 + LTEXT "Dominio", -1, 40, 46, 50, 10 + LTEXT "Usuario", -1, 40, 66, 50, 10 + LTEXT "Contrase�a", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Guardar esta contrase�a (inseguro)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Aceptar", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "Conexi�n LAN"

1 0

Konstantin Kondratyuk : mshtml: Fix typo in Russian resources.
by Alexandre Julliard June 2, 2010

June 2, 2010

Module: wine Branch: master Commit: 437cf862f9369f2c8955a617f89c0ff9f47b22a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=437cf862f9369f2c8955a617f… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Tue Jun 1 22:08:51 2010 +0400 mshtml: Fix typo in Russian resources. --- dlls/mshtml/Ru.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/Ru.rc b/dlls/mshtml/Ru.rc index 6722ddc..c3fede1 100644 --- a/dlls/mshtml/Ru.rc +++ b/dlls/mshtml/Ru.rc @@ -36,7 +36,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Установка Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine не может найти пакет Gecko, который необходим для корректной работы приложений"\ + LTEXT "Wine не может найти пакет Gecko, который необходим для корректной работы приложений "\ "с поддержкой HTML. " \ "Wine может автоматически загрузить и установить его для вас.\n\n" \ "Примечание: рекомендуется использовать пакет, предоставляемый вашим дистрибутивом. "\

1 0

Sven Baars : progman: Fix Dutch translation.
by Alexandre Julliard June 2, 2010

June 2, 2010

Module: wine Branch: master Commit: 624dd8456098628cdf63206c3db861c9b77d912d URL: http://source.winehq.org/git/wine.git/?a=commit;h=624dd8456098628cdf63206c3… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Jun 1 21:27:58 2010 +0200 progman: Fix Dutch translation. --- programs/progman/Nl.rc | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/programs/progman/Nl.rc b/programs/progman/Nl.rc index c0c78a3..a575fe6 100644 --- a/programs/progman/Nl.rc +++ b/programs/progman/Nl.rc @@ -22,6 +22,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(65001) + /* Menu */ MAIN_MENU MENU @@ -30,7 +32,7 @@ MAIN_MENU MENU MENUITEM "&Nieuw...", PM_NEW MENUITEM "&Openen\tEnter", PM_OPEN MENUITEM "Ve&rplaatsen...\tF7", PM_MOVE, GRAYED - MENUITEM "&Kopi�ren...\tF8", PM_COPY, GRAYED + MENUITEM "&Kopiëren...\tF8", PM_COPY, GRAYED MENUITEM "&Verwijderen\tEntf", PM_DELETE MENUITEM "&Eigenschappen...\tAlt+Enter", PM_ATTRIBUTES MENUITEM SEPARATOR @@ -50,7 +52,7 @@ MAIN_MENU MENU } POPUP "&Help" { - MENUITEM "Help-&onderwerpen", PM_CONTENTS + MENUITEM "Help-onder&werpen", PM_CONTENTS MENUITEM "&Zoeken...", PM_SEARCH MENUITEM SEPARATOR MENUITEM "&Hulp bij Help", PM_HELPONHELP @@ -96,9 +98,9 @@ PUSHBUTTON "&Help", PM_HELP, 185, 45, 60, 15, WS_TA DIALOG_COPY DIALOG 0, 0, 250, 65 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Programma kopi�ren" +CAPTION "Programma kopiëren" { -LTEXT "Kopi�er programma:", -1, 5, 5, 90, 15 +LTEXT "Kopiëer programma:", -1, 5, 5, 90, 15 LTEXT "", PM_PROGRAM, 95, 5, 90, 15 LTEXT "Van programmagroep:", -1, 5, 13, 90, 15 LTEXT "", PM_FROM_GROUP, 95, 13, 90, 15 @@ -117,7 +119,7 @@ CAPTION "Eigenschappen van de programmagroep" { LTEXT "B&eschrijving:", PM_DESCRIPTION_TXT, 05, 18, 50, 10 EDITTEXT PM_DESCRIPTION, 60, 18, 90, 15, WS_TABSTOP -LTEXT "&Groepbestand:", PM_FILE_TXT, 05, 38, 50, 10 +LTEXT "&Groepsbestand:", PM_FILE_TXT, 05, 38, 50, 10 EDITTEXT PM_FILE, 60, 38, 90, 15, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 155, 5, 60, 15, WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 155, 25, 60, 15, WS_TABSTOP @@ -192,7 +194,7 @@ IDS_INFO, "Informatie" IDS_DELETE, "Verwijderen" IDS_DELETE_GROUP_s, "Wilt u groep `%s' verwijderen?" IDS_DELETE_PROGRAM_s, "Wilt u programma `%s' verwijderen?" -IDS_NOT_IMPLEMENTED, "Niet ge�mplementeerd" +IDS_NOT_IMPLEMENTED, "Niet geïmplementeerd" IDS_FILE_READ_ERROR_s, "Fout bij het lezen van `%s'." IDS_FILE_WRITE_ERROR_s, "Fout bij het schrijven van `%s'." IDS_GRPFILE_READ_ERROR_s, "\

1 0

Paul Vriens : winhlp32: Update the Danish translation and convert to UTF-8.
by Alexandre Julliard June 2, 2010

June 2, 2010

Module: wine Branch: master Commit: 39bf15400e231b430ae4de721655a0e0822f498a URL: http://source.winehq.org/git/wine.git/?a=commit;h=39bf15400e231b430ae4de721… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 23:26:53 2010 +0200 winhlp32: Update the Danish translation and convert to UTF-8. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- programs/winhlp32/Da.rc | 62 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 49 insertions(+), 13 deletions(-) diff --git a/programs/winhlp32/Da.rc b/programs/winhlp32/Da.rc index fc15eeb..20e3331 100644 --- a/programs/winhlp32/Da.rc +++ b/programs/winhlp32/Da.rc @@ -4,6 +4,7 @@ * Copyright 1997 Henrik Olsen * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2008 Jens Albretsen<jens(a)albretsen.dk> + * 2010 Thomas Larsen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,12 +23,16 @@ #include "winhelp_res.h" +#pragma code_page(65001) + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Filer" { - MENUITEM "�&ben...", MNID_FILE_OPEN + MENUITEM "Å&ben...", MNID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "&Udskriv emne", MNID_FILE_PRINT MENUITEM "&Indstil printer", MNID_FILE_SETUP @@ -37,9 +42,9 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT POPUP "&Rediger" { MENUITEM "K&opier...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "&Anm�rk...", MNID_EDIT_ANNOTATE + MENUITEM "&Anmærk...", MNID_EDIT_ANNOTATE } - POPUP "Bog&m�rke" { + POPUP "Bog&mærke" { MENUITEM "&Definer...", MNID_BKMK_DEFINE } POPUP "&Options" { @@ -58,18 +63,18 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT END MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS } - POPUP "&Hj�lp" { - MENUITEM "&Brug af Hj�lp", MNID_HELP_HELPON - MENUITEM "Altid &�verst", MNID_HELP_HELPTOP + POPUP "&Hjælp" { + MENUITEM "&Brug af Hjælp", MNID_HELP_HELPON + MENUITEM "Altid &øverst", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Information...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "Om &WINE", MNID_HELP_WINE + MENUITEM "Om &Wine", MNID_HELP_WINE #endif } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Index" @@ -77,21 +82,52 @@ CAPTION "Index" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Søg" +{ + LTEXT "Er ikke blevet implementeret endnu", -1, 10, 10, 180, 150 +} + /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { -STID_WINE_HELP, "WINE Hj�lp" +STID_WINE_HELP, "Wine Hjælp" STID_WHERROR, "FEJL" STID_WARNING, "ADVARSEL" STID_INFO, "Information" STID_NOT_IMPLEMENTED, "Ikke implementeret" -STID_HLPFILE_ERROR_s, "Fejl ved indl�sning af filen `%s'" +STID_HLPFILE_ERROR_s, "Fejl ved indlæsning af filen `%s'" STID_INDEX, "&Indhold" STID_CONTENTS, "Summary" STID_BACK, "&Tilbage" STID_ALL_FILES, "Alle filer (*.*)" -STID_HELP_FILES_HLP, "Hj�lpe filer (*.hlp)" +STID_HELP_FILES_HLP, "Hjælpe filer (*.hlp)" STID_FILE_NOT_FOUND_s "Kan ikke finde '%s'. Vil du selv finde filen?" STID_NO_RICHEDIT "Kan ikke finde en 'richedit' implementering... Afbryder" STID_PSH_INDEX, "Help topics: " } + +CONTEXT_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Notat...", MNID_CTXT_ANNOTATE + MENUITEM "Kopier", MNID_CTXT_COPY + MENUITEM "Udskriv...", MNID_CTXT_PRINT + POPUP "Skrifttype" + BEGIN + MENUITEM "Lille", MNID_CTXT_FONTS_SMALL + MENUITEM "Normal", MNID_CTXT_FONTS_NORMAL + MENUITEM "Stor", MNID_CTXT_FONTS_LARGE + END + POPUP "Bevar Hjælp øverst" + BEGIN + MENUITEM "Standard", MNID_CTXT_HELP_DEFAULT + MENUITEM "Synlig", MNID_CTXT_HELP_VISIBLE + MENUITEM "Usynlig", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Benyt systemfarver", MNID_CTXT_SYSTEM_COLORS + END +END

1 0

Alexandre Julliard : comctl32: Only support an alpha channel for 32-bpp DIB-based imagelists.
by Alexandre Julliard June 2, 2010

June 2, 2010

Module: wine Branch: master Commit: 95c529dee6abc68c12837c7b51fd158978f3d96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c529dee6abc68c12837c7b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 2 12:21:41 2010 +0200 comctl32: Only support an alpha channel for 32-bpp DIB-based imagelists. --- dlls/comctl32/imagelist.c | 21 +++++++++++---------- dlls/comctl32/toolbar.c | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a73b423..e4249b9 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -153,8 +153,9 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, if (!GetObjectW( hbmImage, sizeof(bm), &bm )) return FALSE; - /* if neither the imagelist nor the source bitmap can have an alpha channel, bail out now */ - if (himl->uBitsPixel != 32 && bm.bmBitsPixel != 32) return FALSE; + /* if either the imagelist or the source bitmap don't have an alpha channel, bail out now */ + if (!himl->has_alpha) return FALSE; + if (bm.bmBitsPixel != 32) return FALSE; SelectObject( hdc, hbmImage ); mask_width = (bm.bmWidth + 31) / 32 * 4; @@ -208,7 +209,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, } else { - if (himl->has_alpha) himl->has_alpha[pos + n] = 1; + himl->has_alpha[pos + n] = 1; if (mask_info && himl->hbmMask) /* generate the mask from the alpha channel */ { @@ -751,7 +752,7 @@ ImageList_Create (INT cx, INT cy, UINT flags, else himl->hbmMask = 0; - if (himl->uBitsPixel == 32) + if (ilc == ILC_COLOR32) himl->has_alpha = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->cMaxImage ); else himl->has_alpha = NULL; @@ -1204,7 +1205,7 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des } } - if (himl->uBitsPixel == 32) /* we already have an alpha channel in this case */ + if (himl->has_alpha) /* we already have an alpha channel in this case */ { /* pre-multiply by the alpha channel */ for (i = 0, ptr = bits; i < cx * cy; i++, ptr++) @@ -2515,7 +2516,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) if (hdcImage == 0) ERR("invalid hdcImage!\n"); - if (himl->uBitsPixel == 32) + if (himl->has_alpha) { if (!ii.hbmColor) { @@ -2525,13 +2526,13 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) SelectObject( hdcImage, color ); SelectObject( hdcMask, ii.hbmMask ); BitBlt( hdcImage, 0, 0, bmp.bmWidth, height, hdcMask, 0, height, SRCCOPY ); - add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, height, color, ii.hbmMask ); + ret = add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, height, color, ii.hbmMask ); DeleteDC( hdcMask ); DeleteObject( color ); + if (ret) goto done; } - else add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, bmp.bmHeight, ii.hbmColor, ii.hbmMask ); - - goto done; + else if (add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, bmp.bmHeight, + ii.hbmColor, ii.hbmMask )) goto done; } imagelist_point_from_index(himl, nIndex, &pt); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index d24b3dc..684406b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2757,7 +2757,7 @@ TOOLBAR_CheckImageListIconSize(TOOLBAR_INFO *infoPtr) cx, cy, infoPtr->nBitmapWidth, infoPtr->nBitmapHeight); himlNew = ImageList_Create(infoPtr->nBitmapWidth, infoPtr->nBitmapHeight, - ILC_COLORDDB|ILC_MASK, 8, 2); + ILC_COLOR32|ILC_MASK, 8, 2); for (i = 0; i < infoPtr->nNumBitmapInfos; i++) TOOLBAR_AddBitmapToImageList(infoPtr, himlNew, &infoPtr->bitmaps[i]); TOOLBAR_InsertImageList(&infoPtr->himlDef, &infoPtr->cimlDef, himlNew, 0); @@ -2854,7 +2854,7 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp TRACE ("creating default image list!\n"); himlDef = ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight, - ILC_COLORDDB | ILC_MASK, info.nButtons, 2); + ILC_COLOR32 | ILC_MASK, info.nButtons, 2); TOOLBAR_InsertImageList(&infoPtr->himlDef, &infoPtr->cimlDef, himlDef, 0); infoPtr->himlInt = himlDef; }

1 0

Paul Vriens : winecfg: Update the Danish translation.
by Alexandre Julliard June 2, 2010

June 2, 2010

Module: wine Branch: master Commit: 2e01e4cb3cd9b145477d1d0e340b21583fb666f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e01e4cb3cd9b145477d1d0e3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 20:47:02 2010 +0200 winecfg: Update the Danish translation. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- programs/winecfg/Da.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc index 7b2ae81..126c26d 100644 --- a/programs/winecfg/Da.rc +++ b/programs/winecfg/Da.rc @@ -57,11 +57,11 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Program indstillinger ",IDC_STATIC, 8,4,244,240 - LTEXT "Wine kan efterligne forskellige versioner af Windows for hvert program. Tabben hænger sammen med Biblioteker og Grafik tabbene for at tillade ændring af system eller per program indstillinger.", - IDC_STATIC,15,20,227,30 + LTEXT "Wine kan efterligne forskellige Windows-versioner for hvert program. Denne fane er knyttet til Biblioteker og Grafik faner, for at give dig mulighed for at ændre systemsider eller per program indstillinger i disse faneblade.", + IDC_STATIC,15,20,227,40 CONTROL "Programmer",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, - 15,50,230,150 - PUSHBUTTON "&Tilfø program...",IDC_APP_ADDAPP, 90,204,75,14 + 15,60,230,140 + PUSHBUTTON "&Tilføj program...",IDC_APP_ADDAPP, 90,204,75,14 PUSHBUTTON "&Fjern program",IDC_APP_REMOVEAPP, 170,204,75,14 LTEXT "&Windows version:",IDC_STATIC,17,226,58,8 COMBOBOX IDC_WINVER,83,224,163,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -178,7 +178,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Driver valg ",IDC_STATIC,8,4,244,210 - LTEXT "Vælg en lyd driver ved at afkrydse den ønskede driver. Slå lyden fra ved at fravælge alle drivere. Valg af flere drivere er ikke rekommenderet. Konfigurér driver ved at højre klikke på den.",IDC_STATIC,15,20,227,30 + LTEXT "Vælg en lyd driver ved at afkrydse den ønskede driver. Slå lyden fra ved at fravælge alle drivere. Valg af flere drivere er ikke anbefalet. Konfigurér driver ved at højre klikke på den.",IDC_STATIC,15,20,227,30 CONTROL "Enheder",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,155 PUSHBUTTON "&Test lyd",IDC_AUDIO_TEST,170,50,59,14 PUSHBUTTON "&Kontrol panel",IDC_AUDIO_CONTROL_PANEL,170,70,59,14

1 0

Paul Vriens : kernel32: Fix the Korean resources.
by Alexandre Julliard June 2, 2010

June 2, 2010

Module: wine Branch: master Commit: dda58216eae4bd13f4d40fb263eb441f60121ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dda58216eae4bd13f4d40fb26… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 18:57:24 2010 +0200 kernel32: Fix the Korean resources. --- dlls/kernel32/nls/winerr_kor.mc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/nls/winerr_kor.mc b/dlls/kernel32/nls/winerr_kor.mc index 95082e4..289b17e 100644 --- a/dlls/kernel32/nls/winerr_kor.mc +++ b/dlls/kernel32/nls/winerr_kor.mc @@ -664,7 +664,7 @@ MessageId=160 SymbolicName=ERROR_BAD_ARGUMENTS Language=KOR DosExecPgm�� - +. MessageId=161 SymbolicName=ERROR_BAD_PATHNAME Language=KOR @@ -974,7 +974,7 @@ MessageId=534 SymbolicName=ERROR_ARITHMETIC_OVERFLOW Language=KOR Arithmetic ��÷ο� - +. MessageId=535 SymbolicName=ERROR_PIPE_CONNECTED Language=KOR @@ -3109,7 +3109,7 @@ MessageId=1739 SymbolicName=RPC_S_UUID_NO_ADDRESS Language=KOR ��Ʈ��ũ �ּҰ� ��ϴ�. - +. MessageId=1740 SymbolicName=RPC_S_DUPLICATE_ENDPOINT Language=KOR @@ -3489,7 +3489,7 @@ MessageId=1816 SymbolicName=ERROR_NOT_ENOUGH_QUOTA Language=KOR ��Ͱ� �� ʽ��ϴ� - +. MessageId=1817 SymbolicName=RPC_S_NO_INTERFACES Language=KOR @@ -3579,7 +3579,7 @@ MessageId=1899 SymbolicName=EPT_S_CANT_CREATE Language=KOR ��Ʈ �� DB�� ϴ� - +. MessageId=1900 SymbolicName=RPC_S_INVALID_OBJECT Language=KOR

1 0