July 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : kernel32/tests: Avoid using non-ASCII characters in strings.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 97db90290bf987ba2861cabfcc8c034c0362b7f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97db90290bf987ba2861cabfc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 13:55:58 2009 +0200 kernel32/tests: Avoid using non-ASCII characters in strings. --- dlls/kernel32/tests/codepage.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 9061241..61d0c33 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -320,7 +320,7 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) SetLastError(0xdeadbeef); ret = WideCharToMultiByte(950, 0, dbwcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); ok(ret == 5, "ret is %d\n", ret); - ok(!strcmp(mbs, "�H��"), "mbs is %s\n", mbs); + ok(!strcmp(mbs, "\xb5H\xa9\xd2"), "mbs is %s\n", mbs); if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); @@ -334,7 +334,7 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) SetLastError(0xdeadbeef); ret = WideCharToMultiByte(950, 0, dbwcs, 1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); ok(ret == 2, "ret is %d\n", ret); - ok(!strcmp(mbs, "�H"), "mbs is %s\n", mbs); + ok(!strcmp(mbs, "\xb5H"), "mbs is %s\n", mbs); if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError());

1 0

Aric Stewart : shlwapi: Forward UrlCrackW to wininet.InternetCrackUrlW.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 9370c3827cfa47e17ab4e08bb16a50454ef0c3ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=9370c3827cfa47e17ab4e08bb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 6 11:50:20 2009 -0500 shlwapi: Forward UrlCrackW to wininet.InternetCrackUrlW. --- dlls/shlwapi/shlwapi.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index fad7d56..b6426e7 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -477,7 +477,7 @@ 477 stub -noname SHCreatePropertyBagOnMemory 478 stdcall -noname IUnknown_TranslateAcceleratorIO(ptr ptr) 479 stub -noname IUnknown_UIActivateIO -480 stub -noname UrlCrackW +480 stdcall -noname UrlCrackW(wstr long long ptr) wininet.InternetCrackUrlW 481 stdcall -noname IUnknown_HasFocusIO(ptr) 482 stub -noname SHMessageBoxHelpA 483 stub -noname SHMessageBoxHelpW

1 0

Ricardo Filipe : mpr: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 8c69e8a9b54113e55ea70c5aa51a0544e494e849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c69e8a9b54113e55ea70c5aa… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Mon Jul 6 12:29:05 2009 -0700 mpr: Update Portuguese translation and convert to UTF8. --- dlls/mpr/mpr_Pt.rc | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/mpr/mpr_Pt.rc b/dlls/mpr/mpr_Pt.rc index cb86d52..b019193 100644 --- a/dlls/mpr/mpr_Pt.rc +++ b/dlls/mpr/mpr_Pt.rc @@ -2,7 +2,7 @@ * MPR dll resources * * Copyright (C) 2004 Marcelo Duarte - * Copyright (C) 2006 Am�rico Jos� Melo + * Copyright (C) 2006 Américo José Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,9 @@ #include "mprres.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { @@ -36,10 +38,10 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Entre a senha da rede" FONT 8, "MS Shell Dlg" { - LTEXT "Por favor, entre como o nome de usu�rio e a senha:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Por favor, entre como o nome de usuário e a senha:", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 /* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Usu�rio", -1, 40, 66, 50, 10 + LTEXT "Usuário", -1, 40, 66, 50, 10 LTEXT "Senha", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0

1 0

Ricardo Filipe : setupapi: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 2263c97bf4d2351a7109fd007cd866c11b9c12c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2263c97bf4d2351a7109fd007… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Mon Jul 6 14:45:59 2009 -0700 setupapi: Update Portuguese translation and convert to UTF8. --- dlls/setupapi/Pt.rc | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/Pt.rc b/dlls/setupapi/Pt.rc index 5780b8f..5d7ebdb 100644 --- a/dlls/setupapi/Pt.rc +++ b/dlls/setupapi/Pt.rc @@ -2,7 +2,8 @@ * Portuguese resources for SETUPAPI * * Copyright 2003 Marcelo Duarte - * Copyright 2004 Am�rico Jos� Melo + * Copyright 2004 Américo José Melo + * Copyright 2009 Ricardo Filipe * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,6 +22,18 @@ #include "setupapi_private.h" +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "O ficheiro '%s' em %s é necessário" + IDS_UNKNOWN "Desconhecido" + IDS_COPYFROM "Copiar ficheiros de:" + IDS_INFO "Insira o caminho onde se encontram os ficheiros, depois carregue em OK." +} + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 @@ -50,3 +63,17 @@ BEGIN LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Ficheiros Necessários" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insira o disco de instalação do fabricante, depois\nverifique se a drive correcta está seleccionada", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copiar ficheiros do fabricante de:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Procurar...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END

1 0

Ricardo Filipe : user32: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 5d5cf8ceb2bfc911c8b98c8db218eadcc91b3438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5cf8ceb2bfc911c8b98c8db… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Mon Jul 6 16:42:34 2009 -0700 user32: Update Portuguese translation and convert to UTF8. --- dlls/user32/resources/user32_Pt.rc | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/user32/resources/user32_Pt.rc b/dlls/user32/resources/user32_Pt.rc index d0310e6..a57e64f 100644 --- a/dlls/user32/resources/user32_Pt.rc +++ b/dlls/user32/resources/user32_Pt.rc @@ -1,6 +1,7 @@ /* * Copyright 1997 Ricardo R. Massaro - * Copyright 2006 Am�rico Jos� Melo + * Copyright 2006 Américo José Melo + * Copyright 2009 Ricardo Filipe * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,6 +20,8 @@ #include "resources.h" +#pragma code_page(65001) + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE @@ -85,23 +88,23 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE } -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL MSGBOX DIALOG 100, 80, 216, 168 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX - PUSHBUTTON "&Ok", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Cancelar", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Abortar", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Repetir", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Ignorar", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Sim", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&N�o", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Try Again", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Continue", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Não", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Tente Novamente", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Continuar", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Ajuda", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -130,7 +133,7 @@ BEGIN END -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE {

1 0

Huw Davies : wineconsole: Add English neutral translations.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 4a28359ba3a415fff6b40b29bf211a5fa3f32b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a28359ba3a415fff6b40b29b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 6 17:18:33 2009 +0100 wineconsole: Add English neutral translations. --- programs/wineconsole/wineconsole_En.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/programs/wineconsole/wineconsole_En.rc b/programs/wineconsole/wineconsole_En.rc index a1c2173..c9b849a 100644 --- a/programs/wineconsole/wineconsole_En.rc +++ b/programs/wineconsole/wineconsole_En.rc @@ -134,3 +134,21 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 35, 45, 35, 12 PUSHBUTTON "Cancel", IDCANCEL, 80, 45, 35, 12 } + +LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL + +IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION " Font " +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Font", -1, 5, 5, 24, 8 + LISTBOX IDC_FNT_LIST_FONT, 5, 18, 90, 42, LBS_SORT|WS_VSCROLL + LTEXT "&Colour", -1, 100, 5, 50, 8 + CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16 + CONTROL "", IDC_FNT_COLOR_BK, "WineConColorPreview", 0L, 100, 40, 48, 16 + LTEXT "&Size", -1, 158, 5, 40, 8 + LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 60, WS_VSCROLL + CONTROL "", IDC_FNT_PREVIEW, "WineConFontPreview", 0L, 5, 60, 109, 40 + LTEXT "", IDC_FNT_FONT_INFO, 128, 76, 80, 18 +}

1 0

Ricardo Filipe : shell32: Update Portuguese translation and convert to UTF8 .
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: b7432f3c01a1011b0890f728eb33e64fc33b1540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7432f3c01a1011b0890f728e… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Mon Jul 6 16:26:21 2009 -0700 shell32: Update Portuguese translation and convert to UTF8. --- dlls/shell32/shell32_Pt.rc | 253 +++++++++++++++++++++++++++++--------------- 1 files changed, 167 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7432f3c01a1011b0890f…

1 0

Ricardo Filipe : cmdlgtst: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 80de51bd3ff01fec2a79820371c3b5f966131527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80de51bd3ff01fec2a7982037… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 03:42:49 2009 -0700 cmdlgtst: Update Portuguese translation and convert to UTF8. --- programs/cmdlgtst/Pt.rc | 121 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 91 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80de51bd3ff01fec2a798…

1 0

Ricardo Filipe : notepad: Update Portuguese translation and convert to UTF8 .
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 7143a64d715292e51bc2080384fbc06533f75ede URL: http://source.winehq.org/git/wine.git/?a=commit;h=7143a64d715292e51bc208038… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 03:55:29 2009 -0700 notepad: Update Portuguese translation and convert to UTF8. --- programs/notepad/Pt.rc | 84 +++++++++++++++++++++++++++++------------------ 1 files changed, 52 insertions(+), 32 deletions(-) diff --git a/programs/notepad/Pt.rc b/programs/notepad/Pt.rc index 8ad0809..eeae39d 100644 --- a/programs/notepad/Pt.rc +++ b/programs/notepad/Pt.rc @@ -5,7 +5,7 @@ * Copyright 1999 Marcel Baur <alves(a)correionet.com.br> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2003 Marcelo Duarte - * Copyright 2004 Am�rico Jos� Melo + * Copyright 2004 Américo José Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,6 +24,8 @@ #include "notepad_res.h" +#pragma code_page(65001) + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN MAIN_MENU MENU @@ -35,7 +37,7 @@ MAIN_MENU MENU MENUITEM "Salvar &como...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "&Imprimir...\tCtrl+P", CMD_PRINT - MENUITEM "C&onfigurar p�gina...", CMD_PAGE_SETUP + MENUITEM "C&onfigurar página...", CMD_PAGE_SETUP MENUITEM "Configurar i&mpressora...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "Sai&r", CMD_EXIT @@ -51,15 +53,15 @@ POPUP "&Editar" { MENUITEM "Selecionar &tudo", CMD_SELECT_ALL MENUITEM "&Data/Hora\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "&Quebrar autom�tica de linha", CMD_WRAP + MENUITEM "&Quebrar automática de linha", CMD_WRAP MENUITEM "&Fonte...", CMD_FONT } POPUP "&Pesquisa" { MENUITEM "&Localizar...", CMD_SEARCH - MENUITEM "Localizar &pr�xima\tF3", CMD_SEARCH_NEXT + MENUITEM "Localizar &próxima\tF3", CMD_SEARCH_NEXT } POPUP "&Ajuda" { - MENUITEM "&Conte�do", CMD_HELP_CONTENTS + MENUITEM "&Conteúdo", CMD_HELP_CONTENTS MENUITEM "&Procurar...", CMD_HELP_SEARCH MENUITEM "&Ajuda na ajuda", CMD_HELP_ON_HELP MENUITEM SEPARATOR @@ -78,7 +80,7 @@ MAIN_MENU MENU MENUITEM "Gravar &como...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "&Imprimir", CMD_PRINT - MENUITEM "C&onfigurar p�gina...", CMD_PAGE_SETUP + MENUITEM "C&onfigurar página...", CMD_PAGE_SETUP MENUITEM "Configurar i&mpressora...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "Sai&r", CMD_EXIT @@ -94,19 +96,20 @@ POPUP "&Editar" { MENUITEM "Seleccionar &tudo", CMD_SELECT_ALL MENUITEM "&Data/Hora\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "&Quebrar autom�tica de linha", CMD_WRAP + MENUITEM "&Quebrar automática de linha", CMD_WRAP MENUITEM "&Tipo de Letra...", CMD_FONT } POPUP "&Pesquisa" { MENUITEM "&Localizar...", CMD_SEARCH - MENUITEM "Localizar &pr�xima\tF3", CMD_SEARCH_NEXT + MENUITEM "Localizar &próxima\tF3", CMD_SEARCH_NEXT + MENUITEM "&Substituir...\tCtrl+H", CMD_REPLACE } POPUP "&Ajuda" { - MENUITEM "&Conte�do", CMD_HELP_CONTENTS + MENUITEM "&Conteúdo", CMD_HELP_CONTENTS MENUITEM "&Procurar...", CMD_HELP_SEARCH MENUITEM "&Ajuda na ajuda", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&Acerca do Notepad...", CMD_HELP_ABOUT_NOTEPAD } } @@ -118,11 +121,11 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Configurar p�gina" +CAPTION "Configurar página" { -LTEXT "&Cabe�alho (mm):", 0x140, 10, 07, 40, 15 +LTEXT "&Cabeçalho (mm):", 0x140, 10, 07, 40, 15 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "&Rodap�:", 0x142, 10, 24, 40, 15 +LTEXT "&Rodapé:", 0x142, 10, 24, 40, 15 EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP GROUPBOX "&Margens:", 0x144, 10, 43,160, 45 @@ -140,35 +143,42 @@ PUSHBUTTON "Cancelar", IDCANCEL, 180, 21, 40, 15, WS_TABSTO PUSHBUTTON "&Ajuda", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Codificação:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" -STRING_PAGESETUP_FOOTERVALUE, "P�gina &p" +STRING_PAGESETUP_FOOTERVALUE, "Página &p" STRING_NOTEPAD, "Notepad" STRING_ERROR, "ERRO" STRING_WARNING, "AVISO" -STRING_INFO, "Informa��o" +STRING_INFO, "Informação" STRING_UNTITLED, "(sem nome)" STRING_ALL_FILES, "Todos os arquivos (*.*)" STRING_TEXT_FILES_TXT, "Arquivos texto (*.txt)" -STRING_TOOLARGE, "Arquivo '%s' � muito longo para o notepad.\n \ +STRING_TOOLARGE, "Arquivo '%s' é muito longo para o notepad.\n \ Por favor use um editor diferente." -STRING_NOTEXT, "Voc� n�o digitou nenhum texto. \ +STRING_NOTEXT, "Você não digitou nenhum texto. \ \nPor favor digite alguma coisa e tente novamente" -STRING_DOESNOTEXIST, "Arquivo '%s'\nn�o existe\n\n \ -Voc� deseja criar um novo arquivo?" +STRING_DOESNOTEXIST, "Arquivo '%s'\nnão existe\n\n \ +Você deseja criar um novo arquivo?" STRING_NOTSAVED, "Arquivo '%s'\nfoi modificado\n\n \ -Gostaria de salvar as altera��es?" -STRING_NOTFOUND, "'%s' n�o pode ser encontrado." -STRING_OUT_OF_MEMORY, "N�o h� mem�ria suficiente para completar essa \ -tarefa.\nFeche uma ou mais aplica��es para aumentar a quantidade de mem�ria livre." +Gostaria de salvar as alteraçÕes?" +STRING_NOTFOUND, "'%s' não pode ser encontrado." +STRING_OUT_OF_MEMORY, "Não há memória suficiente para completar essa \ +tarefa.\nFeche uma ou mais aplicações para aumentar a quantidade de memória livre." } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -176,27 +186,37 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" - STRING_PAGESETUP_FOOTERVALUE, "P�gina &p" + STRING_PAGESETUP_FOOTERVALUE, "Página &p" STRING_NOTEPAD, "Notepad" STRING_ERROR, "ERRO" STRING_WARNING, "AVISO" - STRING_INFO, "Informa��o" + STRING_INFO, "Informação" STRING_UNTITLED, "(sem nome)" STRING_ALL_FILES, "Todos os arquivos (*.*)" STRING_TEXT_FILES_TXT, "Ficheiros de texto (*.txt)" - STRING_TOOLARGE, "Ficheiros '%s' � muito longo para o notepad.\n \ + STRING_TOOLARGE, "Ficheiros '%s' é muito longo para o notepad.\n \ Por favor use um editor diferente." - STRING_NOTEXT, "N�o digitou nenhum texto. \ + STRING_NOTEXT, "Não digitou nenhum texto. \ \nPor favor digite alguma coisa e tente novamente" - STRING_DOESNOTEXIST, "Ficheiro '%s'\nn�o existe\n\n \ + STRING_DOESNOTEXIST, "Ficheiro '%s'\nnão existe\n\n \ Deseja criar um novo ficheiro?" STRING_NOTSAVED, "Ficheiro '%s'\nfoi modificado\n\n \ -Gostaria de gravar as altera��es?" - STRING_NOTFOUND, "'%s' n�o pode ser encontrado." - STRING_OUT_OF_MEMORY, "N�o h� mem�ria suficiente para completar esta \ -tarefa.\nFeche uma ou mais aplica��es para aumentar a quantidade de mem�ria livre." +Gostaria de gravar as alteraçÕes?" + STRING_NOTFOUND, "'%s' não pode ser encontrado." + STRING_OUT_OF_MEMORY, "Não há memória suficiente para completar esta \ +tarefa.\nFeche uma ou mais aplicações para aumentar a quantidade de memória livre." + +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Este ficheiro contém caracteres Unicode que serão perdidos se\n\ +guardar este ficheiro na codificação %s. \n\ +Para manter estes caracteres, carregue em Cancelar, e depois seleccione\n\ +uma das opções Unicode na lista de Codificações. \n\ +Continuar?" }

1 0

Huw Davies : winecfg: Add English neutral translations.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 7705022c849233ca4f6d74121d99cf25615d1c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7705022c849233ca4f6d74121… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 6 17:14:41 2009 +0100 winecfg: Add English neutral translations. --- programs/winecfg/En.rc | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index f71463a..a69b4d9 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -327,3 +327,70 @@ BEGIN IDC_SYSPARAMS_MENU_HILIGHT "Menu Highlight" IDC_SYSPARAMS_MENUBAR "Menu Bar" END + +LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL + +IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 +STYLE WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + LTEXT "&Theme:",IDC_STATIC,15,16,130,8 + COMBOBOX IDC_THEME_THEMECOMBO,15,24,130,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Install theme...",IDC_THEME_INSTALL,152,23,93,14 + LTEXT "&Colour:",IDC_THEME_COLORTEXT,15,40,112,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,48,112,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Size:",IDC_THEME_SIZETEXT,135,40,110,8 + COMBOBOX IDC_THEME_SIZECOMBO,135,48,110,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "It&em:",IDC_STATIC,15,64,112,8 + COMBOBOX IDC_SYSPARAM_COMBO,15,74,112,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "C&olour:",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED + PUSHBUTTON "",IDC_SYSPARAM_COLOR,135,74,25,13,WS_DISABLED | BS_OWNERDRAW + LTEXT "Si&ze:",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED + EDITTEXT IDC_SYSPARAM_SIZE,166,74,23,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASS,UDS_SETBUDDYINT | WS_DISABLED,187,74,15,13 + PUSHBUTTON "&Font...",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED + GROUPBOX " Fol&ders ",IDC_STATIC,8,114,244,100 + CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 + CONTROL "&Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + EDITTEXT IDC_EDIT_SFPATH,65,195,125,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDC_SYSPARAMS_BUTTON "Controls Background" + IDC_SYSPARAMS_BUTTON_TEXT "Controls Text" + IDC_SYSPARAMS_DESKTOP "Desktop" + IDC_SYSPARAMS_MENU "Menu Background" + IDC_SYSPARAMS_MENU_TEXT "Menu Text" + IDC_SYSPARAMS_SCROLLBAR "Scrollbar" + IDC_SYSPARAMS_SELECTION "Selection Background" + IDC_SYSPARAMS_SELECTION_TEXT "Selection Text" + IDC_SYSPARAMS_TOOLTIP "ToolTip Background" + IDC_SYSPARAMS_TOOLTIP_TEXT "ToolTip Text" + IDC_SYSPARAMS_WINDOW "Window Background" + IDC_SYSPARAMS_WINDOW_TEXT "Window Text" + IDC_SYSPARAMS_ACTIVE_TITLE "Active Title Bar" + IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Active Title Text" + IDC_SYSPARAMS_INACTIVE_TITLE "Inactive Title Bar" + IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inactive Title Text" + IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" + IDC_SYSPARAMS_APPWORKSPACE "Application Workspace" + IDC_SYSPARAMS_WINDOW_FRAME "Window Frame" + IDC_SYSPARAMS_ACTIVE_BORDER "Active Border" + IDC_SYSPARAMS_INACTIVE_BORDER "Inactive Border" + IDC_SYSPARAMS_BUTTON_SHADOW "Controls Shadow" + IDC_SYSPARAMS_GRAY_TEXT "Grey Text" + 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 Title Bar Gradient" + IDC_SYSPARAMS_MENU_HILIGHT "Menu Highlight" + IDC_SYSPARAMS_MENUBAR "Menu Bar" +END

1 0

Huw Davies : winhlp32: Add English neutral translations.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 7ceb4e7278d215dcd482a41c69b9af19ddb4506a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ceb4e7278d215dcd482a41c6… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 6 17:10:39 2009 +0100 winhlp32: Add English neutral translations. --- programs/winhlp32/En.rc | 68 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/En.rc b/programs/winhlp32/En.rc index cff0c6d..a4e9d8a 100644 --- a/programs/winhlp32/En.rc +++ b/programs/winhlp32/En.rc @@ -68,6 +68,51 @@ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT } } +MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL +{ + POPUP "&File" { + MENUITEM "&Open", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "&Print", MNID_FILE_PRINT + MENUITEM "Printer &setup...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "E&xit", MNID_FILE_EXIT + } + POPUP "&Edit" { + MENUITEM "&Copy...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE + } + POPUP "&Bookmark" { + MENUITEM "&Define...", MNID_BKMK_DEFINE + } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colours", MNID_OPTS_SYSTEM_COLORS + } + POPUP "&Help" { + MENUITEM "Help &on help", MNID_HELP_HELPON + MENUITEM "Always on &top", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&Info...", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "&About Wine", MNID_HELP_WINE +#endif + } +} + IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" @@ -125,3 +170,26 @@ BEGIN MENUITEM "Use system colors", MNID_CTXT_SYSTEM_COLORS END END + +CONTEXT_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL +BEGIN + POPUP "" + BEGIN + MENUITEM "Annotation...", MNID_CTXT_ANNOTATE + MENUITEM "Copy", MNID_CTXT_COPY + MENUITEM "Print...", MNID_CTXT_PRINT + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_CTXT_FONTS_SMALL + MENUITEM "Normal", MNID_CTXT_FONTS_NORMAL + MENUITEM "Large", MNID_CTXT_FONTS_LARGE + END + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_CTXT_HELP_DEFAULT + MENUITEM "Visible", MNID_CTXT_HELP_VISIBLE + MENUITEM "Non visible", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Use system colours", MNID_CTXT_SYSTEM_COLORS + END +END

1 0

Henri Verbeet : wined3d: checkGLcall() doesn't need a \n.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 32fd8f21300bce7b9cae574eab0fbdd9b94af582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32fd8f21300bce7b9cae574ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 7 11:08:02 2009 +0200 wined3d: checkGLcall() doesn't need a \n. --- dlls/wined3d/arb_program_shader.c | 10 +++++----- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/directx.c | 14 +++++++------- dlls/wined3d/drawprim.c | 14 +++++++------- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/nvidia_texture_shader.c | 3 +-- dlls/wined3d/query.c | 4 ++-- dlls/wined3d/surface.c | 4 ++-- 8 files changed, 27 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32fd8f21300bce7b9cae5…

1 0

Henri Verbeet : wined3d: Replace some shader_is_pshader_version() calls with plain type checks.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 3484d46a36f2381132dfc617a3f743f4ea927839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3484d46a36f2381132dfc617a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 7 11:08:04 2009 +0200 wined3d: Replace some shader_is_pshader_version() calls with plain type checks. --- dlls/wined3d/baseshader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index ae28565..4e3fb92 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -762,7 +762,7 @@ static void shader_dump_decl_usage(const struct wined3d_shader_semantic *semanti else { /* Pixel shaders 3.0 don't have usage semantics */ - if (shader_is_pshader_version(shader_version->type) && shader_version->major < 3) + if (shader_version->major < 3 && shader_version->type == WINED3D_SHADER_TYPE_PIXEL) return; else TRACE("_"); @@ -844,7 +844,7 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, break; case WINED3DSPR_TEXTURE: /* vs: case WINED3DSPR_ADDR */ - TRACE("%c", shader_is_pshader_version(shader_version->type) ? 't' : 'a'); + TRACE("%c", shader_version->type == WINED3D_SHADER_TYPE_PIXEL ? 't' : 'a'); break; case WINED3DSPR_RASTOUT:

