March 2006 - Wine-commits - list.winehq.org

James Hawkins : advpack: Implement the launching of executables in RunSetupCommand.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 480b64950b9c9212a10d62dcec5c8a733fef6171 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=480b64950b9c9212a10d62d… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 26 22:05:58 2006 -0600 advpack: Implement the launching of executables in RunSetupCommand. --- dlls/advpack/install.c | 42 +++++++++++++++++++++++++++++++++++++++--- dlls/advpack/tests/install.c | 16 +++++----------- 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index ecf8a18..c6bc6c5 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -156,6 +156,39 @@ HRESULT WINAPI LaunchINFSectionExA( HWND return E_FAIL; } +static HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) +{ + STARTUPINFOW si; + PROCESS_INFORMATION pi; + + if (phEXE) *phEXE = NULL; + + ZeroMemory(&pi, sizeof(pi)); + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + + if (!CreateProcessW(NULL, (LPWSTR)cmd, NULL, NULL, FALSE, + CREATE_DEFAULT_ERROR_MODE | CREATE_NEW_PROCESS_GROUP, + NULL, dir, &si, &pi)) + { + return HRESULT_FROM_WIN32(GetLastError()); + } + + CloseHandle(pi.hThread); + + if (phEXE) + { + *phEXE = pi.hProcess; + return S_ASYNCHRONOUS; + } + + /* wait for the child process to finish */ + WaitForSingleObject(pi.hProcess, INFINITE); + CloseHandle(pi.hProcess); + + return S_OK; +} + /*********************************************************************** * RunSetupCommandA (ADVPACK.@) * @@ -220,23 +253,26 @@ HRESULT WINAPI RunSetupCommandA(HWND hWn * HRESULT_FROM_WIN32(GetLastError()) Some other error * * BUGS - * Unimplemented + * INF install unimplemented. */ HRESULT WINAPI RunSetupCommandW(HWND hWnd, LPCWSTR szCmdName, LPCWSTR szInfSection, LPCWSTR szDir, LPCWSTR lpszTitle, HANDLE *phEXE, DWORD dwFlags, LPVOID pvReserved ) { - FIXME("(%p, %s, %s, %s, %s, %p, 0x%08lx, %p): stub\n", + TRACE("(%p, %s, %s, %s, %s, %p, 0x%08lx, %p)\n", hWnd, debugstr_w(szCmdName), debugstr_w(szInfSection), debugstr_w(szDir), debugstr_w(lpszTitle), phEXE, dwFlags, pvReserved); + if (dwFlags) + FIXME("Unhandled flags: 0x%08lx\n", dwFlags); + if (!szCmdName || !szDir) return E_INVALIDARG; if (!(dwFlags & RSC_FLAG_INF)) - *phEXE = NULL; + return launch_exe(szCmdName, szDir, phEXE); return E_UNEXPECTED; } diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 4810868..26f0fa4 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -56,22 +56,16 @@ static void test_RunSetupCommand() /* try to run a non-existent exe */ hexe = (HANDLE)0xdeadbeef; hr = pRunSetupCommand(NULL, "idontexist.exe", "Install", "c:\\windows\\system32", "Title", &hexe, 0, NULL); - todo_wine - { - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %ld\n", hr); - } + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %ld\n", hr); ok(hexe == NULL, "Expcted hexe to be NULL\n"); ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); /* try a bad directory */ hexe = (HANDLE)0xdeadbeef; - hr = pRunSetupCommand(NULL, "winve.exe", "Install", "", "Title", &hexe, 0, NULL); - todo_wine - { - ok(hr == HRESULT_FROM_WIN32(ERROR_DIRECTORY), - "Expected HRESULT_FROM_WIN32(ERROR_DIRECTORY), got %ld\n", hr); - } + hr = pRunSetupCommand(NULL, "winver.exe", "Install", "non\\existent\\directory", "Title", &hexe, 0, NULL); + ok(hr == HRESULT_FROM_WIN32(ERROR_DIRECTORY), + "Expected HRESULT_FROM_WIN32(ERROR_DIRECTORY), got %ld\n", hr); ok(hexe == NULL, "Expcted hexe to be NULL\n"); ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n");

1 0

