September 2010 - Wine-commits

Jacek Caban : urlmon: Make protocol_start IUri-based.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: ef9283328c914fff76d18109a5eb849124663c11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef9283328c914fff76d18109a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 20 20:00:52 2010 +0200 urlmon: Make protocol_start IUri-based. --- dlls/urlmon/ftp.c | 20 +++++++++- dlls/urlmon/gopher.c | 20 +++++++++- dlls/urlmon/http.c | 85 +++++++++++++++++++++++++++----------------- dlls/urlmon/protocol.c | 4 +- dlls/urlmon/urlmon_main.h | 4 +- 5 files changed, 92 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef9283328c914fff76d18…

1 0

Jacek Caban : urlmon: Added about:blank IUri test.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: 9334c202c4996d0639e415fcc762b5ddc289e4a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9334c202c4996d0639e415fcc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 20 20:01:13 2010 +0200 urlmon: Added about:blank IUri test. --- dlls/urlmon/tests/uri.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 3bbb578..b2e265e 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4181,6 +4181,34 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_UNKNOWN,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + { "about:blank", 0, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_DISPLAY_URI|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI| + Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + FALSE, + { + {"about:blank",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"about:blank",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"blank",S_OK,FALSE}, + {"blank",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"about:blank",S_OK,FALSE}, + {"about",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {0,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_ABOUT,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } };

1 0

André Hentschel : build-env: Don't use ' exchange instruction set' instructions on ARM to fix build on ARMv6 e.g. Nokia N810.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: f901fa9769e9eb8e010abb2983a941830b7d430f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f901fa9769e9eb8e010abb298… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 20 23:14:18 2010 +0200 build-env: Don't use 'exchange instruction set' instructions on ARM to fix build on ARMv6 e.g. Nokia N810. --- libs/wine/port.c | 3 ++- tools/winebuild/import.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index 7cbe5b4..3562afa 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -178,7 +178,8 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack, "mov sp, r2\n\t" /* stack */ "mov r2, r0\n\t" /* func -> scratch register */ "mov r0, r1\n\t" /* arg */ - "blx r2\n\t" /* call func */ + "mov LR, PC\n\t" /* return after branch */ + "mov PC, r2\n\t" /* call func */ "mov sp, r4\n\t" /* restore old sp from local var */ "pop {r4,PC}") /* fetch return address into pc */ #else diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 1b89352..8c97b32 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1002,7 +1002,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tmov IP,r0\n"); output( "\tldmfd SP!, {r4-r10,FP,LR}\n" ); output( "\tldmfd SP!, {r0-r3}\n" ); - output( "\tbx IP\n"); + output( "\tmov PC,IP\n"); break; case CPU_POWERPC: if (target_platform == PLATFORM_APPLE) extra_stack_storage = 56;

1 0

Frédéric Delanoy : shell32: Update French translation.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: a8ccf6ea698d4c4131a9c5d917b904cc9c7b32a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ccf6ea698d4c4131a9c5d91… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 21 00:34:05 2010 +0200 shell32: Update French translation. --- dlls/shell32/shell32_Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index a88fa2f..62002e4 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -309,6 +309,7 @@ STRINGTABLE IDS_COMMON_OEM_LINKS "Liens OEM" IDS_DOCUMENTS "Documents" IDS_DOWNLOADS "Téléchargements" + IDS_LOCAL_APPDATA_LOW "AppData\\LocalLow" IDS_NEWFOLDER "Nouveau dossier"

1 0

Luca Bennati : crypt32: Update Italian translation.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: 6100724cd72776c08d7fa04133c49db73a8f9fbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6100724cd72776c08d7fa0413… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Sep 20 22:33:48 2010 +0200 crypt32: Update Italian translation. --- dlls/crypt32/crypt32_It.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/crypt32_It.rc b/dlls/crypt32/crypt32_It.rc index 5aa53f4..28d5ce1 100644 --- a/dlls/crypt32/crypt32_It.rc +++ b/dlls/crypt32/crypt32_It.rc @@ -68,9 +68,9 @@ STRINGTABLE IDS_NETSCAPE_CA_POLICY_URL "URL Policy CA Netscape" IDS_NETSCAPE_SSL_SERVER_NAME "NomeServer SSL Netscape" IDS_NETSCAPE_COMMENT "Commento Netscape" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" + IDS_SPC_SP_AGENCY_INFO "Agenzia di informazione Spc Sp" + IDS_SPC_FINANCIAL_CRITERIA "Criteri finanziari Spc" + IDS_SPC_MINIMAL_CRITERIA "Criteri minimi Spc" IDS_COUNTRY "Paese/Regione" IDS_ORGANIZATION "Organizzazione" IDS_ORGANIZATIONAL_UNIT "Unità Organizzativa" @@ -195,7 +195,7 @@ STRINGTABLE IDS_ALT_NAME_REGISTERED_ID "ID registrato=" IDS_USAGE_UNKNOWN "Uso della Chiave Sconosciuto" IDS_SUBJECT_TYPE "Tipo Soggetto=" - IDS_SUBJECT_TYPE_CA "CA" + IDS_SUBJECT_TYPE_CA "AC" IDS_SUBJECT_TYPE_END_CERT "Fine Entità" IDS_PATH_LENGTH "Vincolo Lunghezza Percorso=" IDS_PATH_LENGTH_NONE "Nessuno" @@ -203,7 +203,7 @@ STRINGTABLE IDS_AIA "Accesso Informazioni Autorità" IDS_ACCESS_METHOD "Metodo Accesso=" IDS_ACCESS_METHOD_OCSP "OCSP" - IDS_ACCESS_METHOD_CA_ISSUERS "Emittenti CA" + IDS_ACCESS_METHOD_CA_ISSUERS "AC emittenti" IDS_ACCESS_METHOD_UNKNOWN "Metodo Accesso Sconosciuto" IDS_ACCESS_LOCATION "Nome Alternativo" IDS_CRL_DIST_POINT "Punto Distribuzione CRL"

1 0

Luca Bennati : avifil32: Update Italian translation.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: a44805aa38671aa73137c462509aafe43d703f1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44805aa38671aa73137c4625… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Sep 20 22:33:01 2010 +0200 avifil32: Update Italian translation. --- dlls/avifil32/avifile_It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/avifile_It.rc b/dlls/avifil32/avifile_It.rc index 9c4671c..6e2b582 100644 --- a/dlls/avifil32/avifile_It.rc +++ b/dlls/avifil32/avifile_It.rc @@ -34,7 +34,7 @@ BEGIN EDITTEXT IDC_INTERLEAVEEVERY,81,41,32,12,ES_AUTOHSCROLL LTEXT "fotogrammi",-1,119,43,36,9 LTEXT "Formato attuale:",-1,3,56,73,9 - LTEXT "This space for rent",IDC_FORMATTEXT,75,56,90,26 + LTEXT "Segnaposto",IDC_FORMATTEXT,75,56,90,26 DEFPUSHBUTTON "OK",IDOK,170,42,50,14 PUSHBUTTON "Annulla",IDCANCEL,170,61,50,14 END

1 0

Jacek Caban : include: Added D3DVECTOR_DEFINED guard.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: f6f6affb299cf500e940f0b9b31a71edc111632c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6f6affb299cf500e940f0b9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 20 16:01:49 2010 +0200 include: Added D3DVECTOR_DEFINED guard. --- include/d3d8types.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/d3d8types.h b/include/d3d8types.h index 3d0d7cb..745f248 100644 --- a/include/d3d8types.h +++ b/include/d3d8types.h @@ -1053,11 +1053,14 @@ typedef struct _D3DINDEXBUFFER_DESC { UINT Size; } D3DINDEXBUFFER_DESC; +#ifndef D3DVECTOR_DEFINED typedef struct _D3DVECTOR { float x; float y; float z; } D3DVECTOR; +#define D3DVECTOR_DEFINED +#endif typedef struct _D3DLIGHT8 { D3DLIGHTTYPE Type;

1 0

Michael Mc Donnell : shell32/tests: SHBrowseForFolder should return new folder pidl.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: a862b95b4ca05a0ac239e1b3e347c6b55796927f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a862b95b4ca05a0ac239e1b3e… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Sun Sep 19 12:12:06 2010 +0200 shell32/tests: SHBrowseForFolder should return new folder pidl. --- dlls/shell32/tests/brsfolder.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index 0aebb74..e9a6e2c 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -86,6 +86,19 @@ static void CALLBACK make_new_folder_timer_callback(HWND hwnd, UINT uMsg, SetFocus(hwnd); break; case 2: + /* + * The test does not trigger the correct state on Windows. This results + * in the new folder pidl not being returned. The result is as + * expected if the same steps are done manually. + * Sending the down key selects the new folder again which sets the + * correct state. This ensures that the correct pidl is returned. + */ + keybd_event(VK_DOWN, 0, 0, 0); + break; + case 3: + keybd_event(VK_DOWN, 0, KEYEVENTF_KEYUP, 0); + break; + case 4: KillTimer(hwnd, idEvent); /* Close dialog box */ SendMessage(hwnd, WM_COMMAND, IDOK, 0); @@ -141,6 +154,7 @@ static void test_click_make_new_folder_button(void) char test_folder_path[MAX_PATH]; WCHAR test_folder_pathW[MAX_PATH]; CHAR new_folder_path[MAX_PATH]; + CHAR new_folder_pidl_path[MAX_PATH]; char selected_folder[MAX_PATH]; const CHAR title[] = "test_click_make_new_folder_button"; int number_of_folders = -1; @@ -204,6 +218,14 @@ static void test_click_make_new_folder_button(void) || broken(!does_folder_or_file_exist(new_folder_path)) /* W95, W98, XP, W2K3 */, "The new folder did not get the name %s\n", new_folder_name); + /* Dialog should return a pidl pointing to the new folder */ + ok(SHGetPathFromIDListA(pidl, new_folder_pidl_path), + "SHGetPathFromIDList failed for new folder.\n"); + todo_wine ok(strcmp(new_folder_path, new_folder_pidl_path) == 0 + || broken(strcmp(new_folder_path, new_folder_pidl_path) != 0) /* earlier than Vista */, + "SHBrowseForFolder did not return the pidl for the new folder. " + "Expected '%s' got '%s'\n", new_folder_path, new_folder_pidl_path); + /* Remove test folder and any subfolders created in this test */ shfileop.hwnd = NULL; shfileop.wFunc = FO_DELETE;

1 0

Łukasz Wojniłowicz : oledlg: Update the Polish translation.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 4dd40c81735adfacf0b6562464d607bcc114abb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dd40c81735adfacf0b656246… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Sep 19 11:11:40 2010 +0200 oledlg: Update the Polish translation. --- dlls/oledlg/oledlg_Pl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/oledlg_Pl.rc b/dlls/oledlg/oledlg_Pl.rc index 341fcbf..d31bbf2 100644 --- a/dlls/oledlg/oledlg_Pl.rc +++ b/dlls/oledlg/oledlg_Pl.rc @@ -78,7 +78,7 @@ BEGIN CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 232, 75, 66, 44 CONTROL "Zmie� &ikon�...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 232, 123, 66, 14 CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 - CONTROL "<< result text goes here >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "<< tekst wynikowy przychodzi tutaj >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 CONTROL "Wynik", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 END

1 0

Łukasz Wojniłowicz : ipconfig: Add the Polish translation.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: deb7197451df88930d1c59c93ed3aadeac6dbf61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb7197451df88930d1c59c93… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Sep 19 11:11:38 2010 +0200 ipconfig: Add the Polish translation. --- programs/ipconfig/Makefile.in | 1 + programs/ipconfig/Pl.rc | 46 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in index 5135a13..2355217 100644 --- a/programs/ipconfig/Makefile.in +++ b/programs/ipconfig/Makefile.in @@ -13,6 +13,7 @@ RC_SRCS = \ Ko.rc \ Lt.rc \ Nl.rc \ + Pl.rc \ Si.rc \ Sv.rc \ Uk.rc diff --git a/programs/ipconfig/Pl.rc b/programs/ipconfig/Pl.rc new file mode 100644 index 0000000..25cce09 --- /dev/null +++ b/programs/ipconfig/Pl.rc @@ -0,0 +1,46 @@ +/* + * IP configuration utility + * + * Copyright 2010 �ukasz Wojni�owicz + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "ipconfig.h" + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "Spos�b u�ycia: ipconfig [ /? | /all ]\n" + STRING_INVALID_CMDLINE, "B��d: Nierozpoznany lub niepe�ny wiersz polecenia\n" + STRING_ADAPTER_FRIENDLY, "%s karta %s\n" + STRING_ETHERNET, "Ethernet" + STRING_UNKNOWN, "Nieznane" + STRING_CONN_DNS_SUFFIX, "Sufiks DNS konkretnego po��czenia" + STRING_IP_ADDRESS, "Adres IP" + STRING_HOSTNAME, "Nazwa hosta" + STRING_NODE_TYPE, "Typ w�z�a" + STRING_BROADCAST, "Nadawca" + STRING_PEER_TO_PEER, "Peer-to-peer" + STRING_MIXED, "Mieszane" + STRING_HYBRID, "Hybrydowe" + STRING_IP_ROUTING, "Przekierowywanie IP w��czone" + STRING_DESCRIPTION, "Opis" + STRING_PHYS_ADDR, "Adres fizyczny" + STRING_DHCP_ENABLED, "DHCP w��czone" + STRING_YES, "Tak" + STRING_NO, "Nie" +}

1 0