June 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : wininet: Include openssl/ssl.h before Windows headers.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 7c616799894faa48ee3277bc276a39bed55780e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c616799894faa48ee3277bc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 2 12:14:37 2008 +0200 wininet: Include openssl/ssl.h before Windows headers. --- dlls/wininet/internet.h | 16 +--------------- dlls/wininet/netconnection.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 2645686..43b8d8e 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -38,18 +38,6 @@ # include <sys/types.h> # include <netinet/in.h> #endif -#ifdef HAVE_OPENSSL_SSL_H -#define DSA __ssl_DSA /* avoid conflict with commctrl.h */ -#undef FAR -/* avoid conflict with wincrypt.h */ -#undef PKCS7_SIGNER_INFO -#undef X509_NAME -#undef X509_CERT_PAIR -# include <openssl/ssl.h> -#undef FAR -#define FAR do_not_use_this_in_wine -#undef DSA -#endif #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif @@ -69,12 +57,10 @@ typedef struct { BOOL useSSL; int socketFD; -#ifdef HAVE_OPENSSL_SSL_H - SSL *ssl_s; + void *ssl_s; char *peek_msg; char *peek_msg_mem; size_t peek_len; -#endif } WININET_NETCONNECTION; static inline LPWSTR WININET_strdupW( LPCWSTR str ) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 9cd7917..f55fbf2 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -23,6 +23,7 @@ #include "config.h" #include "wine/port.h" +#include <sys/types.h> #ifdef HAVE_POLL_H #include <poll.h> #endif @@ -42,6 +43,22 @@ #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif +#include <time.h> +#ifdef HAVE_NETDB_H +# include <netdb.h> +#endif +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif +#ifdef HAVE_OPENSSL_SSL_H +# include <openssl/ssl.h> +#undef FAR +#undef DSA +#endif +#ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#endif + #include <stdarg.h> #include <stdlib.h> #include <string.h>

1 0

Eric Pouech : msvcrt: Fix for getch() and special characters.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 2fc275f64a18973f7f969c8971d8323cec327ee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc275f64a18973f7f969c897… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 1 22:04:15 2008 +0200 msvcrt: Fix for getch() and special characters. --- dlls/msvcrt/console.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index ab1cd94..21bcf16 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -139,11 +139,11 @@ int CDECL _getch(void) { unsigned idx; - if (ir.Event.KeyEvent.wVirtualScanCode & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) + if (ir.Event.KeyEvent.dwControlKeyState & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) idx = ALT_CHAR; - else if (ir.Event.KeyEvent.wVirtualScanCode & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED) ) + else if (ir.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED) ) idx = CTRL_CHAR; - else if (ir.Event.KeyEvent.wVirtualScanCode & SHIFT_PRESSED) + else if (ir.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED) idx = SHIFT_CHAR; else idx = NORMAL_CHAR;

1 0

Michael Stefaniuc : winecfg: Fix the Portuguese translations and re-enable them.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 39ca2fe57d6fd37ec9b929aa8ac873267adec036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39ca2fe57d6fd37ec9b929aa8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 1 23:46:04 2008 +0200 winecfg: Fix the Portuguese translations and re-enable them. --- programs/winecfg/Pt.rc | 243 ++++++++++++++++++------------------------- programs/winecfg/winecfg.rc | 2 +- 2 files changed, 104 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39ca2fe57d6fd37ec9b92…

1 0

Michael Stefaniuc : winecfg: Fix the Czech and Swedish translations.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 73190c419a281efab12be9c0eba9744ffcaa193a URL: http://source.winehq.org/git/wine.git/?a=commit;h=73190c419a281efab12be9c0e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 1 23:46:22 2008 +0200 winecfg: Fix the Czech and Swedish translations. --- programs/winecfg/Cs.rc | 1 - programs/winecfg/Sv.rc | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc index 0ab4c34..a4cc061 100644 --- a/programs/winecfg/Cs.rc +++ b/programs/winecfg/Cs.rc @@ -305,5 +305,4 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "P�smo titulku aktivn�ho okna" IDC_SYSPARAMS_INACTIVE_TITLE "Pozad� titulku neaktivn�ho okna" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "P�smo titulku neaktivn�ho okna" - IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" END diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc index ff03f7b..50a994e 100644 --- a/programs/winecfg/Sv.rc +++ b/programs/winecfg/Sv.rc @@ -299,5 +299,4 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Active Title Text" IDC_SYSPARAMS_INACTIVE_TITLE "Inactive Title Bar" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inactive Title Text" - IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" END

1 0

