December 2019 - Wine-Commits

Hans Leidekker : msado15: Implement _Stream_get_Charset and _Stream_put_Charset.
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: 3e6b9394bc9650928a24bd2ec8890574b46b7280 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e6b9394bc9650928a24bd2e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 10 11:11:22 2019 +0100 msado15: Implement _Stream_get_Charset and _Stream_put_Charset. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/msado15_private.h | 8 ++++++++ dlls/msado15/stream.c | 24 ++++++++++++++++++++---- dlls/msado15/tests/msado15.c | 11 +++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 1078cbf64e..7239e48b53 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -31,4 +31,12 @@ static inline void *heap_realloc_zero( void *mem, SIZE_T len ) return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len ); } +static inline WCHAR *strdupW( const WCHAR *src ) +{ + WCHAR *dst; + if (!src) return NULL; + if ((dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(*dst) ))) lstrcpyW( dst, src ); + return dst; +} + #endif /* _WINE_MSADO15_PRIVATE_H_ */ diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 9aa35d5831..e2e404a620 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -38,6 +38,7 @@ struct stream ConnectModeEnum mode; StreamTypeEnum type; LineSeparatorEnum sep; + WCHAR *charset; LONG size; LONG allocated; LONG pos; @@ -62,6 +63,7 @@ static ULONG WINAPI stream_Release( _Stream *iface ) if (!refs) { TRACE( "destroying %p\n", stream ); + heap_free( stream->charset ); heap_free( stream->buf ); heap_free( stream ); } @@ -240,14 +242,28 @@ static HRESULT WINAPI stream_put_Mode( _Stream *iface, ConnectModeEnum mode ) static HRESULT WINAPI stream_get_Charset( _Stream *iface, BSTR *charset ) { - FIXME( "%p, %p\n", iface, charset ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + const WCHAR *src = stream->charset ? stream->charset : L"Unicode"; + BSTR dst; + + TRACE( "%p, %p\n", stream, charset ); + + if (!(dst = SysAllocString( src ))) return E_OUTOFMEMORY; + *charset = dst; + return S_OK; } static HRESULT WINAPI stream_put_Charset( _Stream *iface, BSTR charset ) { - FIXME( "%p, %s\n", iface, debugstr_w(charset) ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + WCHAR *str; + + TRACE( "%p, %s\n", stream, debugstr_w(charset) ); + + if (!(str = strdupW( charset ))) return E_OUTOFMEMORY; + heap_free( stream->charset ); + stream->charset = str; + return S_OK; } static HRESULT create_byte_array( BYTE *data, LONG len, VARIANT *ret ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 6aab518da9..2c75904837 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -55,6 +55,7 @@ static void test_Stream(void) LONG refs, size, pos; ObjectStateEnum state; ConnectModeEnum mode; + BSTR charset, str; VARIANT missing, val; HRESULT hr; @@ -112,6 +113,16 @@ static void test_Stream(void) hr = _Stream_put_Mode( stream, adModeReadWrite ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_get_Charset( stream, &charset ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( charset, L"Unicode" ), "got %s\n", wine_dbgstr_w(charset) ); + SysFreeString( charset ); + + str = SysAllocString( L"Unicode" ); + hr = _Stream_put_Charset( stream, str ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( str ); + hr = _Stream_Read( stream, 2, &val ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr );

1 0