Alexandre Julliard : server: Fixed process exit code on FreeBSD.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 0a3646292a120c8cd67826858df43b27830866ca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0a3646292a120c8cd678268… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 12:14:24 2006 +0200 server: Fixed process exit code on FreeBSD. --- server/process.c | 2 +- server/request.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/server/process.c b/server/process.c index 393a65a..c119ed1 100644 --- a/server/process.c +++ b/server/process.c @@ -660,7 +660,7 @@ void kill_process( struct process *proce { struct thread *thread = LIST_ENTRY( ptr, struct thread, proc_entry ); - thread->exit_code = exit_code; + if (exit_code) thread->exit_code = exit_code; if (thread != skip) kill_thread( thread, 1 ); } } diff --git a/server/request.c b/server/request.c index 7eb1f83..6f0ffb9 100644 --- a/server/request.c +++ b/server/request.c @@ -389,11 +389,14 @@ int receive_fd( struct process *process return 0; } - if (ret >= 0) + if (!ret) + { + kill_process( process, NULL, 0 ); + } + else if (ret > 0) { - if (ret > 0) - fprintf( stderr, "Protocol error: process %p: partial recvmsg %d for fd\n", - process, ret ); + fprintf( stderr, "Protocol error: process %p: partial recvmsg %d for fd\n", + process, ret ); kill_process( process, NULL, 1 ); } else

1 0

Petr Tesarik : winedos: Clear TF bit before passing control to a VM86 interrupt handler.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 404eadc7751a4a232dc16d2eedbd17163e4dd654 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=404eadc7751a4a232dc16d2… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Mon Mar 27 10:15:29 2006 +0200 winedos: Clear TF bit before passing control to a VM86 interrupt handler. --- dlls/winedos/dosexe.h | 1 + dlls/winedos/interrupts.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winedos/dosexe.h b/dlls/winedos/dosexe.h index 1aba889..ffb62d8 100644 --- a/dlls/winedos/dosexe.h +++ b/dlls/winedos/dosexe.h @@ -98,6 +98,7 @@ extern struct DPMI_segments *DOSVM_dpmi_ * IF_MASK is only pushed into real mode stack. */ #define V86_FLAG 0x00020000 +#define TF_MASK 0x00000100 #define IF_MASK 0x00000200 #define VIF_MASK 0x00080000 #define VIP_MASK 0x00100000 diff --git a/dlls/winedos/interrupts.c b/dlls/winedos/interrupts.c index 49c2dfc..83c215f 100644 --- a/dlls/winedos/interrupts.c +++ b/dlls/winedos/interrupts.c @@ -514,8 +514,8 @@ void DOSVM_HardwareInterruptRM( CONTEXT8 context->SegCs = SELECTOROF( handler ); context->Eip = OFFSETOF( handler ); - /* Clear virtual interrupt flag. */ - context->EFlags &= ~VIF_MASK; + /* Clear virtual interrupt flag and trap flag. */ + context->EFlags &= ~(VIF_MASK | TF_MASK); } }

1 0

