April 2013 - Wine-commits - list.winehq.org

Sam Edwards : gdi32: Prevent another possible buffer overflow in get_glyph_outline.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 53ec9b3291be1d7a5531aa2a04dbcf6b1fa83b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ec9b3291be1d7a5531aa2a0… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Tue Apr 30 00:41:47 2013 -0600 gdi32: Prevent another possible buffer overflow in get_glyph_outline. --- dlls/gdi32/freetype.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fec752a..5b3c138 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6362,9 +6362,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, y_shift = height - (src_height / vmul); dst += x_shift + y_shift * ( pitch / 4 ); - while ( src_height ) + height = min( height, src_height / vmul ); + while ( height-- ) { - for ( x = 0; x < src_width / hmul; x++ ) + for ( x = 0; x < width && x < src_width / hmul; x++ ) { if ( rgb ) {

1 0

Alexandre Julliard : server: When changing a process desktop, start the close timeout on the old desktop if necessary.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: be417d68909aa3bdbfcb0439b4940dc9c11a6e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be417d68909aa3bdbfcb0439b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 13:55:54 2013 +0200 server: When changing a process desktop, start the close timeout on the old desktop if necessary. --- server/winstation.c | 63 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 38 insertions(+), 25 deletions(-) diff --git a/server/winstation.c b/server/winstation.c index e0b7613..57e6995 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -300,6 +300,40 @@ struct desktop *get_thread_desktop( struct thread *thread, unsigned int access ) return get_desktop_obj( thread->process, thread->desktop, access ); } +static void close_desktop_timeout( void *private ) +{ + struct desktop *desktop = private; + + desktop->close_timeout = NULL; + unlink_named_object( &desktop->obj ); /* make sure no other process can open it */ + post_desktop_message( desktop, WM_CLOSE, 0, 0 ); /* and signal the owner to quit */ +} + +/* add a user of the desktop and cancel the close timeout */ +static void add_desktop_user( struct desktop *desktop ) +{ + desktop->users++; + if (desktop->close_timeout) + { + remove_timeout_user( desktop->close_timeout ); + desktop->close_timeout = NULL; + } +} + +/* remove a user of the desktop and start the close timeout if necessary */ +static void remove_desktop_user( struct desktop *desktop ) +{ + assert( desktop->users > 0 ); + desktop->users--; + + /* if we have one remaining user, it has to be the manager of the desktop window */ + if (desktop->users == 1 && get_top_window_owner( desktop )) + { + assert( !desktop->close_timeout ); + desktop->close_timeout = add_timeout_user( -TICKS_PER_SEC, close_desktop_timeout, desktop ); + } +} + /* set the process default desktop handle */ void set_process_default_desktop( struct process *process, struct desktop *desktop, obj_handle_t handle ) @@ -316,15 +350,10 @@ void set_process_default_desktop( struct process *process, struct desktop *deskt LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) if (!thread->desktop) thread->desktop = handle; - if (!process->is_system) + if (!process->is_system && desktop != old_desktop) { - desktop->users++; - if (desktop->close_timeout) - { - remove_timeout_user( desktop->close_timeout ); - desktop->close_timeout = NULL; - } - if (old_desktop) old_desktop->users--; + add_desktop_user( desktop ); + if (old_desktop) remove_desktop_user( old_desktop ); } if (old_desktop) release_object( old_desktop ); @@ -372,15 +401,6 @@ done: clear_error(); } -static void close_desktop_timeout( void *private ) -{ - struct desktop *desktop = private; - - desktop->close_timeout = NULL; - unlink_named_object( &desktop->obj ); /* make sure no other process can open it */ - post_desktop_message( desktop, WM_CLOSE, 0, 0 ); /* and signal the owner to quit */ -} - /* close the desktop of a given process */ void close_process_desktop( struct process *process ) { @@ -388,14 +408,7 @@ void close_process_desktop( struct process *process ) if (process->desktop && (desktop = get_desktop_obj( process, process->desktop, 0 ))) { - assert( desktop->users > 0 ); - desktop->users--; - /* if we have one remaining user, it has to be the manager of the desktop window */ - if (desktop->users == 1 && get_top_window_owner( desktop )) - { - assert( !desktop->close_timeout ); - desktop->close_timeout = add_timeout_user( -TICKS_PER_SEC, close_desktop_timeout, desktop ); - } + remove_desktop_user( desktop ); release_object( desktop ); } clear_error(); /* ignore errors */

1 0

Alexandre Julliard : ctapi32: Don' t unload external libraries on process shutdown.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 6eca89efa7c0aa673a488833c3d20cfc260cfce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eca89efa7c0aa673a488833c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 17:25:29 2013 +0200 ctapi32: Don't unload external libraries on process shutdown. --- dlls/ctapi32/ctapi32.c | 17 ++--------------- 1 files changed, 2 insertions(+), 15 deletions(-) diff --git a/dlls/ctapi32/ctapi32.c b/dlls/ctapi32/ctapi32.c index 7889e2a..089e0ab 100644 --- a/dlls/ctapi32/ctapi32.c +++ b/dlls/ctapi32/ctapi32.c @@ -92,16 +92,6 @@ LOAD_FUNCPTR(CT_close); return 0; } -static void unload_functions(void) -{ - pCT_close = NULL; - pCT_data = NULL; - pCT_init = NULL; - if (ctapi_handle) - wine_dlclose(ctapi_handle, NULL, 0); -} - - /* * ct-API specific functions */ @@ -137,18 +127,15 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: - { DisableThreadLibraryCalls(hinstDLL); /* Try to load low-level library */ if (load_functions() != 0) return FALSE; /* error */ break; - } case DLL_PROCESS_DETACH: - { - unload_functions(); + if (lpvReserved) break; + if (ctapi_handle) wine_dlclose(ctapi_handle, NULL, 0); break; - } } return TRUE;

