February 2010 - Wine-commits

Juan Lang : wintrust: Fix copy-paste error.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: ab270f9966f0f7a35d1f880101d75bae7e87ec7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab270f9966f0f7a35d1f88010… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Feb 1 09:23:30 2010 -0800 wintrust: Fix copy-paste error. --- dlls/wintrust/softpub.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 852976a..f753c93 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -395,8 +395,8 @@ static DWORD SOFTPUB_LoadCatalogMessage(CRYPT_PROVIDER_DATA *data) err = SOFTPUB_GetSIP(data); if (err) goto error; - err = SOFTPUB_GetMessageFromFile(data, data->pWintrustData->u.pFile->hFile, - data->pWintrustData->u.pFile->pcwszFilePath); + err = SOFTPUB_GetMessageFromFile(data, catalog, + data->pWintrustData->u.pCatalog->pcwszCatalogFilePath); if (err) goto error; err = SOFTPUB_CreateStoreFromMessage(data);

1 0

Jörg Höhle : winmm: Have xyzGetDevCaps return MMSYSERR_BADDEVICEID, not INVALHANDLE.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: b0d2f77cc95f9ea86f09977d3b64411d948b9743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0d2f77cc95f9ea86f09977d3… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Jan 30 22:09:12 2010 +0100 winmm: Have xyzGetDevCaps return MMSYSERR_BADDEVICEID, not INVALHANDLE. --- dlls/winmm/winmm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 76c3752..6205466 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -697,7 +697,7 @@ UINT WINAPI auxGetDevCapsW(UINT_PTR uDeviceID, LPAUXCAPSW lpCaps, UINT uSize) if (lpCaps == NULL) return MMSYSERR_INVALPARAM; if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_AUX, TRUE)) == NULL) - return MMSYSERR_INVALHANDLE; + return MMSYSERR_BADDEVICEID; return MMDRV_Message(wmld, AUXDM_GETDEVCAPS, (DWORD_PTR)lpCaps, uSize); } @@ -789,7 +789,7 @@ UINT WINAPI midiOutGetDevCapsW(UINT_PTR uDeviceID, LPMIDIOUTCAPSW lpCaps, if (lpCaps == NULL) return MMSYSERR_INVALPARAM; if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_MIDIOUT, TRUE)) == NULL) - return MMSYSERR_INVALHANDLE; + return MMSYSERR_BADDEVICEID; return MMDRV_Message(wmld, MODM_GETDEVCAPS, (DWORD_PTR)lpCaps, uSize); } @@ -1161,7 +1161,7 @@ UINT WINAPI midiInGetDevCapsW(UINT_PTR uDeviceID, LPMIDIINCAPSW lpCaps, UINT uSi if (lpCaps == NULL) return MMSYSERR_INVALPARAM; if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_MIDIIN, TRUE)) == NULL) - return MMSYSERR_INVALHANDLE; + return MMSYSERR_BADDEVICEID; return MMDRV_Message(wmld, MIDM_GETDEVCAPS, (DWORD_PTR)lpCaps, uSize); }

1 0

André Hentschel : msi: Fix crash with access to component.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 3299bfd4714821ed168afbb3d122354ae405f02f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3299bfd4714821ed168afbb3d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jan 30 14:01:58 2010 +0100 msi: Fix crash with access to component. --- dlls/msi/files.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 7e74dca..b7af4d3 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -365,7 +365,8 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) debugstr_w(component)); /* the action taken was the same as the current install state */ - comp->Action = comp->Installed; + if (comp) + comp->Action = comp->Installed; return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: Test duplicating files from a nonexistent component.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 743ead45c809d1e30a374288d2a3972c510e8a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=743ead45c809d1e30a374288d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 1 19:10:24 2010 +0100 msi: Test duplicating files from a nonexistent component. --- dlls/msi/tests/install.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 9ac9420..153f51a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -837,7 +837,8 @@ static const CHAR df_duplicate_file_dat[] = "FileKey\tComponent_\tFile_\tDestNam "s72\ts72\ts72\tS255\tS72\n" "DuplicateFile\tFileKey\n" "maximus\tmaximus\tmaximus\taugustus\t\n" - "caesar\tmaximus\tmaximus\t\tNONEXISTENT\n"; + "caesar\tmaximus\tmaximus\t\tNONEXISTENT\n" + "augustus\tnosuchcomponent\tmaximus\t\tMSITESTDIR\n"; static const CHAR wrv_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n"

1 0