1 0

Andrew Eikum : gdiplus: Implement GdipBeginContainer2 and GdipEndContainer.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 632aef3d8b3bc4baa0d673980552df288550c72c URL: http://source.winehq.org/git/wine.git/?a=commit;h=632aef3d8b3bc4baa0d673980… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Sun Jul 5 17:04:20 2009 -0500 gdiplus: Implement GdipBeginContainer2 and GdipEndContainer. --- dlls/gdiplus/gdiplus_private.h | 3 + dlls/gdiplus/graphics.c | 153 ++++++++++++++++++++++++++++++++++++++-- include/gdiplusflat.h | 1 + 3 files changed, 151 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 95133ca..be881c7 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -29,6 +29,7 @@ #include "objbase.h" #include "ocidl.h" +#include "wine/list.h" #include "gdiplus.h" @@ -109,6 +110,8 @@ struct GpGraphics{ BOOL busy; /* hdc handle obtained by GdipGetDC */ GpRegion *clip; UINT textcontrast; /* not used yet. get/set only */ + struct list containers; + GraphicsContainer contid; /* last-issued container ID */ }; struct GpBrush{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3525743..b81a984 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -38,6 +38,7 @@ #include "gdiplus.h" #include "gdiplus_private.h" #include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); @@ -941,6 +942,104 @@ GpStatus trace_path(GpGraphics *graphics, GpPath *path) return result; } +typedef struct _GraphicsContainerItem { + struct list entry; + GraphicsContainer contid; + + SmoothingMode smoothing; + CompositingQuality compqual; + InterpolationMode interpolation; + CompositingMode compmode; + TextRenderingHint texthint; + REAL scale; + GpUnit unit; + PixelOffsetMode pixeloffset; + UINT textcontrast; + GpMatrix* worldtrans; + GpRegion* clip; +} GraphicsContainerItem; + +static GpStatus init_container(GraphicsContainerItem** container, + GDIPCONST GpGraphics* graphics){ + GpStatus sts; + + *container = GdipAlloc(sizeof(GraphicsContainerItem)); + if(!(*container)) + return OutOfMemory; + + (*container)->contid = graphics->contid + 1; + + (*container)->smoothing = graphics->smoothing; + (*container)->compqual = graphics->compqual; + (*container)->interpolation = graphics->interpolation; + (*container)->compmode = graphics->compmode; + (*container)->texthint = graphics->texthint; + (*container)->scale = graphics->scale; + (*container)->unit = graphics->unit; + (*container)->textcontrast = graphics->textcontrast; + (*container)->pixeloffset = graphics->pixeloffset; + + sts = GdipCloneMatrix(graphics->worldtrans, &(*container)->worldtrans); + if(sts != Ok){ + GdipFree(*container); + *container = NULL; + return sts; + } + + sts = GdipCloneRegion(graphics->clip, &(*container)->clip); + if(sts != Ok){ + GdipDeleteMatrix((*container)->worldtrans); + GdipFree(*container); + *container = NULL; + return sts; + } + + return Ok; +} + +static void delete_container(GraphicsContainerItem* container){ + GdipDeleteMatrix(container->worldtrans); + GdipDeleteRegion(container->clip); + GdipFree(container); +} + +static GpStatus restore_container(GpGraphics* graphics, + GDIPCONST GraphicsContainerItem* container){ + GpStatus sts; + GpMatrix *newTrans; + GpRegion *newClip; + + sts = GdipCloneMatrix(container->worldtrans, &newTrans); + if(sts != Ok) + return sts; + + sts = GdipCloneRegion(container->clip, &newClip); + if(sts != Ok){ + GdipDeleteMatrix(newTrans); + return sts; + } + + GdipDeleteMatrix(graphics->worldtrans); + graphics->worldtrans = newTrans; + + GdipDeleteRegion(graphics->clip); + graphics->clip = newClip; + + graphics->contid = container->contid - 1; + + graphics->smoothing = container->smoothing; + graphics->compqual = container->compqual; + graphics->interpolation = container->interpolation; + graphics->compmode = container->compmode; + graphics->texthint = container->texthint; + graphics->scale = container->scale; + graphics->unit = container->unit; + graphics->textcontrast = container->textcontrast; + graphics->pixeloffset = container->pixeloffset; + + return Ok; +} + GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) { TRACE("(%p, %p)\n", hdc, graphics); @@ -991,6 +1090,8 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra (*graphics)->scale = 1.0; (*graphics)->busy = FALSE; (*graphics)->textcontrast = 4; + list_init(&(*graphics)->containers); + (*graphics)->contid = 0; return Ok; } @@ -1155,6 +1256,7 @@ GpStatus WINGDIPAPI GdipCreateStreamOnFile(GDIPCONST WCHAR * filename, GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) { + GraphicsContainerItem *cont, *next; TRACE("(%p)\n", graphics); if(!graphics) return InvalidParameter; @@ -1163,6 +1265,11 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) if(graphics->owndc) ReleaseDC(graphics->hwnd, graphics->hdc); + LIST_FOR_EACH_ENTRY_SAFE(cont, next, &graphics->containers, GraphicsContainerItem, entry){ + list_remove(&cont->entry); + delete_container(cont); + } + GdipDeleteRegion(graphics->clip); GdipDeleteMatrix(graphics->worldtrans); GdipFree(graphics); @@ -3254,14 +3361,24 @@ GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics *graphics, GraphicsState *state) return Ok; } -GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics *graphics, GraphicsContainer *state) +GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics *graphics, + GraphicsContainer *state) { - FIXME("(%p, %p)\n", graphics, state); + GraphicsContainerItem *container; + GpStatus sts; + + TRACE("(%p, %p)\n", graphics, state); if(!graphics || !state) return InvalidParameter; - *state = 0xdeadbeef; + sts = init_container(&container, graphics); + if(sts != Ok) + return sts; + + list_add_head(&graphics->containers, &container->entry); + *state = graphics->contid = container->contid; + return Ok; } @@ -3285,12 +3402,36 @@ GpStatus WINGDIPAPI GdipComment(GpGraphics *graphics, UINT sizeData, GDIPCONST B GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsState state) { - FIXME("(%p, 0x%x)\n", graphics, state); + GpStatus sts; + GraphicsContainerItem *container, *container2; - if(!graphics || !state) + TRACE("(%p, %x)\n", graphics, state); + + if(!graphics) return InvalidParameter; - return Ok; + LIST_FOR_EACH_ENTRY(container, &graphics->containers, GraphicsContainerItem, entry){ + if(container->contid == state) + break; + } + + /* did not find a matching container */ + if(&container->entry == &graphics->containers) + return Ok; + + /* remove all of the containers on top of the found container */ + LIST_FOR_EACH_ENTRY_SAFE(container, container2, &graphics->containers, GraphicsContainerItem, entry){ + if(container->contid == state) + break; + list_remove(&container->entry); + delete_container(container); + } + + list_remove(&container->entry); + sts = restore_container(graphics, container); + delete_container(container); + + return sts; } GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics *graphics, REAL sx, diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 48c188b..0c1e54f 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -127,6 +127,7 @@ GpStatus WINGDIPAPI GdipFlush(GpGraphics*, GpFlushIntention); GpStatus WINGDIPAPI GdipBeginContainer(GpGraphics*,GDIPCONST GpRectF*,GDIPCONST GpRectF*,GpUnit,GraphicsContainer*); GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics*,GraphicsContainer*); GpStatus WINGDIPAPI GdipBeginContainerI(GpGraphics*,GDIPCONST GpRect*,GDIPCONST GpRect*,GpUnit,GraphicsContainer*); +GpStatus WINGDIPAPI GdipEndContainer(GpGraphics*,GraphicsContainer); GpStatus WINGDIPAPI GdipComment(GpGraphics*,UINT,GDIPCONST BYTE*); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC,HANDLE,GpGraphics**);