1 0

Alexandre Julliard : msxml3: Don' t unload external libraries on process shutdown.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 2710f05cef19a4bb07c63b9c03eb765cf81c6e06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2710f05cef19a4bb07c63b9c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 17:25:29 2013 +0200 msxml3: Don't unload external libraries on process shutdown. --- dlls/msxml3/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index da3969e..46742ef 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -209,7 +209,7 @@ static void init_libxslt(void) #endif } -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { MSXML_hInstance = hInstDLL; @@ -235,12 +235,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: + if (reserved) break; #ifdef SONAME_LIBXSLT if (libxslt_handle) { pxsltCleanupGlobals(); wine_dlclose(libxslt_handle, NULL, 0); - libxslt_handle = NULL; } #endif #ifdef HAVE_LIBXML2

1 0

Alexandre Julliard : odbc32: Don' t unload external libraries on process shutdown.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 21bfa0812eb45fe1ca048ace0e63d5b7071bf2f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21bfa0812eb45fe1ca048ace0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 17:25:29 2013 +0200 odbc32: Don't unload external libraries on process shutdown. --- dlls/odbc32/proxyodbc.c | 32 +++++++++----------------------- 1 files changed, 9 insertions(+), 23 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index c7a5038..85b3dfe 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -465,39 +465,25 @@ static void ODBC_ReplicateToRegistry (void) /*********************************************************************** * DllMain [Internal] Initializes the internal 'ODBC32.DLL'. - * - * PARAMS - * hinstDLL [I] handle to the DLL's instance - * fdwReason [I] - * lpvReserved [I] reserved, must be NULL - * - * RETURNS - * Success: TRUE - * Failure: FALSE */ - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) { - TRACE("Initializing or Finalizing proxy ODBC: %p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("proxy ODBC: %p,%x,%p\n", hinstDLL, reason, reserved); - if (fdwReason == DLL_PROCESS_ATTACH) + switch (reason) { - TRACE("Loading ODBC...\n"); + case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); if (ODBC_LoadDriverManager()) { ODBC_LoadDMFunctions(); ODBC_ReplicateToRegistry(); } - } - else if (fdwReason == DLL_PROCESS_DETACH) - { - TRACE("Unloading ODBC...\n"); - if (dmHandle) - { - wine_dlclose(dmHandle,NULL,0); - dmHandle = NULL; - } + break; + + case DLL_PROCESS_DETACH: + if (reserved) break; + if (dmHandle) wine_dlclose(dmHandle,NULL,0); } return TRUE;

1 0

Alexandre Julliard : sane.ds: Don' t unload external libraries on process shutdown.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: dc345305b0d37ce2342d7528a4cceab318e5ba4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc345305b0d37ce2342d7528a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 17:25:29 2013 +0200 sane.ds: Don't unload external libraries on process shutdown. --- dlls/sane.ds/sane_main.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 1c73252..c01baeb 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -102,14 +102,12 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; } case DLL_PROCESS_DETACH: + if (lpvReserved) break; #ifdef SONAME_LIBSANE TRACE("calling sane_exit()\n"); psane_exit (); - close_libsane(libsane_handle); - libsane_handle = NULL; -#endif - SANE_instance = NULL; +#endif break; }

1 0

Piotr Caban : msvcr100: Added _vscwprintf_p implementation.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: a5f525276f6459fe5ab269a5632e7141a2c70607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f525276f6459fe5ab269a56… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 14:28:34 2013 +0200 msvcr100: Added _vscwprintf_p implementation. --- dlls/msvcr100/msvcr100.c | 8 ++++++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- include/msvcrt/stdio.h | 1 + include/msvcrt/wchar.h | 1 + 7 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index d43cbbf..4449310 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -423,6 +423,14 @@ int CDECL _vswprintf_p(wchar_t *buffer, size_t length, const wchar_t *format, __ } /********************************************************************* + * _vscwprintf_p (MSVCR100.@) + */ +int CDECL _vscwprintf_p(const wchar_t *format, __ms_va_list args) +{ + return _vscwprintf_p_l(format, NULL, args); +} + +/********************************************************************* * _byteswap_ushort (MSVCR100.@) */ unsigned short CDECL _byteswap_ushort(unsigned short s) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 197a414..52835cb 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1442,7 +1442,7 @@ @ stub _vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcrt._vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) msvcrt._vscwprintf_l -@ stub _vscwprintf_p +@ cdecl _vscwprintf_p(wstr ptr) @ cdecl _vscwprintf_p_l(wstr ptr ptr) msvcrt._vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf_c diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d00f1a9..171bf37 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1804,7 +1804,7 @@ @ stub _vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcrt._vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) msvcrt._vscwprintf_l -@ stub _vscwprintf_p +@ cdecl _vscwprintf_p(wstr ptr) msvcr100._vscwprintf_p @ cdecl _vscwprintf_p_l(wstr ptr ptr) msvcrt._vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf_c diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 860383a..f45095e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1120,7 +1120,7 @@ @ stub _vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcrt._vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) msvcrt._vscwprintf_l -@ stub _vscwprintf_p +@ cdecl _vscwprintf_p(wstr ptr) msvcr100._vscwprintf_p @ cdecl _vscwprintf_p_l(wstr ptr ptr) msvcrt._vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf_c diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ab9cea6..140797d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1096,7 +1096,7 @@ @ stub _vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcrt._vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) msvcrt._vscwprintf_l -@ stub _vscwprintf_p +@ cdecl _vscwprintf_p(wstr ptr) msvcr100._vscwprintf_p @ cdecl _vscwprintf_p_l(wstr ptr ptr) msvcrt._vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf_c diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index a01859e..737003d 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -194,6 +194,7 @@ int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...); int __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); int __cdecl _scwprintf(const wchar_t*,...); int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); +int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 27f673c..d936dc3 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -320,6 +320,7 @@ int __cdecl _putws(const wchar_t*); int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...); int __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); +int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list);

