December 2013 - Wine-commits

Frédéric Delanoy : widl: Constify a character string.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: 120dac41a1dea9b0929b9dddaa718953f46ceb82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=120dac41a1dea9b0929b9ddda… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 19 22:25:14 2013 +0100 widl: Constify a character string. --- tools/widl/widl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index b37a0f8..b9e1412 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -400,7 +400,7 @@ void write_dlldata(const statement_list_t *stmts) dlldata = fopen(dlldata_name, "r"); if (dlldata) { - static char marker[] = "REFERENCE_PROXY_FILE"; + static const char marker[] = "REFERENCE_PROXY_FILE"; static const char delegation_define[] = "#define PROXY_DELEGATION"; char *line = NULL; size_t len = 0;

1 0

Frédéric Delanoy : advapi32/tests: Constify some character strings.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: 3e9b7b5992920bb8334ca02d9d685e3efd3098b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e9b7b5992920bb8334ca02d9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 19 22:25:15 2013 +0100 advapi32/tests: Constify some character strings. --- dlls/advapi32/tests/cred.c | 4 ++-- dlls/advapi32/tests/registry.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 229aaaa..59d4bbb 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -563,8 +563,8 @@ static void test_CredMarshalCredentialA(void) static void test_CredUnmarshalCredentialA(void) { - static WCHAR tW[] = {'t',0}; - static WCHAR testW[] = {'t','e','s','t',0}; + static const WCHAR tW[] = {'t',0}; + static const WCHAR testW[] = {'t','e','s','t',0}; CERT_CREDENTIAL_INFO *cert; USERNAME_TARGET_CREDENTIAL_INFO *username; CRED_MARSHAL_TYPE type; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 6c3a5f0..3df1cd2 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1665,7 +1665,7 @@ static void test_rw_order(void) { HKEY hKey; DWORD dw = 0; - static char keyname[] = "test_rw_order"; + static const char keyname[] = "test_rw_order"; char value_buf[2]; DWORD values, value_len, value_name_max_len; LSTATUS ret;

1 0

Austin English : ntdll: Return success for FSCTL_IS_VOLUME_MOUNTED ioctl.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: 0dac887f48f2067f90c4556cb5b082345b0ad403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dac887f48f2067f90c4556cb… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Dec 19 17:47:02 2013 -0800 ntdll: Return success for FSCTL_IS_VOLUME_MOUNTED ioctl. --- dlls/ntdll/file.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index bdbf121..cf95cd0 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1587,6 +1587,7 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc status = RtlImpersonateSelf( SecurityImpersonation ); break; + case FSCTL_IS_VOLUME_MOUNTED: case FSCTL_LOCK_VOLUME: case FSCTL_UNLOCK_VOLUME: FIXME("stub! return success - Unsupported fsctl %x (device=%x access=%x func=%x method=%x)\n",

1 0

Austin English : ntdll: Export a few more functions.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: 2a3932a0a22f5f5fb8a90d718e00ae7357c6a990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a3932a0a22f5f5fb8a90d718… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Dec 20 00:31:19 2013 -0800 ntdll: Export a few more functions. --- dlls/ntdll/ntdll.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 70bf94f..6418671 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -32,7 +32,7 @@ # @ stub DbgSetDebugFilterState @ stub DbgUiConnectToDbg @ stub DbgUiContinue -# @ stub DbgUiConvertStateChangeStructure +@ stub DbgUiConvertStateChangeStructure # @ stub DbgUiDebugActiveProcess # @ stub DbgUiGetThreadDebugObject # @ stub DbgUiIssueRemoteBreakin @@ -44,7 +44,7 @@ # @ stub KiFastSystemCall # @ stub KiFastSystemCallRet # @ stub KiIntSystemCall -# @ stub KiRaiseUserExceptionDispatcher +@ stub KiRaiseUserExceptionDispatcher @ stub KiUserApcDispatcher @ stub KiUserCallbackDispatcher @ stub KiUserExceptionDispatcher @@ -312,7 +312,7 @@ # @ stub NtSetBootEntryOrder # @ stub NtSetBootOptions @ stdcall NtSetContextThread(long ptr) -# @ stub NtSetDebugFilterState +@ stub NtSetDebugFilterState @ stub NtSetDefaultHardErrorPort @ stdcall NtSetDefaultLocale(long long) @ stdcall NtSetDefaultUILanguage(long)

1 0

Austin English : server: Set process start time a bit later.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: d506e59dabc985be0a24c47112102af409a25b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d506e59dabc985be0a24c4711… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Dec 19 21:00:53 2013 -0800 server: Set process start time a bit later. --- server/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/process.c b/server/process.c index 8622fec..4a73662 100644 --- a/server/process.c +++ b/server/process.c @@ -342,7 +342,6 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit list_init( &process->dlls ); list_init( &process->rawinput_devices ); - process->start_time = current_time; process->end_time = 0; list_add_tail( &process_list, &process->entry ); @@ -1064,6 +1063,7 @@ DECL_HANDLER(init_process_done) list_add_head( &process->dlls, &dll->entry ); process->ldt_copy = req->ldt_copy; + process->start_time = current_time; generate_startup_debug_events( process, req->entry ); set_process_startup_state( process, STARTUP_DONE );

1 0

Sebastian Lackner : ntdll: Fix incorrect value added to out-> used in pf_output_stringA.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: 661212b5f507e1c5abc64932f95b6397193329f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=661212b5f507e1c5abc64932f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 20 05:54:09 2013 +0100 ntdll: Fix incorrect value added to out->used in pf_output_stringA. --- dlls/ntdll/printf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index 0a27f7e..49d3983 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -137,7 +137,7 @@ static inline int pf_output_stringA( pf_output *out, LPCSTR str, int len ) return len; } if (space > 0) RtlMultiByteToUnicodeN( p, space * sizeof(WCHAR), NULL, str, len ); - out->used += n; + out->used += n / sizeof(WCHAR); } return -1; }

1 0

Sebastian Lackner : ntdll: Handle error if RtlAllocateHeap fails in printf functions.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: 29de7dd60ba27c7aa79f455b4f4bc9c56c8292d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29de7dd60ba27c7aa79f455b4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 20 05:55:34 2013 +0100 ntdll: Handle error if RtlAllocateHeap fails in printf functions. --- dlls/ntdll/printf.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index 49d3983..3a5067a 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -300,7 +300,13 @@ static void pf_integer_conv( char *buf, int buf_len, pf_flags *flags, char number[40], *tmp = number; if( buf_len > sizeof number ) - tmp = RtlAllocateHeap( GetProcessHeap(), 0, buf_len ); + { + if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, buf_len ))) + { + buf[0] = '\0'; + return; + } + } base = 10; if( flags->Format == 'o' ) @@ -588,7 +594,8 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis flags.FieldLength : flags.Precision) + 10; if( x_len >= sizeof number) - x = RtlAllocateHeap( GetProcessHeap(), 0, x_len ); + if (!(x = RtlAllocateHeap( GetProcessHeap(), 0, x_len ))) + return -1; pf_integer_conv( x, x_len, &flags, va_arg(valist, LONGLONG) ); @@ -611,7 +618,8 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis flags.FieldLength : flags.Precision) + 10; if( x_len >= sizeof number) - x = RtlAllocateHeap( GetProcessHeap(), 0, x_len ); + if (!(x = RtlAllocateHeap( GetProcessHeap(), 0, x_len ))) + return -1; pf_rebuild_format_string( fmt, &flags );

