July 2010 - Wine-commits - list.winehq.org

Gustavo Henrique Milaré : setupapi: Update Portuguese (Brazilian) translation.
by Alexandre Julliard 02 Jul '10

02 Jul '10

Module: wine Branch: master Commit: a65ed886bdfcf8ee91cac8e5fb3e105ca0a63c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a65ed886bdfcf8ee91cac8e5f… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Jul 1 17:27:57 2010 -0300 setupapi: Update Portuguese (Brazilian) translation. --- dlls/setupapi/Pt.rc | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Pt.rc b/dlls/setupapi/Pt.rc index 5d7ebdb..362ab2f 100644 --- a/dlls/setupapi/Pt.rc +++ b/dlls/setupapi/Pt.rc @@ -4,6 +4,7 @@ * Copyright 2003 Marcelo Duarte * Copyright 2004 Américo José Melo * Copyright 2009 Ricardo Filipe + * Copyright 2010 Gustavo Henrique Milaré * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,6 +25,16 @@ #pragma code_page(65001) +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "O arquivo '%s' em %s é necessário" + IDS_UNKNOWN "Desconhecido" + IDS_COPYFROM "Copiar arquivos de:" + IDS_INFO "Insira o caminho onde se encontram os arquivos, depois clique em OK." +} + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE @@ -34,6 +45,7 @@ STRINGTABLE DISCARDABLE 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 @@ -64,6 +76,25 @@ BEGIN CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Arquivos Necessários" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insira o disco de instalação do fabricante, depois\nverifique se o drive correto está selecionado", 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 arquivos 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 + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Ficheiros Necessários"

1 0

Gustavo Henrique Milaré : appwiz.cpl: Fix Portuguese (Brazilian) translation.
by Alexandre Julliard 02 Jul '10

02 Jul '10

Module: wine Branch: master Commit: 12fd4ae518363f6e3155c3ec0076f91b610d1d7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=12fd4ae518363f6e3155c3ec0… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Jul 1 20:48:59 2010 -0300 appwiz.cpl: Fix Portuguese (Brazilian) translation. --- dlls/appwiz.cpl/Pt.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/Pt.rc b/dlls/appwiz.cpl/Pt.rc index 87d50a4..d8a33a2 100644 --- a/dlls/appwiz.cpl/Pt.rc +++ b/dlls/appwiz.cpl/Pt.rc @@ -32,7 +32,7 @@ STRINGTABLE IDS_CPL_DESC, "Permite a instalação de novo software, ou a remoção de software existente no seu computador." IDS_TAB1_TITLE, "Aplicativos" - IDS_UNINSTALL_FAILED, "Não foi possível executar o desinstalador, '%s'. Deseja remover do registo a entrada de desinstalação para este programa?" + IDS_UNINSTALL_FAILED, "Não foi possível executar o desinstalador, '%s'. Deseja remover do registro a entrada de desinstalação para este programa?" IDS_NOT_SPECIFIED, "Não especificado" IDS_COLUMN_NAME, "Nome" @@ -72,11 +72,11 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Instalar/Desinstalar" FONT 8, "MS Shell Dlg" { - CONTROL "Para instalar um programa novo a partir de uma disquete, CD-ROM ou do seu disco rígido, clique em Instalar.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "Para instalar um programa novo a partir de um disquete, CD-ROM ou do seu disco rígido, clique em Instalar.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 CONTROL "&Instalar...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "O software seguinte pode ser automaticamente removido. Para remover um programa ou modificar os seus componentes instalados selecione-o na lista e clique em Adicionar/Remover.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "O software a seguir pode ser automaticamente removido. Para remover um programa ou modificar os seus componentes instalados, selecione-o na lista e clique em Adicionar/Remover.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "&Informação de Suporte...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 198, 94, 14 CONTROL "&Modificar...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14

1 0

André Hentschel : winecfg: Remove BS_DEFPUSHBUTTON style for AddDll.
by Alexandre Julliard 02 Jul '10

02 Jul '10

Module: wine Branch: master Commit: afdc767cd383caca16cfa34bc14133e9433d223d URL: http://source.winehq.org/git/wine.git/?a=commit;h=afdc767cd383caca16cfa34bc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jul 1 18:38:23 2010 +0200 winecfg: Remove BS_DEFPUSHBUTTON style for AddDll. --- programs/winecfg/Bg.rc | 2 +- programs/winecfg/Cs.rc | 2 +- programs/winecfg/Da.rc | 2 +- programs/winecfg/De.rc | 2 +- programs/winecfg/En.rc | 2 +- programs/winecfg/Es.rc | 2 +- programs/winecfg/Fi.rc | 2 +- programs/winecfg/Fr.rc | 2 +- programs/winecfg/Hu.rc | 2 +- programs/winecfg/It.rc | 2 +- programs/winecfg/Ja.rc | 2 +- programs/winecfg/Ko.rc | 2 +- programs/winecfg/Lt.rc | 2 +- programs/winecfg/Nl.rc | 2 +- programs/winecfg/No.rc | 2 +- programs/winecfg/Pl.rc | 2 +- programs/winecfg/Pt.rc | 4 ++-- programs/winecfg/Ro.rc | 2 +- programs/winecfg/Ru.rc | 2 +- programs/winecfg/Si.rc | 2 +- programs/winecfg/Sv.rc | 2 +- programs/winecfg/Tr.rc | 2 +- programs/winecfg/Zh.rc | 4 ++-- 23 files changed, 25 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afdc767cd383caca16cfa…

