wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Detlef Riekenberg : ntprint: Do not fail when the spooler service was stopped.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 0e997674c57f0effa93c7502eb5b1f4e06e5f6e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e997674c57f0effa93c7502e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 12 21:56:06 2012 +0200 ntprint: Do not fail when the spooler service was stopped. --- dlls/ntprint/tests/ntprint.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ntprint/tests/ntprint.c b/dlls/ntprint/tests/ntprint.c index cf9853d..7e1ab58 100644 --- a/dlls/ntprint/tests/ntprint.c +++ b/dlls/ntprint/tests/ntprint.c @@ -70,6 +70,10 @@ static void test_PSetupCreateMonitorInfo(VOID) SetLastError(0xdeadbeef); mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL); + if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { + win_skip("The Service 'Spooler' is required for many test\n"); + return; + } ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); if (mi) pPSetupDestroyMonitorInfo(mi); @@ -96,6 +100,10 @@ static void test_PSetupDestroyMonitorInfo(VOID) SetLastError(0xdeadbeef); mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL); + if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { + win_skip("The Service 'Spooler' is required for many test\n"); + return; + } ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); if (!mi) return;

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 034de95550be8518fce566041a225434ed3ef26c URL: http://source.winehq.org/git/wine.git/?a=commit;h=034de95550be8518fce566041… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:14:30 2012 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 262 ++++++++++++------------ dlls/msvcp70/msvcp70.spec | 374 +++++++++++++++++----------------- dlls/msvcp71/msvcp71.spec | 406 +++++++++++++++++++------------------- dlls/msvcp80/msvcp80.spec | 462 +++++++++++++++++++++--------------------- 4 files changed, 752 insertions(+), 752 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=034de95550be8518fce56…

1 0