1 0

Sebastian Lackner : ntdll: Don' t do further calls to pf_output_stringA if previous call failed.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: 805311f798760500d849a70118bb06c43a6e8a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=805311f798760500d849a7011… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 20 05:59:41 2013 +0100 ntdll: Don't do further calls to pf_output_stringA if previous call failed. --- dlls/ntdll/printf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index 3a5067a..e09833a 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -169,7 +169,7 @@ static inline int pf_fill( pf_output *out, int len, pf_flags *flags, char left ) } } - if( left && flags->Sign && !flags->PadZero ) + if (left && flags->Sign && !flags->PadZero && r >= 0) r = pf_output_stringA( out, &flags->Sign, 1 ); return r;

1 0

Alexandre Julliard : msvcr: Add import libraries for all versions.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: ec7d714464cf51c5ff8962e28f85ad751fb17212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7d714464cf51c5ff8962e28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 20 17:07:20 2013 +0100 msvcr: Add import libraries for all versions. --- configure | 8 ++++---- configure.ac | 8 ++++---- dlls/msvcr100/Makefile.in | 1 + dlls/msvcr110/Makefile.in | 1 + dlls/msvcr80/Makefile.in | 1 + dlls/msvcr90/Makefile.in | 1 + 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 8c343b5..dfac3ad 100755 --- a/configure +++ b/configure @@ -17078,13 +17078,13 @@ wine_fn_config_dll msvcp71 enable_msvcp71 wine_fn_config_dll msvcp80 enable_msvcp80 wine_fn_config_dll msvcp90 enable_msvcp90 wine_fn_config_test dlls/msvcp90/tests msvcp90_test -wine_fn_config_dll msvcr100 enable_msvcr100 +wine_fn_config_dll msvcr100 enable_msvcr100 implib wine_fn_config_test dlls/msvcr100/tests msvcr100_test -wine_fn_config_dll msvcr110 enable_msvcr110 +wine_fn_config_dll msvcr110 enable_msvcr110 implib wine_fn_config_dll msvcr70 enable_msvcr70 implib wine_fn_config_dll msvcr71 enable_msvcr71 implib -wine_fn_config_dll msvcr80 enable_msvcr80 -wine_fn_config_dll msvcr90 enable_msvcr90 +wine_fn_config_dll msvcr80 enable_msvcr80 implib +wine_fn_config_dll msvcr90 enable_msvcr90 implib wine_fn_config_test dlls/msvcr90/tests msvcr90_test wine_fn_config_dll msvcrt enable_msvcrt implib wine_fn_config_test dlls/msvcrt/tests msvcrt_test diff --git a/configure.ac b/configure.ac index ebf77e6..d80a2bc 100644 --- a/configure.ac +++ b/configure.ac @@ -3034,13 +3034,13 @@ WINE_CONFIG_DLL(msvcp71) WINE_CONFIG_DLL(msvcp80) WINE_CONFIG_DLL(msvcp90) WINE_CONFIG_TEST(dlls/msvcp90/tests) -WINE_CONFIG_DLL(msvcr100) +WINE_CONFIG_DLL(msvcr100,,[implib]) WINE_CONFIG_TEST(dlls/msvcr100/tests) -WINE_CONFIG_DLL(msvcr110) +WINE_CONFIG_DLL(msvcr110,,[implib]) WINE_CONFIG_DLL(msvcr70,,[implib]) WINE_CONFIG_DLL(msvcr71,,[implib]) -WINE_CONFIG_DLL(msvcr80) -WINE_CONFIG_DLL(msvcr90) +WINE_CONFIG_DLL(msvcr80,,[implib]) +WINE_CONFIG_DLL(msvcr90,,[implib]) WINE_CONFIG_TEST(dlls/msvcr90/tests) WINE_CONFIG_DLL(msvcrt,,[implib]) WINE_CONFIG_TEST(dlls/msvcrt/tests) diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index 7714289..50b60eb 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -1,4 +1,5 @@ MODULE = msvcr100.dll +IMPORTLIB = msvcr100 IMPORTS = msvcrt MODCFLAGS = @BUILTINFLAG@ EXTRAINCL = -I$(top_srcdir)/include/msvcrt diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in index 9b8e6b1..84711cd 100644 --- a/dlls/msvcr110/Makefile.in +++ b/dlls/msvcr110/Makefile.in @@ -1,4 +1,5 @@ MODULE = msvcr110.dll +IMPORTLIB = msvcr110 IMPORTS = msvcrt MODCFLAGS = @BUILTINFLAG@ EXTRAINCL = -I$(top_srcdir)/include/msvcrt diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index b353a1f..1bdff6e 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -1,4 +1,5 @@ MODULE = msvcr80.dll +IMPORTLIB = msvcr80 IMPORTS = msvcrt MODCFLAGS = @BUILTINFLAG@ EXTRAINCL = -I$(top_srcdir)/include/msvcrt diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in index 4cc72d3..cb0b224 100644 --- a/dlls/msvcr90/Makefile.in +++ b/dlls/msvcr90/Makefile.in @@ -1,4 +1,5 @@ MODULE = msvcr90.dll +IMPORTLIB = msvcr90 IMPORTS = msvcrt MODCFLAGS = @BUILTINFLAG@ EXTRAINCL = -I$(top_srcdir)/include/msvcrt