1 0

Huw Davies : gdi32: Use a modified version of MulDiv to match native behaviour.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 787ead80880b5afbcba36f90a431c74634615f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=787ead80880b5afbcba36f90a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 7 11:32:41 2009 +0100 gdi32: Use a modified version of MulDiv to match native behaviour. --- dlls/gdi32/metafile.c | 46 ++++++++++++++++++------- dlls/gdi32/tests/metafile.c | 79 ++++++++++++++++++++++++++++++++----------- 2 files changed, 92 insertions(+), 33 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 2e34f37..a14928c 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1222,6 +1222,26 @@ end: return ret; } +/******************************************************************* + * muldiv + * + * Behaves somewhat differently to MulDiv when the answer is -ve + * and also rounds n.5 towards zero + */ +static INT muldiv(INT m1, INT m2, INT d) +{ + LONGLONG ret; + + ret = ((LONGLONG)m1 * m2 + d/2) / d; /* Always add d/2 even if ret will be -ve */ + + if((LONGLONG)m1 * m2 * 2 == (2 * ret - 1) * d) /* If the answer is exactly n.5 round towards zero */ + { + if(ret > 0) ret--; + else ret++; + } + return ret; +} + /****************************************************************** * set_window * @@ -1247,28 +1267,28 @@ static BOOL set_window(HDC hdc, HENHMETAFILE emf, HDC ref_dc, INT map_mode) case MM_TEXT: case MM_ISOTROPIC: case MM_ANISOTROPIC: - pt.y = MulDiv(header.rclFrame.top, vert_res, vert_size * 100); - pt.x = MulDiv(header.rclFrame.left, horz_res, horz_size * 100); + pt.y = muldiv(header.rclFrame.top, vert_res, vert_size * 100); + pt.x = muldiv(header.rclFrame.left, horz_res, horz_size * 100); break; case MM_LOMETRIC: - pt.y = MulDiv(-header.rclFrame.top, 1, 10) + 1; - pt.x = MulDiv( header.rclFrame.left, 1, 10); + pt.y = muldiv(-header.rclFrame.top, 1, 10) + 1; + pt.x = muldiv( header.rclFrame.left, 1, 10); break; case MM_HIMETRIC: pt.y = -header.rclFrame.top + 1; - pt.x = header.rclFrame.left; + pt.x = (header.rclFrame.left >= 0) ? header.rclFrame.left : header.rclFrame.left + 1; /* See the tests */ break; case MM_LOENGLISH: - pt.y = MulDiv(-header.rclFrame.top, 10, 254) + 1; - pt.x = MulDiv( header.rclFrame.left, 10, 254); + pt.y = muldiv(-header.rclFrame.top, 10, 254) + 1; + pt.x = muldiv( header.rclFrame.left, 10, 254); break; case MM_HIENGLISH: - pt.y = MulDiv(-header.rclFrame.top, 100, 254) + 1; - pt.x = MulDiv( header.rclFrame.left, 100, 254); + pt.y = muldiv(-header.rclFrame.top, 100, 254) + 1; + pt.x = muldiv( header.rclFrame.left, 100, 254); break; case MM_TWIPS: - pt.y = MulDiv(-header.rclFrame.top, 72 * 20, 2540) + 1; - pt.x = MulDiv( header.rclFrame.left, 72 * 20, 2540); + pt.y = muldiv(-header.rclFrame.top, 72 * 20, 2540) + 1; + pt.x = muldiv( header.rclFrame.left, 72 * 20, 2540); break; default: WARN("Unknown map mode %d\n", map_mode); @@ -1276,8 +1296,8 @@ static BOOL set_window(HDC hdc, HENHMETAFILE emf, HDC ref_dc, INT map_mode) } SetWindowOrgEx(hdc, pt.x, pt.y, NULL); - pt.x = MulDiv(header.rclFrame.right - header.rclFrame.left, horz_res, horz_size * 100); - pt.y = MulDiv(header.rclFrame.bottom - header.rclFrame.top, vert_res, vert_size * 100); + pt.x = muldiv(header.rclFrame.right - header.rclFrame.left, horz_res, horz_size * 100); + pt.y = muldiv(header.rclFrame.bottom - header.rclFrame.top, vert_res, vert_size * 100); SetWindowExtEx(hdc, pt.x, pt.y, NULL); return TRUE; } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index d1966da..49a5489 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2308,11 +2308,25 @@ static void test_SetWinMetaFileBits(void) HeapFree(GetProcessHeap(), 0, buffer); } -static void getwinmetafilebits(UINT mode, int scale) +/* This is somewhat different to MulDiv, but appears to be how native behaves */ +static INT muldiv(INT m1, INT m2, INT d) +{ + LONGLONG ret; + + ret = ((LONGLONG)m1 * m2 + d/2) / d; /* Always add d/2 even if ret will be -ve */ + + if((LONGLONG)m1 * m2 * 2 == (2 * ret - 1) * d) /* If the answer is exactly n.5 round towards zero */ + { + if(ret > 0) ret--; + else ret++; + } + return ret; +} + +static void getwinmetafilebits(UINT mode, int scale, RECT *rc) { HENHMETAFILE emf; HDC display_dc, emf_dc; - RECT rc; ENHMETAHEADER *enh_header; UINT size, emf_size, i; WORD check = 0; @@ -2322,17 +2336,19 @@ static void getwinmetafilebits(UINT mode, int scale) INT horz_res, vert_res, horz_size, vert_size; display_dc = GetDC(NULL); + ok(display_dc != NULL, "display_dc is NULL\n"); horz_res = GetDeviceCaps(display_dc, HORZRES); vert_res = GetDeviceCaps(display_dc, VERTRES); horz_size = GetDeviceCaps(display_dc, HORZSIZE); vert_size = GetDeviceCaps(display_dc, VERTSIZE); - SetRect(&rc, 1000, 2000, 3000, 6000); - emf_dc = CreateEnhMetaFileA(display_dc, NULL, &rc, NULL); + emf_dc = CreateEnhMetaFileA(display_dc, NULL, rc, NULL); + ok(emf_dc != NULL, "emf_dc is NULL\n"); for(i = 0; i < 3000; i++) /* This is enough to take emf_size > 0xffff */ Rectangle(emf_dc, 0, 0, 1000, 20); emf = CloseEnhMetaFile(emf_dc); + ok(emf != NULL, "emf is NULL\n"); emf_size = GetEnhMetaFileBits(emf, 0, NULL); enh_header = HeapAlloc(GetProcessHeap(), 0, emf_size); @@ -2342,6 +2358,8 @@ static void getwinmetafilebits(UINT mode, int scale) have different resolutions */ enh_header->szlDevice.cx *= scale; emf = SetEnhMetaFileBits(emf_size, (BYTE*)enh_header); + ok(emf != NULL, "emf is NULL\n"); + ok(EqualRect((RECT*)&enh_header->rclFrame, rc), "Frame rectangles differ\n"); size = GetWinMetaFileBits(emf, 0, NULL, mode, display_dc); ok(size, "GetWinMetaFileBits returns 0\n"); @@ -2403,28 +2421,28 @@ static void getwinmetafilebits(UINT mode, int scale) case MM_TEXT: case MM_ISOTROPIC: case MM_ANISOTROPIC: - pt.y = MulDiv(rc.top, vert_res, vert_size * 100); - pt.x = MulDiv(rc.left, horz_res, horz_size * 100); + pt.y = muldiv(rc->top, vert_res, vert_size * 100); + pt.x = muldiv(rc->left, horz_res, horz_size * 100); break; case MM_LOMETRIC: - pt.y = MulDiv(-rc.top, 1, 10) + 1; - pt.x = MulDiv(rc.left, 1, 10); + pt.y = muldiv(-rc->top, 1, 10) + 1; + pt.x = muldiv( rc->left, 1, 10); break; case MM_HIMETRIC: - pt.y = -rc.top + 1; - pt.x = rc.left; + pt.y = -rc->top + 1; + pt.x = (rc->left >= 0) ? rc->left : rc->left + 1; /* strange but true */ break; case MM_LOENGLISH: - pt.y = MulDiv(-rc.top, 10, 254) + 1; - pt.x = MulDiv( rc.left, 10, 254); + pt.y = muldiv(-rc->top, 10, 254) + 1; + pt.x = muldiv( rc->left, 10, 254); break; case MM_HIENGLISH: - pt.y = MulDiv(-rc.top, 100, 254) + 1; - pt.x = MulDiv( rc.left, 100, 254); + pt.y = muldiv(-rc->top, 100, 254) + 1; + pt.x = muldiv( rc->left, 100, 254); break; case MM_TWIPS: - pt.y = MulDiv(-rc.top, 72 * 20, 2540) + 1; - pt.x = MulDiv( rc.left, 72 * 20, 2540); + pt.y = muldiv(-rc->top, 72 * 20, 2540) + 1; + pt.x = muldiv( rc->left, 72 * 20, 2540); break; default: pt.x = pt.y = 0; @@ -2437,8 +2455,9 @@ static void getwinmetafilebits(UINT mode, int scale) if(rec_num == mfcomment_chunks + 2) { ok(rec->rdFunction == META_SETWINDOWEXT, "got %04x\n", rec->rdFunction); - ok((short)rec->rdParm[0] == MulDiv(rc.bottom - rc.top, vert_res, vert_size * 100), "got %d\n", (short)rec->rdParm[0]); - ok((short)rec->rdParm[1] == MulDiv(rc.right - rc.left, horz_res, horz_size * 100), "got %d\n", (short)rec->rdParm[1]); + ok((short)rec->rdParm[0] == muldiv(rc->bottom - rc->top, vert_res, vert_size * 100), "got %d\n", (short)rec->rdParm[0]); + ok((short)rec->rdParm[1] == muldiv(rc->right - rc->left, horz_res, horz_size * 100), "got %d\n", (short)rec->rdParm[1]); + } rec_num++; @@ -2455,11 +2474,31 @@ static void getwinmetafilebits(UINT mode, int scale) static void test_GetWinMetaFileBits(void) { UINT mode; + RECT frames[] = + { + { 1000, 2000, 3000, 6000}, + {-1000, 2000, 3000, 6000}, + { 1000, -2000, 3000, 6000}, + { 1005, 2005, 3000, 6000}, + {-1005, -2005, 3000, 6000}, + {-1005, -2010, 3000, 6000}, + {-1005, 2010, 3000, 6000}, + { 0, 0, 1, 1}, + { -1, -1, 1, 1}, + { 0, 0, 0, 0} + }; for(mode = MM_MIN; mode <= MM_MAX; mode++) { - getwinmetafilebits(mode, 1); - getwinmetafilebits(mode, 2); + RECT *rc; + trace("mode %d\n", mode); + + for(rc = frames; rc->right - rc->left > 0; rc++) + { + trace("frame %d,%d - %d,%d\n", rc->left, rc->top, rc->right, rc->bottom); + getwinmetafilebits(mode, 1, rc); + getwinmetafilebits(mode, 2, rc); + } } }

1 0

Andrew Eikum : gdiplus/tests: Test cases for GdipBeginContainer2.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 0ed10bf696dc6cf09034eaa2ca124f6ace52cd2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed10bf696dc6cf09034eaa2c… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Sun Jul 5 15:53:07 2009 -0500 gdiplus/tests: Test cases for GdipBeginContainer2. --- dlls/gdiplus/tests/graphics.c | 186 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 186 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index ad7f2d3..23aa717 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -323,6 +323,191 @@ static void test_GdipDrawArcI(void) ReleaseDC(0, hdc); } +static void test_BeginContainer2(void) +{ + GpMatrix *transform; + GpRectF clip; + REAL defClip[] = {5, 10, 15, 20}; + REAL elems[6], defTrans[] = {1, 2, 3, 4, 5, 6}; + GraphicsContainer cont1, cont2, cont3, cont4; + CompositingQuality compqual, defCompqual = CompositingQualityHighSpeed; + CompositingMode compmode, defCompmode = CompositingModeSourceOver; + InterpolationMode interp, defInterp = InterpolationModeHighQualityBicubic; + REAL scale, defScale = 17; + GpUnit unit, defUnit = UnitPixel; + PixelOffsetMode offsetmode, defOffsetmode = PixelOffsetModeHighSpeed; + SmoothingMode smoothmode, defSmoothmode = SmoothingModeAntiAlias; + UINT contrast, defContrast = 5; + TextRenderingHint texthint, defTexthint = TextRenderingHintAntiAlias; + + GpStatus status; + GpGraphics *graphics = NULL; + HDC hdc = GetDC(0); + + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + /* null graphics, null container */ + status = GdipBeginContainer2(NULL, &cont1); + expect(InvalidParameter, status); + + status = GdipBeginContainer2(graphics, NULL); + expect(InvalidParameter, status); + + status = GdipEndContainer(NULL, cont1); + expect(InvalidParameter, status); + + /* test all quality-related values */ + GdipSetCompositingMode(graphics, defCompmode); + GdipSetCompositingQuality(graphics, defCompqual); + GdipSetInterpolationMode(graphics, defInterp); + GdipSetPageScale(graphics, defScale); + GdipSetPageUnit(graphics, defUnit); + GdipSetPixelOffsetMode(graphics, defOffsetmode); + GdipSetSmoothingMode(graphics, defSmoothmode); + GdipSetTextContrast(graphics, defContrast); + GdipSetTextRenderingHint(graphics, defTexthint); + + status = GdipBeginContainer2(graphics, &cont1); + expect(Ok, status); + + GdipSetCompositingMode(graphics, CompositingModeSourceCopy); + GdipSetCompositingQuality(graphics, CompositingQualityHighQuality); + GdipSetInterpolationMode(graphics, InterpolationModeBilinear); + GdipSetPageScale(graphics, 10); + GdipSetPageUnit(graphics, UnitDocument); + GdipSetPixelOffsetMode(graphics, PixelOffsetModeHalf); + GdipSetSmoothingMode(graphics, SmoothingModeNone); + GdipSetTextContrast(graphics, 7); + GdipSetTextRenderingHint(graphics, TextRenderingHintClearTypeGridFit); + + status = GdipEndContainer(graphics, cont1); + expect(Ok, status); + + GdipGetCompositingMode(graphics, &compmode); + ok(defCompmode == compmode, "Expected Compositing Mode to be restored to %d, got %d\n", defCompmode, compmode); + + GdipGetCompositingQuality(graphics, &compqual); + ok(defCompqual == compqual, "Expected Compositing Quality to be restored to %d, got %d\n", defCompqual, compqual); + + GdipGetInterpolationMode(graphics, &interp); + ok(defInterp == interp, "Expected Interpolation Mode to be restored to %d, got %d\n", defInterp, interp); + + GdipGetPageScale(graphics, &scale); + ok(fabs(defScale - scale) < 0.0001, "Expected Page Scale to be restored to %f, got %f\n", defScale, scale); + + GdipGetPageUnit(graphics, &unit); + ok(defUnit == unit, "Expected Page Unit to be restored to %d, got %d\n", defUnit, unit); + + GdipGetPixelOffsetMode(graphics, &offsetmode); + ok(defOffsetmode == offsetmode, "Expected Pixel Offset Mode to be restored to %d, got %d\n", defOffsetmode, offsetmode); + + GdipGetSmoothingMode(graphics, &smoothmode); + ok(defSmoothmode == smoothmode, "Expected Smoothing Mode to be restored to %d, got %d\n", defSmoothmode, smoothmode); + + GdipGetTextContrast(graphics, &contrast); + ok(defContrast == contrast, "Expected Text Contrast to be restored to %d, got %d\n", defContrast, contrast); + + GdipGetTextRenderingHint(graphics, &texthint); + ok(defTexthint == texthint, "Expected Text Hint to be restored to %d, got %d\n", defTexthint, texthint); + + /* test world transform */ + status = GdipBeginContainer2(graphics, &cont1); + expect(Ok, status); + + GdipCreateMatrix2(defTrans[0], defTrans[1], defTrans[2], defTrans[3], + defTrans[4], defTrans[5], &transform); + GdipSetWorldTransform(graphics, transform); + GdipDeleteMatrix(transform); + transform = NULL; + + status = GdipBeginContainer2(graphics, &cont2); + expect(Ok, status); + + GdipCreateMatrix2(10, 20, 30, 40, 50, 60, &transform); + GdipSetWorldTransform(graphics, transform); + GdipDeleteMatrix(transform); + transform = NULL; + + status = GdipEndContainer(graphics, cont2); + expect(Ok, status); + + GdipCreateMatrix(&transform); + GdipGetWorldTransform(graphics, transform); + GdipGetMatrixElements(transform, elems); + ok(fabs(defTrans[0] - elems[0]) < 0.0001 && + fabs(defTrans[1] - elems[1]) < 0.0001 && + fabs(defTrans[2] - elems[2]) < 0.0001 && + fabs(defTrans[3] - elems[3]) < 0.0001 && + fabs(defTrans[4] - elems[4]) < 0.0001 && + fabs(defTrans[5] - elems[5]) < 0.0001, + "Expected World Transform Matrix to be restored to [%f, %f, %f, %f, %f, %f], got [%f, %f, %f, %f, %f, %f]\n", + defTrans[0], defTrans[1], defTrans[2], defTrans[3], defTrans[4], defTrans[5], + elems[0], elems[1], elems[2], elems[3], elems[4], elems[5]); + GdipDeleteMatrix(transform); + transform = NULL; + + status = GdipEndContainer(graphics, cont1); + expect(Ok, status); + + /* test clipping */ + status = GdipBeginContainer2(graphics, &cont1); + expect(Ok, status); + + GdipSetClipRect(graphics, defClip[0], defClip[1], defClip[2], defClip[3], CombineModeReplace); + + status = GdipBeginContainer2(graphics, &cont2); + expect(Ok, status); + + GdipSetClipRect(graphics, 2, 4, 6, 8, CombineModeReplace); + + status = GdipEndContainer(graphics, cont2); + + GdipGetClipBounds(graphics, &clip); + todo_wine ok(fabs(defClip[0] - clip.X) < 0.0001 && + fabs(defClip[1] - clip.Y) < 0.0001 && + fabs(defClip[2] - clip.Width) < 0.0001 && + fabs(defClip[3] - clip.Height) < 0.0001, + "Expected Clipping Rectangle to be restored to [%f, %f, %f, %f], got [%f, %f, %f, %f]\n", + defClip[0], defClip[1], defClip[2], defClip[3], + clip.X, clip.Y, clip.Width, clip.Height); + + status = GdipEndContainer(graphics, cont1); + + /* nesting */ + status = GdipBeginContainer2(graphics, &cont1); + expect(Ok, status); + + status = GdipBeginContainer2(graphics, &cont2); + expect(Ok, status); + + status = GdipBeginContainer2(graphics, &cont3); + expect(Ok, status); + + status = GdipEndContainer(graphics, cont3); + expect(Ok, status); + + status = GdipBeginContainer2(graphics, &cont4); + expect(Ok, status); + + status = GdipEndContainer(graphics, cont4); + expect(Ok, status); + + /* skip cont2 */ + status = GdipEndContainer(graphics, cont1); + expect(Ok, status); + + /* end an already-ended container */ + status = GdipEndContainer(graphics, cont1); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + ReleaseDC(0, hdc); +} + static void test_GdipDrawBezierI(void) { GpStatus status; @@ -1511,6 +1696,7 @@ START_TEST(graphics) test_GdipDrawLinesI(); test_GdipDrawString(); test_Get_Release_DC(); + test_BeginContainer2(); test_transformpoints(); test_get_set_clip(); test_isempty();

1 0

Paul Vriens : shell32: Add missing encoding for Dutch resources.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 5f5c34085539bfbbec4d5757508a7a2a83b4b445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f5c34085539bfbbec4d57575… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 7 13:01:18 2009 +0200 shell32: Add missing encoding for Dutch resources. --- dlls/shell32/shell32_Nl.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index 9ea879d..33a65bc 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -19,6 +19,8 @@ #include "shresdef.h" +#pragma code_page(65001) + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL MENU_001 MENU DISCARDABLE

1 0

Henri Verbeet : wined3d: Get rid of some pointers in WINED3DADAPTER_IDENTIFIER.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 699f68cdee8f9c2bc4ee51e54ec52487dd16531f URL: http://source.winehq.org/git/wine.git/?a=commit;h=699f68cdee8f9c2bc4ee51e54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 7 11:08:03 2009 +0200 wined3d: Get rid of some pointers in WINED3DADAPTER_IDENTIFIER. This also avoids some unchecked strcpy() calls. --- dlls/d3d8/directx.c | 36 +++++++++++++---------- dlls/d3d9/directx.c | 28 ++++++++++-------- dlls/wined3d/directx.c | 71 +++++++++++++++++++++++++++++++-------------- include/wine/wined3d.idl | 23 ++++++++------ 4 files changed, 97 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=699f68cdee8f9c2bc4ee5…

1 0

Michael Stefaniuc : oleacc: Add missing encoding info to the German resource file.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: b880d71e28dd2ac82f689a442b26b7f0284ff45a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b880d71e28dd2ac82f689a442… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 7 11:06:26 2009 +0200 oleacc: Add missing encoding info to the German resource file. The file is already UTF-8. --- dlls/oleacc/oleacc_De.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleacc/oleacc_De.rc b/dlls/oleacc/oleacc_De.rc index f39ff39..f15cc2d 100644 --- a/dlls/oleacc/oleacc_De.rc +++ b/dlls/oleacc/oleacc_De.rc @@ -20,6 +20,8 @@ #include "oleacc.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE

1 0

Henri Verbeet : wined3d: Add some missing float suffixes.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 2ac34bf2315a23e2ab00c0b76ceffdd1b6eea23d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ac34bf2315a23e2ab00c0b76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 7 11:08:01 2009 +0200 wined3d: Add some missing float suffixes. The compiler should be smart enough to fix most of these, but it looks sloppy. --- dlls/wined3d/arb_program_shader.c | 44 +++++++++++----------- dlls/wined3d/ati_fragment_shader.c | 8 ++-- dlls/wined3d/baseshader.c | 18 +++++----- dlls/wined3d/buffer.c | 4 +- dlls/wined3d/context.c | 4 +- dlls/wined3d/cubetexture.c | 10 +++--- dlls/wined3d/device.c | 68 ++++++++++++++++++++---------------- dlls/wined3d/directx.c | 22 ++++++------ dlls/wined3d/drawprim.c | 66 +++++++++++++++++----------------- dlls/wined3d/gl_compat.c | 18 +++++----- dlls/wined3d/glsl_shader.c | 18 +++++----- dlls/wined3d/state.c | 62 +++++++++++++++++---------------- dlls/wined3d/surface.c | 66 +++++++++++++++++------------------ dlls/wined3d/surface_base.c | 12 +++--- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 20 +++++----- dlls/wined3d/utils.c | 4 +- dlls/wined3d/volumetexture.c | 8 ++-- dlls/wined3d/wined3d_private.h | 26 +++++++------- 19 files changed, 244 insertions(+), 236 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ac34bf2315a23e2ab00c…

1 0

Michael Stefaniuc : cryptdlg: Add missing encoding info to the German resource file.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: b1edb166911bd0688a81d46ec7cd76b7468732fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1edb166911bd0688a81d46ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 7 11:06:36 2009 +0200 cryptdlg: Add missing encoding info to the German resource file. The file is already UTF-8. --- dlls/cryptdlg/cryptdlg_De.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/cryptdlg/cryptdlg_De.rc b/dlls/cryptdlg/cryptdlg_De.rc index d3181ef..cd3fa96 100644 --- a/dlls/cryptdlg/cryptdlg_De.rc +++ b/dlls/cryptdlg/cryptdlg_De.rc @@ -20,6 +20,8 @@ #include "cryptres.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE

1 0

Henri Verbeet : wined3d: Avoid an unnecessary strcpy().
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 7ec911adebf8294bc614dbc1287bd5c578690047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ec911adebf8294bc614dbc12… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 7 11:08:00 2009 +0200 wined3d: Avoid an unnecessary strcpy(). --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_gl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ff6bbe2..fecbc4f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -869,7 +869,7 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info, const char *gl_renderer) driver_version_table[i].lopart_lo); gl_info->driver_version_hipart = MAKEDWORD_VERSION(driver_version_table[i].hipart_hi, driver_version_table[i].hipart_lo); - strcpy(gl_info->driver_description, driver_version_table[i].description); + gl_info->driver_description = driver_version_table[i].description; break; } } diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 794748d..ee15d35 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3954,7 +3954,7 @@ typedef struct _WineD3D_GL_Info { UINT vidmem; DWORD driver_version; DWORD driver_version_hipart; - CHAR driver_description[255]; + const char *driver_description; /** * CAPS Constants */

1 0

Alexandre Julliard : shell32: Add support for the CSIDL_SYSTEMX86 folder.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 43e90c8ff74b89c45351f2efe43f3793f8a84098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e90c8ff74b89c45351f2efe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 11:47:58 2009 +0200 shell32: Add support for the CSIDL_SYSTEMX86 folder. --- dlls/shell32/shellpath.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 2434e9a..44f0750 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -812,6 +812,7 @@ typedef enum _CSIDL_Type { CSIDL_Type_NonExistent, CSIDL_Type_WindowsPath, CSIDL_Type_SystemPath, + CSIDL_Type_SystemX86Path, } CSIDL_Type; typedef struct @@ -1029,7 +1030,7 @@ static const CSIDL_DATA CSIDL_Data[] = NULL }, { /* 0x29 - CSIDL_SYSTEMX86 */ - CSIDL_Type_NonExistent, + CSIDL_Type_SystemX86Path, NULL, NULL }, @@ -1782,6 +1783,17 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( } hr = S_OK; break; + case CSIDL_Type_SystemX86Path: + if (!GetSystemWow64DirectoryW(szTemp, MAX_PATH)) GetSystemDirectoryW(szTemp, MAX_PATH); + if (CSIDL_Data[folder].szDefaultPath && + !IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath) && + *CSIDL_Data[folder].szDefaultPath) + { + PathAddBackslashW(szTemp); + strcatW(szTemp, CSIDL_Data[folder].szDefaultPath); + } + hr = S_OK; + break; case CSIDL_Type_CurrVer: hr = _SHGetCurrentVersionPath(dwFlags, folder, szTemp); break;