Luca Bennati : net: Add Italian translation.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 9069faac68e7716c5ae07a955c4288d393c1b523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9069faac68e7716c5ae07a955… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Feb 1 10:40:55 2010 +0100 net: Add Italian translation. --- programs/net/It.rc | 49 ++++++++++++++++++++++++++++++++++++++++++++++ programs/net/Makefile.in | 1 + 2 files changed, 50 insertions(+), 0 deletions(-) diff --git a/programs/net/It.rc b/programs/net/It.rc new file mode 100644 index 0000000..3c026af --- /dev/null +++ b/programs/net/It.rc @@ -0,0 +1,49 @@ +/* + * NET.EXE - Wine-compatible net program + * Italian language support + * + * Copyright (C) 2010 Luca Bennati + * + * 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 "resources.h" + +/*UTF-8*/ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "La sistassi di questo comando è:\n\nNET [ HELP | START | STOP | USE ]\n" + STRING_START_USAGE, "Specificare il nome del servizio da avviare.\n" + STRING_STOP_USAGE, "Specificare il nome del servizio da fermare.\n" + STRING_STOP_DEP, "Fermando il servizio dipendente: %s\n" + STRING_CANT_STOP, "Impossibile fermare il servizio %s\n" + STRING_NO_SCM, "Impossibile ottenere l'handle del service control manager.\n" + STRING_NO_SVCHANDLE, "Impossibile ottenere l'handle del service.\n" + STRING_START_SVC, "Il servizio %s sarà avviato.\n" + STRING_START_SVC_SUCCESS, "Il servizio %s è stato avviato con successo.\n" + STRING_START_SVC_FAIL, "Impossibile avviare il servizio %s.\n" + STRING_STOP_SVC, "Il servizio %s sarà fermato.\n" + STRING_STOP_SVC_SUCCESS, "Il servizio %s è stato fermato con successo.\n" + STRING_STOP_SVC_FAIL, "IMpossibile fermare il servizio %s.\n" + STRING_HELP_USAGE, "La sistassi di questo comando è:\n\nNET HELP comando\n -o-\nNET comando /HELP\n\n"\ + " Comandi disponibili:\n NET HELP NET START NET STOP NET USE\n" + STRING_NO_ENTRIES, "Non ci sono elementi nella lista.\n" + STRING_USE_HEADER, "\nStato Locale Remoto\n---------------------------------------------------------------\n" + STRING_USE_ENTRY, "%s %S %S Risorse aperte: %lu\n" +} diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in index cf30dce..8a67b13 100644 --- a/programs/net/Makefile.in +++ b/programs/net/Makefile.in @@ -14,6 +14,7 @@ RC_SRCS = \ De.rc \ En.rc \ Fr.rc \ + It.rc \ Ko.rc \ Lt.rc \ Nl.rc \

1 0

Luca Bennati : wineboot: Add Italian translation.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 4c9f6b151de05636df296b6170834cc74126519d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c9f6b151de05636df296b617… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Feb 1 10:46:46 2010 +0100 wineboot: Add Italian translation. --- programs/wineboot/Makefile.in | 1 + programs/wineboot/wineboot_It.rc | 40 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 2109457..42c9ee2 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -18,6 +18,7 @@ RC_SRCS = \ wineboot_En.rc \ wineboot_Es.rc \ wineboot_Fr.rc \ + wineboot_It.rc \ wineboot_Ja.rc \ wineboot_Ko.rc \ wineboot_Lt.rc \ diff --git a/programs/wineboot/wineboot_It.rc b/programs/wineboot/wineboot_It.rc new file mode 100644 index 0000000..452f60a --- /dev/null +++ b/programs/wineboot/wineboot_It.rc @@ -0,0 +1,40 @@ +/* + * WineBoot resources + * + * Copyright (C) 2010 Luca Bennati + * + * 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 "resource.h" + +/*UTF-8*/ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "In attesa del programma" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Annulla",IDCANCEL,129,49,50,15 + PUSHBUTTON "Termina il processo",IDOK,51,49,71,15 + LTEXT "Un log-off o uno spegimento simulato è in corso, ma questo programma non risponde.", + IDC_STATIC,7,7,172,19 + LTEXT "Se termini il processo, rischi di perdere tutti i dati non salvati.", + IDC_STATIC,7,28,172,15 +END

1 0