Petr Tesarik : winedbg: Fix stepping over an instruction.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 68f8d289459d98a89d93c615be0f02a1f07cbd0d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=68f8d289459d98a89d93c61… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Fri Mar 24 12:46:10 2006 +0100 winedbg: Fix stepping over an instruction. --- programs/winedbg/break.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index cd36fb4..cafb4cd 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -731,9 +731,9 @@ BOOL break_should_continue(ADDRESS* addr if (code == EXCEPTION_BREAKPOINT) addr->Offset += be_cpu->adjust_pc_for_break(&dbg_context, TRUE); + dbg_curr_thread->stopped_xpoint = find_xpoint(addr, be_xpoint_break); dbg_curr_process->bp[0].enabled = FALSE; /* disable the step-over breakpoint */ - dbg_curr_thread->stopped_xpoint = find_xpoint(addr, be_xpoint_break); if (dbg_curr_thread->stopped_xpoint > 0) { if (!should_stop(dbg_curr_thread->stopped_xpoint)) return TRUE; @@ -744,7 +744,8 @@ BOOL break_should_continue(ADDRESS* addr return FALSE; } - dbg_curr_thread->stopped_xpoint = find_xpoint(addr, be_xpoint_watch_exec); + if(dbg_curr_thread->stopped_xpoint < 0) + dbg_curr_thread->stopped_xpoint = find_xpoint(addr, be_xpoint_watch_exec); if (dbg_curr_thread->stopped_xpoint > 0) { /* If not single-stepping, do not back up over the break instruction */ @@ -759,7 +760,8 @@ BOOL break_should_continue(ADDRESS* addr return FALSE; } - dbg_curr_thread->stopped_xpoint = find_triggered_watch(&oldval); + if(dbg_curr_thread->stopped_xpoint < 0) + dbg_curr_thread->stopped_xpoint = find_triggered_watch(&oldval); if (dbg_curr_thread->stopped_xpoint > 0) { /* If not single-stepping, do not back up over the break instruction */

1 0

f_sophia : winhelp: Added Esperanto language support.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: fa68994ab17feaa6269b911328b1c5095cab49f7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa68994ab17feaa6269b911… Author: f_sophia <f_sophia(a)libero.it> Date: Sun Mar 26 15:58:21 2006 +0100 winhelp: Added Esperanto language support. --- programs/winhelp/Eo.rc | 71 ++++++++++++++++++++++++++++++++++++++++++++++ programs/winhelp/rsrc.rc | 1 + 2 files changed, 72 insertions(+), 0 deletions(-) create mode 100644 programs/winhelp/Eo.rc diff --git a/programs/winhelp/Eo.rc b/programs/winhelp/Eo.rc new file mode 100644 index 0000000..af5a77e --- /dev/null +++ b/programs/winhelp/Eo.rc @@ -0,0 +1,71 @@ +/* + * Help Viewer + * Esperanto Language Support + * + * Copyright 2006 Antonio Codazzi + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* Cxapelitaj literoj estas en Latin-3 iso8859-3 */ + +/* Menu */ + +MAIN_MENU MENU LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT +{ + POPUP "Dosiero" { + MENUITEM "Malfermu", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "&Presu", MNID_FILE_PRINT + MENUITEM "Impozu Printilon...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "Finu", MNID_FILE_EXIT + } + POPUP "Redakto" { + MENUITEM "Kopiu...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "Notu...", MNID_EDIT_ANNOTATE + } + POPUP "Legosigno" { + MENUITEM "&Difinu...", MNID_BKMK_DEFINE + } + POPUP "&Helpo" { + MENUITEM "Helpu pri helpo", MNID_HELP_HELPON + MENUITEM "�iam supre", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "Pri...", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "Pri WINE", MNID_HELP_WINE +#endif + } +} + +/* Strings */ +STRINGTABLE DISCARDABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT +{ +STID_WINE_HELP, "WINE Helpanto" +STID_WHERROR, "ERARO" +STID_WARNING, "ATENTU" +STID_INFO, "Informo pri" +STID_NOT_IMPLEMENTED, "Ne-implementata" +STID_HLPFILE_ERROR_s, "Eraro dum la legado de helpdosiero `%s'" +STID_CONTENTS, "Enhavo" +STID_SEARCH, "&Ser�u" +STID_BACK, "Anta�a" +STID_HISTORY, "&Historio" +STID_TOPICS, "&Temoj" +STID_ALL_FILES, "Tutaj dosieroj (*.*)" +STID_HELP_FILES_HLP, "Helpaj dosieroj (*.hlp)" +} diff --git a/programs/winhelp/rsrc.rc b/programs/winhelp/rsrc.rc index 8342085..dca51ee 100644 --- a/programs/winhelp/rsrc.rc +++ b/programs/winhelp/rsrc.rc @@ -28,6 +28,7 @@ #include "Da.rc" #include "De.rc" #include "En.rc" +#include "Eo.rc" #include "Es.rc" #include "Fi.rc" #include "Fr.rc"

1 0

James Hawkins : kernel: Error out of CreateProcess if the specified current directory
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 61c3bb03a0daa16599db5afffd3a8f8fabaadccc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=61c3bb03a0daa16599db5af… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 26 21:53:09 2006 -0600 kernel: Error out of CreateProcess if the specified current directory doesn't exist. --- dlls/kernel/process.c | 6 +++++- dlls/kernel/tests/process.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index d1ff341..4263a22 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -1661,7 +1661,11 @@ BOOL WINAPI CreateProcessW( LPCWSTR app_ if (cur_dir) { - unixdir = wine_get_unix_file_name( cur_dir ); + if (!(unixdir = wine_get_unix_file_name( cur_dir ))) + { + SetLastError(ERROR_DIRECTORY); + goto done; + } } else { diff --git a/dlls/kernel/tests/process.c b/dlls/kernel/tests/process.c index b28f28d..245136f 100644 --- a/dlls/kernel/tests/process.c +++ b/dlls/kernel/tests/process.c @@ -811,6 +811,18 @@ static void test_Directory(void) okChildIString("Misc", "CurrDirA", windir); release_memory(); assert(DeleteFileA(resfile) != 0); + + /* search PATH for the exe if directory is NULL */ + ok(CreateProcessA(NULL, "winver.exe", NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); + ok(TerminateProcess(info.hProcess, 0), "Child process termination\n"); + + /* if any directory is provided, don't search PATH, error on bad directory */ + SetLastError(0xdeadbeef); + memset(&info, 0, sizeof(info)); + ok(!CreateProcessA(NULL, "winver.exe", NULL, NULL, FALSE, 0L, + NULL, "non\\existent\\directory", &startup, &info), "CreateProcess\n"); + ok(GetLastError() == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %ld\n", GetLastError()); + ok(!TerminateProcess(info.hProcess, 0), "Child process should not exist\n"); } static BOOL is_str_env_drive_dir(const char* str)

1 0

Antonio Codazzi : shell32: Updated Esperanto translation.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 77405a786db98464f7792a22dc751bf3696ea3d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=77405a786db98464f7792a2… Author: Antonio Codazzi <f_sophia(a)libero.it> Date: Sun Mar 26 15:58:02 2006 +0100 shell32: Updated Esperanto translation. --- dlls/shell32/shell32_Eo.rc | 199 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 189 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shell32_Eo.rc b/dlls/shell32/shell32_Eo.rc index 9bf1655..e34d468 100644 --- a/dlls/shell32/shell32_Eo.rc +++ b/dlls/shell32/shell32_Eo.rc @@ -1,5 +1,6 @@ /* * Copyright 1998 Juergen Schmied + * Copyright 2006 Antonio Codazzi * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,17 +19,104 @@ LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT +/* Cxapelitaj literoj estas en Latin-3 iso8895-3 */ + +MENU_001 MENU DISCARDABLE +BEGIN + MENUITEM "&Grandaj Ikonoj", FCIDM_SHVIEW_BIGICON + MENUITEM "Malgrandaj Ikonoj", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Listo", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Detale", FCIDM_SHVIEW_REPORTVIEW +END + +/* + shellview background menu +*/ +MENU_002 MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&Vido" + BEGIN + MENUITEM "&Grandaj Ikonoj", FCIDM_SHVIEW_BIGICON + MENUITEM "Malgrandaj Ikonoj", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Listo", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Detale", FCIDM_SHVIEW_REPORTVIEW + END + MENUITEM SEPARATOR + POPUP "Aran�u &Ikonojn" + BEGIN + MENUITEM "La�� &Nomo", 0x30 /* column 0 */ + MENUITEM "La�� &Tipo", 0x32 /* column 2 */ + MENUITEM "La�� Grandeco", 0x31 /* ... */ + MENUITEM "La�� &Dato", 0x33 + MENUITEM SEPARATOR + MENUITEM "&Aran�u A�tomate", FCIDM_SHVIEW_AUTOARRANGE + END + MENUITEM "Vicigu Ikonojn", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM SEPARATOR + MENUITEM "Relegu", FCIDM_SHVIEW_REFRESH + MENUITEM SEPARATOR + MENUITEM "Enmetu", FCIDM_SHVIEW_INSERT + MENUITEM "Enmetu kiel Ligo", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + POPUP "Nova" + BEGIN + MENUITEM "Nova &Dosierujo", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "Nova &Ligo", FCIDM_SHVIEW_NEWLINK + MENUITEM SEPARATOR + END + MENUITEM SEPARATOR + MENUITEM "Ecoj", FCIDM_SHVIEW_PROPERTIES + END +END + +/* + shellview item menu +*/ +MENU_SHV_FILE MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "E&sploru", FCIDM_SHVIEW_EXPLORE + MENUITEM "Malfermu", FCIDM_SHVIEW_OPEN + MENUITEM SEPARATOR + MENUITEM "Enmetu", FCIDM_SHVIEW_CUT + MENUITEM "Kopiu", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "Kreu Ligon", FCIDM_SHVIEW_CREATELINK + MENUITEM "Forigu", FCIDM_SHVIEW_DELETE + MENUITEM "Alinomu", FCIDM_SHVIEW_RENAME + MENUITEM SEPARATOR + MENUITEM "Ecoj", FCIDM_SHVIEW_PROPERTIES + END +END + +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Foliu Dosierujon" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "Bone", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Rezigni", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 4, 40, 180, 120 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Pri %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "Enorde", IDOK, 153, 133, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "Bone", 1, 153, 130, 50, 12 LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 + ICON "", 1088, 189, 10, 14, 16 + LTEXT "", 100, 8, 10, 137, 33 + LTEXT "Wine estas disponebla dank'al:", 98, 8, 55, 137, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -37,10 +125,101 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 + LTEXT "Skribu nomon de programo, de dosierujo, de documento a� de Interreta fonto, kaj Wine malfermos �in.", 12289, 36, 11, 182, 18 + LTEXT "Malfermu:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 - DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 170, 63, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "Bone", IDOK, 62, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "Rezigni", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "Foliu...", 12288, 170, 63, 50, 14, WS_TABSTOP +} + +/* + special folders +*/ +STRINGTABLE DISCARDABLE +{ + IDS_DESKTOP "Desktop" + IDS_MYCOMPUTER "Mea Komputero" +} + +/* + context menus +*/ +STRINGTABLE DISCARDABLE +{ + IDS_VIEW_LARGE "&Grandaj Ikonoj" + IDS_VIEW_SMALL "Malgrandaj Ikonoj" + IDS_VIEW_LIST "&Listo" + IDS_VIEW_DETAILS "&Detale" + IDS_SELECT "Elektu" + IDS_OPEN "Malfermu" +} + +STRINGTABLE DISCARDABLE +{ + IDS_CREATEFOLDER_DENIED "Mi ne povas crei novan Dosierujon: Aliro rifuzita." + IDS_CREATEFOLDER_CAPTION "Eraro dum krei�o de dosierujo" + IDS_DELETEITEM_CAPTION "Konfirmu forigon de dosiero" + IDS_DELETEFOLDER_CAPTION "Konfirmu forigon de dosierujo" + IDS_DELETEITEM_TEXT "�u vi estas certa pri forigo de '%1'?" + IDS_DELETEMULTIPLE_TEXT "�u vi estas certa pri forigo de �i tiuj %1 komponantoj?" + IDS_OVERWRITEFILE_TEXT "�u vi supreskribas la dosieron %1?" + IDS_OVERWRITEFILE_CAPTION "Konfirmu supreskribiton de dosieron" } + +/* columns in the shellview */ +STRINGTABLE +BEGIN + IDS_SHV_COLUMN1 "Dosiero" + IDS_SHV_COLUMN2 "Gandeco" + IDS_SHV_COLUMN3 "Tipo" + IDS_SHV_COLUMN4 "Modifita" + IDS_SHV_COLUMN5 "Atributoj" + IDS_SHV_COLUMN6 "Spaco" + IDS_SHV_COLUMN7 "Disponebla Spaco" + IDS_SHV_COLUMN8 "Nomo" + IDS_SHV_COLUMN9 "Komentario" +END + + +/* message box strings */ +STRINGTABLE DISCARDABLE +{ + IDS_RESTART_TITLE "Restartigu" + IDS_RESTART_PROMPT "�u vi volas simuli Vindozan restartigon?" + IDS_SHUTDOWN_TITLE "Adia�u" + IDS_SHUTDOWN_PROMPT "�u vi volas adia�i Wine?" +} + +/* shell folder path default values */ +STRINGTABLE DISCARDABLE +{ + IDS_PROGRAMS "Start Menu\\Programs" + IDS_PERSONAL "Miaj Dokumentoj" + IDS_FAVORITES "Favorites" + IDS_STARTUP "Start Menu\\Programs\\StartUp" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" + IDS_STARTMENU "Start Menu" + IDS_MYMUSIC "Miaj Dokumentoj\\Muziko" + IDS_MYVIDEO "Miai Dokumentoj\\Video" + IDS_DESKTOPDIRECTORY "Desktop" + IDS_NETHOOD "NetHood" + IDS_TEMPLATES "Templates" + IDS_APPDATA "Application Data" + IDS_PRINTHOOD "PrintHood" + IDS_LOCAL_APPDATA "Local Settings\\Application Data" + IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_COOKIES "Cookies" + IDS_HISTORY "History" + IDS_PROGRAM_FILES "Program Files" + IDS_MYPICTURES "Maj Documentoj\\Bildoj" + IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_COMMON_DOCUMENTS "Documents" + IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" + IDS_COMMON_MUSIC "Documents\\Musiko" + IDS_COMMON_PICTURES "Documents\\Bildoj" + IDS_COMMON_VIDEO "Documents\\Video" + IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" +} +

1 0

Vitaly Lipatov : wine.inf: Add some dll stub dll to the system directory.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 94dcabecd8b779e70b2ae4b7b8c55c4cd16da618 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=94dcabecd8b779e70b2ae4b… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Mar 26 15:30:58 2006 +0400 wine.inf: Add some dll stub dll to the system directory. --- tools/wine.inf | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index efc384c..7177761 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2111,15 +2111,31 @@ HKLM,%CurrentVersion%\Telephony\Country 10,,winhelp.exe 10,,winhlp32.exe,winhelp.exe 10,command,start.exe +11,,advapi32.dll +11,,comdlg32.dll 11,,control.exe +11,,crypt32.dll +11,,gdi32.dll 11,,help.exe,winhelp.exe +11,,kernel32.dll 11,,msiexec.exe +11,,msvcrt.dll 11,,notepad.exe -11,,shdocvw.dll +11,,ntdll.dll 11,,progman.exe 11,,regsvr32.exe +11,,rpcrt4.dll +11,,shdocvw.dll +11,,shell32.dll +11,,shfolder.dll +11,,shlwapi.dll +11,,user32.dll +11,,version.dll 11,,wcmd.exe +11,,winmm.dll 11,,winver.exe +11,,ws2_32.dll +11,,wsock32.dll [SystemIni] system.ini, mci,,"MPEGVideo=mciqtz.drv"

1 0

Paul Vriens : wine.inf: Add SystemRoot.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: a589eb27ac6caec1697c4307273b6f13dcf51075 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a589eb27ac6caec1697c430… Author: Paul Vriens <paul.vriens(a)xs4all.nl> Date: Fri Mar 24 10:01:00 2006 +0100 wine.inf: Add SystemRoot. --- tools/wine.inf | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 17d9144..efc384c 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -150,8 +150,9 @@ HKLM,%CurrentVersion%\Setup,"BootDir",," HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"Change preferred organization in ~/.wine/system.reg" HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"Change preferred owner in ~/.wine/system.reg" -HKLM,Software\Microsoft\Windows NT\CurrentVersion\Fonts,,,"" -HKLM,Software\Microsoft\Windows NT\CurrentVersion\Hotfix\Q246009,"Installed",,"1" +HKLM,%CurrentVersionNT%,"SystemRoot",,"%10%" +HKLM,%CurrentVersionNT%\Fonts,,,"" +HKLM,%CurrentVersionNT%\Q246009,"Installed",,"1" [Debugger] HKLM,Software\Microsoft\Windows NT\CurrentVersion\AeDebug,"Debugger",2,"winedbg --auto %ld %ld"

1 0

Petr Tesarik : ntdll: Fix debug exceptions from VM86.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: e748a77e1ae75d828c4340733f2f1107ec6ac2d2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e748a77e1ae75d828c43407… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Mon Mar 27 10:12:02 2006 +0200 ntdll: Fix debug exceptions from VM86. - Set ContextFlags accordingly in save_vm86_context(). - Raise debug exceptions correctly for debug exceptions. - Do not clear TF bit for VM86-generated debug exceptions. --- dlls/ntdll/signal_i386.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 727223d..a9f2589 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -531,6 +531,7 @@ static inline TEB *get_current_teb(void) */ static void save_vm86_context( CONTEXT *context, const struct vm86plus_struct *vm86 ) { + context->ContextFlags = CONTEXT_FULL; context->Eax = vm86->regs.eax; context->Ebx = vm86->regs.ebx; context->Ecx = vm86->regs.ecx; @@ -1528,7 +1529,7 @@ void __wine_enter_vm86( CONTEXT *context case VM86_TRAP: /* return due to DOS-debugger request */ switch(VM86_ARG(res)) { - case TRAP_x86_TRCTRAP: /* Single-step exception, single step flag is cleared by raise_trap_exception */ + case TRAP_x86_TRCTRAP: /* Single-step exception */ rec.ExceptionCode = EXCEPTION_SINGLE_STEP; break; case TRAP_x86_BPTFLT: /* Breakpoint exception */ @@ -1538,8 +1539,7 @@ void __wine_enter_vm86( CONTEXT *context rec.ExceptionCode = EXCEPTION_BREAKPOINT; break; } - raise_trap_exception( &rec, context ); - continue; + break; case VM86_INTx: /* int3/int x instruction (ARG = x) */ rec.ExceptionCode = EXCEPTION_VM86_INTx; rec.NumberParameters = 1;

1 0