1 0

Alexandre Julliard : ntdll: Support querying the Wow64 state of other processes.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 12c90b04dc3b95f5b15d4d64cd3ebaa1374f2f59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c90b04dc3b95f5b15d4d64c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 11:38:19 2009 +0200 ntdll: Support querying the Wow64 state of other processes. --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/process.c | 14 +++++++++++++- dlls/ntdll/server.c | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3032553..ea2234a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -71,6 +71,7 @@ extern void virtual_init_threading(void); /* server support */ extern timeout_t server_start_time; +extern unsigned int server_cpus; extern int is_wow64; extern void server_init_process(void); extern NTSTATUS server_init_process_done(void); diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 9ec5513..6258569 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -307,7 +307,19 @@ NTSTATUS WINAPI NtQueryInformationProcess( case ProcessWow64Information: if (ProcessInformationLength == sizeof(DWORD)) { - *(DWORD *)ProcessInformation = is_wow64; + DWORD val = 0; + + if (ProcessHandle == GetCurrentProcess()) val = is_wow64; + else if (server_cpus & (1 << CPU_x86_64)) + { + SERVER_START_REQ( get_process_info ) + { + req->handle = wine_server_obj_handle( ProcessHandle ); + if (!(ret = wine_server_call( req ))) val = (reply->cpu != CPU_x86_64); + } + SERVER_END_REQ; + } + *(DWORD *)ProcessInformation = val; len = sizeof(DWORD); } else ret = STATUS_INFO_LENGTH_MISMATCH; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index a4f2953..1eea402 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -94,7 +94,7 @@ static const enum cpu_type client_cpu = CPU_SPARC; #error Unsupported CPU #endif -static unsigned int server_cpus; +unsigned int server_cpus = 0; int is_wow64 = FALSE; #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS

1 0

Alexandre Julliard : server: Return the process CPU in the get_process_info request.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 6056e8a52b8a931bc54306044fb991028fa7f1cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6056e8a52b8a931bc54306044… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 11:37:47 2009 +0200 server: Return the process CPU in the get_process_info request. --- include/wine/server_protocol.h | 4 +++- server/process.c | 1 + server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 1 + 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f819686..c7566ea 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -693,6 +693,8 @@ struct get_process_info_reply timeout_t end_time; int exit_code; int priority; + cpu_type_t cpu; + char __pad_60[4]; }; @@ -5310,6 +5312,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 386 +#define SERVER_PROTOCOL_VERSION 387 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index 8a4fb15..2b8d8f6 100644 --- a/server/process.c +++ b/server/process.c @@ -1068,6 +1068,7 @@ DECL_HANDLER(get_process_info) reply->peb = process->peb; reply->start_time = process->start_time; reply->end_time = process->end_time; + reply->cpu = process->cpu; release_object( process ); } } diff --git a/server/protocol.def b/server/protocol.def index 8ae653b..e871736 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -660,6 +660,7 @@ typedef union timeout_t end_time; /* process end time */ int exit_code; /* process exit code */ int priority; /* priority class */ + cpu_type_t cpu; /* CPU that this process is running on */ @END diff --git a/server/request.h b/server/request.h index f85756c..4fc3bd6 100644 --- a/server/request.h +++ b/server/request.h @@ -694,7 +694,8 @@ C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, start_time) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, end_time) == 40 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, exit_code) == 48 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, priority) == 52 ); -C_ASSERT( sizeof(struct get_process_info_reply) == 56 ); +C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, cpu) == 56 ); +C_ASSERT( sizeof(struct get_process_info_reply) == 64 ); C_ASSERT( FIELD_OFFSET(struct set_process_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_process_info_request, mask) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_process_info_request, priority) == 20 ); diff --git a/server/trace.c b/server/trace.c index 6781ef7..d24f653 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1152,6 +1152,7 @@ static void dump_get_process_info_reply( const struct get_process_info_reply *re dump_timeout( ", end_time=", &req->end_time ); fprintf( stderr, ", exit_code=%d", req->exit_code ); fprintf( stderr, ", priority=%d", req->priority ); + dump_cpu_type( ", cpu=", &req->cpu ); } static void dump_set_process_info_request( const struct set_process_info_request *req )