Luca Bennati : winedbg: Add Italian translation.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 45d311374745ed4bd1e2f1eaa5ce8f00c24f0586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45d311374745ed4bd1e2f1eaa… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Feb 1 10:55:02 2010 +0100 winedbg: Add Italian translation. --- programs/winedbg/Makefile.in | 1 + programs/winedbg/rsrc_It.rc | 58 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 1d92849..80ef47b 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -36,6 +36,7 @@ RC_SRCS = \ rsrc_En.rc \ rsrc_Es.rc \ rsrc_Fr.rc \ + rsrc_It.rc \ rsrc_Ko.rc \ rsrc_Lt.rc \ rsrc_Nl.rc \ diff --git a/programs/winedbg/rsrc_It.rc b/programs/winedbg/rsrc_It.rc new file mode 100644 index 0000000..29a8005 --- /dev/null +++ b/programs/winedbg/rsrc_It.rc @@ -0,0 +1,58 @@ +/* + * Italian Language Support + * + * Copyright 2010 Luca Bennati + * + * 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 "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Debug", ID_DEBUG + END +END + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Errore del programma" +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "Il programma %s ha incontrato un errore e deve \ + chiudersi. Siamo spiacenti per l'inconveniente.", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "Questo può essere causato da un problema nel programma o da una mancanza in Wine. \ + Potresti voler vedere http://appdb.winehq.org per consigli su \ + questa applicazione.\n\n\ + Se questo problema non è presente sotto Windows e non è stato ancora riportato, \ + puoi riportarlo a http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "Chiudi", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "Crash di Wine" + IDS_INVALID_PARAMS "Errori interni - ricevuti parametri non validi" + IDS_UNIDENTIFIED "(non identificato)" +END

1 0

Alexandre Julliard : kernel32/tests: Remove leftover Sleep() call.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 5c9753e2b6d62d9e7aa6747d249002c71129cb97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9753e2b6d62d9e7aa6747d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 16:19:21 2010 +0100 kernel32/tests: Remove leftover Sleep() call. --- dlls/kernel32/tests/heap.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 68ed459..edc0a64 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -810,7 +810,6 @@ START_TEST(heap) test_debug_heap( argv[0], FLG_HEAP_DISABLE_COALESCING ); test_debug_heap( argv[0], FLG_HEAP_PAGE_ALLOCS ); test_debug_heap( argv[0], 0xdeadbeef ); - Sleep(5000); } else win_skip( "RtlGetNtGlobalFlags not found, skipping heap debug tests\n" ); }

1 0

Alexandre Julliard : server: Make terminate_process more robust against recursive calls for the same process .
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 349eba9e0944c24cfd6623f063b84a05adba6dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=349eba9e0944c24cfd6623f06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 16:22:53 2010 +0100 server: Make terminate_process more robust against recursive calls for the same process. --- server/process.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/server/process.c b/server/process.c index 379bec6..e4dca68 100644 --- a/server/process.c +++ b/server/process.c @@ -562,23 +562,17 @@ static void process_unload_dll( struct process *process, mod_handle_t base ) /* terminate a process with the given exit code */ static void terminate_process( struct process *process, struct thread *skip, int exit_code ) { - struct list *ptr; - - if (skip && skip->process == process) /* move it to the end of the list */ - { - assert( skip->state != TERMINATED ); - list_remove( &skip->proc_entry ); - list_add_tail( &process->thread_list, &skip->proc_entry ); - } + struct thread *thread; grab_object( process ); /* make sure it doesn't get freed when threads die */ - while ((ptr = list_head( &process->thread_list ))) +restart: + LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) { - struct thread *thread = LIST_ENTRY( ptr, struct thread, proc_entry ); - if (exit_code) thread->exit_code = exit_code; - if (thread == skip) break; + if (thread == skip) continue; + if (thread->state == TERMINATED) continue; kill_thread( thread, 1 ); + goto restart; } release_object( process ); }

1 0

Alexandre Julliard : user.exe: Make CreateIcon16 available as 32-bit export .
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 5f27257e57b63ef6fa4bb7cdd1755e9758179ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f27257e57b63ef6fa4bb7cdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 17:02:46 2010 +0100 user.exe: Make CreateIcon16 available as 32-bit export. --- dlls/user.exe16/user.exe16.spec | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/user.exe16/user.exe16.spec b/dlls/user.exe16/user.exe16.spec index 7094f47..8d928bc 100644 --- a/dlls/user.exe16/user.exe16.spec +++ b/dlls/user.exe16/user.exe16.spec @@ -564,3 +564,8 @@ # Wine internal functions 1010 pascal __wine_call_wndproc(word word word long long) __wine_call_wndproc + +################################################################ +# 32-bit exports of the 16-bit functions needed by other dlls +# +@ stdcall -arch=win32 CreateIcon16(long long long long long ptr ptr)

1 0