1 0

Austin English : wininet: Avoid size_t in ERR().
by Alexandre Julliard 02 Jul '10

02 Jul '10

Module: wine Branch: master Commit: eff0aeccef18451088a90e37fdd305878961c0fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eff0aeccef18451088a90e37f… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jul 1 13:02:01 2010 -0500 wininet: Avoid size_t in ERR(). --- dlls/wininet/cookie.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 75cf049..7dfd2a8 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -431,7 +431,7 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST value = data = heap_strdupW(cookie_data); if (!data) { - ERR("could not allocate %zu bytes for the cookie data buffer\n", (strlenW(cookie_data) + 1) * sizeof(WCHAR)); + ERR("could not allocate the cookie data buffer\n"); return FALSE; } @@ -457,7 +457,7 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST if (value == NULL) { HeapFree(GetProcessHeap(), 0, data); - ERR("could not allocate %zu bytes for the cookie value buffer\n", (ptr - data) * sizeof(WCHAR)); + ERR("could not allocate the cookie value buffer\n"); return FALSE; } strcpyW(value, data);

1 0

André Hentschel : winetest: There is no ' pass also-todo'.
by Alexandre Julliard 02 Jul '10

02 Jul '10

Module: tools Branch: master Commit: 31c80ed24d8a76d58092722baf336dfb1025c818 URL: http://source.winehq.org/git/tools.git/?a=commit;h=31c80ed24d8a76d58092722b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jul 1 20:01:11 2010 +0200 winetest: There is no 'pass also-todo'. --- winetest/gather | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/gather b/winetest/gather index ce3b530..6cfc954 100755 --- a/winetest/gather +++ b/winetest/gather @@ -403,7 +403,7 @@ my $legend = Some tests fail in some reports. Some tests fail in all reports. This border signals that some tests are skipped. -This border and this background signal that the implementation needs some work. +This border and this background signal that the implementation needs some work. </div>"; sub min_to_max($)

1 0

Dmitry Timoshkov : comdlg32: Not all messages depend on initialized custom choose font dialog data.
by Alexandre Julliard 01 Jul '10

01 Jul '10

Module: wine Branch: master Commit: 542be258b380dd6e3c70d2102633a9a9a2c4a76f URL: http://source.winehq.org/git/wine.git/?a=commit;h=542be258b380dd6e3c70d2102… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jul 1 20:45:16 2010 +0900 comdlg32: Not all messages depend on initialized custom choose font dialog data. --- dlls/comdlg32/fontdlg.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 80f1ad9..ad580d5 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -782,7 +782,7 @@ static LRESULT CFn_WMMeasureItem(HWND hDlg, LPARAM lParam) /* use MAX of bitmap height and tm.tmHeight .*/ hdc=GetDC(hDlg); if(!hdc) return 0; - hfontprev = SelectObject( hdc, GetStockObject( SYSTEM_FONT)); + hfontprev = SelectObject( hdc, GetStockObject( DEFAULT_GUI_FONT ) ); GetTextMetricsW(hdc, &tm); if( tm.tmHeight > lpmi->itemHeight) lpmi->itemHeight = tm.tmHeight; SelectObject(hdc, hfontprev); @@ -905,6 +905,8 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO HDC hdc; LPLOGFONTW lpxx=lpcf->lpLogFont; + if (!lpcf) return FALSE; + TRACE("WM_COMMAND wParam=%08X lParam=%08lX\n", (LONG)wParam, lParam); switch (LOWORD(wParam)) { @@ -1071,6 +1073,8 @@ static LRESULT CFn_WMDestroy(HWND hwnd, LPCHOOSEFONTW lpcfw) LPLOGFONTA lpLogFonta; int len; + if (!lpcfw) return FALSE; + lpcfa = GetPropW(hwnd, strWineFontData_a); lpLogFonta = lpcfa->lpLogFont; lpszStyle = lpcfa->lpszStyle; @@ -1098,6 +1102,8 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSE { WINDOWINFO info; + if (!lpcf) return FALSE; + info.cbSize=sizeof(info); if( GetWindowInfo( GetDlgItem( hDlg, stc5), &info ) ) { @@ -1156,9 +1162,7 @@ static INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, if (uMsg!=WM_INITDIALOG) { lpcfw = GetPropW(hDlg, strWineFontData); - if (!lpcfw) - return FALSE; - if (CFn_HookCallChk32(lpcfw)) + if (lpcfw && CFn_HookCallChk32(lpcfw)) res=CallWindowProcA((WNDPROC)lpcfw->lpfnHook, hDlg, uMsg, wParam, lParam); if (res) return res; @@ -1218,9 +1222,7 @@ static INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, if (uMsg!=WM_INITDIALOG) { lpcf= GetPropW(hDlg, strWineFontData); - if (!lpcf) - return FALSE; - if (CFn_HookCallChk32(lpcf)) + if (lpcf && CFn_HookCallChk32(lpcf)) res=CallWindowProcW((WNDPROC)lpcf->lpfnHook, hDlg, uMsg, wParam, lParam); if (res) return res;