1 0

Alexandre Julliard : shell32/tests: Revive the test for CSIDL_SYSTEMX86.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 7af70c2c9736883348c7a490d9e18beb131fe6c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af70c2c9736883348c7a490d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 11:48:25 2009 +0200 shell32/tests: Revive the test for CSIDL_SYSTEMX86. --- dlls/shell32/tests/shellpath.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 4cacb08..b5b1967 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -89,6 +89,7 @@ static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); static LPITEMIDLIST (WINAPI *pILFindLastID)(LPCITEMIDLIST); static int (WINAPI *pSHFileOperationA)(LPSHFILEOPSTRUCTA); static HRESULT (WINAPI *pSHGetMalloc)(LPMALLOC *); +static UINT (WINAPI *pGetSystemWow64DirectoryA)(LPSTR,UINT); static DLLVERSIONINFO shellVersion = { 0 }; static LPMALLOC pMalloc; static const BYTE guidType[] = { PT_GUID }; @@ -684,10 +685,17 @@ static void testSystemDir(void) "GetSystemDirectory returns %s SHGetSpecialFolderPath returns %s\n", systemDir, systemShellPath); } - /* CSIDL_SYSTEMX86 isn't checked in the same way, since it's different - * on Win64 (and non-x86 Windows systems, if there are any still in - * existence) than on Win32. - */ + + if (!pGetSystemWow64DirectoryA || !pGetSystemWow64DirectoryA(systemDir, sizeof(systemDir))) + GetSystemDirectoryA(systemDir, sizeof(systemDir)); + myPathRemoveBackslashA(systemDir); + if (pSHGetSpecialFolderPathA(NULL, systemShellPath, CSIDL_SYSTEMX86, FALSE)) + { + myPathRemoveBackslashA(systemShellPath); + ok(!lstrcmpiA(systemDir, systemShellPath), + "GetSystemDirectory returns %s SHGetSpecialFolderPath returns %s\n", + systemDir, systemShellPath); + } } /* Globals used by subprocesses */ @@ -871,6 +879,8 @@ START_TEST(shellpath) if (!init()) return; loadShell32(); + pGetSystemWow64DirectoryA = (void *)GetProcAddress( GetModuleHandleA("kernel32.dll"), + "GetSystemWow64DirectoryA" ); if (myARGC >= 3) doChild(myARGV[2]);

1 0

Alexandre Julliard : kernel32: Add implementation of GetSystemWow64DirectoryA/W.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 03d6da0894b3a3f9c3b37b36b2c70d7c2a4ce831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d6da0894b3a3f9c3b37b36b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 11:42:03 2009 +0200 kernel32: Add implementation of GetSystemWow64DirectoryA/W. --- dlls/kernel32/kernel_private.h | 1 + dlls/kernel32/path.c | 28 ++++++++++++++++++++++------ dlls/kernel32/process.c | 15 +++++++++++++++ include/winbase.h | 3 +++ 4 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index b23aedf..39a5e23 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -71,6 +71,7 @@ extern HANDLE dos_handles[DOS_TABLE_SIZE]; extern const WCHAR *DIR_Windows; extern const WCHAR *DIR_System; +extern const WCHAR *DIR_SysWow64; extern VOID SYSLEVEL_CheckNotLevel( INT level ); diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 0b3a87e..299db1c 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1521,10 +1521,22 @@ UINT WINAPI GetSystemDirectoryA( LPSTR path, UINT count ) * - On Win32 we should returns ERROR_CALL_NOT_IMPLEMENTED * - On Win64 we should returns the SysWow64 (system64) directory */ -UINT WINAPI GetSystemWow64DirectoryW( LPWSTR lpBuffer, UINT uSize ) +UINT WINAPI GetSystemWow64DirectoryW( LPWSTR path, UINT count ) { - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return 0; + UINT len; + + if (!DIR_SysWow64) + { + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return 0; + } + len = strlenW( DIR_SysWow64 ) + 1; + if (path && count >= len) + { + strcpyW( path, DIR_SysWow64 ); + len--; + } + return len; } @@ -1533,10 +1545,14 @@ UINT WINAPI GetSystemWow64DirectoryW( LPWSTR lpBuffer, UINT uSize ) * * See comment for GetWindowsWow64DirectoryW. */ -UINT WINAPI GetSystemWow64DirectoryA( LPSTR lpBuffer, UINT uSize ) +UINT WINAPI GetSystemWow64DirectoryA( LPSTR path, UINT count ) { - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return 0; + if (!DIR_SysWow64) + { + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return 0; + } + return copy_filename_WtoA( DIR_SysWow64, path, count ); } diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6fde35b..4e74782 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -76,11 +76,13 @@ static UINT process_error_mode; static DWORD shutdown_flags = 0; static DWORD shutdown_priority = 0x280; static DWORD process_dword; +static BOOL is_wow64; HMODULE kernel32_handle = 0; const WCHAR *DIR_Windows = NULL; const WCHAR *DIR_System = NULL; +const WCHAR *DIR_SysWow64 = NULL; /* Process flags */ #define PDB32_DEBUGGED 0x0001 /* Process is being debugged */ @@ -822,6 +824,7 @@ static void init_windows_dirs(void) static const WCHAR winsysdirW[] = {'w','i','n','s','y','s','d','i','r',0}; static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s',0}; static const WCHAR default_sysdirW[] = {'\\','s','y','s','t','e','m','3','2',0}; + static const WCHAR default_syswow64W[] = {'\\','s','y','s','w','o','w','6','4',0}; DWORD len; WCHAR *buffer; @@ -849,6 +852,17 @@ static void init_windows_dirs(void) DIR_System = buffer; } +#ifndef _WIN64 /* SysWow64 is always defined on 64-bit */ + if (is_wow64) +#endif + { + len = strlenW( DIR_Windows ); + buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) + sizeof(default_syswow64W) ); + memcpy( buffer, DIR_Windows, len * sizeof(WCHAR) ); + memcpy( buffer + len, default_syswow64W, sizeof(default_syswow64W) ); + DIR_SysWow64 = buffer; + } + if (!CreateDirectoryW( DIR_Windows, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) ERR( "directory %s could not be created, error %u\n", debugstr_w(DIR_Windows), GetLastError() ); @@ -1010,6 +1024,7 @@ void CDECL __wine_kernel_init(void) setbuf(stdout,NULL); setbuf(stderr,NULL); kernel32_handle = GetModuleHandleW(kernel32W); + IsWow64Process( GetCurrentProcess(), &is_wow64 ); LOCALE_Init(); diff --git a/include/winbase.h b/include/winbase.h index a7eaf9d..d7d8773 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1726,6 +1726,9 @@ WINBASEAPI VOID WINAPI GetSystemTimeAsFileTime(LPFILETIME); WINBASEAPI UINT WINAPI GetSystemWindowsDirectoryA(LPSTR,UINT); WINBASEAPI UINT WINAPI GetSystemWindowsDirectoryW(LPWSTR,UINT); #define GetSystemWindowsDirectory WINELIB_NAME_AW(GetSystemWindowsDirectory) +WINBASEAPI UINT WINAPI GetSystemWow64DirectoryA(LPSTR,UINT); +WINBASEAPI UINT WINAPI GetSystemWow64DirectoryW(LPWSTR,UINT); +#define GetSystemWow64Directory WINELIB_NAME_AW(GetSystemWow64Directory) WINBASEAPI DWORD WINAPI GetTapeParameters(HANDLE,DWORD,LPDWORD,LPVOID); WINBASEAPI DWORD WINAPI GetTapePosition(HANDLE,DWORD,LPDWORD,LPDWORD,LPDWORD); WINBASEAPI DWORD WINAPI GetTapeStatus(HANDLE);

1 0

Vladimir Pankratov : regedit: Implement open last key at startup.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 5ce04f7ffc0db236d229fbe46d4d42bbf572506a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce04f7ffc0db236d229fbe46… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 2 21:29:44 2009 +0500 regedit: Implement open last key at startup. --- programs/regedit/childwnd.c | 51 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 74c8b66..a7e4666 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -24,6 +24,7 @@ #include <stdio.h> #include "main.h" +#include "regproc.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -33,6 +34,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(regedit); ChildWnd* g_pChildWnd; static int last_split; +static const WCHAR wszLastKey[] = {'L','a','s','t','K','e','y',0}; +static const WCHAR wszKeyName[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'A','p','p','l','e','t','s','\\','R','e','g','e','d','i','t',0}; + /******************************************************************************* * Local module support methods */ @@ -222,6 +230,47 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } /******************************************************************************* + * get_last_key [internal] + * + * open last key + * + */ +static void get_last_key(HWND hwndTV) +{ + HKEY hkey; + WCHAR wszVal[KEY_MAX_LEN]; + DWORD dwSize = sizeof(wszVal); + + if (RegCreateKeyExW(HKEY_CURRENT_USER, wszKeyName, 0, NULL, 0, KEY_READ, NULL, &hkey, NULL) == ERROR_SUCCESS) + { + if (RegQueryValueExW(hkey, wszLastKey, NULL, NULL, (LPBYTE)wszVal, &dwSize) == ERROR_SUCCESS) + SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)FindPathInTree(hwndTV, wszVal)); + + RegCloseKey(hkey); + } +} + +/******************************************************************************* + * set_last_key [internal] + * + * save last key + * + */ +static void set_last_key(HWND hwndTV) +{ + HKEY hkey; + WCHAR *wszVal; + + if (RegCreateKeyExW(HKEY_CURRENT_USER, wszKeyName, 0, NULL, 0, KEY_WRITE, NULL, &hkey, NULL) == ERROR_SUCCESS) + { + wszVal = GetItemFullPath(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), FALSE); + RegSetValueExW(hkey, wszLastKey, 0, REG_SZ, (LPBYTE)wszVal, KEY_MAX_LEN * sizeof(WCHAR)); + HeapFree(GetProcessHeap(), 0, wszVal); + RegCloseKey(hkey); + } +} + +/******************************************************************************* * * FUNCTION: ChildWndProc(HWND, unsigned, WORD, LONG) * @@ -245,6 +294,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa g_pChildWnd->hListWnd = CreateListView(hWnd, LIST_WINDOW/*, g_pChildWnd->szPath*/); g_pChildWnd->nFocusPanel = 1; SetFocus(g_pChildWnd->hTreeWnd); + get_last_key(g_pChildWnd->hTreeWnd); break; case WM_COMMAND: if (!_CmdWndProc(hWnd, message, wParam, lParam)) { @@ -266,6 +316,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa } goto def; case WM_DESTROY: + set_last_key(g_pChildWnd->hTreeWnd); HeapFree(GetProcessHeap(), 0, g_pChildWnd); g_pChildWnd = NULL; PostQuitMessage(0);

1 0

Francois Gouget : ole32: Make apartment_addref() static.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 3cbeae820dbb77bddaea3d65335ddc47cd04b798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cbeae820dbb77bddaea3d653… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jul 6 08:09:06 2009 +0200 ole32: Make apartment_addref() static. --- dlls/ole32/compobj.c | 2 +- dlls/ole32/compobj_private.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 801caf0..b2013cf 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -312,7 +312,7 @@ static void COMPOBJ_DllList_Free(void) * Manage apartments. */ -DWORD apartment_addref(struct apartment *apt) +static DWORD apartment_addref(struct apartment *apt) { DWORD refs = InterlockedIncrement(&apt->refs); TRACE("%s: before = %d\n", wine_dbgstr_longlong(apt->oxid), refs - 1); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 58e3856..fb05934 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -252,7 +252,6 @@ void OLEDD_UnInitialize(void); APARTMENT *apartment_findfromoxid(OXID oxid, BOOL ref); APARTMENT *apartment_findfromtid(DWORD tid); -DWORD apartment_addref(struct apartment *apt); DWORD apartment_release(struct apartment *apt); HRESULT apartment_disconnectproxies(struct apartment *apt); void apartment_disconnectobject(struct apartment *apt, void *object);

1 0

Vincent Povirk : windowscodecs: Add support for decoding RLE4-encoded BMP files.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 48d58cef5958e6a6a2912a5b8e82eb805ac53fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d58cef5958e6a6a2912a5b8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 6 15:51:44 2009 -0500 windowscodecs: Add support for decoding RLE4-encoded BMP files. --- dlls/windowscodecs/bmpdecode.c | 126 +++++++++++++++++++++++++ dlls/windowscodecs/tests/bmpformat.c | 167 ++++++++++++++++++++++++++++++++++ 2 files changed, 293 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48d58cef5958e6a6a2912…

1 0

Vincent Povirk : windowscodecs: Add support for decoding RLE8-encoded BMP files.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 07a6b89f87c998a16aa45994bd56286a4533027a URL: http://source.winehq.org/git/wine.git/?a=commit;h=07a6b89f87c998a16aa45994b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 6 15:20:03 2009 -0500 windowscodecs: Add support for decoding RLE8-encoded BMP files. --- dlls/windowscodecs/bmpdecode.c | 111 +++++++++++++++++++++ dlls/windowscodecs/tests/bmpformat.c | 180 ++++++++++++++++++++++++++++++++++ 2 files changed, 291 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07a6b89f87c998a16aa45…

1 0

Vincent Povirk : windowscodecs: Return proper error codes in unneeded BMP decoder methods.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 387b842707e276a4ca0365370da24fb99db95baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=387b842707e276a4ca0365370… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 6 13:10:46 2009 -0500 windowscodecs: Return proper error codes in unneeded BMP decoder methods. --- dlls/windowscodecs/bmpdecode.c | 28 ++++++++++++++-------------- dlls/windowscodecs/tests/bmpformat.c | 24 ++++++++++++++++++++++++ include/wincodec.idl | 1 + 3 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 61d68c1..70923a1 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -311,22 +311,22 @@ static HRESULT WINAPI BmpFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, static HRESULT WINAPI BmpFrameDecode_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, IWICMetadataQueryReader **ppIMetadataQueryReader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI BmpFrameDecode_GetColorContexts(IWICBitmapFrameDecode *iface, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); - return E_NOTIMPL; + TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI BmpFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface, IWICBitmapSource **ppIThumbnail) { - FIXME("(%p,%p): stub\n", iface, ppIThumbnail); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIThumbnail); + return WINCODEC_ERR_CODECNOTHUMBNAIL; } static HRESULT BmpFrameDecode_ReadUncompressed(BmpFrameDecode* This) @@ -637,29 +637,29 @@ static HRESULT WINAPI BmpDecoder_CopyPalette(IWICBitmapDecoder *iface, static HRESULT WINAPI BmpDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, IWICMetadataQueryReader **ppIMetadataQueryReader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI BmpDecoder_GetPreview(IWICBitmapDecoder *iface, IWICBitmapSource **ppIBitmapSource) { - FIXME("(%p,%p): stub\n", iface, ppIBitmapSource); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIBitmapSource); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI BmpDecoder_GetColorContexts(IWICBitmapDecoder *iface, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); - return E_NOTIMPL; + TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI BmpDecoder_GetThumbnail(IWICBitmapDecoder *iface, IWICBitmapSource **ppIThumbnail) { - FIXME("(%p,%p): stub\n", iface, ppIThumbnail); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIThumbnail); + return WINCODEC_ERR_CODECNOTHUMBNAIL; } static HRESULT WINAPI BmpDecoder_GetFrameCount(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 2456245..1ed77e2 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -49,6 +49,9 @@ static void test_decode_24bpp(void) { IWICBitmapDecoder *decoder, *decoder2; IWICBitmapFrameDecode *framedecode; + IWICMetadataQueryReader *queryreader; + IWICColorContext *colorcontext; + IWICBitmapSource *thumbnail; HRESULT hr; HGLOBAL hbmpdata; char *bmpdata; @@ -88,6 +91,18 @@ static void test_decode_24bpp(void) ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatBmp), "unexpected container format\n"); + hr = IWICBitmapDecoder_GetMetadataQueryReader(decoder, &queryreader); + ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "expected WINCODEC_ERR_UNSUPPORTEDOPERATION, got %x\n", hr); + + hr = IWICBitmapDecoder_GetColorContexts(decoder, 1, &colorcontext, &count); + ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "expected WINCODEC_ERR_UNSUPPORTEDOPERATION, got %x\n", hr); + + hr = IWICBitmapDecoder_GetThumbnail(decoder, &thumbnail); + ok(hr == WINCODEC_ERR_CODECNOTHUMBNAIL, "expected WINCODEC_ERR_CODECNOTHUMBNAIL, got %x\n", hr); + + hr = IWICBitmapDecoder_GetPreview(decoder, &thumbnail); + ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "expected WINCODEC_ERR_UNSUPPORTEDOPERATION, got %x\n", hr); + hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); ok(SUCCEEDED(hr), "GetFrameCount failed, hr=%x\n", hr); ok(count == 1, "unexpected count %u\n", count); @@ -116,6 +131,15 @@ static void test_decode_24bpp(void) ok(SUCCEEDED(hr), "GetPixelFormat failed, hr=%x\n", hr); ok(IsEqualGUID(&guidresult, &GUID_WICPixelFormat24bppBGR), "unexpected pixel format\n"); + hr = IWICBitmapFrameDecode_GetMetadataQueryReader(framedecode, &queryreader); + ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "expected WINCODEC_ERR_UNSUPPORTEDOPERATION, got %x\n", hr); + + hr = IWICBitmapFrameDecode_GetColorContexts(framedecode, 1, &colorcontext, &count); + ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "expected WINCODEC_ERR_UNSUPPORTEDOPERATION, got %x\n", hr); + + hr = IWICBitmapFrameDecode_GetThumbnail(framedecode, &thumbnail); + ok(hr == WINCODEC_ERR_CODECNOTHUMBNAIL, "expected WINCODEC_ERR_CODECNOTHUMBNAIL, got %x\n", hr); + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory); ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); diff --git a/include/wincodec.idl b/include/wincodec.idl index d8712b8..691a4fd 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -96,6 +96,7 @@ typedef UINT32 WICColor; cpp_quote("#define WINCODEC_ERR_WRONGSTATE 0x88982f04") cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45") +cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") interface IWICBitmap; interface IWICComponentInfo;

