wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Hans Leidekker : msi: Make sure to keep a reference to custom action data until the actions are finished .
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: cd4432bc9bd4168eba4d1f8e414313f265473133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4432bc9bd4168eba4d1f8e4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 6 13:13:21 2011 +0100 msi: Make sure to keep a reference to custom action data until the actions are finished. --- dlls/msi/custom.c | 39 ++++++++++++--------------------------- 1 files changed, 12 insertions(+), 27 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 3b8e677..cb7461b 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -734,7 +734,6 @@ static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source, msi_custom_action_info *info; WCHAR package_path[MAX_PATH]; DWORD size; - UINT r; size = MAX_PATH; msi_get_property(package->db, szSourceDir, package_path, &size); @@ -744,10 +743,7 @@ static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source, TRACE("Installing package %s concurrently\n", debugstr_w(package_path)); info = do_msidbCAConcurrentInstall(package, type, package_path, target, action); - - r = wait_thread_handle(info); - release_custom_action_data( info ); - return r; + return wait_thread_handle(info); } static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, @@ -755,7 +751,6 @@ static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, { msi_custom_action_info *info; MSIBINARY *binary; - UINT r; if (!(binary = get_temp_binary( package, source, TRUE ))) return ERROR_FUNCTION_FAILED; @@ -763,10 +758,7 @@ static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, TRACE("Calling function %s from %s\n", debugstr_w(target), debugstr_w(binary->tmpfile)); info = do_msidbCustomActionTypeDll( package, type, binary->tmpfile, target, action ); - - r = wait_thread_handle( info ); - release_custom_action_data( info ); - return r; + return wait_thread_handle( info ); } static HANDLE execute_command( const WCHAR *app, WCHAR *arg, const WCHAR *dir ) @@ -860,7 +852,6 @@ static UINT HANDLE_CustomType17(MSIPACKAGE *package, LPCWSTR source, { msi_custom_action_info *info; MSIFILE *file; - UINT r; TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); @@ -872,10 +863,7 @@ static UINT HANDLE_CustomType17(MSIPACKAGE *package, LPCWSTR source, } info = do_msidbCustomActionTypeDll( package, type, file->TargetPath, target, action ); - - r = wait_thread_handle( info ); - release_custom_action_data( info ); - return r; + return wait_thread_handle( info ); } static UINT HANDLE_CustomType18(MSIPACKAGE *package, LPCWSTR source, @@ -1046,16 +1034,12 @@ static msi_custom_action_info *do_msidbCustomActionTypeScript( static UINT HANDLE_CustomType37_38(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { - UINT r; msi_custom_action_info *info; TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); info = do_msidbCustomActionTypeScript( package, type, target, NULL, action ); - - r = wait_thread_handle( info ); - release_custom_action_data( info ); - return r; + return wait_thread_handle( info ); } static UINT HANDLE_CustomType5_6(MSIPACKAGE *package, LPCWSTR source, @@ -1098,7 +1082,6 @@ static UINT HANDLE_CustomType5_6(MSIPACKAGE *package, LPCWSTR source, info = do_msidbCustomActionTypeScript( package, type, bufferw, target, action ); r = wait_thread_handle( info ); - release_custom_action_data( info ); done: msi_free(bufferw); @@ -1158,7 +1141,6 @@ static UINT HANDLE_CustomType21_22(MSIPACKAGE *package, LPCWSTR source, } info = do_msidbCustomActionTypeScript( package, type, bufferw, target, action ); r = wait_thread_handle( info ); - release_custom_action_data( info ); done: msi_free(bufferw); @@ -1171,7 +1153,6 @@ static UINT HANDLE_CustomType53_54(MSIPACKAGE *package, LPCWSTR source, { msi_custom_action_info *info; WCHAR *prop; - UINT r; TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); @@ -1180,9 +1161,7 @@ static UINT HANDLE_CustomType53_54(MSIPACKAGE *package, LPCWSTR source, info = do_msidbCustomActionTypeScript( package, type, prop, NULL, action ); msi_free(prop); - r = wait_thread_handle( info ); - release_custom_action_data( info ); - return r; + return wait_thread_handle( info ); } UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL execute) @@ -1404,8 +1383,14 @@ void ACTION_FinishCustomActions(const MSIPACKAGE* package) msi_dialog_check_messages( wait_handles[i] ); CloseHandle( wait_handles[i] ); } - msi_free( wait_handles ); + + EnterCriticalSection( &msi_custom_action_cs ); + LIST_FOR_EACH_ENTRY_SAFE( info, cursor, &msi_pending_custom_actions, msi_custom_action_info, entry ) + { + if (info->package == package) release_custom_action_data( info ); + } + LeaveCriticalSection( &msi_custom_action_cs ); } typedef struct _msi_custom_remote_impl {

1 0

Hans Leidekker : user32: Add stub implementations of MessageBoxTimeoutA/W.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: e54ab7a8b6edbffe5ef642f9258f84baafbe59fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e54ab7a8b6edbffe5ef642f92… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 6 13:12:57 2011 +0100 user32: Add stub implementations of MessageBoxTimeoutA/W. --- dlls/user32/msgbox.c | 20 ++++++++++++++++++++ dlls/user32/user32.spec | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index fe72166..91437bc 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -454,6 +454,26 @@ INT WINAPI MessageBoxExW( HWND hWnd, LPCWSTR text, LPCWSTR title, } /************************************************************************** + * MessageBoxTimeoutA (USER32.@) + */ +INT WINAPI MessageBoxTimeoutA( HWND hWnd, LPCSTR text, LPCSTR title, + UINT type, WORD langid, DWORD timeout ) +{ + FIXME("timeout not supported (%u)\n", timeout); + return MessageBoxExA( hWnd, text, title, type, langid ); +} + +/************************************************************************** + * MessageBoxTimeoutW (USER32.@) + */ +INT WINAPI MessageBoxTimeoutW( HWND hWnd, LPCWSTR text, LPCWSTR title, + UINT type, WORD langid, DWORD timeout ) +{ + FIXME("timeout not supported (%u)\n", timeout); + return MessageBoxExW( hWnd, text, title, type, langid ); +} + +/************************************************************************** * MessageBoxIndirectA (USER32.@) */ INT WINAPI MessageBoxIndirectA( LPMSGBOXPARAMSA msgbox ) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 104ca86..d5c123c 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -498,8 +498,8 @@ @ stdcall MessageBoxExW(long wstr wstr long long) @ stdcall MessageBoxIndirectA(ptr) @ stdcall MessageBoxIndirectW(ptr) -# @ stub MessageBoxTimeoutA -# @ stub MessageBoxTimeoutW +@ stdcall MessageBoxTimeoutA(long str str long long long) +@ stdcall MessageBoxTimeoutW(long wstr wstr long long long) @ stdcall MessageBoxW(long wstr wstr long) # @ stub ModifyAccess @ stdcall ModifyMenuA(long long long long ptr)

1 0

Piotr Caban : msvcp90: Added _Getctype implementation.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: c56c74331c337e7ec2ba0142d328b577b274375c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56c74331c337e7ec2ba0142d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:49:52 2011 +0100 msvcp90: Added _Getctype implementation. --- dlls/msvcp90/locale.c | 27 +++++++++++++++++++++++---- dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/tests/misc.c | 37 ++++++++++++++++++++++++++++++++++++- 3 files changed, 60 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index a319d12..2fd3bd1 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -68,7 +68,7 @@ typedef struct { typedef struct { LCID handle; unsigned page; - const short *table; + short *table; int delfl; } _Ctypevec; @@ -868,14 +868,33 @@ _Collvec __thiscall _Locinfo__Getcoll(const _Locinfo *this) return _Getcoll(); } +/* _Getctype */ +_Ctypevec __cdecl _Getctype(void) +{ + _Ctypevec ret; + _locale_t locale = _get_current_locale(); + + TRACE("\n"); + + ret.page = locale->locinfo->lc_codepage; + ret.handle = locale->locinfo->lc_handle[LC_COLLATE]; + ret.delfl = TRUE; + ret.table = malloc(sizeof(short[256])); + if(!ret.table) { + _free_locale(locale); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + memcpy(ret.table, locale->locinfo->pctype, sizeof(short[256])); + _free_locale(locale); + return ret; +} + /* ?_Getctype@_Locinfo@std@@QBE?AU_Ctypevec@@XZ */ /* ?_Getctype@_Locinfo@std@@QEBA?AU_Ctypevec@@XZ */ DEFINE_THISCALL_WRAPPER_RETPTR(_Locinfo__Getctype, 4) _Ctypevec __thiscall _Locinfo__Getctype(const _Locinfo *this) { - _Ctypevec ret = { 0 }; /* FIXME */ - FIXME("(%p) stub\n", this); - return ret; + return _Getctype(); } /* ?_Getcvt@_Locinfo@std@@QBE?AU_Cvtvec@@XZ */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 2464328..bcaaa1c 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5751,7 +5751,7 @@ @ extern _FSnan # extern _FXbig @ cdecl _Getcoll() -@ stub _Getctype +@ cdecl _Getctype() @ stub _Getcvt @ stub _Getdateorder @ stub _Getwctype diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 069c935..221edf1 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -17,12 +17,22 @@ */ #include <stdio.h> +#include <locale.h> #include <windef.h> #include <winbase.h> #include "wine/test.h" +typedef struct { + LCID handle; + unsigned page; + short *table; + int delfl; +} MSVCP__Ctypevec; + static void* (__cdecl *p_set_invalid_parameter_handler)(void*); +static _locale_t (__cdecl *p__get_current_locale)(void); +static void (__cdecl *p_free)(void*); static void (__cdecl *p_char_assign)(void*, const void*); static void (__cdecl *p_wchar_assign)(void*, const void*); @@ -35,6 +45,7 @@ static BYTE (__cdecl *p_short_eq)(const void*, const void*); static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); +static MSVCP__Ctypevec (__cdecl *p__Getctype)(void); #ifdef __i386__ #define __thiscall __stdcall @@ -119,7 +130,9 @@ static BOOL init(void) } p_set_invalid_parameter_handler = (void*)GetProcAddress(msvcr, "_set_invalid_parameter_handler"); - if(!p_set_invalid_parameter_handler) { + p__get_current_locale = (void*)GetProcAddress(msvcr, "_get_current_locale"); + p_free = (void*)GetProcAddress(msvcr, "free"); + if(!p_set_invalid_parameter_handler || !p__get_current_locale || !p_free) { win_skip("Error setting tests environment\n"); return FALSE; } @@ -127,6 +140,7 @@ static BOOL init(void) p_set_invalid_parameter_handler(test_invalid_parameter_handler); SET(p_wctype, "wctype"); + SET(p__Getctype, "_Getctype"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_char_assign, "?assign@?$char_traits@D@std@@SAXAEADAEBD@Z"); SET(p_wchar_assign, "?assign@?$char_traits@_W@std@@SAXAEA_WAEB_W@Z"); @@ -291,6 +305,26 @@ static void test_wctype(void) } } +static void test__Getctype(void) +{ + MSVCP__Ctypevec ret; + + ret = p__Getctype(); + ok(ret.handle == 0, "ret.handle = %d\n", ret.handle); + ok(ret.page == 0, "ret.page = %d\n", ret.page); + ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl); + ok(ret.table[0] == 32, "ret.table[0] = %d\n", ret.table[0]); + p_free(ret.table); + + p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 1; + ret = p__Getctype(); + ok(ret.handle == 1, "ret.handle = %d\n", ret.handle); + ok(ret.page == 0, "ret.page = %d\n", ret.page); + ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl); + ok(ret.table[0] == 32, "ret.table[0] = %d\n", ret.table[0]); + p_free(ret.table); +} + static void test_allocator_char(void) { void *allocator = (void*)0xdeadbeef; @@ -331,6 +365,7 @@ START_TEST(misc) test_equal(); test_Copy_s(); test_wctype(); + test__Getctype(); test_allocator_char();

1 0

Piotr Caban : msvcp90: Added _Getcoll implementation.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 34d947189a665152de54dd8874aedfab31e1b3f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d947189a665152de54dd887… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:49:16 2011 +0100 msvcp90: Added _Getcoll implementation. --- dlls/msvcp90/locale.c | 18 +++++++++++++++--- dlls/msvcp90/msvcp90.spec | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 0cc0c58..a319d12 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -846,14 +846,26 @@ _Locinfo* __thiscall _Locinfo__Addcats(_Locinfo *this, int category, const char return _Locinfo__Locinfo_Addcats(this, category, locstr); } +/* _Getcoll */ +_Collvec __cdecl _Getcoll(void) +{ + _Collvec ret; + _locale_t locale = _get_current_locale(); + + TRACE("\n"); + + ret.page = locale->locinfo->lc_collate_cp; + ret.handle = locale->locinfo->lc_handle[LC_COLLATE]; + _free_locale(locale); + return ret; +} + /* ?_Getcoll@_Locinfo@std@@QBE?AU_Collvec@@XZ */ /* ?_Getcoll@_Locinfo@std@@QEBA?AU_Collvec@@XZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getcoll, 4) _Collvec __thiscall _Locinfo__Getcoll(const _Locinfo *this) { - _Collvec ret = { 0 }; /* FIXME */ - FIXME("(%p) stub\n", this); - return ret; + return _Getcoll(); } /* ?_Getctype@_Locinfo@std@@QBE?AU_Ctypevec@@XZ */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 43cc50e..2464328 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5750,7 +5750,7 @@ @ stub _FSinh @ extern _FSnan # extern _FXbig -@ stub _Getcoll +@ cdecl _Getcoll() @ stub _Getctype @ stub _Getcvt @ stub _Getdateorder

1 0

Piotr Caban : msvcp90: Added _Locinfo::_Addcats partial implementation.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: bff3f0cd3c75253c6163e6e698026c7948d94e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff3f0cd3c75253c6163e6e69… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:49:01 2011 +0100 msvcp90: Added _Locinfo::_Addcats partial implementation. --- dlls/msvcp90/locale.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 2614724..0cc0c58 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -814,8 +814,28 @@ void __thiscall _Locinfo_dtor(_Locinfo *this) /* ?_Locinfo_Addcats@_Locinfo@std@@SAAEAV12@PEAV12@HPEBD@Z */ _Locinfo* __cdecl _Locinfo__Locinfo_Addcats(_Locinfo *locinfo, int category, const char *locstr) { - FIXME("%p %d %s) stub\n", locinfo, category, locstr); - return NULL; + const char *locale = NULL; + + /* This function is probably modifying more global objects */ + FIXME("(%p %d %s) semi-stub\n", locinfo, category, locstr); + if(!locstr) + throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); + + _Lockit_ctor_locktype(&locinfo->lock, _LOCK_LOCALE); + MSVCP_basic_string_char_dtor(&locinfo->newlocname); + + if(category) + locale = setlocale(LC_ALL, locstr); + else + locale = setlocale(LC_ALL, NULL); + + if(locale) + MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, locale); + else + MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, "*"); + _Lockit_dtor(&locinfo->lock); + + return locinfo; } /* ?_Addcats@_Locinfo@std@@QAEAAV12@HPBD@Z */ @@ -823,8 +843,7 @@ _Locinfo* __cdecl _Locinfo__Locinfo_Addcats(_Locinfo *locinfo, int category, con DEFINE_THISCALL_WRAPPER(_Locinfo__Addcats, 12) _Locinfo* __thiscall _Locinfo__Addcats(_Locinfo *this, int category, const char *locstr) { - FIXME("(%p %d %s) stub\n", this, category, locstr); - return NULL; + return _Locinfo__Locinfo_Addcats(this, category, locstr); } /* ?_Getcoll@_Locinfo@std@@QBE?AU_Collvec@@XZ */

1 0

Piotr Caban : msvcp90: Added _Locinfo constructor implementation.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: e97578e4071831dcc2380802c1aae2dac2ff8a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e97578e4071831dcc2380802c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:48:46 2011 +0100 msvcp90: Added _Locinfo constructor implementation. --- dlls/msvcp90/locale.c | 84 ++++++++++++++++++++++++++++++----------------- dlls/msvcp90/msvcp90.h | 2 +- dlls/msvcp90/string.c | 4 +- 3 files changed, 56 insertions(+), 34 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index e928d3e..2614724 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -712,29 +712,35 @@ void* __thiscall _Timevec__Getptr(_Timevec *this) return this->timeptr; } -/* ?_Locinfo_ctor@_Locinfo@std@@SAXPAV12@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z */ -/* ?_Locinfo_ctor@_Locinfo@std@@SAXPEAV12@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z */ -_Locinfo* __cdecl _Locinfo__Locinfo_ctor_bstr(_Locinfo *locinfo, const basic_string_char *locstr) -{ - FIXME("(%p %p) stub\n", locinfo, locstr); - return NULL; -} - -/* ??0_Locinfo@std@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z */ -/* ??0_Locinfo@std@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z */ -DEFINE_THISCALL_WRAPPER(_Locinfo_ctor_bstr, 8) -_Locinfo* __thiscall _Locinfo_ctor_bstr(_Locinfo *this, const basic_string_char *locstr) -{ - FIXME("(%p %p) stub\n", this, locstr); - return NULL; -} - /* ?_Locinfo_ctor@_Locinfo@std@@SAXPAV12@HPBD@Z */ /* ?_Locinfo_ctor@_Locinfo@std@@SAXPEAV12@HPEBD@Z */ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cat_cstr(_Locinfo *locinfo, int category, const char *locstr) { - FIXME("(%p %d %s) stub\n", locinfo, category, locstr); - return NULL; + const char *locale = NULL; + + /* This function is probably modifying more global objects */ + FIXME("(%p %d %s) semi-stub\n", locinfo, category, locstr); + + if(!locstr) + throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); + + _Lockit_ctor_locktype(&locinfo->lock, _LOCK_LOCALE); + MSVCP_basic_string_char_ctor_cstr(&locinfo->days, ""); + MSVCP_basic_string_char_ctor_cstr(&locinfo->months, ""); + MSVCP_basic_string_char_ctor_cstr(&locinfo->oldlocname, setlocale(LC_ALL, NULL)); + + if(category) + locale = setlocale(LC_ALL, locstr); + else + locale = setlocale(LC_ALL, NULL); + + if(locale) + MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, locale); + else + MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, "*"); + _Lockit_dtor(&locinfo->lock); + + return locinfo; } /* ??0_Locinfo@std@@QAE@HPBD@Z */ @@ -742,16 +748,29 @@ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cat_cstr(_Locinfo *locinfo, int categor DEFINE_THISCALL_WRAPPER(_Locinfo_ctor_cat_cstr, 12) _Locinfo* __thiscall _Locinfo_ctor_cat_cstr(_Locinfo *this, int category, const char *locstr) { - FIXME("(%p %d %s) stub\n", this, category, locstr); - return NULL; + return _Locinfo__Locinfo_ctor_cat_cstr(this, category, locstr); +} + +/* ?_Locinfo_ctor@_Locinfo@std@@SAXPAV12@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z */ +/* ?_Locinfo_ctor@_Locinfo@std@@SAXPEAV12@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z */ +_Locinfo* __cdecl _Locinfo__Locinfo_ctor_bstr(_Locinfo *locinfo, const basic_string_char *locstr) +{ + return _Locinfo__Locinfo_ctor_cat_cstr(locinfo, 1/*FIXME*/, MSVCP_basic_string_char_c_str(locstr)); +} + +/* ??0_Locinfo@std@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z */ +/* ??0_Locinfo@std@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z */ +DEFINE_THISCALL_WRAPPER(_Locinfo_ctor_bstr, 8) +_Locinfo* __thiscall _Locinfo_ctor_bstr(_Locinfo *this, const basic_string_char *locstr) +{ + return _Locinfo__Locinfo_ctor_cat_cstr(this, 1/*FIXME*/, MSVCP_basic_string_char_c_str(locstr)); } /* ?_Locinfo_ctor@_Locinfo@std@@SAXPAV12@PBD@Z */ /* ?_Locinfo_ctor@_Locinfo@std@@SAXPEAV12@PEBD@Z */ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cstr(_Locinfo *locinfo, const char *locstr) { - FIXME("(%p %s) stub\n", locinfo, locstr); - return NULL; + return _Locinfo__Locinfo_ctor_cat_cstr(locinfo, 1/*FIXME*/, locstr); } /* ??0_Locinfo@std@@QAE@PBD@Z */ @@ -759,16 +778,20 @@ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cstr(_Locinfo *locinfo, const char *loc DEFINE_THISCALL_WRAPPER(_Locinfo_ctor_cstr, 8) _Locinfo* __thiscall _Locinfo_ctor_cstr(_Locinfo *this, const char *locstr) { - FIXME("(%p %s) stub\n", this, locstr); - return NULL; + return _Locinfo__Locinfo_ctor_cat_cstr(this, 1/*FIXME*/, locstr); } /* ?_Locinfo_dtor@_Locinfo@std@@SAXPAV12@@Z */ /* ?_Locinfo_dtor@_Locinfo@std@@SAXPEAV12@@Z */ -_Locinfo* __cdecl _Locinfo__Locinfo_dtor(_Locinfo *locinfo) +void __cdecl _Locinfo__Locinfo_dtor(_Locinfo *locinfo) { - FIXME("(%p) stub\n", locinfo); - return NULL; + TRACE("(%p)\n", locinfo); + + setlocale(LC_ALL, MSVCP_basic_string_char_c_str(&locinfo->oldlocname)); + MSVCP_basic_string_char_dtor(&locinfo->days); + MSVCP_basic_string_char_dtor(&locinfo->months); + MSVCP_basic_string_char_dtor(&locinfo->oldlocname); + MSVCP_basic_string_char_dtor(&locinfo->newlocname); } /* ??_F_Locinfo@std@@QAEXXZ */ @@ -776,8 +799,7 @@ _Locinfo* __cdecl _Locinfo__Locinfo_dtor(_Locinfo *locinfo) DEFINE_THISCALL_WRAPPER(_Locinfo_ctor, 4) _Locinfo* __thiscall _Locinfo_ctor(_Locinfo *this) { - FIXME("(%p) stub\n", this); - return NULL; + return _Locinfo__Locinfo_ctor_cat_cstr(this, 1/*FIXME*/, "C"); } /* ??1_Locinfo@std@@QAE@XZ */ @@ -785,7 +807,7 @@ _Locinfo* __thiscall _Locinfo_ctor(_Locinfo *this) DEFINE_THISCALL_WRAPPER(_Locinfo_dtor, 4) void __thiscall _Locinfo_dtor(_Locinfo *this) { - FIXME("(%p) stub\n", this); + _Locinfo__Locinfo_dtor(this); } /* ?_Locinfo_Addcats@_Locinfo@std@@SAAAV12@PAV12@HPBD@Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 72e5d11..ed66d23 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -172,7 +172,7 @@ typedef struct _basic_string_char basic_string_char* __stdcall MSVCP_basic_string_char_ctor_cstr(basic_string_char*, const char*); basic_string_char* __stdcall MSVCP_basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*); void __stdcall MSVCP_basic_string_char_dtor(basic_string_char*); -const char* __stdcall MSVCP_basic_string_char_c_str(basic_string_char*); +const char* __stdcall MSVCP_basic_string_char_c_str(const basic_string_char*); #define BUF_SIZE_WCHAR 8 typedef struct _basic_string_wchar diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 19459c1..906a99c 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -882,7 +882,7 @@ MSVCP_size_t __thiscall basic_string_char_copy(const basic_string_char *this, /* ?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ */ /* ?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_c_str, 4) -const char* __thiscall MSVCP_basic_string_char_c_str(basic_string_char *this) +const char* __thiscall MSVCP_basic_string_char_c_str(const basic_string_char *this) { TRACE("%p\n", this); return basic_string_char_const_ptr(this); @@ -2724,7 +2724,7 @@ MSVCP_size_t __thiscall basic_string_wchar_copy(const basic_string_wchar *this, /* ?data@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEPBGXZ */ /* ?data@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAPEBGXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_c_str, 4) -const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(basic_string_wchar *this) +const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(const basic_string_wchar *this) { TRACE("%p\n", this); return basic_string_wchar_const_ptr(this);

1 0

Piotr Caban : include: Update msvcrt/locale.h.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: f4518b9a543d0f87b7303e918fb04d2f7758a04e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4518b9a543d0f87b7303e918… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:48:31 2011 +0100 include: Update msvcrt/locale.h. --- include/msvcrt/locale.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/locale.h b/include/msvcrt/locale.h index 2b97c54..5e0dd35 100644 --- a/include/msvcrt/locale.h +++ b/include/msvcrt/locale.h @@ -63,6 +63,10 @@ extern "C" { char* __cdecl setlocale(int,const char*); struct lconv* __cdecl localeconv(void); +int __cdecl _configthreadlocale(int); +_locale_t __cdecl _get_current_locale(void); +_locale_t __cdecl _create_locale(int, const char*); +void __cdecl _free_locale(_locale_t); #ifndef _WLOCALE_DEFINED #define _WLOCALE_DEFINED

1 0

Piotr Caban : msvcrt: Fix lc_collate_cp initialization.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: dbff7a1ca2872cc305133d400891ff99b845b8da URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbff7a1ca2872cc305133d400… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:48:09 2011 +0100 msvcrt: Fix lc_collate_cp initialization. --- dlls/msvcrt/locale.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 6bb6162..6893685 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -789,6 +789,8 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) MSVCRT__free_locale(loc); return NULL; } + + loc->locinfo->lc_collate_cp = loc->locinfo->lc_id[MSVCRT_LC_COLLATE].wCodePage; } else loc->locinfo->lc_category[MSVCRT_LC_COLLATE].locale = MSVCRT__strdup("C"); @@ -802,7 +804,6 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) } loc->locinfo->lc_codepage = loc->locinfo->lc_id[MSVCRT_LC_CTYPE].wCodePage; - loc->locinfo->lc_collate_cp = loc->locinfo->lc_codepage; loc->locinfo->lc_clike = 1; if(!GetCPInfo(loc->locinfo->lc_codepage, &cp)) { MSVCRT__free_locale(loc); @@ -1155,6 +1156,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) switch(category) { case MSVCRT_LC_ALL: case MSVCRT_LC_COLLATE: + locinfo->lc_collate_cp = loc->locinfo->lc_collate_cp; locinfo->lc_handle[MSVCRT_LC_COLLATE] = loc->locinfo->lc_handle[MSVCRT_LC_COLLATE]; swap_pointers((void**)&locinfo->lc_category[MSVCRT_LC_COLLATE].locale, @@ -1174,7 +1176,6 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) (void**)&loc->locinfo->lc_category[MSVCRT_LC_CTYPE].refcount); locinfo->lc_codepage = loc->locinfo->lc_codepage; - locinfo->lc_collate_cp = loc->locinfo->lc_collate_cp; locinfo->lc_clike = loc->locinfo->lc_clike; locinfo->mb_cur_max = loc->locinfo->mb_cur_max;

1 0

Piotr Caban : msvcrt: Added _get_current_locale implementation.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: f84858ac2c2e31bfa0bf90af4b1f7f4df20491b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f84858ac2c2e31bfa0bf90af4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:47:54 2011 +0100 msvcrt: Added _get_current_locale implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/locale.c | 24 ++++++++++++++++++++++-- dlls/msvcrt/msvcrt.spec | 1 + 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1760a1a..38ec0e1 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -675,7 +675,7 @@ @ varargs _fwscanf_s_l(ptr wstr ptr) msvcrt._fwscanf_s_l @ cdecl _gcvt(double long str) msvcrt._gcvt @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s -@ stub _get_current_locale +@ cdecl _get_current_locale() msvcrt._get_current_locale @ stub _get_daylight @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 503864f..a083053 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -517,7 +517,7 @@ @ cdecl _gcvt(double long str) msvcrt._gcvt @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ stub _get_amblksiz -@ stub _get_current_locale +@ cdecl _get_current_locale() msvcrt._get_current_locale @ stub _get_daylight @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 7976a0f..475e3a9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -512,7 +512,7 @@ @ cdecl _gcvt(double long str) msvcrt._gcvt @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ stub _get_amblksiz -@ stub _get_current_locale +@ cdecl _get_current_locale() msvcrt._get_current_locale @ stub _get_daylight @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 44fdf7c..6bb6162 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -603,6 +603,9 @@ void free_locinfo(MSVCRT_pthreadlocinfo locinfo) if(!locinfo) return; + if(InterlockedDecrement(&locinfo->refcount)) + return; + for(i=MSVCRT_LC_MIN+1; i<=MSVCRT_LC_MAX; i++) { MSVCRT_free(locinfo->lc_category[i].locale); MSVCRT_free(locinfo->lc_category[i].refcount); @@ -640,9 +643,26 @@ void free_mbcinfo(MSVCRT_pthreadmbcinfo mbcinfo) if(!mbcinfo) return; + if(InterlockedDecrement(&mbcinfo->refcount)) + return; + MSVCRT_free(mbcinfo); } +/* _get_current_locale - not exported in native msvcrt */ +MSVCRT__locale_t CDECL MSVCRT__get_current_locale(void) +{ + MSVCRT__locale_t loc = MSVCRT_malloc(sizeof(MSVCRT__locale_tstruct)); + if(!loc) + return NULL; + + loc->locinfo = get_locinfo(); + loc->mbcinfo = get_mbcinfo(); + InterlockedIncrement(&loc->locinfo->refcount); + InterlockedIncrement(&loc->mbcinfo->refcount); + return loc; +} + /* _free_locale - not exported in native msvcrt */ void CDECL MSVCRT__free_locale(MSVCRT__locale_t locale) { @@ -747,6 +767,8 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) } memset(loc->locinfo, 0, sizeof(MSVCRT_threadlocinfo)); + loc->locinfo->refcount = 1; + loc->mbcinfo->refcount = 1; loc->locinfo->lconv = MSVCRT_malloc(sizeof(struct MSVCRT_lconv)); if(!loc->locinfo->lconv) { @@ -762,8 +784,6 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) return NULL; } - loc->locinfo->refcount = 1; - if(lcid[MSVCRT_LC_COLLATE] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_COLLATE)) { if(update_threadlocinfo_category(lcid[MSVCRT_LC_COLLATE], loc, MSVCRT_LC_COLLATE)) { MSVCRT__free_locale(loc); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index dfd3a07..75a3b35 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1490,6 +1490,7 @@ @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ cdecl _configthreadlocale(long) @ cdecl _create_locale(long str) MSVCRT__create_locale +@ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _dupenv_s(ptr ptr str) @ cdecl _free_locale(ptr) MSVCRT__free_locale @ cdecl _get_invalid_parameter_handler()

1 0

Alexandre Julliard : winex11: Allow the visible region to be zero when not clipping.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 8d6354c5b23bc2e5d1b0ebdb03583b1bd0c93353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6354c5b23bc2e5d1b0ebdb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 14:00:14 2011 +0100 winex11: Allow the visible region to be zero when not clipping. --- dlls/winex11.drv/bitblt.c | 5 +-- dlls/winex11.drv/graphics.c | 78 ++++++++++++++++++++++++++---------------- dlls/winex11.drv/text.c | 6 ++-- dlls/winex11.drv/x11drv.h | 4 +- dlls/winex11.drv/xrender.c | 75 +++++++++++++++++++++++++---------------- 5 files changed, 101 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d6354c5b23bc2e5d1b0e…

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2011