1 0

Piotr Caban : msvcrt: Added _mbstok_s_l implementation.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: ff7388ca3fe27d5910c161e7074ca89dbdeff54a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff7388ca3fe27d5910c161e70… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 14:29:11 2013 +0200 msvcrt: Added _mbstok_s_l implementation. --- dlls/msvcr100/msvcr100.spec | 6 +- dlls/msvcr110/msvcr110.spec | 6 +- dlls/msvcr80/msvcr80.spec | 6 +- dlls/msvcr90/msvcr90.spec | 6 +- dlls/msvcrt/mbcs.c | 94 ++++++++++++++++++++++++++++--------------- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 6 +- 7 files changed, 77 insertions(+), 48 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 52835cb..e60e0fb 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1183,9 +1183,9 @@ @ cdecl _mbsstr(str str) msvcrt._mbsstr @ stub _mbsstr_l @ cdecl _mbstok(str str) msvcrt._mbstok -@ stub _mbstok_l -@ stub _mbstok_s -@ stub _mbstok_s_l +@ cdecl _mbstok_l(str str ptr) msvcrt._mbstok_l +@ cdecl _mbstok_s(str str ptr) msvcrt._mbstok_s +@ cdecl _mbstok_s_l(str str ptr ptr) msvcrt._mbstok_s_l @ cdecl _mbstowcs_l(ptr str long ptr) msvcrt._mbstowcs_l @ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcrt._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcrt._mbstrlen diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 171bf37..9f36dad 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1545,9 +1545,9 @@ @ cdecl _mbsstr(str str) msvcrt._mbsstr @ stub _mbsstr_l @ cdecl _mbstok(str str) msvcrt._mbstok -@ stub _mbstok_l -@ stub _mbstok_s -@ stub _mbstok_s_l +@ cdecl _mbstok_l(str str ptr) msvcrt._mbstok_l +@ cdecl _mbstok_s(str str ptr) msvcrt._mbstok_s +@ cdecl _mbstok_s_l(str str ptr ptr) msvcrt._mbstok_s_l @ cdecl _mbstowcs_l(ptr str long ptr) msvcrt._mbstowcs_l @ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcrt._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcrt._mbstrlen diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f45095e..a8490e1 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -854,9 +854,9 @@ @ cdecl _mbsstr(str str) msvcrt._mbsstr @ stub _mbsstr_l @ cdecl _mbstok(str str) msvcrt._mbstok -@ stub _mbstok_l -@ stub _mbstok_s -@ stub _mbstok_s_l +@ cdecl _mbstok_l(str str ptr) msvcrt._mbstok_l +@ cdecl _mbstok_s(str str ptr) msvcrt._mbstok_s +@ cdecl _mbstok_s_l(str str ptr ptr) msvcrt._mbstok_s_l @ cdecl _mbstowcs_l(ptr str long ptr) msvcrt._mbstowcs_l @ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcrt._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcrt._mbstrlen diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 140797d..9783c2f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -832,9 +832,9 @@ @ cdecl _mbsstr(str str) msvcrt._mbsstr @ stub _mbsstr_l @ cdecl _mbstok(str str) msvcrt._mbstok -@ stub _mbstok_l -@ stub _mbstok_s -@ stub _mbstok_s_l +@ cdecl _mbstok_l(str str ptr) msvcrt._mbstok_l +@ cdecl _mbstok_s(str str ptr) msvcrt._mbstok_s +@ cdecl _mbstok_s_l(str str ptr ptr) msvcrt._mbstok_s_l @ cdecl _mbstowcs_l(ptr str long ptr) msvcrt._mbstowcs_l @ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcrt._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcrt._mbstrlen diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 3d50d6c..b70ffa0 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -145,11 +145,6 @@ static inline unsigned char *u_strrchr( const unsigned char *s, unsigned char x return (unsigned char*) strrchr( (const char*)s, x ); } -static inline unsigned char *u_strtok( unsigned char *s, const unsigned char *delim ) -{ - return (unsigned char*) strtok( (char*)s, (const char*)delim ); -} - static inline unsigned char *u__strset( unsigned char *s, unsigned char c ) { return (unsigned char*) _strset( (char*)s, c); @@ -1090,38 +1085,71 @@ unsigned char* CDECL _mbsrchr(const unsigned char* s, unsigned int x) } /********************************************************************* - * _mbstok(MSVCRT.@) - * - * Find and extract tokens from strings + * _mbstok_s_l(MSVCRT.@) */ -unsigned char* CDECL _mbstok(unsigned char *str, const unsigned char *delim) +unsigned char* CDECL _mbstok_s_l(unsigned char *str, const unsigned char *delim, + unsigned char **ctx, MSVCRT__locale_t locale) { - thread_data_t *data = msvcrt_get_thread_data(); - unsigned char *ret; + MSVCRT_pthreadmbcinfo mbcinfo; + unsigned int c; - if(get_mbcinfo()->ismbcodepage) - { - unsigned int c; + if(!MSVCRT_CHECK_PMT(delim != NULL)) return NULL; + if(!MSVCRT_CHECK_PMT(ctx != NULL)) return NULL; + if(!MSVCRT_CHECK_PMT(str || *ctx)) return NULL; + + if(locale) + mbcinfo = locale->mbcinfo; + else + mbcinfo = get_mbcinfo(); - if (!str) - if (!(str = data->mbstok_next)) return NULL; + if(!mbcinfo->ismbcodepage) + return (unsigned char*)MSVCRT_strtok_s((char*)str, (const char*)delim, (char**)ctx); - while ((c = _mbsnextc(str)) && _mbschr(delim, c)) { - str += c > 255 ? 2 : 1; - } - if (!*str) return NULL; - ret = str++; - while ((c = _mbsnextc(str)) && !_mbschr(delim, c)) { - str += c > 255 ? 2 : 1; - } - if (*str) { - *str++ = 0; - if (c > 255) *str++ = 0; - } - data->mbstok_next = str; - return ret; + if(!str) + str = *ctx; + + while((c=_mbsnextc(str)) && _mbschr(delim, c)) + str += c>255 ? 2 : 1; + if(!*str) + return NULL; + + *ctx = str + (c>255 ? 2 : 1); + while((c=_mbsnextc(*ctx)) && !_mbschr(delim, c)) + *ctx += c>255 ? 2 : 1; + if (**ctx) { + *(*ctx)++ = 0; + if(c > 255) + *(*ctx)++ = 0; } - return u_strtok(str, delim); /* ASCII CP */ + + return str; +} + + +/********************************************************************* + * _mbstok_s(MSVCRT.@) + */ +unsigned char* CDECL _mbstok_s(unsigned char *str, + const unsigned char *delim, unsigned char **ctx) +{ + return _mbstok_s_l(str, delim, ctx, NULL); +} + +/********************************************************************* + * _mbstok_l(MSVCRT.@) + */ +unsigned char* CDECL _mbstok_l(unsigned char *str, + const unsigned char *delim, MSVCRT__locale_t locale) +{ + return _mbstok_s_l(str, delim, &msvcrt_get_thread_data()->mbstok_next, locale); +} + +/********************************************************************* + * _mbstok(MSVCRT.@) + */ +unsigned char* CDECL _mbstok(unsigned char *str, const unsigned char *delim) +{ + return _mbstok_s_l(str, delim, &msvcrt_get_thread_data()->mbstok_next, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index b51ff81..35e9c7d 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -989,6 +989,7 @@ int __cdecl MSVCRT__tolower_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); int __cdecl MSVCRT__strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); unsigned int __cdecl _get_output_format(void); +char* __cdecl MSVCRT_strtok_s(char*, const char*, char**); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0af2423..43d3c45 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -808,9 +808,9 @@ @ cdecl _mbsstr(str str) # stub _mbsstr_l(str str ptr) @ cdecl _mbstok(str str) -# stub _mbstok_l(str str ptr) -# stub _mbstok_s(str str ptr) -# stub _mbstok_s_l(str str ptr ptr) +@ cdecl _mbstok_l(str str ptr) +@ cdecl _mbstok_s(str str ptr) +@ cdecl _mbstok_s_l(str str ptr ptr) @ cdecl _mbstowcs_l(ptr str long ptr) MSVCRT__mbstowcs_l @ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) MSVCRT__mbstowcs_s_l @ cdecl _mbstrlen(str)

1 0

Piotr Caban : msvcrt: Move _fstat32 and _fstat64i32 functions to msvcrt.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: f99742a5393e296581a07c6aef115d8248f83b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f99742a5393e296581a07c6ae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 14:29:59 2013 +0200 msvcrt: Move _fstat32 and _fstat64i32 functions to msvcrt. --- dlls/msvcr100/msvcr100.c | 32 +----------------------- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr110/msvcr110.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/file.c | 54 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 + 7 files changed, 66 insertions(+), 38 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 4449310..149f132 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -78,8 +78,8 @@ typedef void (__cdecl *free_func_t)(void*); extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int); /********************************************************************* - * * stat64_to_stat32 [internal] - * */ + * stat64_to_stat32 [internal] + */ static void stat64_to_stat32(const struct _stat64 *buf64, struct _stat32 *buf) { buf->st_dev = buf64->st_dev; @@ -210,20 +210,6 @@ void* CDECL _recalloc(void* mem, size_t num, size_t size) } /********************************************************************* - * _fstat32 (MSVCR100.@) - */ -int CDECL _fstat32(int fd, struct _stat32* buf) -{ - int ret; - struct _stat64 buf64; - - ret = _fstat64(fd, &buf64); - if (!ret) - stat64_to_stat32(&buf64, buf); - return ret; -} - -/********************************************************************* * _stat32 (MSVCR100.@) */ int CDECL _stat32(const char *path, struct _stat32* buf) @@ -310,20 +296,6 @@ static void stat64_to_stat64i32(const struct _stat64 *buf64, struct _stat64i32 * } /********************************************************************* - * _fstat64i32 (MSVCR100.@) - */ -int CDECL _fstat64i32(int fd, struct _stat64i32* buf) -{ - int ret; - struct _stat64 buf64; - - ret = _fstat64(fd, &buf64); - if (!ret) - stat64_to_stat64i32(&buf64, buf); - return ret; -} - -/********************************************************************* * _stat64i32 (MSVCR100.@) */ int CDECL _stat64i32(const char* path, struct _stat64i32 * buf) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e60e0fb..370feb2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -841,10 +841,10 @@ @ cdecl _fseeki64(ptr int64 long) msvcrt._fseeki64 @ stub _fseeki64_nolock @ cdecl _fsopen(str str long) msvcrt._fsopen -@ cdecl _fstat32(long ptr) +@ cdecl _fstat32(long ptr) msvcrt._fstat32 @ stub _fstat32i64 @ cdecl _fstat64(long ptr) msvcrt._fstat64 -@ cdecl _fstat64i32(long ptr) +@ cdecl _fstat64i32(long ptr) msvcrt._fstat64i32 @ stub _ftell_nolock @ cdecl -ret64 _ftelli64(ptr) msvcrt._ftelli64 @ stub _ftelli64_nolock diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 9f36dad..12fc808 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1193,10 +1193,10 @@ @ cdecl _fseeki64(ptr int64 long) msvcrt._fseeki64 @ stub _fseeki64_nolock @ cdecl _fsopen(str str long) msvcrt._fsopen -@ cdecl _fstat32(long ptr) msvcr100._fstat32 +@ cdecl _fstat32(long ptr) msvcrt._fstat32 @ stub _fstat32i64 @ cdecl _fstat64(long ptr) msvcrt._fstat64 -@ cdecl _fstat64i32(long ptr) msvcr100._fstat64i32 +@ cdecl _fstat64i32(long ptr) msvcrt._fstat64i32 @ stub _ftell_nolock @ cdecl -ret64 _ftelli64(ptr) msvcrt._ftelli64 @ stub _ftelli64_nolock diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a8490e1..47bf34f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -507,10 +507,10 @@ @ cdecl _fseeki64(ptr int64 long) msvcrt._fseeki64 @ stub _fseeki64_nolock @ cdecl _fsopen(str str long) msvcrt._fsopen -@ cdecl _fstat32(long ptr) msvcr100._fstat32 +@ cdecl _fstat32(long ptr) msvcrt._fstat32 @ stub _fstat32i64 @ cdecl _fstat64(long ptr) msvcrt._fstat64 -@ cdecl _fstat64i32(long ptr) msvcr100._fstat64i32 +@ cdecl _fstat64i32(long ptr) msvcrt._fstat64i32 @ stub _ftell_nolock @ cdecl -ret64 _ftelli64(ptr) msvcrt._ftelli64 @ stub _ftelli64_nolock diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9783c2f..d76ab73 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -489,10 +489,10 @@ @ cdecl _fseeki64(ptr int64 long) msvcrt._fseeki64 @ stub _fseeki64_nolock @ cdecl _fsopen(str str long) msvcrt._fsopen -@ cdecl _fstat32(long ptr) msvcr100._fstat32 +@ cdecl _fstat32(long ptr) msvcrt._fstat32 @ stub _fstat32i64 @ cdecl _fstat64(long ptr) msvcrt._fstat64 -@ cdecl _fstat64i32(long ptr) msvcr100._fstat64i32 +@ cdecl _fstat64i32(long ptr) msvcrt._fstat64i32 @ stub _ftell_nolock @ cdecl -ret64 _ftelli64(ptr) msvcrt._ftelli64 @ stub _ftelli64_nolock diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c8863b3..c0c7124 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -177,6 +177,36 @@ static void msvcrt_stat64_to_stati64(const struct MSVCRT__stat64 *buf64, struct buf->st_ctime = buf64->st_ctime; } +static void msvcrt_stat64_to_stat32(const struct MSVCRT__stat64 *buf64, struct MSVCRT__stat32 *buf) +{ + buf->st_dev = buf64->st_dev; + buf->st_ino = buf64->st_ino; + buf->st_mode = buf64->st_mode; + buf->st_nlink = buf64->st_nlink; + buf->st_uid = buf64->st_uid; + buf->st_gid = buf64->st_gid; + buf->st_rdev = buf64->st_rdev; + buf->st_size = buf64->st_size; + buf->st_atime = buf64->st_atime; + buf->st_mtime = buf64->st_mtime; + buf->st_ctime = buf64->st_ctime; +} + +static void msvcrt_stat64_to_stat64i32(const struct MSVCRT__stat64 *buf64, struct MSVCRT__stat64i32 *buf) +{ + buf->st_dev = buf64->st_dev; + buf->st_ino = buf64->st_ino; + buf->st_mode = buf64->st_mode; + buf->st_nlink = buf64->st_nlink; + buf->st_uid = buf64->st_uid; + buf->st_gid = buf64->st_gid; + buf->st_rdev = buf64->st_rdev; + buf->st_size = buf64->st_size; + buf->st_atime = buf64->st_atime; + buf->st_mtime = buf64->st_mtime; + buf->st_ctime = buf64->st_ctime; +} + static void time_to_filetime( MSVCRT___time64_t time, FILETIME *ft ) { /* 1601 to 1970 is 369 years plus 89 leap days */ @@ -1558,6 +1588,30 @@ int CDECL MSVCRT__fstat(int fd, struct MSVCRT__stat* buf) return ret; } +/* _fstat32 - not exported in native msvcrt */ +int CDECL _fstat32(int fd, struct MSVCRT__stat32* buf) +{ + int ret; + struct MSVCRT__stat64 buf64; + + ret = MSVCRT__fstat64(fd, &buf64); + if (!ret) + msvcrt_stat64_to_stat32(&buf64, buf); + return ret; +} + +/* _fstat64i32 - not exported in native msvcrt */ +int CDECL _fstat64i32(int fd, struct MSVCRT__stat64i32* buf) +{ + int ret; + struct MSVCRT__stat64 buf64; + + ret = MSVCRT__fstat64(fd, &buf64); + if (!ret) + msvcrt_stat64_to_stat64i32(&buf64, buf); + return ret; +} + /********************************************************************* * _futime64 (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 43d3c45..55ebba9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1532,3 +1532,5 @@ @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _getptd() @ cdecl fread_s(ptr long long long ptr) +@ cdecl _fstat32(long ptr) +@ cdecl _fstat64i32(long ptr)

1 0

Piotr Caban : wininet: Create raw HTTP headers dynamically.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: e092233396bceb950c64394b386fb3acad505935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e092233396bceb950c64394b3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 16:58:00 2013 +0200 wininet: Create raw HTTP headers dynamically. --- dlls/wininet/http.c | 149 ++++++++++++++++++++++++++------------------------ 1 files changed, 77 insertions(+), 72 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 73aa3f7..682ed36 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -585,61 +585,9 @@ static DWORD init_gzip_stream(http_request_t *req) #endif /*********************************************************************** - * HTTP_Tokenize (internal) - * - * Tokenize a string, allocating memory for the tokens. - */ -static LPWSTR * HTTP_Tokenize(LPCWSTR string, LPCWSTR token_string) -{ - LPWSTR * token_array; - int tokens = 0; - int i; - LPCWSTR next_token; - - if (string) - { - /* empty string has no tokens */ - if (*string) - tokens++; - /* count tokens */ - for (i = 0; string[i]; i++) - { - if (!strncmpW(string+i, token_string, strlenW(token_string))) - { - DWORD j; - tokens++; - /* we want to skip over separators, but not the null terminator */ - for (j = 0; j < strlenW(token_string) - 1; j++) - if (!string[i+j]) - break; - i += j; - } - } - } - - /* add 1 for terminating NULL */ - token_array = heap_alloc((tokens+1) * sizeof(*token_array)); - token_array[tokens] = NULL; - if (!tokens) - return token_array; - for (i = 0; i < tokens; i++) - { - int len; - next_token = strstrW(string, token_string); - if (!next_token) next_token = string+strlenW(string); - len = next_token - string; - token_array[i] = heap_alloc((len+1)*sizeof(WCHAR)); - memcpy(token_array[i], string, len*sizeof(WCHAR)); - token_array[i][len] = '\0'; - string = next_token+strlenW(token_string); - } - return token_array; -} - -/*********************************************************************** * HTTP_FreeTokens (internal) * - * Frees memory returned from HTTP_Tokenize. + * Frees table of pointers. */ static void HTTP_FreeTokens(LPWSTR * token_array) { @@ -742,6 +690,59 @@ static LPWSTR HTTP_BuildHeaderRequestString( http_request_t *request, LPCWSTR ve return requestString; } +static WCHAR* build_response_header(http_request_t *request, BOOL use_cr) +{ + static const WCHAR colonW[] = { ':',' ',0 }; + static const WCHAR crW[] = { '\r',0 }; + static const WCHAR lfW[] = { '\n',0 }; + static const WCHAR status_fmt[] = { ' ','%','u',' ',0 }; + + const WCHAR **req; + WCHAR *ret, buf[14]; + DWORD i, n = 0; + + req = heap_alloc((request->nCustHeaders*5+8)*sizeof(WCHAR*)); + if(!req) + return NULL; + + if(request->rawHeaders) + { + req[n++] = request->version; + sprintfW(buf, status_fmt, request->status_code); + req[n++] = buf; + req[n++] = request->statusText; + if (use_cr) + req[n++] = crW; + req[n++] = lfW; + } + + for(i = 0; i < request->nCustHeaders; i++) + { + if(!(request->custHeaders[i].wFlags & HDR_ISREQUEST) + && strcmpW(request->custHeaders[i].lpszField, szStatus)) + { + req[n++] = request->custHeaders[i].lpszField; + req[n++] = colonW; + req[n++] = request->custHeaders[i].lpszValue; + if(use_cr) + req[n++] = crW; + req[n++] = lfW; + + TRACE("Adding custom header %s (%s)\n", + debugstr_w(request->custHeaders[i].lpszField), + debugstr_w(request->custHeaders[i].lpszValue)); + } + } + if(use_cr) + req[n++] = crW; + req[n++] = lfW; + req[n] = NULL; + + ret = HTTP_build_req(req, 0); + heap_free(req); + return ret; +} + static void HTTP_ProcessCookies( http_request_t *request ) { int HeaderIndex; @@ -3422,7 +3423,7 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, if (request_only) headers = HTTP_BuildHeaderRequestString(request, request->verb, request->path, request->version); else - headers = request->rawHeaders; + headers = build_response_header(request, TRUE); if (headers) len = strlenW(headers) * sizeof(WCHAR); @@ -3446,38 +3447,42 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, } *lpdwBufferLength = len; - if (request_only) heap_free(headers); + heap_free(headers); return res; } case HTTP_QUERY_RAW_HEADERS: { - LPWSTR * ppszRawHeaderLines = HTTP_Tokenize(request->rawHeaders, szCrLf); - DWORD i, size = 0; - LPWSTR pszString = lpBuffer; + LPWSTR headers; + DWORD len; - for (i = 0; ppszRawHeaderLines[i]; i++) - size += strlenW(ppszRawHeaderLines[i]) + 1; + headers = build_response_header(request, FALSE); + if (!headers) + return ERROR_OUTOFMEMORY; - if (size + 1 > *lpdwBufferLength/sizeof(WCHAR)) + len = strlenW(headers) * sizeof(WCHAR); + if (len > *lpdwBufferLength) { - HTTP_FreeTokens(ppszRawHeaderLines); - *lpdwBufferLength = (size + 1) * sizeof(WCHAR); + *lpdwBufferLength = len; + heap_free(headers); return ERROR_INSUFFICIENT_BUFFER; } - if (pszString) + + if (lpBuffer) { - for (i = 0; ppszRawHeaderLines[i]; i++) + DWORD i; + + TRACE("returning data: %s\n", debugstr_wn(headers, len / sizeof(WCHAR))); + + for (i=0; i<len; i++) { - DWORD len = strlenW(ppszRawHeaderLines[i]); - memcpy(pszString, ppszRawHeaderLines[i], (len+1)*sizeof(WCHAR)); - pszString += len+1; + if (headers[i] == '\n') + headers[i] = 0; } - *pszString = '\0'; - TRACE("returning data: %s\n", debugstr_wn(lpBuffer, size)); + memcpy(lpBuffer, headers, len + sizeof(WCHAR)); } - *lpdwBufferLength = size * sizeof(WCHAR); - HTTP_FreeTokens(ppszRawHeaderLines); + *lpdwBufferLength = len - sizeof(WCHAR); + heap_free(headers); return ERROR_SUCCESS; } case HTTP_QUERY_STATUS_TEXT:

1 0