November 2006 - Wine-Commits

Marcus Meissner : kernel32/tests: Test -1 length for NULL ptr too.
by Alexandre Julliard Nov. 24, 2006

Nov. 24, 2006

Module: wine Branch: master Commit: 9e8b1259caaa89699de91186837733ee85fdba4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8b1259caaa89699de911868… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Nov 23 21:24:33 2006 +0100 kernel32/tests: Test -1 length for NULL ptr too. --- dlls/kernel32/tests/codepage.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index d65aa59..de15067 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -101,6 +101,13 @@ static void test_null_source(void) ok(!len && GLE == ERROR_INVALID_PARAMETER, "WideCharToMultiByte returned %d with GLE=%d (expected 0 with ERROR_INVALID_PARAMETER)\n", len, GLE); + + SetLastError(0); + len = WideCharToMultiByte(CP_ACP, 0, NULL, -1, NULL, 0, NULL, NULL); + GLE = GetLastError(); + ok(!len && GLE == ERROR_INVALID_PARAMETER, + "WideCharToMultiByte returned %d with GLE=%d (expected 0 with ERROR_INVALID_PARAMETER)\n", + len, GLE); } /* lstrcmpW is not supported on Win9x! */

1 0

Francois Gouget : comdlg32: Moved a FIXME out of the user-visible string.
by Alexandre Julliard Nov. 24, 2006

Nov. 24, 2006

Module: wine Branch: master Commit: 22209db865ab31addaa609b49567e74a575ceb3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=22209db865ab31addaa609b49… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 23 21:49:43 2006 +0100 comdlg32: Moved a FIXME out of the user-visible string. --- dlls/comdlg32/cdlg_Pt.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/cdlg_Pt.rc b/dlls/comdlg32/cdlg_Pt.rc index 9659e03..b890e80 100644 --- a/dlls/comdlg32/cdlg_Pt.rc +++ b/dlls/comdlg32/cdlg_Pt.rc @@ -142,7 +142,8 @@ FONT 8, "MS Shell Dlg" CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Exemplo",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 + /* FIXME: Translate */ + LTEXT "Scr&ipt:",stc7 ,98,114,80,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP }

1 0

Francois Gouget : serialui: Update the Portuguese translation ( contributed by Americo Jose Melo).
by Alexandre Julliard Nov. 24, 2006

Nov. 24, 2006

Module: wine Branch: master Commit: 4e2a8b5b66e1ccde5a1a690e9212a9d8ba34ce5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2a8b5b66e1ccde5a1a690e9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 23 21:48:40 2006 +0100 serialui: Update the Portuguese translation (contributed by Americo Jose Melo). --- dlls/serialui/Pt.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/serialui/Pt.rc b/dlls/serialui/Pt.rc index 2b6ea22..459bdbb 100644 --- a/dlls/serialui/Pt.rc +++ b/dlls/serialui/Pt.rc @@ -45,18 +45,18 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUG IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propriedades para " +CAPTION "Propriedades de " FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bits por segundo", 0,5,20,55,10 COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "Paridade", 0,5,40,55,10 COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Controle de fluxo", 0,5,60,55,10 + LTEXT "Controlo de fluxo", 0,5,60,55,10 COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "Bits de dados", 0,5,80,55,10 COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Bits de parada", 0,5,100,55,10 + LTEXT "Bits de paragem", 0,5,100,55,10 COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK,30,138,50,14 PUSHBUTTON "Cancelar", IDCANCEL,85,138,50,14

1 0

Francois Gouget : programs: Update the Portuguese translation ( contributed by Americo Jose Melo).
by Alexandre Julliard Nov. 24, 2006

Nov. 24, 2006