1 0

Vincent Povirk : windowscodecs: Add test for 4-bit indexed color BMP.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 6caca236788cfd647246e5e2eed982e85aeb9617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6caca236788cfd647246e5e2e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 6 12:44:38 2009 -0500 windowscodecs: Add test for 4-bit indexed color BMP. --- dlls/windowscodecs/tests/bmpformat.c | 160 ++++++++++++++++++++++++++++++++++ 1 files changed, 160 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 6538e66..2456245 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <math.h> #define COBJMACROS @@ -359,12 +360,171 @@ static void test_decode_1bpp(void) IWICBitmapDecoder_Release(decoder); } +static const char testbmp_4bpp[] = { + /* BITMAPFILEHEADER */ + 66,77, /* "BM" */ + 82,0,0,0, /* file size */ + 0,0,0,0, /* reserved */ + 74,0,0,0, /* offset to bits */ + /* BITMAPINFOHEADER */ + 40,0,0,0, /* header size */ + 2,0,0,0, /* width */ + 254,255,255,255, /* height = -2 */ + 1,0, /* planes */ + 4,0, /* bit count */ + 0,0,0,0, /* compression = BI_RGB */ + 0,0,0,0, /* image size = 0 */ + 16,39,0,0, /* X pixels per meter = 10000 */ + 32,78,0,0, /* Y pixels per meter = 20000 */ + 5,0,0,0, /* colors used */ + 5,0,0,0, /* colors important */ + /* color table */ + 255,0,0,0, + 0,255,0,255, + 0,0,255,23, + 128,0,128,1, + 255,255,255,0, + /* bits */ + 0x01,0,0,0, + 0x23,0,0,0, +}; + +static void test_decode_4bpp(void) +{ + IWICBitmapDecoder *decoder, *decoder2; + IWICBitmapFrameDecode *framedecode; + HRESULT hr; + HGLOBAL hbmpdata; + char *bmpdata; + IStream *bmpstream; + DWORD capability=0; + GUID guidresult; + UINT count=0, width=0, height=0; + double dpiX, dpiY; + BYTE imagedata[2] = {1}; + const BYTE expected_imagedata[2] = {0x01,0x23}; + WICColor palettedata[5] = {1}; + const WICColor expected_palettedata[5] = + {0xff0000ff,0xff00ff00,0xffff0000,0xff800080,0xffffffff}; + WICRect rc; + + hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (!SUCCEEDED(hr)) return; + + hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_4bpp)); + ok(hbmpdata != 0, "GlobalAlloc failed\n"); + if (hbmpdata) + { + bmpdata = GlobalLock(hbmpdata); + memcpy(bmpdata, testbmp_4bpp, sizeof(testbmp_4bpp)); + GlobalUnlock(hbmpdata); + + hr = CreateStreamOnHGlobal(hbmpdata, FALSE, &bmpstream); + ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_Initialize(decoder, bmpstream, WICDecodeMetadataCacheOnLoad); + ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); + ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatBmp), "unexpected container format\n"); + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); + ok(SUCCEEDED(hr), "GetFrameCount failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %u\n", count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(SUCCEEDED(hr), "GetFrame failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + IWICImagingFactory *factory; + IWICPalette *palette; + + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); + ok(SUCCEEDED(hr), "GetSize failed, hr=%x\n", hr); + ok(width == 2, "expected width=2, got %u\n", width); + ok(height == 2, "expected height=2, got %u\n", height); + + hr = IWICBitmapFrameDecode_GetResolution(framedecode, &dpiX, &dpiY); + ok(SUCCEEDED(hr), "GetResolution failed, hr=%x\n", hr); + ok(fabs(dpiX - 254.0) < 0.01, "expected dpiX=96.0, got %f\n", dpiX); + ok(fabs(dpiY - 508.0) < 0.01, "expected dpiY=96.0, got %f\n", dpiY); + + hr = IWICBitmapFrameDecode_GetPixelFormat(framedecode, &guidresult); + ok(SUCCEEDED(hr), "GetPixelFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_WICPixelFormat4bppIndexed), "unexpected pixel format\n"); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(SUCCEEDED(hr), "CreatePalette failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "expected WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); + + hr = IWICBitmapFrameDecode_CopyPalette(framedecode, palette); + ok(SUCCEEDED(hr), "CopyPalette failed, hr=%x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(SUCCEEDED(hr), "GetColorCount failed, hr=%x\n", hr); + ok(count == 5, "expected count=5, got %u\n", count); + + hr = IWICPalette_GetColors(palette, 5, palettedata, &count); + ok(SUCCEEDED(hr), "GetColorCount failed, hr=%x\n", hr); + ok(count == 5, "expected count=5, got %u\n", count); + ok(!memcmp(palettedata, expected_palettedata, sizeof(palettedata)), "unexpected palette data\n"); + + IWICPalette_Release(palette); + } + + IWICImagingFactory_Release(factory); + } + + rc.X = 0; + rc.Y = 0; + rc.Width = 2; + rc.Height = 2; + hr = IWICBitmapFrameDecode_CopyPixels(framedecode, &rc, 1, sizeof(imagedata), imagedata); + ok(SUCCEEDED(hr), "CopyPixels failed, hr=%x\n", hr); + ok(!memcmp(imagedata, expected_imagedata, sizeof(imagedata)), "unexpected image data\n"); + + IWICBitmapFrameDecode_Release(framedecode); + } + + hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder2); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_QueryCapability(decoder2, bmpstream, &capability); + ok(hr == S_OK, "QueryCapability failed, hr=%x\n", hr); + ok(capability == (WICBitmapDecoderCapabilityCanDecodeAllImages), + "unexpected capabilities: %x\n", capability); + } + + IStream_Release(bmpstream); + } + + GlobalFree(hbmpdata); + } + + IWICBitmapDecoder_Release(decoder); +} + START_TEST(bmpformat) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_decode_24bpp(); test_decode_1bpp(); + test_decode_4bpp(); CoUninitialize(); }

1 0