Vitaliy Margolen : Update Russian translations.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 5fc1b36b1724799660f783be113407f088d33574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc1b36b1724799660f783be1… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jun 1 21:25:29 2008 -0600 Update Russian translations. --- programs/regedit/Ru.rc | 1 + programs/start/Ru.rc | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Ru.rc b/programs/regedit/Ru.rc index 12ee92f..292f51f 100644 --- a/programs/regedit/Ru.rc +++ b/programs/regedit/Ru.rc @@ -106,6 +106,7 @@ BEGIN MENUITEM "&��\tDel", ID_EDIT_DELETE MENUITEM "&��\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR + MENUITEM "&��...", ID_EDIT_EXPORT MENUITEM "�&�� ", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&��\tCtrl+F", ID_EDIT_FIND, GRAYED diff --git a/programs/start/Ru.rc b/programs/start/Ru.rc index 5d85b85..71ac337 100644 --- a/programs/start/Ru.rc +++ b/programs/start/Ru.rc @@ -33,6 +33,7 @@ start [options] /MAX[imized] �� . \n\ /R[estored] �� (�� ). \n\ /W[ait] �� . \n\ +/Unix �� Unix �� .\n\ /L �� . \n\ \n\ start.exe �� 0.2 Copyright (C) 2003, Dan Kegel \n\ @@ -63,4 +64,6 @@ See the COPYING.LIB file for license information. \n\ " STRING_EXECFAIL "�� .\n�� ShellExecuteEx ��" + +STRING_UNIXFAIL "�� UNIX � �� DOS." }

1 0

Alexandre Julliard : ntdll: Add local defines for VIF and VIP flags.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 3499cb96b69d0c99da5ae68f5f7052c2ce8e66be URL: http://source.winehq.org/git/wine.git/?a=commit;h=3499cb96b69d0c99da5ae68f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 2 12:13:33 2008 +0200 ntdll: Add local defines for VIF and VIP flags. --- dlls/ntdll/signal_i386.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index d9c6aba..9edbaa1 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -127,6 +127,8 @@ typedef ucontext_t SIGCONTEXT; #define FPUX_sig(context) (FPU_sig(context) && !((context)->uc_mcontext.fpregs->status >> 16) ? (XMM_SAVE_AREA32 *)(FPU_sig(context) + 1) : NULL) #define VM86_EAX 0 /* the %eax value while vm86_enter is executing */ +#define VIF_FLAG 0x00080000 +#define VIP_FLAG 0x00100000 int vm86_enter( void **vm86_ptr ); void vm86_return(void); @@ -541,7 +543,7 @@ static void merge_vm86_pending_flags( EXCEPTION_RECORD *rec ) * Note that SIGUSR2 may turn VIF flag off so * VIF check must occur only when TEB.vm86_ptr is NULL. */ - if (vm86->regs.eflags & VIF_MASK) + if (vm86->regs.eflags & VIF_FLAG) { CONTEXT vcontext; save_vm86_context( &vcontext, vm86 ); @@ -552,7 +554,7 @@ static void merge_vm86_pending_flags( EXCEPTION_RECORD *rec ) rec->NumberParameters = 0; rec->ExceptionAddress = (LPVOID)vcontext.Eip; - vcontext.EFlags &= ~VIP_MASK; + vcontext.EFlags &= ~VIP_FLAG; get_vm86_teb_info()->vm86_pending = 0; __regs_RtlRaiseException( rec, &vcontext ); @@ -1239,7 +1241,7 @@ static void WINAPI raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) static void WINAPI raise_vm86_sti_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { /* merge_vm86_pending_flags merges the vm86_pending flag in safely */ - get_vm86_teb_info()->vm86_pending |= VIP_MASK; + get_vm86_teb_info()->vm86_pending |= VIP_FLAG; if (ntdll_get_thread_data()->vm86_ptr) { @@ -1269,7 +1271,7 @@ done: * * Handler for SIGUSR2. * We use it to signal that the running __wine_enter_vm86() should - * immediately set VIP_MASK, causing pending events to be handled + * immediately set VIP_FLAG, causing pending events to be handled * as early as possible. */ static void usr2_handler( int signal, siginfo_t *siginfo, void *sigcontext ) @@ -1659,8 +1661,8 @@ void __wine_enter_vm86( CONTEXT *context ) rec.ExceptionInformation[0] = VM86_ARG(res); break; case VM86_STI: /* sti/popf/iret instruction enabled virtual interrupts */ - context->EFlags |= VIF_MASK; - context->EFlags &= ~VIP_MASK; + context->EFlags |= VIF_FLAG; + context->EFlags &= ~VIP_FLAG; get_vm86_teb_info()->vm86_pending = 0; rec.ExceptionCode = EXCEPTION_VM86_STI; break;

1 0

José Manuel Ferrer Ortiz : Spanish translations updates.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 85e839a2c2afb5adc2b6487252862f64c166626b URL: http://source.winehq.org/git/wine.git/?a=commit;h=85e839a2c2afb5adc2b648725… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Sat May 31 12:57:20 2008 -0700 Spanish translations updates. --- dlls/comdlg32/cdlg_Es.rc | 72 ++++++++++++--------- dlls/credui/credui_Es.rc | 5 +- dlls/gphoto2.ds/gphoto2_Es.rc | 11 ++-- dlls/msvfw32/msvfw32_Es.rc | 5 +- dlls/shell32/shell32_Es.rc | 57 ++++++++++++++--- programs/progman/Es.rc | 138 ++++++++++++++++++++++++----------------- programs/regedit/Es.rc | 7 +- programs/start/Es.rc | 5 +- programs/winecfg/Es.rc | 21 +++++- 9 files changed, 206 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85e839a2c2afb5adc2b64…