Hans Leidekker : msado15: Implement _Stream_get_EOS.
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: 74410ebb26b3a3bed7b178dd5a84aa70e3298f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=74410ebb26b3a3bed7b178dd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 10 11:11:19 2019 +0100 msado15: Implement _Stream_get_EOS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/stream.c | 9 +++++++-- dlls/msado15/tests/msado15.c | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 169be7319e..9fb6007b57 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -124,8 +124,13 @@ static HRESULT WINAPI stream_get_Size( _Stream *iface, LONG *size ) static HRESULT WINAPI stream_get_EOS( _Stream *iface, VARIANT_BOOL *eos ) { - FIXME( "%p, %p\n", iface, eos ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %p\n", stream, eos ); + + if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + *eos = (stream->pos >= stream->size) ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI stream_get_Position( _Stream *iface, LONG *pos ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 1755a7f3da..0b10579905 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -49,6 +49,7 @@ static HRESULT str_to_byte_array( const char *data, VARIANT *ret ) static void test_Stream(void) { _Stream *stream; + VARIANT_BOOL eos; StreamTypeEnum type; LONG refs, size, pos; ObjectStateEnum state; @@ -61,6 +62,9 @@ static void test_Stream(void) hr = _Stream_get_Size( stream, &size ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + hr = _Stream_get_EOS( stream, &eos ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + hr = _Stream_get_Position( stream, &pos ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); @@ -111,6 +115,11 @@ static void test_Stream(void) ok( hr == S_OK, "got %08x\n", hr ); ok( !size, "got %d\n", size ); + eos = VARIANT_FALSE; + hr = _Stream_get_EOS( stream, &eos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( eos == VARIANT_TRUE, "got %04x\n", eos ); + pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Francois Gouget : msado15: Fix the name of the GetString() delimiter parameters.
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: 4d5e1f07ef145872d406231c2e83a39405c6dc89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d5e1f07ef145872d406231c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 10 09:24:13 2019 +0100 msado15: Fix the name of the GetString() delimiter parameters. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 6 +++--- include/msado15_backcompat.idl | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 52282c7e82..84adec406f 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -526,11 +526,11 @@ static HRESULT WINAPI recordset_get_StayInSync( _Recordset *iface, VARIANT_BOOL } static HRESULT WINAPI recordset_GetString( _Recordset *iface, StringFormatEnum string_format, LONG num_rows, - BSTR column_delimeter, BSTR row_delimeter, BSTR null_expr, + BSTR column_delimiter, BSTR row_delimiter, BSTR null_expr, BSTR *ret_string ) { - FIXME( "%p, %u, %d, %s, %s, %s, %p\n", iface, string_format, num_rows, debugstr_w(column_delimeter), - debugstr_w(row_delimeter), debugstr_w(null_expr), ret_string ); + FIXME( "%p, %u, %d, %s, %s, %s, %p\n", iface, string_format, num_rows, debugstr_w(column_delimiter), + debugstr_w(row_delimiter), debugstr_w(null_expr), ret_string ); return E_NOTIMPL; } diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index a1d5e28038..e4a847ab85 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -1068,8 +1068,8 @@ interface Recordset20 : Recordset15 HRESULT GetString( [in, defaultvalue(adClipString)] StringFormatEnum string_format, [in, defaultvalue(-1)] LONG num_rows, - [in, optional] BSTR column_delimeter, - [in, optional] BSTR row_delimeter, + [in, optional] BSTR column_delimiter, + [in, optional] BSTR row_delimiter, [in, optional] BSTR null_expr, [out, retval] BSTR *ret_string);

1 0

Alexandre Julliard : kernelbase: Add an OpenConsoleW() replacement wrapper.
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: 7b3c0fbed230dda20836b4b4fb8cc0584e198b99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b3c0fbed230dda20836b4b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 10 11:09:33 2019 +0100 kernelbase: Add an OpenConsoleW() replacement wrapper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 25 +++++++++++++++++++++++++ dlls/kernelbase/file.c | 16 ++++++---------- dlls/kernelbase/kernelbase.h | 2 ++ 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 615c0f434a..0729e578e4 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -157,6 +157,31 @@ static COORD get_largest_console_window_size( HANDLE handle ) return c; } +/* helper function to replace OpenConsoleW */ +HANDLE open_console( BOOL output, DWORD access, SECURITY_ATTRIBUTES *sa, DWORD creation ) +{ + HANDLE ret; + + if (creation != OPEN_EXISTING) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return INVALID_HANDLE_VALUE; + } + + SERVER_START_REQ( open_console ) + { + req->from = wine_server_obj_handle( ULongToHandle( output )); + req->access = access; + req->attributes = sa && sa->bInheritHandle ? OBJ_INHERIT : 0; + req->share = FILE_SHARE_READ | FILE_SHARE_WRITE; + wine_server_call_err( req ); + ret = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + if (ret) ret = console_handle_map( ret ); + return ret; +} + /****************************************************************** * AttachConsole (kernelbase.@) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 23ca5629a3..59ddcd9ed9 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -428,8 +428,6 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileW( LPCWSTR filename, DWORD access, DWO DWORD dosdev; const WCHAR *vxd_name = NULL; static const WCHAR bkslashes_with_dotW[] = {'\\','\\','.','\\',0}; - static const WCHAR coninW[] = {'C','O','N','I','N','$',0}; - static const WCHAR conoutW[] = {'C','O','N','O','U','T','$',0}; SECURITY_QUALITY_OF_SERVICE qos; static const UINT nt_disposition[5] = @@ -462,12 +460,10 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileW( LPCWSTR filename, DWORD access, DWO /* Open a console for CONIN$ or CONOUT$ */ - if (!wcsicmp(filename, coninW) || !wcsicmp(filename, conoutW)) - { - ret = OpenConsoleW( filename, access, sa && sa->bInheritHandle, creation ? OPEN_EXISTING : 0 ); - if (ret == INVALID_HANDLE_VALUE) SetLastError( ERROR_INVALID_PARAMETER ); - return ret; - } + if (!wcsicmp( filename, L"CONIN$" )) + return open_console( FALSE, access, sa, creation ? OPEN_EXISTING : 0 ); + if (!wcsicmp( filename, L"CONOUT$" )) + return open_console( TRUE, access, sa, creation ? OPEN_EXISTING : 0 ); if (!wcsncmp( filename, bkslashes_with_dotW, 4 )) { @@ -502,9 +498,9 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileW( LPCWSTR filename, DWORD access, DWO switch (access & (GENERIC_READ|GENERIC_WRITE)) { case GENERIC_READ: - return OpenConsoleW( coninW, access, sa && sa->bInheritHandle, OPEN_EXISTING ); + return open_console( FALSE, access, sa, OPEN_EXISTING ); case GENERIC_WRITE: - return OpenConsoleW( conoutW, access, sa && sa->bInheritHandle, OPEN_EXISTING ); + return open_console( TRUE, access, sa, OPEN_EXISTING ); default: SetLastError( ERROR_FILE_NOT_FOUND ); return INVALID_HANDLE_VALUE; diff --git a/dlls/kernelbase/kernelbase.h b/dlls/kernelbase/kernelbase.h index 4aed1829e3..d7de53c412 100644 --- a/dlls/kernelbase/kernelbase.h +++ b/dlls/kernelbase/kernelbase.h @@ -35,6 +35,8 @@ extern const WCHAR system_dir[] DECLSPEC_HIDDEN; static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); extern BOOL is_wow64 DECLSPEC_HIDDEN; +extern HANDLE open_console( BOOL output, DWORD access, SECURITY_ATTRIBUTES *sa, DWORD creation ) DECLSPEC_HIDDEN; + static inline BOOL is_console_handle(HANDLE h) { return h != INVALID_HANDLE_VALUE && ((UINT_PTR)h & 3) == 3;

1 0

Alexandre Julliard : kernel32: Remove __wine_kernel_init().
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: 30e5f1215e0d2a0555bd2c6243276451fdaf5b03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30e5f1215e0d2a0555bd2c62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 10 11:08:40 2019 +0100 kernel32: Remove __wine_kernel_init(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/kernel_main.c | 3 +++ dlls/kernel32/process.c | 30 +++++++----------------------- dlls/ntdll/loader.c | 9 +++------ 4 files changed, 14 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index daf93aebfd..4118d29b3d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1686,4 +1686,4 @@ @ cdecl wine_get_dos_file_name(str) # Init code -@ cdecl __wine_kernel_init() +@ cdecl __wine_start_process() diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 9247e3c117..be355fe724 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -84,6 +84,9 @@ static BOOL process_attach( HMODULE module ) { RTL_USER_PROCESS_PARAMETERS *params = NtCurrentTeb()->Peb->ProcessParameters; + kernel32_handle = module; + RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter ); + NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); /* Setup registry timezone information */ diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index e5e51a93d8..7b8b8adcc2 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -104,9 +104,7 @@ __ASM_GLOBAL_FUNC( call_process_entry, __ASM_CFI(".cfi_same_value %ebp\n\t") "ret" ) -extern void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) DECLSPEC_HIDDEN; -extern void WINAPI start_process_wrapper(void) DECLSPEC_HIDDEN; -__ASM_GLOBAL_FUNC( start_process_wrapper, +__ASM_GLOBAL_FUNC( __wine_start_process, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") @@ -120,16 +118,18 @@ static inline DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry ) { return entry( peb ); } -static void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ); -#define start_process_wrapper start_process #endif /*********************************************************************** - * start_process + * __wine_start_process * * Startup routine of a new process. Runs on the new process stack. */ -void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) +#ifdef __i386__ +void CDECL start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) +#else +void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) +#endif { BOOL being_debugged; @@ -161,22 +161,6 @@ void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) } -/*********************************************************************** - * __wine_kernel_init - * - * Wine initialisation: load and start the main exe file. - */ -void * CDECL __wine_kernel_init(void) -{ - static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0}; - - kernel32_handle = GetModuleHandleW(kernel32W); - RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter ); - - return start_process_wrapper; -} - - /*********************************************************************** * wait_input_idle * diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d87d6857d7..2f203447ed 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4237,7 +4237,6 @@ void __wine_process_init(void) NTSTATUS status; ANSI_STRING func_name; UNICODE_STRING nt_name; - void * (CDECL *init_func)(void); INITIAL_TEB stack; BOOL suspend; SIZE_T info_size; @@ -4273,11 +4272,11 @@ void __wine_process_init(void) MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); exit(1); } - RtlInitAnsiString( &func_name, "__wine_kernel_init" ); + RtlInitAnsiString( &func_name, "__wine_start_process" ); if ((status = LdrGetProcedureAddress( wm->ldr.BaseAddress, &func_name, - 0, (void **)&init_func )) != STATUS_SUCCESS) + 0, (void **)&kernel32_start_process )) != STATUS_SUCCESS) { - MESSAGE( "wine: could not find __wine_kernel_init in kernel32.dll, status %x\n", status ); + MESSAGE( "wine: could not find __wine_start_process in kernel32.dll, status %x\n", status ); exit(1); } @@ -4323,8 +4322,6 @@ void __wine_process_init(void) NtTerminateProcess( GetCurrentProcess(), status ); } - kernel32_start_process = init_func(); - virtual_set_large_address_space(); /* the main exe needs to be the first in the load order list */

1 0

Michael Stefaniuc : dmband: Get rid of the redundant debugstr_DMUS_OBJECTDESC().
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: 2e66404dc9bac13f77bf78d89ae934413a0a82ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e66404dc9bac13f77bf78d8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 10 00:48:09 2019 +0100 dmband: Get rid of the redundant debugstr_DMUS_OBJECTDESC(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/dmutils.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index a1dc7e28a5..af24054bf4 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -122,31 +122,6 @@ static const char *debugstr_dmversion (const DMUS_VERSION *version) { HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); } -/* dump whole DMUS_OBJECTDESC struct */ -static const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { - if (pDesc) { - char buffer[1024] = "", *ptr = &buffer[0]; - - ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):\n", pDesc); - ptr += sprintf(ptr, " - dwSize = 0x%08X\n", pDesc->dwSize); - ptr += sprintf(ptr, " - dwValidData = 0x%08X ( %s)\n", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); - if (pDesc->dwValidData & DMUS_OBJ_CLASS) ptr += sprintf(ptr, " - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) ptr += sprintf(ptr, " - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) ptr += sprintf(ptr, " - ftDate = %s\n", debugstr_filetime (&pDesc->ftDate)); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) ptr += sprintf(ptr, " - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); - if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", - wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); - if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream); - - return wine_dbg_sprintf("%s", buffer); - } else { - return "(NULL)"; - } -} - HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { switch (pChunk->fccID) { @@ -303,7 +278,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, TRACE_(dmfile)("** DM Reference Begin of Load ***\n"); TRACE_(dmfile)("With Desc:\n"); - debugstr_DMUS_OBJECTDESC(&ref_desc); + debug_DMUS_OBJECTDESC(&ref_desc); { LPDIRECTMUSICGETLOADER pGetLoader = NULL; @@ -521,7 +496,7 @@ void debug_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) TRACE(" - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CLASS) TRACE(" - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); if (pDesc->dwValidData & DMUS_OBJ_OBJECT) TRACE(" - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) TRACE(" - ftDate = FIXME\n"); + if (pDesc->dwValidData & DMUS_OBJ_DATE) TRACE(" - ftDate = %s\n", debugstr_filetime(&pDesc->ftDate)); if (pDesc->dwValidData & DMUS_OBJ_VERSION) TRACE(" - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName));

1 0

Hans Leidekker : winhttp/tests: Show that WINHTTP_OPTION_SECURE_PROTOCOLS can't be set on connection handles.
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: 2c708d8d9c7b3e4b9886303bc3af3175ce74283b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c708d8d9c7b3e4b9886303b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 10 12:12:38 2019 +0100 winhttp/tests: Show that WINHTTP_OPTION_SECURE_PROTOCOLS can't be set on connection handles. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48254 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index e4c614cb10..3e0e8baeb9 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1070,6 +1070,13 @@ static void test_secure_connection(void) con = WinHttpConnect(ses, test_winehq, 443, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + SetLastError( 0xdeadbeef ); + protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2; + ret = WinHttpSetOption(con, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols)); + err = GetLastError(); + ok(!ret, "unexpected success\n"); + ok(err == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %u\n", err); + /* try without setting WINHTTP_FLAG_SECURE */ req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError());

1 0

Michael Stefaniuc : msado15: Print the debug strings and not the pointers to them.
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: 516dc46b82af3c4b4b864e522ecde558d5c9d3e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=516dc46b82af3c4b4b864e52… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 10 09:56:11 2019 +0100 msado15: Print the debug strings and not the pointers to them. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 2 +- dlls/msado15/stream.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index f33bc89a1a..43497636a8 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -187,7 +187,7 @@ static HRESULT WINAPI connection_Open( _Connection *iface, BSTR connect_str, BST LONG options ) { FIXME( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), - debugstr_w(password), options ); + password, options ); return E_NOTIMPL; } diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 0c4d9ea425..169be7319e 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -371,7 +371,7 @@ static HRESULT WINAPI stream_ReadText( _Stream *iface, LONG len, BSTR *ret ) static HRESULT WINAPI stream_WriteText( _Stream *iface, BSTR data, StreamWriteEnum options ) { - FIXME( "%p, %p, %u\n", iface, debugstr_w(data), options ); + FIXME( "%p, %s, %u\n", iface, debugstr_w(data), options ); return E_NOTIMPL; }

1 0

Alexandre Julliard : kernelbase: Add IsBadStringPtr() replacement functions.
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: 0235e5146529d3d7eb257b2b3e5cc36bc2c77dbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0235e5146529d3d7eb257b2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 10 11:12:20 2019 +0100 kernelbase: Add IsBadStringPtr() replacement functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/memory.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 465a57209b..83805ece45 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -390,6 +390,42 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteProcessMemory( HANDLE process, void *addr, co } +/* IsBadStringPtrA replacement for kernelbase, to catch exception in debug traces. */ +BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) +{ + if (!str) return TRUE; + __TRY + { + volatile const char *p = str; + while (p != str + max) if (!*p++) break; + } + __EXCEPT_PAGE_FAULT + { + return TRUE; + } + __ENDTRY + return FALSE; +} + + +/* IsBadStringPtrW replacement for kernelbase, to catch exception in debug traces. */ +BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) +{ + if (!str) return TRUE; + __TRY + { + volatile const WCHAR *p = str; + while (p != str + max) if (!*p++) break; + } + __EXCEPT_PAGE_FAULT + { + return TRUE; + } + __ENDTRY + return FALSE; +} + + /*********************************************************************** * Heap functions ***********************************************************************/

1 0

Alexandre Julliard : kernel32: Move timezone functions to kernelbase.
by Alexandre Julliard Dec. 10, 2019

Dec. 10, 2019

Module: wine Branch: master Commit: 89500484c24de304b2a6d245573b6f51fbb4852f URL: https://source.winehq.org/git/wine.git/?a=commit;h=89500484c24de304b2a6d245… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 10 18:14:19 2019 +0100 kernel32: Move timezone functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 14 +- dlls/kernel32/kernel_main.c | 3 - dlls/kernel32/kernel_private.h | 3 - dlls/kernel32/time.c | 621 +--------------------------------------- dlls/kernelbase/kernelbase.spec | 14 +- dlls/kernelbase/locale.c | 321 +++++++++++++++++++++ 6 files changed, 336 insertions(+), 640 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=89500484c24de304b2a6…

1 0