Vincent Povirk : windowscodecs: Add test for 1-bit indexed color BMP.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: aec0ccbd77eaaeb1dd1f9952813140b04a45ed0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec0ccbd77eaaeb1dd1f99528… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 6 12:22:21 2009 -0500 windowscodecs: Add test for 1-bit indexed color BMP. --- dlls/windowscodecs/tests/bmpformat.c | 149 ++++++++++++++++++++++++++++++++++ 1 files changed, 149 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index d312e80..6538e66 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -211,11 +211,160 @@ static void test_decode_24bpp(void) IWICBitmapDecoder_Release(decoder); } +static const char testbmp_1bpp[] = { + /* BITMAPFILEHEADER */ + 66,77, /* "BM" */ + 40,0,0,0, /* file size */ + 0,0,0,0, /* reserved */ + 32,0,0,0, /* offset to bits */ + /* BITMAPCOREHEADER */ + 12,0,0,0, /* header size */ + 2,0, /* width */ + 2,0, /* height */ + 1,0, /* planes */ + 1,0, /* bit count */ + /* color table */ + 255,0,0, + 0,255,0, + /* bits */ + 0xc0,0,0,0, + 0x80,0,0,0 +}; + +static void test_decode_1bpp(void) +{ + IWICBitmapDecoder *decoder, *decoder2; + IWICBitmapFrameDecode *framedecode; + HRESULT hr; + HGLOBAL hbmpdata; + char *bmpdata; + IStream *bmpstream; + DWORD capability=0; + GUID guidresult; + UINT count=0, width=0, height=0; + double dpiX, dpiY; + BYTE imagedata[2] = {1}; + const BYTE expected_imagedata[2] = {0x80,0xc0}; + WICColor palettedata[2] = {1}; + const WICColor expected_palettedata[2] = {0xff0000ff,0xff00ff00}; + WICRect rc; + + hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (!SUCCEEDED(hr)) return; + + hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_1bpp)); + ok(hbmpdata != 0, "GlobalAlloc failed\n"); + if (hbmpdata) + { + bmpdata = GlobalLock(hbmpdata); + memcpy(bmpdata, testbmp_1bpp, sizeof(testbmp_1bpp)); + GlobalUnlock(hbmpdata); + + hr = CreateStreamOnHGlobal(hbmpdata, FALSE, &bmpstream); + ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_Initialize(decoder, bmpstream, WICDecodeMetadataCacheOnLoad); + ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); + ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatBmp), "unexpected container format\n"); + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); + ok(SUCCEEDED(hr), "GetFrameCount failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %u\n", count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(SUCCEEDED(hr), "GetFrame failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + IWICImagingFactory *factory; + IWICPalette *palette; + + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); + ok(SUCCEEDED(hr), "GetSize failed, hr=%x\n", hr); + ok(width == 2, "expected width=2, got %u\n", width); + ok(height == 2, "expected height=2, got %u\n", height); + + hr = IWICBitmapFrameDecode_GetResolution(framedecode, &dpiX, &dpiY); + ok(SUCCEEDED(hr), "GetResolution failed, hr=%x\n", hr); + ok(dpiX == 96.0, "expected dpiX=96.0, got %f\n", dpiX); + ok(dpiY == 96.0, "expected dpiY=96.0, got %f\n", dpiY); + + hr = IWICBitmapFrameDecode_GetPixelFormat(framedecode, &guidresult); + ok(SUCCEEDED(hr), "GetPixelFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_WICPixelFormat1bppIndexed), "unexpected pixel format\n"); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(SUCCEEDED(hr), "CreatePalette failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "expected WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); + + hr = IWICBitmapFrameDecode_CopyPalette(framedecode, palette); + ok(SUCCEEDED(hr), "CopyPalette failed, hr=%x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(SUCCEEDED(hr), "GetColorCount failed, hr=%x\n", hr); + ok(count == 2, "expected count=2, got %u\n", count); + + hr = IWICPalette_GetColors(palette, 2, palettedata, &count); + ok(SUCCEEDED(hr), "GetColorCount failed, hr=%x\n", hr); + ok(count == 2, "expected count=2, got %u\n", count); + ok(!memcmp(palettedata, expected_palettedata, sizeof(palettedata)), "unexpected palette data\n"); + + IWICPalette_Release(palette); + } + + IWICImagingFactory_Release(factory); + } + + rc.X = 0; + rc.Y = 0; + rc.Width = 2; + rc.Height = 2; + hr = IWICBitmapFrameDecode_CopyPixels(framedecode, &rc, 1, sizeof(imagedata), imagedata); + ok(SUCCEEDED(hr), "CopyPixels failed, hr=%x\n", hr); + ok(!memcmp(imagedata, expected_imagedata, sizeof(imagedata)), "unexpected image data\n"); + + IWICBitmapFrameDecode_Release(framedecode); + } + + hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder2); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_QueryCapability(decoder2, bmpstream, &capability); + ok(hr == S_OK, "QueryCapability failed, hr=%x\n", hr); + ok(capability == (WICBitmapDecoderCapabilityCanDecodeAllImages), + "unexpected capabilities: %x\n", capability); + } + + IStream_Release(bmpstream); + } + + GlobalFree(hbmpdata); + } + + IWICBitmapDecoder_Release(decoder); +} + START_TEST(bmpformat) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_decode_24bpp(); + test_decode_1bpp(); CoUninitialize(); }

1 0

Vincent Povirk : windowscodecs: Implement CopyPalette for BMP decoder.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 3899c3e2472b22156ab2a2e7aeff65ef0212cfe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3899c3e2472b22156ab2a2e7a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 6 11:39:29 2009 -0500 windowscodecs: Implement CopyPalette for BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 102 ++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/bmpformat.c | 24 ++++++++ include/wincodec.idl | 1 + 3 files changed, 123 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index b81987c..61d68c1 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -189,8 +189,101 @@ static HRESULT WINAPI BmpFrameDecode_GetResolution(IWICBitmapFrameDecode *iface, static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + HRESULT hr; + BmpFrameDecode *This = (BmpFrameDecode*)iface; + TRACE("(%p,%p)\n", iface, pIPalette); + + if (This->bih.bV5Size == sizeof(BITMAPCOREHEADER)) + { + BITMAPCOREHEADER *bch = (BITMAPCOREHEADER*)&This->bih; + if (bch->bcBitCount <= 8) + { + /* 2**n colors in BGR format after the header */ + int count = 1 << bch->bcBitCount; + WICColor *wiccolors; + ULONG tablesize, bytesread; + RGBTRIPLE *bgrcolors; + LARGE_INTEGER offset; + int i; + + wiccolors = HeapAlloc(GetProcessHeap(), 0, sizeof(WICColor) * count); + tablesize = sizeof(RGBTRIPLE) * count; + bgrcolors = HeapAlloc(GetProcessHeap(), 0, tablesize); + if (!wiccolors || !bgrcolors) + { + HeapFree(GetProcessHeap(), 0, wiccolors); + HeapFree(GetProcessHeap(), 0, bgrcolors); + return E_OUTOFMEMORY; + } + + offset.QuadPart = sizeof(BITMAPFILEHEADER)+sizeof(BITMAPCOREHEADER); + hr = IStream_Seek(This->stream, offset, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) return hr; + + hr = IStream_Read(This->stream, bgrcolors, tablesize, &bytesread); + if (FAILED(hr)) return hr; + if (bytesread != tablesize) return E_FAIL; + + for (i=0; i<count; i++) + { + wiccolors[i] = 0xff000000| + (bgrcolors[i].rgbtRed<<16)| + (bgrcolors[i].rgbtGreen<<8)| + bgrcolors[i].rgbtBlue; + } + + hr = IWICPalette_InitializeCustom(pIPalette, wiccolors, count); + + HeapFree(GetProcessHeap(), 0, wiccolors); + HeapFree(GetProcessHeap(), 0, bgrcolors); + return hr; + } + else + { + return WINCODEC_ERR_PALETTEUNAVAILABLE; + } + } + else + { + if (This->bih.bV5BitCount <= 8) + { + int count; + WICColor *wiccolors; + ULONG tablesize, bytesread; + LARGE_INTEGER offset; + int i; + + if (This->bih.bV5ClrUsed == 0) + count = 1 << This->bih.bV5BitCount; + else + count = This->bih.bV5ClrUsed; + + tablesize = sizeof(WICColor) * count; + wiccolors = HeapAlloc(GetProcessHeap(), 0, tablesize); + if (!wiccolors) return E_OUTOFMEMORY; + + offset.QuadPart = sizeof(BITMAPFILEHEADER) + This->bih.bV5Size; + hr = IStream_Seek(This->stream, offset, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) return hr; + + hr = IStream_Read(This->stream, wiccolors, tablesize, &bytesread); + if (FAILED(hr)) return hr; + if (bytesread != tablesize) return E_FAIL; + + /* convert from BGR to BGRA by setting alpha to 100% */ + for (i=0; i<count; i++) + wiccolors[i] |= 0xff000000; + + hr = IWICPalette_InitializeCustom(pIPalette, wiccolors, count); + + HeapFree(GetProcessHeap(), 0, wiccolors); + return hr; + } + else + { + return WINCODEC_ERR_PALETTEUNAVAILABLE; + } + } } static HRESULT WINAPI BmpFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, @@ -536,8 +629,9 @@ static HRESULT WINAPI BmpDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, static HRESULT WINAPI BmpDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, pIPalette); + + return WINCODEC_ERR_PALETTEUNAVAILABLE; } static HRESULT WINAPI BmpDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index fb6f491..d312e80 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -98,6 +98,9 @@ static void test_decode_24bpp(void) ok(SUCCEEDED(hr), "GetFrame failed, hr=%x\n", hr); if (SUCCEEDED(hr)) { + IWICImagingFactory *factory; + IWICPalette *palette; + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); ok(SUCCEEDED(hr), "GetSize failed, hr=%x\n", hr); ok(width == 2, "expected width=2, got %u\n", width); @@ -112,6 +115,27 @@ static void test_decode_24bpp(void) ok(SUCCEEDED(hr), "GetPixelFormat failed, hr=%x\n", hr); ok(IsEqualGUID(&guidresult, &GUID_WICPixelFormat24bppBGR), "unexpected pixel format\n"); + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(SUCCEEDED(hr), "CreatePalette failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "expected WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); + + hr = IWICBitmapFrameDecode_CopyPalette(framedecode, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "expected WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); + + IWICPalette_Release(palette); + } + + IWICImagingFactory_Release(factory); + } + rc.X = 0; rc.Y = 0; rc.Width = 3; diff --git a/include/wincodec.idl b/include/wincodec.idl index e5f22e3..d8712b8 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -95,6 +95,7 @@ typedef UINT32 WICColor; cpp_quote("#define WINCODEC_ERR_WRONGSTATE 0x88982f04") cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") +cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45") interface IWICBitmap; interface IWICComponentInfo;

1 0

Nikolay Sivov : comctl32/listview: Fix hittesting for "small" positive Y coordinates.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 86e4d1cdbe2bd0cff9474415caddb4b9491d0518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86e4d1cdbe2bd0cff9474415c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 7 03:28:53 2009 +0400 comctl32/listview: Fix hittesting for "small" positive Y coordinates. --- dlls/comctl32/listview.c | 28 +++++++++++++++++++++------- dlls/comctl32/tests/listview.c | 18 +++++++++--------- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2a66152..24da77d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6814,6 +6814,16 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, /* LVM_SUBITEMHITTEST checks left bound of possible client area */ if (infoPtr->rcList.left > lpht->pt.x && Origin.x < lpht->pt.x) lpht->flags |= LVHT_TOLEFT; + + if (lpht->pt.y < infoPtr->rcList.top && lpht->pt.y >= 0) + opt.y = lpht->pt.y + infoPtr->rcList.top; + else + opt.y = lpht->pt.y; + + if (infoPtr->rcList.top > opt.y) + lpht->flags |= LVHT_ABOVE; + else if (infoPtr->rcList.bottom < opt.y) + lpht->flags |= LVHT_BELOW; } else { @@ -6821,12 +6831,12 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, lpht->flags |= LVHT_TOLEFT; else if (infoPtr->rcList.right < lpht->pt.x) lpht->flags |= LVHT_TORIGHT; + + if (infoPtr->rcList.top > lpht->pt.y) + lpht->flags |= LVHT_ABOVE; + else if (infoPtr->rcList.bottom < lpht->pt.y) + lpht->flags |= LVHT_BELOW; } - - if (infoPtr->rcList.top > lpht->pt.y) - lpht->flags |= LVHT_ABOVE; - else if (infoPtr->rcList.bottom < lpht->pt.y) - lpht->flags |= LVHT_BELOW; /* even if item is invalid try to find subitem */ if (infoPtr->uView == LV_VIEW_DETAILS && subitem) @@ -6883,8 +6893,12 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &rcBox, NULL, &rcIcon, &rcState, &rcLabel); LISTVIEW_GetItemOrigin(infoPtr, iItem, &Position); opt.x = lpht->pt.x - Position.x - Origin.x; - opt.y = lpht->pt.y - Position.y - Origin.y; - + + if (lpht->pt.y < infoPtr->rcList.top && lpht->pt.y >= 0) + opt.y = lpht->pt.y - Position.y - Origin.y + infoPtr->rcList.top; + else + opt.y = lpht->pt.y - Position.y - Origin.y; + if (infoPtr->uView == LV_VIEW_DETAILS) { rcBounds = rcBox; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 98c31c4..fd0e55c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2663,7 +2663,7 @@ static void test_hittest(void) test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); y = (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, TRUE, __LINE__); - test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); /* outside possible client rectangle (to right) */ x = pos.x + 500; y = pos.y + (bounds.bottom - bounds.top) / 2; @@ -2671,7 +2671,7 @@ static void test_hittest(void) test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); y = (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, TRUE, __LINE__); - test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); /* subitem returned with -1 item too */ x = pos.x + 150; y = -10; @@ -2684,7 +2684,7 @@ static void test_hittest(void) test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); y = (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_NOWHERE, FALSE, TRUE, __LINE__); - test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); /* the same with LVS_EX_FULLROWSELECT */ SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); x = pos.x + 150; /* outside column */ @@ -2692,7 +2692,7 @@ static void test_hittest(void) test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEM, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); y = (bounds.bottom - bounds.top) / 2; - test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); MoveWindow(hwnd, 0, 0, 100, 100, FALSE); x = pos.x + 150; /* outside column */ y = pos.y + (bounds.bottom - bounds.top) / 2; @@ -2700,7 +2700,7 @@ static void test_hittest(void) test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); y = (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, TRUE, __LINE__); - test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); /* outside possible client rectangle (to right) */ x = pos.x + 500; y = pos.y + (bounds.bottom - bounds.top) / 2; @@ -2708,7 +2708,7 @@ static void test_hittest(void) test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); y = (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, TRUE, __LINE__); - test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); /* try with icons, state icons index is 1 based so at least 2 bitmaps needed */ himl = ImageList_Create(16, 16, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n"); @@ -2736,7 +2736,7 @@ static void test_hittest(void) test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, FALSE, __LINE__); y = (bounds.bottom - bounds.top) / 2; - test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, TRUE, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, FALSE, __LINE__); /* state icons indices are 1 based, check with valid index */ item.mask = LVIF_STATE; @@ -2752,7 +2752,7 @@ static void test_hittest(void) test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, FALSE, __LINE__); y = (bounds.bottom - bounds.top) / 2; - test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, TRUE, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, FALSE, __LINE__); himl2 = (HIMAGELIST)SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)NULL); ok(himl2 == himl, "should return handle\n"); @@ -2765,7 +2765,7 @@ static void test_hittest(void) test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMICON, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMICON, FALSE, FALSE, FALSE, __LINE__); y = (bounds.bottom - bounds.top) / 2; - test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMICON, TRUE, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMICON, FALSE, FALSE, FALSE, __LINE__); DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/listview: More LVM_*HITTEST tests.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: faebaa575bbc8daff287c39bd7fbff96a0b47d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faebaa575bbc8daff287c39bd… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 7 02:50:15 2009 +0400 comctl32/listview: More LVM_*HITTEST tests. --- dlls/comctl32/tests/listview.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 43a7037..98c31c4 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2661,11 +2661,17 @@ static void test_hittest(void) y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + y = (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE, __LINE__); /* outside possible client rectangle (to right) */ x = pos.x + 500; y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); + y = (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, TRUE, __LINE__); /* subitem returned with -1 item too */ x = pos.x + 150; y = -10; @@ -2676,22 +2682,33 @@ static void test_hittest(void) y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_NOWHERE, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + y = (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_NOWHERE, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE, __LINE__); /* the same with LVS_EX_FULLROWSELECT */ SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); x = pos.x + 150; /* outside column */ y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEM, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + y = (bounds.bottom - bounds.top) / 2; + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE, __LINE__); MoveWindow(hwnd, 0, 0, 100, 100, FALSE); x = pos.x + 150; /* outside column */ y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + y = (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE, __LINE__); /* outside possible client rectangle (to right) */ x = pos.x + 500; y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); + y = (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, TRUE, __LINE__); /* try with icons, state icons index is 1 based so at least 2 bitmaps needed */ himl = ImageList_Create(16, 16, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n"); @@ -2718,6 +2735,8 @@ static void test_hittest(void) y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, FALSE, __LINE__); + y = (bounds.bottom - bounds.top) / 2; + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, TRUE, FALSE, FALSE, __LINE__); /* state icons indices are 1 based, check with valid index */ item.mask = LVIF_STATE; @@ -2732,6 +2751,8 @@ static void test_hittest(void) y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, FALSE, __LINE__); + y = (bounds.bottom - bounds.top) / 2; + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, TRUE, FALSE, FALSE, __LINE__); himl2 = (HIMAGELIST)SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)NULL); ok(himl2 == himl, "should return handle\n"); @@ -2743,6 +2764,8 @@ static void test_hittest(void) y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMICON, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMICON, FALSE, FALSE, FALSE, __LINE__); + y = (bounds.bottom - bounds.top) / 2; + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMICON, TRUE, FALSE, TRUE, __LINE__); DestroyWindow(hwnd); }

1 0

Francois Gouget : ole32: Reorder some compobj functions to avoid forward declarations.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: f8afcdbb7c1e92b9e0f93f363a814a8766974b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8afcdbb7c1e92b9e0f93f363… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jul 6 08:08:27 2009 +0200 ole32: Reorder some compobj functions to avoid forward declarations. --- dlls/ole32/compobj.c | 794 ++++++++++++++++++++++++------------------------- 1 files changed, 389 insertions(+), 405 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f8afcdbb7c1e92b9e0f93…

1 0

Nikolay Sivov : comctl32/listview: Fix hittest flag calculation for negative Y values on report mode.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 2f989163bdebb4cf19389ac3e44db8de0d01379c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f989163bdebb4cf19389ac3e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 7 03:44:30 2009 +0400 comctl32/listview: Fix hittest flag calculation for negative Y values on report mode. --- dlls/comctl32/listview.c | 4 +--- dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 24da77d..cd1d0d5 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6820,9 +6820,7 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, else opt.y = lpht->pt.y; - if (infoPtr->rcList.top > opt.y) - lpht->flags |= LVHT_ABOVE; - else if (infoPtr->rcList.bottom < opt.y) + if (infoPtr->rcList.bottom < opt.y) lpht->flags |= LVHT_BELOW; } else diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index fd0e55c..c0b272b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2675,7 +2675,7 @@ static void test_hittest(void) /* subitem returned with -1 item too */ x = pos.x + 150; y = -10; - test_lvm_subitemhittest(hwnd, x, y, -1, 1, LVHT_NOWHERE, FALSE, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, -1, 1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); /* parent client area is 100x100 by default */ MoveWindow(hwnd, 0, 0, 300, 100, FALSE); x = pos.x + 150; /* outside column */

1 0

Rein Klazes : comdlg32: Rearrange some more controls when resizing a file dialog.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: c23ccc03d98c73bfc24d1754a30977ce6556e545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23ccc03d98c73bfc24d1754a… Author: Rein Klazes <wijn(a)online.nl> Date: Tue Jul 7 08:11:55 2009 +0200 comdlg32: Rearrange some more controls when resizing a file dialog. --- dlls/comdlg32/filedlg.c | 65 ++++++++++++++++--- dlls/comdlg32/tests/filedlg.c | 139 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 182 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c23ccc03d98c73bfc24d1…

1 0

Hans Leidekker : iphlpapi: Use a separate index to count addresses in GetAdaptersAddresses.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: cd1ed081def59bc912dab9a378d7eacd90396fea URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd1ed081def59bc912dab9a37… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 7 10:12:56 2009 +0200 iphlpapi: Use a separate index to count addresses in GetAdaptersAddresses. Fixes address enumeration when an interfaces is not configured with an IP address or when an interface is configured with more than one address. --- dlls/iphlpapi/iphlpapi_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8490c67..16cf1b3 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -611,7 +611,7 @@ static DWORD typeFromMibType(DWORD mib_type) static ULONG addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs) { - ULONG ret, i; + ULONG ret, i, j; MIB_IPADDRTABLE *at; *num_addrs = 0; @@ -625,9 +625,9 @@ static ULONG addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs) HeapFree(GetProcessHeap(), 0, at); return ERROR_OUTOFMEMORY; } - for (i = 0; i < at->dwNumEntries; i++) + for (i = 0, j = 0; i < at->dwNumEntries; i++) { - if (at->table[i].dwIndex == index) (*addrs)[i] = at->table[i].dwAddr; + if (at->table[i].dwIndex == index) (*addrs)[j++] = at->table[i].dwAddr; } HeapFree(GetProcessHeap(), 0, at); return ERROR_SUCCESS;