1 0

Alexandre Julliard : msvcp: Import the corresponding version of the msvcr library.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: c3f70de66e741015645d4333c947cc1bd625d4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3f70de66e741015645d4333c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 20 17:07:48 2013 +0100 msvcp: Import the corresponding version of the msvcr library. --- dlls/msvcp100/Makefile.in | 2 +- dlls/msvcp80/Makefile.in | 2 +- dlls/msvcp90/Makefile.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp100/Makefile.in b/dlls/msvcp100/Makefile.in index 87a4dc2..acf5480 100644 --- a/dlls/msvcp100/Makefile.in +++ b/dlls/msvcp100/Makefile.in @@ -1,5 +1,5 @@ MODULE = msvcp100.dll -IMPORTS = msvcrt +IMPORTS = msvcr100 MODCFLAGS = @BUILTINFLAG@ EXTRAINCL = -I$(top_srcdir)/include/msvcrt EXTRADEFS = -D_MSVCP_VER=100 diff --git a/dlls/msvcp80/Makefile.in b/dlls/msvcp80/Makefile.in index 8abfa4f..8db4749 100644 --- a/dlls/msvcp80/Makefile.in +++ b/dlls/msvcp80/Makefile.in @@ -1,5 +1,5 @@ MODULE = msvcp80.dll -IMPORTS = msvcrt +IMPORTS = msvcr80 MODCFLAGS = @BUILTINFLAG@ EXTRAINCL = -I$(top_srcdir)/include/msvcrt EXTRADEFS = -D_MSVCP_VER=80 diff --git a/dlls/msvcp90/Makefile.in b/dlls/msvcp90/Makefile.in index 25b5e6f..6b289a4 100644 --- a/dlls/msvcp90/Makefile.in +++ b/dlls/msvcp90/Makefile.in @@ -1,5 +1,5 @@ MODULE = msvcp90.dll -IMPORTS = msvcrt +IMPORTS = msvcr90 MODCFLAGS = @BUILTINFLAG@ EXTRAINCL = -I$(top_srcdir)/include/msvcrt EXTRADEFS = -D_MSVCP_VER=90

1 0