1 0

André Hentschel : include: Add some SYSDBG_COMMANDs.
by Alexandre Julliard 01 Jul '10

01 Jul '10

Module: wine Branch: master Commit: f2b874ffae693d667eec0768ac4afa7c3c73cdfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b874ffae693d667eec0768a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jul 1 16:44:18 2010 +0200 include: Add some SYSDBG_COMMANDs. --- include/winternl.h | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 39a034b..ee3dd98 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1886,7 +1886,21 @@ typedef enum _SYSDBG_COMMAND { SysDbgSetTracepoint, SysDbgSetSpecialCall, SysDbgClearSpecialCalls, - SysDbgQuerySpecialCalls + SysDbgQuerySpecialCalls, + SysDbgBreakPoint, + SysDbgQueryVersion, + SysDbgReadVirtual, + SysDbgWriteVirtual, + SysDbgReadPhysical, + SysDbgWritePhysical, + SysDbgReadControlSpace, + SysDbgWriteControlSpace, + SysDbgReadIoSpace, + SysDbgWriteIoSpace, + SysDbgReadMsr, + SysDbgWriteMsr, + SysDbgReadBusData, + SysDbgWriteBusData } SYSDBG_COMMAND, *PSYSDBG_COMMAND;

1 0

Austin English : user32: Fix a compiler warning on mingw.
by Alexandre Julliard 01 Jul '10

01 Jul '10

Module: wine Branch: master Commit: 71fb0068af04d33d106c8c7ec9e4b4746e8fc70d URL: http://source.winehq.org/git/wine.git/?a=commit;h=71fb0068af04d33d106c8c7ec… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jul 1 10:20:33 2010 -0500 user32: Fix a compiler warning on mingw. --- dlls/user32/sysparams.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index e6d2386..3d4075f 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -941,11 +941,7 @@ void SYSPARAMS_Init(void) } /* last chance, take the default */ - if (!bOk) - { - int iNumColors = sscanf( DefSysColors[i*2+1], " %d %d %d", &r, &g, &b ); - assert (iNumColors==3); - } + if (!bOk) sscanf( DefSysColors[i*2+1], " %d %d %d", &r, &g, &b ); SYSPARAMS_SetSysColor( i, RGB(r,g,b) ); }

1 0

Alexandre Julliard : gdiplus/tests: Don' t fail if we do find Microsoft Sans Serif on Wine.
by Alexandre Julliard 01 Jul '10

01 Jul '10

Module: wine Branch: master Commit: 415bb3c5a0a16c9794b7b206302632629f72adfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=415bb3c5a0a16c9794b7b2063… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 12:06:35 2010 +0200 gdiplus/tests: Don't fail if we do find Microsoft Sans Serif on Wine. --- dlls/gdiplus/tests/font.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 80f11bc..c2ed3c7 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -33,6 +33,7 @@ static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r', static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; +static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0}; static void test_createfont(void) { @@ -295,9 +296,12 @@ static void test_getgenerics (void) expect (Ok, stat); stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); expect (Ok, stat); - todo_wine ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0), - "Expected Microsoft Sans Serif, got %s\n", - wine_dbgstr_w(familyName)); + if (!lstrcmpiW(familyName, Tahoma)) + todo_wine ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0), + "Expected Microsoft Sans Serif, got Tahoma\n"); + else + ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0), + "Expected Microsoft Sans Serif, got %s\n", wine_dbgstr_w(familyName)); stat = GdipDeleteFontFamily (family); expect (Ok, stat);

1 0

Alexandre Julliard : msi/tests: Reset the enumeration index for MsiEnumProducts before testing it.
by Alexandre Julliard 01 Jul '10

01 Jul '10

Module: wine Branch: master Commit: bcb869a342a02f8ffe256ba8cf811630b0e0c0c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcb869a342a02f8ffe256ba8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 13:21:34 2010 +0200 msi/tests: Reset the enumeration index for MsiEnumProducts before testing it. --- dlls/msi/tests/msi.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 90a357b..b377320 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -11298,6 +11298,9 @@ static void test_MsiEnumProducts(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); index = 0; + r = MsiEnumProductsA(index, guid); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + r = MsiEnumProductsA(index, NULL); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r);

1 0