1 0

Damjan Jovanovic : ws2_32: Test AcceptEx short reads.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 0066319b2dca4dd5041cd5bf714a64faf458cf3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0066319b2dca4dd5041cd5bf7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Jul 6 20:29:35 2009 +0200 ws2_32: Test AcceptEx short reads. --- dlls/ws2_32/tests/sock.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1eab132..b667008 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2656,6 +2656,44 @@ static void test_AcceptEx(void) ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); ok(bytesReturned == 0, "bytesReturned isn't supposed to be %d\n", bytesReturned); + closesocket(connector); + connector = INVALID_SOCKET; + closesocket(acceptor); + acceptor = INVALID_SOCKET; + + /* Test short reads */ + + acceptor = socket(AF_INET, SOCK_STREAM, 0); + if (acceptor == INVALID_SOCKET) { + skip("could not create acceptor socket, error %d\n", WSAGetLastError()); + goto end; + } + connector = socket(AF_INET, SOCK_STREAM, 0); + if (connector == INVALID_SOCKET) { + skip("could not create connector socket, error %d\n", WSAGetLastError()); + goto end; + } + bret = pAcceptEx(listener, acceptor, buffer, 2, + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + + iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); + + dwret = WaitForSingleObject(overlapped.hEvent, 0); + ok(dwret == WAIT_TIMEOUT, "Waiting for accept event timeout failed with %d + errno %d\n", dwret, GetLastError()); + + iret = send(connector, buffer, 1, 0); + ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError()); + + dwret = WaitForSingleObject(overlapped.hEvent, 0); + ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + + bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); + ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); + ok(bytesReturned == 1, "bytesReturned isn't supposed to be %d\n", bytesReturned); + end: if (overlapped.hEvent) WSACloseEvent(overlapped.hEvent);

1 0

Paul Chitescu : crypt32: Updated Romanian translation.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: a852de9daf7966b7223ccee269fc1156fbf4481c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a852de9daf7966b7223ccee26… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Mon Jul 6 21:03:27 2009 +0300 crypt32: Updated Romanian translation. --- dlls/crypt32/crypt32_Ro.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_Ro.rc b/dlls/crypt32/crypt32_Ro.rc index 65d1c1e..10e33ea 100644 --- a/dlls/crypt32/crypt32_Ro.rc +++ b/dlls/crypt32/crypt32_Ro.rc @@ -177,6 +177,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_CA "Autorități intermediare de certificare" IDS_LOCALIZEDNAME_ADDRESSBOOK "Alte persoane" IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Editor de încredere" + IDS_LOCALIZEDNAME_DISALLOWED "Lipsite de încredere" } STRINGTABLE DISCARDABLE

1 0

Ricardo Filipe : oledlg: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 137582a9dbaab53fab9f1eee2d015e3235eec83f URL: http://source.winehq.org/git/wine.git/?a=commit;h=137582a9dbaab53fab9f1eee2… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Mon Jul 6 12:59:09 2009 -0700 oledlg: Update Portuguese translation and convert to UTF8. --- dlls/oledlg/oledlg_Pt.rc | 57 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 50 insertions(+), 7 deletions(-) diff --git a/dlls/oledlg/oledlg_Pt.rc b/dlls/oledlg/oledlg_Pt.rc index 1ab7a02..078d2c1 100644 --- a/dlls/oledlg/oledlg_Pt.rc +++ b/dlls/oledlg/oledlg_Pt.rc @@ -1,6 +1,7 @@ /* * Copyright 2004 Marcelo Duarte - * Copyright 2006 Am�rico Jos� Melo + * Copyright 2006 Américo José Melo + * Copyright 2009 Ricardo Filipe * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,6 +20,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 @@ -41,7 +44,7 @@ BEGIN BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "&Adicionar Controle...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Mostrar como �cone",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Mostrar como ícone",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Procurar...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE LTEXT "Arquivo:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE @@ -70,7 +73,7 @@ BEGIN BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "&Adicionar Controlo...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Mostrar como �cone",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Mostrar como ícone",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Procurar...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE LTEXT "Ficheiro:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE @@ -83,9 +86,9 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE { IDS_RESULTOBJDESC "Inserir um novo objeto %s no documento" - IDS_RESULTFILEOBJDESC "Inserir o conte�do do arquivo como um objeto no documento de modo que possa ativ�-lo usando o programa que o criou." + IDS_RESULTFILEOBJDESC "Inserir o conteúdo do arquivo como um objeto no documento de modo que possa ativá-lo usando o programa que o criou." IDS_BROWSE "Procurar" - IDS_NOTOLEMOD "O arquivo n�o parece ser um m�dulo OLE v�lido. Imposs�vel registrar o controle OLE." + IDS_NOTOLEMOD "O arquivo não parece ser um módulo OLE válido. Impossível registrar o controle OLE." IDS_NOTOLEMODCAPTION "Adicionar Controle" } @@ -94,8 +97,48 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE { IDS_RESULTOBJDESC "Inserir novo objecto %s no documento" - IDS_RESULTFILEOBJDESC "Inserir conte�do do ficheiro como um objecto no documento de modo que opossa activar usando o programa que o criou." + IDS_RESULTFILEOBJDESC "Inserir conteúdo do ficheiro como um objecto no documento de modo que opossa activar usando o programa que o criou." IDS_BROWSE "Procurar" - IDS_NOTOLEMOD "O ficheiro n�o parece ser um m�dulo OLE v�lido. Imposs�vel registrar o controlo OLE." + IDS_NOTOLEMOD "O ficheiro não parece ser um módulo OLE válido. Impossível registrar o controlo OLE." IDS_NOTOLEMODCAPTION "Adicionar Controlo" } + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Colar Especial" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Origem:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "&Colar", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "Colar &Ligação", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&Como:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "Cancelar", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "&Ajuda", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "&Mostrar como Icone", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "Mudar &Icone...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< texto resultante fica aqui >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "Resultado", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Editar", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Insere o conteúdo da área de transferência no seu documento como %s." + IDS_PS_PASTE_OBJECT "Insere o conteúdo da área de transferência no seu documento para que o possa activar usando %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Insere o conteúdo da área de transferência no seu documento para que o possa activar usando %s. Vai ser mostrado como um icone." + IDS_PS_PASTE_LINK_DATA "Insere o conteúdo da área de transferência no seu documento como %s. Os dados estão ligados ao ficheiro de origem para que alterações ao ficheiro se reflictam no seu documento." + IDS_PS_PASTE_LINK_OBJECT "Insere uma imagem da área de transferência no seu documento. A imagem fica ligada ao ficheiro de origem para que alterações ao ficheiro se reflictam no seu documento." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Insere um atalho que aponta para a localização do conteúdo na área de transferência. O atalho fica ligado ao ficheiro de origem para que alterações ao ficheiro se reflictam no seu documento." + IDS_PS_NON_OLE "Insere o conteúdo da área de transferência no seu documento." + IDS_PS_UNKNOWN_TYPE "Tipo Desconhecido" + IDS_PS_UNKNOWN_SRC "Origem Desconhecida" + IDS_PS_UNKNOWN_APP "o programa que o criou" +}

1 0

Ricardo Filipe : comdlg32: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 003c8dadf21dc6d6449f920e491a6c292a611b15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=003c8dadf21dc6d6449f920e4… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Mon Jul 6 12:20:51 2009 -0700 comdlg32: Update Portuguese translation and convert to UTF8. --- dlls/comdlg32/cdlg_Pt.rc | 284 ++++++++++++++++++++++++---------------------- 1 files changed, 148 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=003c8dadf21dc6d6449f9…

1 0

André Hentschel : crypt32: Update German translation.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: c43968a68dfabd6e683811edab4470a79a5e6905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43968a68dfabd6e683811eda… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 6 18:38:05 2009 +0200 crypt32: Update German translation. --- dlls/crypt32/crypt32_De.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_De.rc b/dlls/crypt32/crypt32_De.rc index 0a8bd38..aa3a456 100644 --- a/dlls/crypt32/crypt32_De.rc +++ b/dlls/crypt32/crypt32_De.rc @@ -177,6 +177,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_CA "Zwischenzertifizierungsstellen" IDS_LOCALIZEDNAME_ADDRESSBOOK "Andere Personen" IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Vertrauenswürdige Herausgeber" + IDS_LOCALIZEDNAME_DISALLOWED "Nicht Vertrauenswürdige Zertifikate" } STRINGTABLE DISCARDABLE

1 0

André Hentschel : winecfg: Improve German About dialog .
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 90586893c167b157bf76cce5bfa37ea3514e5d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90586893c167b157bf76cce5b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 6 18:49:21 2009 +0200 winecfg: Improve German About dialog. --- programs/winecfg/De.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index 1bedd06..019b49b 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -42,11 +42,11 @@ BEGIN LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 LTEXT "Diese Bibliothek ist freie Software; Sie d�rfen sie unter den Bedingungen der GNU Lesser General Public License, wie von der Free Software Foundation ver�ffentlicht, weiterverteilen und/oder modifizieren; entweder gem�� Version 2.1 der Lizenz oder (nach Ihrer Option) jeder sp�teren Version.", IDC_STATIC,119,44,124,72 - GROUPBOX " Windows-Registrierungs-Informationen ", IDC_STATIC, 15, 110, 230, 55 - LTEXT "&Eigent�mer:", IDC_STATIC, 22, 126, 40, 20 - EDITTEXT IDC_ABT_OWNER, 75, 126, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP - LTEXT "&Organisation:", IDC_STATIC, 22, 140, 50, 20 - EDITTEXT IDC_ABT_ORG, 75, 140, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP + GROUPBOX " Windows-Registrierungs-Informationen ", IDC_STATIC, 15, 120, 230, 55 + LTEXT "&Eigent�mer:", IDC_STATIC, 22, 136, 40, 20 + EDITTEXT IDC_ABT_OWNER, 75, 136, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP + LTEXT "&Organisation:", IDC_STATIC, 22, 150, 50, 20 + EDITTEXT IDC_ABT_ORG, 75, 150, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP END IDD_APPCFG DIALOG DISCARDABLE 0, 0, 260, 250

1 0

Anders Jonsson : notepad: Update Swedish translation.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 1903e74c687761fb7cd70d5d29fbcb1c9e7ad2eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1903e74c687761fb7cd70d5d2… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Mon Jul 6 17:13:42 2009 +0200 notepad: Update Swedish translation. --- programs/notepad/Sv.rc | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Sv.rc b/programs/notepad/Sv.rc index f2893b0..75d0e59 100644 --- a/programs/notepad/Sv.rc +++ b/programs/notepad/Sv.rc @@ -94,6 +94,14 @@ PUSHBUTTON "Avbryt", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "&Hj�lp", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Kodning:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" @@ -122,4 +130,13 @@ STRING_OUT_OF_MEMORY, "Det finns inte tillr den h�r uppgiften.\nAvsluta ett eller flera program f�r att �ka m�ngden\nledigt \ minne." +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Denna fil inneh�ller Unicode-tecken vilka kommer att g� \n\ +f�rlorade om du sparar filen under kodningen %s. \n\ +Klicka Avbryt och v�lj sedan ett av Unicode-alternativen \n\ +i teckenkodningslistan f�r att beh�lla dessa tecken. \n\ +Vill du forts�tta?" }

1 0

Hans Leidekker : winhttp: Implement WinHttpSetTimeouts.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 9d9c505a273edbb79ce7dc60a324d2bbf6a2bdab URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9c505a273edbb79ce7dc60a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 7 10:14:11 2009 +0200 winhttp: Implement WinHttpSetTimeouts. --- dlls/winhttp/session.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 11c4b4f..55f9779 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -737,8 +737,40 @@ WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback( HINTERNET handle, WINHT */ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int send, int receive ) { - FIXME("%p, %d, %d, %d, %d\n", handle, resolve, connect, send, receive); - return TRUE; + BOOL ret = TRUE; + request_t *request; + + TRACE("%p, %d, %d, %d, %d\n", handle, resolve, connect, send, receive); + + if (resolve < -1 || connect < -1 || send < -1 || receive < -1) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + FIXME("resolve and connect timeout not supported\n"); + + if (!(request = (request_t *)grab_object( handle ))) + { + set_last_error( ERROR_INVALID_HANDLE ); + return FALSE; + } + + if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) + { + release_object( &request->hdr ); + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + return FALSE; + } + + if (send < 0) send = 0; + if (netconn_set_timeout( &request->netconn, TRUE, send )) ret = FALSE; + + if (receive < 0) receive = 0; + if (netconn_set_timeout( &request->netconn, FALSE, receive )) ret = FALSE; + + release_object( &request->hdr ); + return ret; } static const WCHAR wkday[7][4] = diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 511e124..823d0ae 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -214,6 +214,7 @@ BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ); BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_in * ); BOOL netconn_secure_connect( netconn_t * ); BOOL netconn_send( netconn_t *, const void *, size_t, int, int * ); +DWORD netconn_set_timeout( netconn_t *, BOOL, int ); const void *netconn_get_certificate( netconn_t * ); BOOL set_cookies( request_t *, const WCHAR * );

1 0

Frédéric Delanoy : wininet: Fix French translation & UI display.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 71da857d8219f30649579e4a94df65744852e4bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=71da857d8219f30649579e4a9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 02:24:31 2009 +0200 wininet: Fix French translation & UI display. --- dlls/wininet/wininet_Fr.rc | 38 +++++++++++++++++++++----------------- 1 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/wininet_Fr.rc b/dlls/wininet/wininet_Fr.rc index 9458b1e..e12aa6d 100644 --- a/dlls/wininet/wininet_Fr.rc +++ b/dlls/wininet/wininet_Fr.rc @@ -3,8 +3,9 @@ * French language support * * Copyright 2003 Mike McCormack for CodeWeavers - * Copyright 2003 Vincent B�ron + * Copyright 2003 Vincent Béron * Copyright 2005 Jonathan Ernst + * Copyright 2009 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,29 +24,32 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 218, 150 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Entrez le mot de passe r�seau" +CAPTION "Entrez le mot de passe réseau" FONT 8, "MS Shell Dlg" { - LTEXT "Entrez votre nom d'utilisateur et votre mot de passe :", -1, 40, 6, 150, 15 - LTEXT "Mandataire", -1, 40, 26, 50, 10 - LTEXT "Domaine", -1, 40, 46, 50, 10 - LTEXT "Utilisateur", -1, 40, 66, 50, 10 - LTEXT "Mot de passe", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 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 "&Enregistrer ce mot de passe (risqu�)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Annuler", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "Entrez votre nom d'utilisateur et votre mot de passe :", -1, 10, 8, 173, 12 + LTEXT "Serveur mandataire", -1, 10, 28, 50, 17 + LTEXT "Domaine", -1, 10, 50, 50, 10 + LTEXT "Utilisateur", -1, 10, 71, 50, 10 + LTEXT "Mot de passe", -1, 10, 90, 50, 10 + LTEXT "" IDC_PROXY, 58, 28, 150, 14, 0 + LTEXT "" IDC_REALM, 58, 48, 150, 14, 0 + EDITTEXT IDC_USERNAME, 58, 68, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 58, 88, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Enregistrer ce mot de passe (risqué)", IDC_SAVEPASSWORD, + 58, 108, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 87, 128, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Annuler", IDCANCEL, 147, 128, 56, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE { - IDS_LANCONNECTION "Connexion LAN" + IDS_LANCONNECTION "Connexion réseau local (LAN)" }

1 0