Piotr Caban : msvcp90: Added basic_istream<char>::getline(basic_string<char >) implementation.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 0db98a30b99bcfc6135a4608d7bb34f61af375d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0db98a30b99bcfc6135a4608d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:14:09 2012 +0200 msvcp90: Added basic_istream<char>::getline(basic_string<char>) implementation. --- dlls/msvcp90/ios.c | 33 +++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 2 ++ dlls/msvcp90/msvcp90.spec | 8 ++++---- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 8f4c216..97edacf 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -4630,6 +4630,39 @@ basic_istream_char* __thiscall basic_istream_char_read_bool(basic_istream_char * return NULL; } +/* ??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@D@Z */ +/* ??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@D@Z */ +basic_istream_char* __cdecl basic_istream_char_getline_str_delim( + basic_istream_char *istream, basic_string_char *str, char delim) +{ + IOSB_iostate state = IOSTATE_failbit; + int c; + + TRACE("(%p %p %c)\n", istream, str, delim); + + if(basic_istream_char_sentry_create(istream, TRUE)) { + MSVCP_basic_string_char_clear(str); + + for(c = basic_istream_char_get(istream); c!=delim && c!=EOF; + c = basic_istream_char_get(istream)) { + state = IOSTATE_goodbit; + MSVCP_basic_string_char_append_ch(str, c); + } + } + basic_istream_char_sentry_destroy(istream); + + basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), state); + return istream; +} + +/* ??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ +/* ??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ +basic_istream_char* __cdecl basic_istream_char_getline_str( + basic_istream_char *istream, basic_string_char *str) +{ + return basic_istream_char_getline_str_delim(istream, str, '\n'); +} + /* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@XZ */ /* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_ctor, 8) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index ba5b0a7..5ca938c 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -247,6 +247,8 @@ basic_string_char* __stdcall MSVCP_basic_string_char_ctor_cstr(basic_string_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(const basic_string_char*); +void __thiscall MSVCP_basic_string_char_clear(basic_string_char*); +basic_string_char* __thiscall MSVCP_basic_string_char_append_ch(basic_string_char*, char); #define BUF_SIZE_WCHAR 8 typedef struct _basic_string_wchar diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 03e6c1a..0a6b24a 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -386,10 +386,10 @@ @ stub -arch=win64 ??$exp@N@std@@YA?AV?$complex@N@0@AEBV10@@Z @ stub -arch=win32 ??$exp@O@std@@YA?AV?$complex@O@0@ABV10@@Z @ stub -arch=win64 ??$exp@O@std@@YA?AV?$complex@O@0@AEBV10@@Z -@ stub -arch=win32 ??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z -@ stub -arch=win64 ??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z -@ stub -arch=win32 ??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@D@Z -@ stub -arch=win64 ??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@D@Z +@ cdecl -arch=win32 ??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z(ptr ptr) basic_istream_char_getline_str +@ cdecl -arch=win64 ??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z(ptr ptr) basic_istream_char_getline_str +@ cdecl -arch=win32 ??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@D@Z(ptr ptr long) basic_istream_char_getline_str_delim +@ cdecl -arch=win64 ??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@D@Z(ptr ptr long) basic_istream_char_getline_str_delim @ stub -arch=win32 ??$getline@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z @ stub -arch=win64 ??$getline@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z @ stub -arch=win32 ??$getline@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@G@Z

1 0

Piotr Caban : msvcp90: Added basic_ifstream<char> implementation.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 5b0548cc3ee525b59ac79c7a7f92ab6073ca24fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0548cc3ee525b59ac79c7a7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:13:50 2012 +0200 msvcp90: Added basic_ifstream<char> implementation. --- dlls/msvcp90/ios.c | 221 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 68 +++++++------- 2 files changed, 255 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b0548cc3ee525b59ac79…

1 0

Piotr Caban : msvcp90: Accept more base classes in DEFINE_RTTI_DATA macro.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 8d39c7d8899d224174bee692934ab34eada9b69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d39c7d8899d224174bee6929… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:13:27 2012 +0200 msvcp90: Accept more base classes in DEFINE_RTTI_DATA macro. --- dlls/msvcp90/exception.c | 18 +++++++++--------- dlls/msvcp90/ios.c | 30 +++++++++++++++--------------- dlls/msvcp90/locale.c | 32 ++++++++++++++++---------------- dlls/msvcp90/msvcp90.h | 18 +++++++++++++++--- 4 files changed, 55 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d39c7d8899d224174bee…

1 0

Piotr Caban : msvcp90: Added basic_filebuf<char> implementation.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 9f9a4a18d1fecadba589e7b7cf7f601e08ea8503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9a4a18d1fecadba589e7b7c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:13:06 2012 +0200 msvcp90: Added basic_filebuf<char> implementation. --- dlls/msvcp90/ios.c | 576 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/locale.c | 17 +-- dlls/msvcp90/msvcp90.h | 26 ++ dlls/msvcp90/msvcp90.spec | 102 ++++---- 4 files changed, 653 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f9a4a18d1fecadba589e…

1 0

Piotr Caban : msvcp90: Added locale::global implementation.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 65db238da0bd62bd830d4867abef6c921f3e04f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65db238da0bd62bd830d4867a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:12:51 2012 +0200 msvcp90: Added locale::global implementation. --- dlls/msvcp90/locale.c | 27 +++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 4 ++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f5fec45..ca8001b 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4614,6 +4614,33 @@ basic_string_char* __thiscall locale_name(const locale *this, basic_string_char return ret; } +/* ?global@locale@std@@SA?AV12@ABV12@@Z */ +/* ?global@locale@std@@SA?AV12@AEBV12@@Z */ +locale* __cdecl locale_global(locale *ret, const locale *loc) +{ + _Lockit lock; + int i; + + TRACE("(%p %p)\n", loc, ret); + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + locale_ctor(ret); + + if(loc->ptr != global_locale) { + locale_facet__Decref(&global_locale->facet); + global_locale = loc->ptr; + locale_facet__Incref(&global_locale->facet); + + for(i=LC_ALL+1; i<=LC_MAX; i++) { + if((global_locale->catmask & (1<<(i-1))) == 0) + continue; + setlocale(i, MSVCP_basic_string_char_c_str(&global_locale->name)); + } + } + _Lockit_dtor(&lock); + return ret; +} + DEFINE_RTTI_DATA(locale_facet, 0, 0, NULL, NULL, NULL, ".?AVfacet@locale@std@@"); DEFINE_RTTI_DATA(collate_char, 0, 1, &locale_facet_rtti_base_descriptor, NULL, NULL, ".?AV?$collate@D@std@@"); DEFINE_RTTI_DATA(collate_wchar, 0, 1, &locale_facet_rtti_base_descriptor, NULL, NULL, ".?AV?$collate@_W@std@@"); diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 880e84d..a823f3f 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -4155,8 +4155,8 @@ @ cdecl -arch=win64 ?getloc@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@QEBA?AVlocale@2@XZ(ptr ptr) basic_streambuf_wchar_getloc @ thiscall -arch=win32 ?getloc@ios_base@std@@QBE?AVlocale@2@XZ(ptr ptr) ios_base_getloc @ cdecl -arch=win64 ?getloc@ios_base@std@@QEBA?AVlocale@2@XZ(ptr ptr) ios_base_getloc -@ stub -arch=win32 ?global@locale@std@@SA?AV12@ABV12@@Z -@ stub -arch=win64 ?global@locale@std@@SA?AV12@AEBV12@@Z +@ cdecl -arch=win32 ?global@locale@std@@SA?AV12@ABV12@@Z(ptr ptr) locale_global +@ cdecl -arch=win64 ?global@locale@std@@SA?AV12@AEBV12@@Z(ptr ptr) locale_global @ thiscall -arch=win32 ?good@ios_base@std@@QBE_NXZ(ptr) ios_base_good @ cdecl -arch=win64 ?good@ios_base@std@@QEBA_NXZ(ptr) ios_base_good @ thiscall -arch=win32 ?gptr@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IBEPADXZ(ptr) basic_streambuf_char_gptr