1 0

James Hawkins : urlmon: Fix a few failing tests in win2k3.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: 6fc9d7e59d25c5b9742595d532b0d74527c233ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fc9d7e59d25c5b9742595d53… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat May 31 21:10:54 2008 -0500 urlmon: Fix a few failing tests in win2k3. --- dlls/urlmon/tests/protocol.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 6361403..60335ec 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -426,7 +426,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) { if(binding_test) - ok(szStatusText == expect_wsz, "unexpected szStatusText\n"); + ok(!lstrcmpW(szStatusText, expect_wsz), "unexpected szStatusText\n"); else if(tested_protocol == FILE_TEST) ok(!lstrcmpW(szStatusText, file_name), "szStatusText = \"%s\"\n", debugstr_w(szStatusText)); else @@ -1721,13 +1721,18 @@ static void test_mk_protocol(void) expect_hrResult = INET_E_RESOURCE_NOT_FOUND; hres = IInternetProtocol_Start(protocol, wrong_url2, &protocol_sink, &bind_info, 0, 0); - ok(hres == INET_E_RESOURCE_NOT_FOUND, "Start failed: %08x, expected INET_E_RESOURCE_NOT_FOUND\n", hres); + ok(hres == INET_E_RESOURCE_NOT_FOUND || + hres == INET_E_INVALID_URL, /* win2k3 */ + "Start failed: %08x, expected INET_E_RESOURCE_NOT_FOUND or INET_E_INVALID_URL\n", hres); - CHECK_CALLED(GetBindInfo); - CLEAR_CALLED(ReportProgress_DIRECTBIND); - CHECK_CALLED(ReportProgress_SENDINGREQUEST); - CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); - CHECK_CALLED(ReportResult); + if (hres == INET_E_RESOURCE_NOT_FOUND) + { + CHECK_CALLED(GetBindInfo); + CLEAR_CALLED(ReportProgress_DIRECTBIND); + CHECK_CALLED(ReportProgress_SENDINGREQUEST); + CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); + CHECK_CALLED(ReportResult); + } IInternetProtocol_Release(protocol); }

1 0

Simon Richter : winebuild: Fix branch mnemonic on ppc.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: d1e277fb70ad512059db7a5fac39104388ea1fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e277fb70ad512059db7a5fa… Author: Simon Richter <Simon.Richter(a)hogyros.de> Date: Sat May 31 10:49:49 2008 +0200 winebuild: Fix branch mnemonic on ppc. --- tools/winebuild/spec32.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 32a8299..5038579 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -368,7 +368,18 @@ void BuildSpec32File( DLLSPEC *spec ) else { output( "\n\t.section \".init\",\"ax\"\n" ); - output( "\tjmp 1f\n" ); + switch(target_cpu) + { + case CPU_x86: + case CPU_x86_64: + case CPU_ALPHA: + case CPU_SPARC: + output( "\tjmp 1f\n" ); + break; + case CPU_POWERPC: + output( "\tb 1f\n" ); + break; + } output( "__wine_spec_pe_header:\n" ); output( "\t.skip %u\n", 65536 + page_size ); output( "1:\n" );

1 0

Michael Stefaniuc : cmdlgtst: Fix the Portuguese translations.
by Alexandre Julliard 02 Jun '08

02 Jun '08

Module: wine Branch: master Commit: e51ed2f4a7b75fd60745b530bcc01233ae94712b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51ed2f4a7b75fd60745b530b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 1 00:22:28 2008 +0200 cmdlgtst: Fix the Portuguese translations. --- programs/cmdlgtst/Pt.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/cmdlgtst/Pt.rc b/programs/cmdlgtst/Pt.rc index 699c034..836f210 100644 --- a/programs/cmdlgtst/Pt.rc +++ b/programs/cmdlgtst/Pt.rc @@ -41,6 +41,7 @@ CmdlgtstMenu MENU MENUITEM "&Substituir texto", CM_U_REPLACE MENUITEM SEPARATOR MENUITEM "&Imprimir", CM_U_PRINT + MENUITEM "Pa&ge Setup", CM_U_PAGESETUP } POPUP "F&lags" @@ -53,6 +54,7 @@ CmdlgtstMenu MENU MENUITEM "&Localizar/Substituir", CM_F_FINDREPLACE MENUITEM SEPARATOR MENUITEM "&Imprimir", CM_F_PRINT + MENUITEM "Pa&ge Setup", CM_F_PAGESETUP } POPUP "Aj&uda" @@ -84,6 +86,7 @@ CmdlgtstMenu MENU MENUITEM "&Substituir texto", CM_U_REPLACE MENUITEM SEPARATOR MENUITEM "&Imprimir", CM_U_PRINT + MENUITEM "Pa&ge Setup", CM_U_PAGESETUP } POPUP "F&lags" @@ -96,6 +99,7 @@ CmdlgtstMenu MENU MENUITEM "&Localizar/Substituir", CM_F_FINDREPLACE MENUITEM SEPARATOR MENUITEM "&Imprimir", CM_F_PRINT + MENUITEM "Pa&ge Setup", CM_F_PAGESETUP } POPUP "Aj&uda"

1 0