Module: wine Branch: master Commit: 0cfa13dd3fd5930c06bf2f47120a3677058b743e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cfa13dd3fd5930c06bf2f471… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 23 21:47:59 2006 +0100 programs: Update the Portuguese translation (contributed by Americo Jose Melo). --- programs/notepad/Pt.rc | 6 +++--- programs/progman/Pt.rc | 2 +- programs/start/Pt.rc | 4 ++-- programs/view/Pt.rc | 2 +- programs/winhelp/Pt.rc | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/notepad/Pt.rc b/programs/notepad/Pt.rc index 7603ebf..d810a48 100644 --- a/programs/notepad/Pt.rc +++ b/programs/notepad/Pt.rc @@ -77,7 +77,7 @@ MAIN_MENU MENU MENUITEM "&Novo...", CMD_NEW MENUITEM "A&brir", CMD_OPEN MENUITEM "&Gravar", CMD_SAVE - MENUITEM "gravar &como...", CMD_SAVE_AS + MENUITEM "Gravar &como...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "&Imprimir", CMD_PRINT MENUITEM "C&onfigurar p�gina...", CMD_PAGE_SETUP @@ -88,12 +88,12 @@ MAIN_MENU MENU POPUP "&Editar" { MENUITEM "&Desfazer\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "&Recortar\tCtrl+X", CMD_CUT + MENUITEM "&Cortar\tCtrl+X", CMD_CUT MENUITEM "&Copiar\tCtrl+C", CMD_COPY MENUITEM "C&olar\tCtrl+V", CMD_PASTE MENUITEM "E&xcluir\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "Selecionar &tudo", CMD_SELECT_ALL + MENUITEM "Seleccionar &tudo", CMD_SELECT_ALL MENUITEM "&Data/Hora\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "&Quebrar autom�tica de linha", CMD_WRAP diff --git a/programs/progman/Pt.rc b/programs/progman/Pt.rc index 06ad271..0624c97 100644 --- a/programs/progman/Pt.rc +++ b/programs/progman/Pt.rc @@ -318,7 +318,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUG STRINGTABLE DISCARDABLE { -IDS_PROGRAM_MANAGER, "Gerenciador de programas" +IDS_PROGRAM_MANAGER, "Ger�nciador de programas" IDS_ERROR, "ERRO" IDS_WARNING, "AVISO" IDS_INFO, "Informa��o" diff --git a/programs/start/Pt.rc b/programs/start/Pt.rc index 32758cc..aad9ea7 100644 --- a/programs/start/Pt.rc +++ b/programs/start/Pt.rc @@ -81,7 +81,7 @@ Options: \n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel \n\ Start n�o vem com ABSOLUTAMENTE NENHUMA GARANTIA; para detahes execute com a op��o /L. \n\ -Este � um software livre (free software), e � benvindo a redistribu�-lo sob certas \n\ +Este � um software livre (free software), e � bem-vindo a redistribu�-lo sob certas \n\ condi��es; execute 'start /L' para detalhes. \n\ " @@ -103,5 +103,5 @@ Foundation, Inc., 51 Franklin St, Fifth Veja o ficheiro COPYING.LIB para informa��o sobre a licen�a. \n\ " -STRING_EXECFAIL "Aplica��o n�o pode ser iniciada, ou n�o existe aplica��o associada com o ficheiro especificado.\nShellExecuteEx falhado" +STRING_EXECFAIL "A aplica��o n�o pode ser iniciada, ou n�o existe aplica��o associada com o ficheiro especificado.\nShellExecuteEx falhado" } diff --git a/programs/view/Pt.rc b/programs/view/Pt.rc index ac57522..47aab01 100644 --- a/programs/view/Pt.rc +++ b/programs/view/Pt.rc @@ -57,7 +57,7 @@ BEGIN END POPUP "&Pan" BEGIN - MENUITEM "Ajustar a &janela", IDM_SET_EXT_TO_WIN + MENUITEM "Ajustar &janela", IDM_SET_EXT_TO_WIN MENUITEM SEPARATOR MENUITEM "&Esquerda", IDM_LEFT MENUITEM "&Direita", IDM_RIGHT diff --git a/programs/winhelp/Pt.rc b/programs/winhelp/Pt.rc index 276bd57..d080c19 100644 --- a/programs/winhelp/Pt.rc +++ b/programs/winhelp/Pt.rc @@ -82,7 +82,7 @@ MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Informa��es...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&Sobre WINE", MNID_HELP_WINE + MENUITEM "&Acerca do WINE", MNID_HELP_WINE #endif } } @@ -106,7 +106,7 @@ STID_HISTORY, "&Hist�rico" STID_TOPICS, "&T�picos" STID_ALL_FILES, "Todos os arquivos (*.*)" STID_HELP_FILES_HLP, "Arquivos de ajuda (*.hlp)" -STID_FILE_NOT_FOUND_s"Cannot find '%s'. Do you want to find this file yourself?" +STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE

1 0

Francois Gouget : Replace SUBLANG_DEFAULT with the specific SUBLANG_XXX constant for languages that have multiple sublanguages .
by Alexandre Julliard Nov. 24, 2006

Nov. 24, 2006