1 0

Piotr Caban : msvcp90: Added use_facet< codecvt<char> > implementation.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 9c83b6ee42574857d035f1a379cf766003686761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c83b6ee42574857d035f1a37… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:12:32 2012 +0200 msvcp90: Added use_facet< codecvt<char> > implementation. --- dlls/msvcp90/locale.c | 73 +++++++++++++++++++++++++++++++++++++++++++---- dlls/msvcp90/msvcp90.h | 6 ++++ 2 files changed, 72 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 49d864a..f5fec45 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -25,6 +25,8 @@ #include "errno.h" #include "limits.h" +#include "wine/list.h" + #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -37,6 +39,7 @@ char* __cdecl _Getmonths(void); void* __cdecl _Gettnames(void); unsigned int __cdecl ___lc_codepage_func(void); LCID* __cdecl ___lc_handle_func(void); +const locale_facet* __thiscall locale__Getfacet(const locale*, MSVCP_size_t); typedef int category; @@ -44,11 +47,6 @@ typedef struct { MSVCP_size_t id; } locale_id; -typedef struct { - const vtable_ptr *vtable; - MSVCP_size_t refs; -} locale_facet; - typedef struct _locale__Locimp { locale_facet facet; locale_facet **facetvec; @@ -200,6 +198,25 @@ locale_facet* __thiscall MSVCP_locale_facet_vector_dtor(locale_facet *this, unsi return this; } +typedef struct +{ + locale_facet *fac; + struct list entry; +} facets_elem; +static struct list lazy_facets = LIST_INIT(lazy_facets); + +static void locale_facet_register(locale_facet *add) +{ + facets_elem *head = MSVCRT_operator_new(sizeof(*head)); + if(!head) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + + head->fac = add; + list_add_head(&lazy_facets, &head->entry); +} + extern const vtable_ptr MSVCP_locale_facet_vtable; /* ??0id@locale@std@@QAE@I@Z */ @@ -2657,6 +2674,32 @@ MSVCP_size_t __cdecl codecvt_char__Getcat(const locale_facet **facet, const loca return LC_CTYPE; } +codecvt_char* codecvt_char_use_facet(locale *loc) +{ + static codecvt_char *obj = NULL; + + _Lockit lock; + const locale_facet *fac; + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + fac = locale__Getfacet(loc, codecvt_char_id.id); + if(fac) { + _Lockit_dtor(&lock); + return (codecvt_char*)fac; + } + + if(obj) + return obj; + + codecvt_char__Getcat(&fac, loc); + obj = (codecvt_char*)fac; + locale_facet__Incref(&obj->base.facet); + locale_facet_register(&obj->base.facet); + _Lockit_dtor(&lock); + + return obj; +} + /* ?do_in@?$codecvt@DDH@std@@MBEHAAHPBD1AAPBDPAD3AAPAD@Z */ /* ?do_in@?$codecvt@DDH@std@@MEBAHAEAHPEBD1AEAPEBDPEAD3AEAPEAD@Z */ #define call_codecvt_char_do_in(this, state, from, from_end, from_next, to, to_end, to_next) \ @@ -4525,8 +4568,15 @@ locale* __thiscall locale__Addfac(locale *this, locale_facet *facet, MSVCP_size_ DEFINE_THISCALL_WRAPPER(locale__Getfacet, 8) const locale_facet* __thiscall locale__Getfacet(const locale *this, MSVCP_size_t id) { - FIXME("(%p %lu) stub\n", this, id); - return NULL; + locale_facet *fac; + + TRACE("(%p %lu)\n", this, id); + + fac = id < this->ptr->facet_cnt ? this->ptr->facetvec[id] : NULL; + if(fac || !this->ptr->transparent) + return fac; + + return id < global_locale->facet_cnt ? global_locale->facetvec[id] : NULL; } /* ?_Getgloballocale@locale@std@@CAPAV_Locimp@12@XZ */ @@ -4711,8 +4761,17 @@ void __asm_dummy_vtables(void) { void free_locale(void) { + facets_elem *iter, *safe; + if(global_locale) { locale__Locimp_dtor(global_locale); locale_dtor(&classic_locale); } + + LIST_FOR_EACH_ENTRY_SAFE(iter, safe, &lazy_facets, facets_elem, entry) { + list_remove(&iter->entry); + if(locale_facet__Decref(iter->fac)) + call_locale_facet_vector_dtor(iter->fac, 1); + MSVCRT_operator_delete(iter); + } } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 47bcc26..aebd034 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -257,6 +257,12 @@ wchar_t* __stdcall MSVCP_allocator_wchar_allocate(void*, MSVCP_size_t); void __stdcall MSVCP_allocator_wchar_deallocate(void*, wchar_t*, MSVCP_size_t); MSVCP_size_t __stdcall MSVCP_allocator_wchar_max_size(void*); +/* class locale::facet */ +typedef struct { + const vtable_ptr *vtable; + MSVCP_size_t refs; +} locale_facet; + /* class locale */ typedef struct {