Module: wine Branch: master Commit: b5f104d05b07e0156349ef84bb27430b66cdfc93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5f104d05b07e0156349ef84b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 23 21:47:23 2006 +0100 Replace SUBLANG_DEFAULT with the specific SUBLANG_XXX constant for languages that have multiple sublanguages. --- dlls/avifil32/avifile_Pt.rc | 2 +- dlls/comctl32/comctl_Pt.rc | 2 +- dlls/comdlg32/cdlg_Pt.rc | 2 +- dlls/mpr/mpr_Pt.rc | 2 +- dlls/msacm32/msacm_Pt.rc | 2 +- dlls/msi/msi_Pt.rc | 2 +- dlls/msrle32/msrle_Pt.rc | 2 +- dlls/oleaut32/oleaut32_No.rc | 2 +- dlls/oleaut32/oleaut32_Pt.rc | 2 +- dlls/oledlg/oledlg_Pt.rc | 2 +- dlls/shdocvw/Pt.rc | 2 +- dlls/shell32/shell32_Pt.rc | 2 +- dlls/shlwapi/shlwapi_Pt.rc | 2 +- dlls/user32/resources/user32_Pt.rc | 2 +- dlls/wineps.drv/wps_Pt.rc | 2 +- dlls/wininet/wininet_Pt.rc | 2 +- dlls/winmm/winmm_Pt.rc | 2 +- programs/winecfg/Pt.rc | 6 +++--- programs/wineconsole/wineconsole_Pt.rc | 2 +- 19 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/avifil32/avifile_Pt.rc b/dlls/avifil32/avifile_Pt.rc index 6eac551..d243292 100644 --- a/dlls/avifil32/avifile_Pt.rc +++ b/dlls/avifil32/avifile_Pt.rc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU diff --git a/dlls/comctl32/comctl_Pt.rc b/dlls/comctl32/comctl_Pt.rc index f3ed6bf..7d7ee30 100644 --- a/dlls/comctl32/comctl_Pt.rc +++ b/dlls/comctl32/comctl_Pt.rc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE diff --git a/dlls/comdlg32/cdlg_Pt.rc b/dlls/comdlg32/cdlg_Pt.rc index 1e05bec..9659e03 100644 --- a/dlls/comdlg32/cdlg_Pt.rc +++ b/dlls/comdlg32/cdlg_Pt.rc @@ -21,7 +21,7 @@ * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES. */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU diff --git a/dlls/mpr/mpr_Pt.rc b/dlls/mpr/mpr_Pt.rc index da2350a..0b3731e 100644 --- a/dlls/mpr/mpr_Pt.rc +++ b/dlls/mpr/mpr_Pt.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE { diff --git a/dlls/msacm32/msacm_Pt.rc b/dlls/msacm32/msacm_Pt.rc index 3bf3831..ab8cd25 100644 --- a/dlls/msacm32/msacm_Pt.rc +++ b/dlls/msacm32/msacm_Pt.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU diff --git a/dlls/msi/msi_Pt.rc b/dlls/msi/msi_Pt.rc index f9af3f4..e5799e3 100644 --- a/dlls/msi/msi_Pt.rc +++ b/dlls/msi/msi_Pt.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE { diff --git a/dlls/msrle32/msrle_Pt.rc b/dlls/msrle32/msrle_Pt.rc index 8248595..e24a1ad 100644 --- a/dlls/msrle32/msrle_Pt.rc +++ b/dlls/msrle32/msrle_Pt.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE { diff --git a/dlls/oleaut32/oleaut32_No.rc b/dlls/oleaut32/oleaut32_No.rc index c75a267..7ca883c 100644 --- a/dlls/oleaut32/oleaut32_No.rc +++ b/dlls/oleaut32/oleaut32_No.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE { diff --git a/dlls/oleaut32/oleaut32_Pt.rc b/dlls/oleaut32/oleaut32_Pt.rc index b60adcd..9a4953b 100644 --- a/dlls/oleaut32/oleaut32_Pt.rc +++ b/dlls/oleaut32/oleaut32_Pt.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE { diff --git a/dlls/oledlg/oledlg_Pt.rc b/dlls/oledlg/oledlg_Pt.rc index 40c7539..5a3757e 100644 --- a/dlls/oledlg/oledlg_Pt.rc +++ b/dlls/oledlg/oledlg_Pt.rc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU diff --git a/dlls/shdocvw/Pt.rc b/dlls/shdocvw/Pt.rc index a868fbc..291b938 100644 --- a/dlls/shdocvw/Pt.rc +++ b/dlls/shdocvw/Pt.rc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN 100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU diff --git a/dlls/shell32/shell32_Pt.rc b/dlls/shell32/shell32_Pt.rc index b7d8440..1090f4d 100644 --- a/dlls/shell32/shell32_Pt.rc +++ b/dlls/shell32/shell32_Pt.rc @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN MENU_001 MENU DISCARDABLE BEGIN diff --git a/dlls/shlwapi/shlwapi_Pt.rc b/dlls/shlwapi/shlwapi_Pt.rc index 30f4961..9724b55 100644 --- a/dlls/shlwapi/shlwapi_Pt.rc +++ b/dlls/shlwapi/shlwapi_Pt.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU diff --git a/dlls/user32/resources/user32_Pt.rc b/dlls/user32/resources/user32_Pt.rc index e2131b9..36419c0 100644 --- a/dlls/user32/resources/user32_Pt.rc +++ b/dlls/user32/resources/user32_Pt.rc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE { diff --git a/dlls/wineps.drv/wps_Pt.rc b/dlls/wineps.drv/wps_Pt.rc index a3232bd..05fd7bf 100644 --- a/dlls/wineps.drv/wps_Pt.rc +++ b/dlls/wineps.drv/wps_Pt.rc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE diff --git a/dlls/wininet/wininet_Pt.rc b/dlls/wininet/wininet_Pt.rc index 73c3fc8..b255ae5 100644 --- a/dlls/wininet/wininet_Pt.rc +++ b/dlls/wininet/wininet_Pt.rc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU diff --git a/dlls/winmm/winmm_Pt.rc b/dlls/winmm/winmm_Pt.rc index 0747589..1e92fd3 100644 --- a/dlls/winmm/winmm_Pt.rc +++ b/dlls/winmm/winmm_Pt.rc @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN BEGIN /* MMSYS errors */ diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc index 5d7d25b..1d229f3 100644 --- a/programs/winecfg/Pt.rc +++ b/programs/winecfg/Pt.rc @@ -21,7 +21,7 @@ * */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_ABOUTCFG DIALOGEX 0, 0, 260, 250 STYLE WS_CHILD @@ -82,7 +82,7 @@ BEGIN END -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED @@ -151,7 +151,7 @@ BEGIN END -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED diff --git a/programs/wineconsole/wineconsole_Pt.rc b/programs/wineconsole/wineconsole_Pt.rc index 489f6d0..a8f5604 100644 --- a/programs/wineconsole/wineconsole_Pt.rc +++ b/programs/wineconsole/wineconsole_Pt.rc @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE BEGIN

1 0

Francois Gouget : user32/tests: Remove unneeded NONAMELESS* macros.
by Alexandre Julliard Nov. 24, 2006

Nov. 24, 2006

Module: wine Branch: master Commit: 3988c3dc8fa39845827edfc8853a1ee1764d0cbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3988c3dc8fa39845827edfc88… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 23 21:35:57 2006 +0100 user32/tests: Remove unneeded NONAMELESS* macros. --- dlls/user32/tests/dce.c | 3 --- dlls/user32/tests/menu.c | 3 --- dlls/user32/tests/win.c | 3 --- 3 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index ada01fd..72cd3fa 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include <assert.h> #include <stdlib.h> #include <stdarg.h> diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index af01462..3b24553 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include <stdlib.h> #include <stdarg.h> #include <stdio.h> diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 81e8ba4..65795da 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -23,9 +23,6 @@ /* To get ICON_SMALL2 with the MSVC headers */ #define _WIN32_WINNT 0x0501 -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include <assert.h> #include <stdlib.h> #include <stdarg.h>

1 0

Francois Gouget : msvcrt/tests: The tests must not include msvcrt. h because it contains declarations that may be incompatible with the PSDK headers .
by Alexandre Julliard Nov. 24, 2006

Nov. 24, 2006

Module: wine Branch: master Commit: b2765fc45afe398867da5c92dc83fa1eaa4d40c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2765fc45afe398867da5c92d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 23 21:37:49 2006 +0100 msvcrt/tests: The tests must not include msvcrt.h because it contains declarations that may be incompatible with the PSDK headers. --- dlls/msvcrt/tests/data.c | 1 - dlls/msvcrt/tests/file.c | 41 ++++++++++++++++++++--------------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index c8eee75..b13d722 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "msvcrt.h" #include "wine/test.h" #include <stdarg.h> #include <stdlib.h> diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index bd58eeb..bfeaf75 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -32,7 +32,6 @@ #include <winnls.h> #include <process.h> #include <errno.h> -#include "msvcrt.h" static void test_fdopen( void ) { @@ -139,20 +138,20 @@ static void test_readmode( BOOL ascii_mo static const char outbuffer[] = "0,1,2,3,4,5,6,7,8,9\r\n\r\nA,B,C,D,E\r\nX,Y,Z"; static const char padbuffer[] = "ghjghjghjghj"; static const char nlbuffer[] = "\r\n"; - char buffer[2*MSVCRT_BUFSIZ+256], *optr; + char buffer[2*BUFSIZ+256], *optr; int fd; FILE *file; int i, j, m, fp, ao, *ip, pl; long l; fd = open ("fdopen.tst", O_WRONLY | O_CREAT | O_BINARY, _S_IREAD |_S_IWRITE); - /* an internal buffer of MSVCRT_BUFSIZ is maintained, so make a file big + /* an internal buffer of BUFSIZ is maintained, so make a file big * enough to test operations that cross the buffer boundary */ - j = (2*MSVCRT_BUFSIZ-4)/strlen(padbuffer); + j = (2*BUFSIZ-4)/strlen(padbuffer); for (i=0; i<j; i++) write (fd, padbuffer, strlen(padbuffer)); - j = (2*MSVCRT_BUFSIZ-4)%strlen(padbuffer); + j = (2*BUFSIZ-4)%strlen(padbuffer); for (i=0; i<j; i++) write (fd, &padbuffer[i], 1); write (fd, nlbuffer, strlen(nlbuffer)); @@ -173,9 +172,9 @@ static void test_readmode( BOOL ascii_mo /* first is a test of fgets, ftell, fseek */ ok(ftell(file) == 0,"Did not start at beginning of file in %s\n", IOMODE); - ok(fgets(buffer,2*MSVCRT_BUFSIZ+256,file) !=0,"padding line fgets failed unexpected in %s\n", IOMODE); + ok(fgets(buffer,2*BUFSIZ+256,file) !=0,"padding line fgets failed unexpected in %s\n", IOMODE); l = ftell(file); - pl = 2*MSVCRT_BUFSIZ-2; + pl = 2*BUFSIZ-2; ok(l == pl,"padding line ftell got %ld should be %d in %s\n", l, pl, IOMODE); ok(lstrlenA(buffer) == pl+ao,"padding line fgets got size %d should be %d in %s\n", lstrlenA(buffer), pl+ao, IOMODE); @@ -207,15 +206,15 @@ static void test_readmode( BOOL ascii_mo /* test fread across buffer boundary */ rewind(file); ok(ftell(file) == 0,"Did not start at beginning of file in %s\n", IOMODE); - ok(fgets(buffer,MSVCRT_BUFSIZ-6,file) !=0,"padding line fgets failed unexpected in %s\n", IOMODE); + ok(fgets(buffer,BUFSIZ-6,file) !=0,"padding line fgets failed unexpected in %s\n", IOMODE); j=strlen(outbuffer); - i=fread(buffer,1,MSVCRT_BUFSIZ+strlen(outbuffer),file); - ok(i==MSVCRT_BUFSIZ+j,"fread failed, expected %d got %d in %s\n", MSVCRT_BUFSIZ+j, i, IOMODE); + i=fread(buffer,1,BUFSIZ+strlen(outbuffer),file); + ok(i==BUFSIZ+j,"fread failed, expected %d got %d in %s\n", BUFSIZ+j, i, IOMODE); l = ftell(file); ok(l == pl+j-(ao*4)-5,"ftell after fread got %ld should be %d in %s\n", l, pl+j-(ao*4)-5, IOMODE); for (m=0; m<3; m++) - ok(buffer[m]==padbuffer[m+(MSVCRT_BUFSIZ-4)%strlen(padbuffer)],"expected %c got %c\n", padbuffer[m], buffer[m]); - m+=MSVCRT_BUFSIZ+2+ao; + ok(buffer[m]==padbuffer[m+(BUFSIZ-4)%strlen(padbuffer)],"expected %c got %c\n", padbuffer[m], buffer[m]); + m+=BUFSIZ+2+ao; optr = (char *)outbuffer; for (; m<i; m++) { ok(buffer[m]==*optr,"char %d expected %c got %c in %s\n", m, *optr, buffer[m], IOMODE); @@ -226,7 +225,7 @@ static void test_readmode( BOOL ascii_mo /* fread should return the requested number of bytes if available */ rewind(file); ok(ftell(file) == 0,"Did not start at beginning of file in %s\n", IOMODE); - ok(fgets(buffer,MSVCRT_BUFSIZ-6,file) !=0,"padding line fgets failed unexpected in %s\n", IOMODE); + ok(fgets(buffer,BUFSIZ-6,file) !=0,"padding line fgets failed unexpected in %s\n", IOMODE); j = fp+10; i=fread(buffer,1,j,file); ok(i==j,"fread failed, expected %d got %d in %s\n", j, i, IOMODE); @@ -245,7 +244,7 @@ static void test_readmode( BOOL ascii_mo /* test some additional functions */ rewind(file); ok(ftell(file) == 0,"Did not start at beginning of file in %s\n", IOMODE); - ok(fgets(buffer,2*MSVCRT_BUFSIZ+256,file) !=0,"padding line fgets failed unexpected in %s\n", IOMODE); + ok(fgets(buffer,2*BUFSIZ+256,file) !=0,"padding line fgets failed unexpected in %s\n", IOMODE); i = _getw(file); ip = (int *)outbuffer; ok(i == *ip,"_getw failed, expected %08x got %08x in %s\n", *ip, i, IOMODE); @@ -302,7 +301,7 @@ static void test_fgetwc( void ) char* tempf; FILE *tempfh; static const char mytext[]= "This is test_fgetwc\r\n"; - WCHAR wtextW[MSVCRT_BUFSIZ+LLEN+1]; + WCHAR wtextW[BUFSIZ+LLEN+1]; WCHAR *mytextW = NULL, *aptr, *wptr; BOOL diff_found = FALSE; int i, j; @@ -312,7 +311,7 @@ static void test_fgetwc( void ) tempfh = fopen(tempf,"wb"); j = 'a'; /* pad to almost the length of the internal buffer */ - for (i=0; i<MSVCRT_BUFSIZ-4; i++) + for (i=0; i<BUFSIZ-4; i++) fputc(j,tempfh); j = '\r'; fputc(j,tempfh); @@ -325,11 +324,11 @@ static void test_fgetwc( void ) tempfh = fopen(tempf,"rt"); /* open in TEXT mode */ fgetws(wtextW,LLEN,tempfh); l=ftell(tempfh); - ok(l==MSVCRT_BUFSIZ-2, "ftell expected %d got %ld\n", MSVCRT_BUFSIZ-2, l); + ok(l==BUFSIZ-2, "ftell expected %d got %ld\n", BUFSIZ-2, l); fgetws(wtextW,LLEN,tempfh); l=ftell(tempfh); - ok(l==MSVCRT_BUFSIZ-2+strlen(mytext), "ftell expected %d got %ld\n", - MSVCRT_BUFSIZ-2+strlen(mytext), l); + ok(l==BUFSIZ-2+strlen(mytext), "ftell expected %d got %ld\n", + BUFSIZ-2+strlen(mytext), l); mytextW = AtoW ((char*)mytext); aptr = mytextW; wptr = wtextW; @@ -347,7 +346,7 @@ static void test_fgetwc( void ) /* pad to almost the length of the internal buffer. Use an odd number of bytes to test that we can read wchars that are split across the internal buffer boundary */ - for (i=0; i<MSVCRT_BUFSIZ-3-strlen(mytext)*sizeof(WCHAR); i++) + for (i=0; i<BUFSIZ-3-strlen(mytext)*sizeof(WCHAR); i++) fputc(j,tempfh); j = '\r'; fputwc(j,tempfh); @@ -358,7 +357,7 @@ static void test_fgetwc( void ) fclose(tempfh); /* in binary mode, getws/c expects wide characters */ tempfh = fopen(tempf,"rb"); /* open in BINARY mode */ - j=(MSVCRT_BUFSIZ-2)/sizeof(WCHAR)-strlen(mytext); + j=(BUFSIZ-2)/sizeof(WCHAR)-strlen(mytext); fgetws(wtextW,j,tempfh); l=ftell(tempfh); j=(j-1)*sizeof(WCHAR);

1 0

Francois Gouget : comctl32/tests: Fix the CheckDPA() tests.
by Alexandre Julliard Nov. 24, 2006

Nov. 24, 2006

Module: wine Branch: master Commit: fb957ec589808d80f804b06745b48e59b5fa294d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb957ec589808d80f804b0674… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 23 21:37:08 2006 +0100 comctl32/tests: Fix the CheckDPA() tests. There is no guarantee that the compiler will compute the function arguments in left-to-right order. --- dlls/comctl32/tests/dpa.c | 60 +++++++++++++++++++++++++++++++------------- 1 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index c05aecb..8940e4a 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -202,6 +202,7 @@ static void test_dpa(void) PVOID p; DWORD dw, dw2, dw3; HRESULT hRes; + BOOL rc; GetSystemInfo(&si); hHeap = HeapCreate(0, 1, 2); @@ -219,7 +220,8 @@ static void test_dpa(void) ok(pDPA_SetPtr(dpa, 1, (PVOID)6), "\n"); /* Fill the greated gap */ ok(pDPA_SetPtr(dpa, 0, (PVOID)5), "\n"); - ok(CheckDPA(dpa, 0x56, &dw), "dw=0x%x\n", dw); + rc=CheckDPA(dpa, 0x56, &dw); + ok(rc, "dw=0x%x\n", dw); /* Prepend item */ ret = pDPA_InsertPtr(dpa, 1, (PVOID)1); @@ -234,7 +236,8 @@ static void test_dpa(void) ret = pDPA_InsertPtr(dpa, DPA_APPEND, (PVOID)4); ok(ret == 5, "ret=%d\n", ret); - ok(CheckDPA(dpa, 0x516324, &dw), "dw=0x%x\n", dw); + rc=CheckDPA(dpa, 0x516324, &dw); + ok(rc, "dw=0x%x\n", dw); for(i = 1; i <= 6; i++) { @@ -247,24 +250,29 @@ static void test_dpa(void) /* Sort DPA */ ok(pDPA_Sort(dpa, CB_CmpGT, 0xdeadbeef), "\n"); - ok(CheckDPA(dpa, 0x654321, &dw), "dw=0x%x\n", dw); + rc=CheckDPA(dpa, 0x654321, &dw); + ok(rc, "dw=0x%x\n", dw); /* Clone into a new DPA */ dpa2 = pDPA_Clone(dpa, NULL); ok(dpa2 != NULL, "\n"); /* The old data should have been preserved */ - ok(CheckDPA(dpa2, 0x654321, &dw2), "dw=0x%x\n", dw2); + rc=CheckDPA(dpa2, 0x654321, &dw2); + ok(rc, "dw=0x%x\n", dw2); ok(pDPA_Sort(dpa, CB_CmpLT, 0xdeadbeef), "\n"); /* Test if the DPA itself was really copied */ - ok(CheckDPA(dpa, 0x123456, &dw), "dw=0x%x\n", dw ); - ok(CheckDPA(dpa2, 0x654321, &dw2), "dw2=0x%x\n", dw2); + rc=CheckDPA(dpa, 0x123456, &dw); + ok(rc, "dw=0x%x\n", dw ); + rc=CheckDPA(dpa2, 0x654321, &dw2); + ok(rc, "dw2=0x%x\n", dw2); /* Clone into an old DPA */ p = NULL; SetLastError(ERROR_SUCCESS); p = pDPA_Clone(dpa, dpa3); ok(p == dpa3, "p=%p\n", p); - ok(CheckDPA(dpa3, 0x123456, &dw3), "dw3=0x%x\n", dw3); + rc=CheckDPA(dpa3, 0x123456, &dw3); + ok(rc, "dw3=0x%x\n", dw3); for(i = 1; i <= 6; i++) { @@ -297,7 +305,8 @@ static void test_dpa(void) /* Delete the third item */ p = pDPA_DeletePtr(dpa, 2); ok(p == (PVOID)3, "p=%p\n", p); - ok(CheckDPA(dpa, 0x12456, &dw), "dw=0x%x\n", dw); + rc=CheckDPA(dpa, 0x12456, &dw); + ok(rc, "dw=0x%x\n", dw); /* Check where to re-insert the deleted item */ i = pDPA_Search(dpa, (PVOID)3, 0, @@ -315,7 +324,8 @@ static void test_dpa(void) /* Re-insert the item */ ret = pDPA_InsertPtr(dpa, 2, (PVOID)3); ok(ret == 2, "ret=%d i=%d\n", ret, 2); - ok(CheckDPA(dpa, 0x123456, &dw), "dw=0x%x\n", dw); + rc=CheckDPA(dpa, 0x123456, &dw); + ok(rc, "dw=0x%x\n", dw); /* When doing a binary search while claiming reverse order all indexes * should be bogus */ @@ -332,12 +342,17 @@ static void test_dpa(void) p = pDPA_DeletePtr(dpa, 1); p = pDPA_DeletePtr(dpa, 2); p = pDPA_DeletePtr(dpa, 3); - ok(CheckDPA(dpa, 0x135, &dw), "dw=0x%x\n", dw); + rc=CheckDPA(dpa, 0x135, &dw); + ok(rc, "dw=0x%x\n", dw); /* Delete all odd entries from dpa2 */ pDPA_Merge(dpa2, dpa, DPAM_DELETE, CB_CmpLT, CB_MergeDeleteOddSrc, 0xdeadbeef); - todo_wine ok(CheckDPA(dpa2, 0x246, &dw2), "dw=0x%x\n", dw2); + todo_wine + { + rc=CheckDPA(dpa2, 0x246, &dw2); + ok(rc, "dw=0x%x\n", dw2); + } /* Merge dpa3 into dpa2 and dpa */ pDPA_Merge(dpa, dpa3, DPAM_INSERT|DPAM_NOSORT, @@ -345,16 +360,20 @@ static void test_dpa(void) pDPA_Merge(dpa2, dpa3, DPAM_INSERT|DPAM_NOSORT, CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef); - ok(CheckDPA(dpa, 0x123456, &dw ), "dw=0x%x\n", dw); - ok(CheckDPA(dpa2, 0x123456, &dw2), "dw2=0x%x\n", dw2); - ok(CheckDPA(dpa3, 0x123456, &dw3), "dw3=0x%x\n", dw3); + rc=CheckDPA(dpa, 0x123456, &dw); + ok(rc, "dw=0x%x\n", dw); + rc=CheckDPA(dpa2, 0x123456, &dw2); + ok(rc, "dw2=0x%x\n", dw2); + rc=CheckDPA(dpa3, 0x123456, &dw3); + ok(rc, "dw3=0x%x\n", dw3); } if(pDPA_EnumCallback) { nEnum = 0; pDPA_EnumCallback(dpa2, CB_EnumFirstThree, (PVOID)dpa2); - ok(CheckDPA(dpa2, 0x777456, &dw2), "dw=0x%x\n", dw2); + rc=CheckDPA(dpa2, 0x777456, &dw2); + ok(rc, "dw=0x%x\n", dw2); ok(nEnum == 3, "nEnum=%d\n", nEnum); } @@ -364,7 +383,8 @@ static void test_dpa(void) ok(ret == 0x12345, "ret=%d\n", ret); pDPA_DeleteAllPtrs(dpa2); - ok(CheckDPA(dpa2, 0, &dw2), "dw2=0x%x\n", dw2); + rc=CheckDPA(dpa2, 0, &dw2); + ok(rc, "dw2=0x%x\n", dw2); pDPA_Destroy(dpa2); if(pDPA_DestroyCallback) @@ -402,8 +422,12 @@ static void test_dpa(void) hRes = IStream_Seek(pStm, liZero, STREAM_SEEK_SET, NULL); ok(hRes == S_OK, "hRes=0x%x\n", hRes); hRes = pDPA_LoadStream(&dpa, CB_Load, pStm, 0xdeadbeef); - todo_wine ok(hRes == S_OK, "hRes=0x%x\n", hRes); - todo_wine ok(CheckDPA(dpa, 0x123456, &dw), "dw=0x%x\n", dw); + todo_wine + { + ok(hRes == S_OK, "hRes=0x%x\n", hRes); + rc=CheckDPA(dpa, 0x123456, &dw); + ok(rc, "dw=0x%x\n", dw); + } pDPA_Destroy(dpa); ret = IStream_Release(pStm);

1 0

Francois Gouget : shlwapi/tests: Remove unneeded NONAMELESS* macros.
by Alexandre Julliard Nov. 24, 2006

Nov. 24, 2006

Module: wine Branch: master Commit: 26b2cdf8a0367fb7660ffa485ab11bbc596a97e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b2cdf8a0367fb7660ffa485… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 23 21:35:44 2006 +0100 shlwapi/tests: Remove unneeded NONAMELESS* macros. --- dlls/shlwapi/tests/string.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 209a3c8..5bed266 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -19,8 +19,6 @@ #include <stdio.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "wine/test.h" #include "winbase.h" #include "winerror.h"

1 0

Francois Gouget : shell32/tests: Don' t use the NONAMELESS* macros in the tests.
by Alexandre Julliard Nov. 24, 2006

Nov. 24, 2006

Module: wine Branch: master Commit: 144995b5a545731219d64900338df0e694bb0d43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=144995b5a545731219d649003… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 23 21:35:32 2006 +0100 shell32/tests: Don't use the NONAMELESS* macros in the tests. --- dlls/shell32/tests/string.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/string.c b/dlls/shell32/tests/string.c index 1481ace..acd3101 100644 --- a/dlls/shell32/tests/string.c +++ b/dlls/shell32/tests/string.c @@ -21,8 +21,6 @@ #include <stdarg.h> #include <stdio.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #define WINE_NOWINSOCK #include "windef.h" #include "winbase.h" @@ -67,21 +65,21 @@ static void test_StrRetToStringNW(void) trace("StrRetToStringNAW is Unicode\n"); strret.uType = STRRET_WSTR; - strret.u.pOleStr = CoDupStrW("Test"); + U(strret).pOleStr = CoDupStrW("Test"); memset(buff, 0xff, sizeof(buff)); ret = pStrRetToStrNAW(buff, sizeof(buff)/sizeof(WCHAR), &strret, NULL); ok(ret == TRUE && !strcmpW(buff, szTestW), "STRRET_WSTR: dup failed, ret=%d\n", ret); strret.uType = STRRET_CSTR; - lstrcpyA(strret.u.cStr, "Test"); + lstrcpyA(U(strret).cStr, "Test"); memset(buff, 0xff, sizeof(buff)); ret = pStrRetToStrNAW(buff, sizeof(buff)/sizeof(WCHAR), &strret, NULL); ok(ret == TRUE && !strcmpW(buff, szTestW), "STRRET_CSTR: dup failed, ret=%d\n", ret); strret.uType = STRRET_OFFSET; - strret.u.uOffset = 1; + U(strret).uOffset = 1; strcpy((char*)&iidl, " Test"); memset(buff, 0xff, sizeof(buff)); ret = pStrRetToStrNAW(buff, sizeof(buff)/sizeof(WCHAR), &strret, iidl); @@ -92,7 +90,7 @@ static void test_StrRetToStringNW(void) #if 0 /* Invalid dest - should return FALSE, except NT4 does not, so we don't check. */ strret.uType = STRRET_WSTR; - strret.u.pOleStr = CoDupStrW("Test"); + U(strret).pOleStr = CoDupStrW("Test"); pStrRetToStrNAW(NULL, sizeof(buff)/sizeof(WCHAR), &strret, NULL); trace("NULL dest: ret=%d\n", ret); #endif

1 0