1 0

Piotr Caban : msvcp90: Fixed default locale constructor implementation.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 1d0b072d0f1d5adf3229eca282ce42de11a231d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d0b072d0f1d5adf3229eca28… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:12:12 2012 +0200 msvcp90: Fixed default locale constructor implementation. --- dlls/msvcp90/locale.c | 78 +++++++++++++++++++++++++++++++------------ dlls/msvcp90/msvcp90.h | 1 + dlls/msvcp90/msvcp90_main.c | 1 + 3 files changed, 58 insertions(+), 22 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 54c2eaf..49d864a 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -163,6 +163,9 @@ typedef struct _istreambuf_iterator_wchar /* ?_Id_cnt@id@locale@std@@0HA */ int locale_id__Id_cnt = 0; +static locale__Locimp *global_locale; +static locale classic_locale; + /* ?_Clocptr@_Locimp@locale@std@@0PAV123@A */ /* ?_Clocptr@_Locimp@locale@std@@0PEAV123@EA */ locale__Locimp *locale__Locimp__Clocptr = NULL; @@ -2606,7 +2609,6 @@ codecvt_char* __thiscall codecvt_char_ctor(codecvt_char *this) return codecvt_char_ctor_locinfo(this, NULL, 0); } -/* ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */ /* ??1?$codecvt@DDH@std@@MAE@XZ */ /* ??1?$codecvt@DDH@std@@MEAA@XZ */ DEFINE_THISCALL_WRAPPER(codecvt_char_dtor, 4) @@ -2636,6 +2638,7 @@ codecvt_char* __thiscall MSVCP_codecvt_char_vector_dtor(codecvt_char *this, unsi return this; } +/* ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */ /* ?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */ MSVCP_size_t __cdecl codecvt_char__Getcat(const locale_facet **facet, const locale *loc) { @@ -4338,6 +4341,41 @@ locale* __thiscall locale_ctor_locimp(locale *this, locale__Locimp *locimp) return this; } +/* ?_Init@locale@std@@CAPAV_Locimp@12@XZ */ +/* ?_Init@locale@std@@CAPEAV_Locimp@12@XZ */ +locale__Locimp* __cdecl locale__Init(void) +{ + _Lockit lock; + + TRACE("\n"); + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + if(global_locale) { + _Lockit_dtor(&lock); + return global_locale; + } + + global_locale = MSVCRT_operator_new(sizeof(locale__Locimp)); + if(!global_locale) { + _Lockit_dtor(&lock); + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return NULL; + } + + locale__Locimp_ctor(global_locale); + global_locale->catmask = (1<<(LC_MAX+1))-1; + MSVCP_basic_string_char_dtor(&global_locale->name); + MSVCP_basic_string_char_ctor_cstr(&global_locale->name, "C"); + + locale__Locimp__Clocptr = global_locale; + global_locale->facet.refs++; + locale_ctor_locimp(&classic_locale, locale__Locimp__Clocptr); + _Lockit_dtor(&lock); + + return global_locale; +} + /* ??0locale@std@@QAE@ABV01@0H@Z */ /* ??0locale@std@@QEAA@AEBV01@0H@Z */ DEFINE_THISCALL_WRAPPER(locale_ctor_locale_locale, 16) @@ -4392,14 +4430,8 @@ DEFINE_THISCALL_WRAPPER(locale_ctor, 4) locale* __thiscall locale_ctor(locale *this) { TRACE("(%p)\n", this); - this->ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); - if(!this->ptr) { - ERR("Out of memory\n"); - throw_exception(EXCEPTION_BAD_ALLOC, NULL); - return NULL; - } - - locale__Locimp_ctor(this->ptr); + this->ptr = locale__Init(); + locale_facet__Incref(&this->ptr->facet); return this; } @@ -4497,35 +4529,29 @@ const locale_facet* __thiscall locale__Getfacet(const locale *this, MSVCP_size_t return NULL; } -/* ?_Init@locale@std@@CAPAV_Locimp@12@XZ */ -/* ?_Init@locale@std@@CAPEAV_Locimp@12@XZ */ -locale__Locimp* __cdecl locale__Init(void) -{ - FIXME("stub\n"); - return NULL; -} - /* ?_Getgloballocale@locale@std@@CAPAV_Locimp@12@XZ */ /* ?_Getgloballocale@locale@std@@CAPEAV_Locimp@12@XZ */ locale__Locimp* __cdecl locale__Getgloballocale(void) { - FIXME("stub\n"); - return NULL; + TRACE("\n"); + return global_locale; } /* ?_Setgloballocale@locale@std@@CAXPAX@Z */ /* ?_Setgloballocale@locale@std@@CAXPEAX@Z */ void __cdecl locale__Setgloballocale(void *locimp) { - FIXME("(%p) stub\n", locimp); + TRACE("(%p)\n", locimp); + global_locale = locimp; } /* ?classic@locale@std@@SAABV12@XZ */ /* ?classic@locale@std@@SAAEBV12@XZ */ const locale* __cdecl locale_classic(void) { - FIXME("stub\n"); - return NULL; + TRACE("\n"); + locale__Init(); + return &classic_locale; } /* ?name@locale@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */ @@ -4682,3 +4708,11 @@ void __asm_dummy_vtables(void) { #ifndef __GNUC__ } #endif + +void free_locale(void) +{ + if(global_locale) { + locale__Locimp_dtor(global_locale); + locale_dtor(&classic_locale); + } +} diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index f15e832..47bcc26 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -267,6 +267,7 @@ locale* __thiscall locale_ctor(locale*); locale* __thiscall locale_copy_ctor(locale*, const locale*); locale* __thiscall locale_operator_assign(locale*, const locale*); void __thiscall locale_dtor(locale*); +void free_locale(void); /* class _Lockit */ typedef struct { diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index 6a1d4d2..de036e5 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -92,6 +92,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) init_lockit(); break; case DLL_PROCESS_DETACH: + free_locale(); free_lockit(); break; }

1 0

Henri Verbeet : wined3d: Invalidate the entire buffer on maps with WINED3DLOCK_DISCARD.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 0610d1eec9a287e22831a40427e6a9a38f3f745f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0610d1eec9a287e22831a4042… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 12 17:03:50 2012 +0200 wined3d: Invalidate the entire buffer on maps with WINED3DLOCK_DISCARD. --- dlls/wined3d/buffer.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f11edf4..4735595 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1011,7 +1011,20 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN flags = buffer_sanitize_flags(buffer, flags); if (!(flags & WINED3DLOCK_READONLY)) { - if (!buffer_add_dirty_area(buffer, offset, size)) return E_OUTOFMEMORY; + if (flags & WINED3DLOCK_DISCARD) + { + /* DISCARD invalidates the entire buffer, regardless of the + * specified offset and size. Some applications also depend on the + * entire buffer being uploaded in that case. Two such + * applications are Port Royale and Darkstar One. */ + if (!buffer_add_dirty_area(buffer, 0, 0)) + return E_OUTOFMEMORY; + } + else + { + if (!buffer_add_dirty_area(buffer, offset, size)) + return E_OUTOFMEMORY; + } } count = ++buffer->resource.map_count;

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
83
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 June 2012