August 2011 - Wine-commits - list.winehq.org

Piotr Caban : msvcp90: Added locale::id class implementation.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 48ce9f9e28747c184b14e50d25aff330eed391b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ce9f9e28747c184b14e50d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 24 14:38:35 2011 +0200 msvcp90: Added locale::id class implementation. --- dlls/msvcp90/locale.c | 29 +++++++++++++++++++++-------- dlls/msvcp90/misc.c | 5 ----- dlls/msvcp90/msvcp90.h | 8 ++++++++ 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index af20c7e..c0279db 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -91,8 +91,10 @@ static const vtable_ptr MSVCP_locale_facet_vtable[]; DEFINE_THISCALL_WRAPPER(locale_id_ctor_id, 8) locale_id* __thiscall locale_id_ctor_id(locale_id *this, MSVCP_size_t id) { - FIXME("(%p %lu) stub\n", this, id); - return NULL; + TRACE("(%p %lu)\n", this, id); + + this->id = id; + return this; } /* ??_Fid(a)locale@std@@QAEXXZ */ @@ -100,8 +102,10 @@ locale_id* __thiscall locale_id_ctor_id(locale_id *this, MSVCP_size_t id) DEFINE_THISCALL_WRAPPER(locale_id_ctor, 4) locale_id* __thiscall locale_id_ctor(locale_id *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + + this->id = 0; + return this; } /* ??Bid(a)locale@std@@QAEIXZ */ @@ -109,16 +113,25 @@ locale_id* __thiscall locale_id_ctor(locale_id *this) DEFINE_THISCALL_WRAPPER(locale_id_operator_size_t, 4) MSVCP_size_t __thiscall locale_id_operator_size_t(locale_id *this) { - FIXME("(%p) stub\n", this); - return 0; + _Lockit lock; + + TRACE("(%p)\n", this); + + if(!this->id) { + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + this->id = ++locale_id__Id_cnt; + _Lockit_dtor(&lock); + } + + return this->id; } /* ?_Id_cnt_func(a)id@locale(a)std@@CAAAHXZ */ /* ?_Id_cnt_func(a)id@locale(a)std@@CAAEAHXZ */ int* __cdecl locale_id__Id_cnt_func(void) { - FIXME("stub\n"); - return NULL; + TRACE("\n"); + return &locale_id__Id_cnt; } /* ??_Ffacet(a)locale@std@@QAEXXZ */ diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 19f76a0..3a3cb9f 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -87,11 +87,6 @@ void CDECL mutex_mutex_dtor(mutex *m) mutex_dtor(m); } -#define _LOCK_LOCALE 0 -#define _LOCK_MALLOC 1 -#define _LOCK_STREAM 2 -#define _LOCK_DEBUG 3 -#define _MAX_LOCK 4 static CRITICAL_SECTION lockit_cs[_MAX_LOCK]; /* ?_Lockit_ctor(a)_Lockit@std@@SAXH(a)Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index d848782..6bc81ba 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -200,8 +200,16 @@ typedef struct { int locktype; } _Lockit; +#define _LOCK_LOCALE 0 +#define _LOCK_MALLOC 1 +#define _LOCK_STREAM 2 +#define _LOCK_DEBUG 3 +#define _MAX_LOCK 4 + void init_lockit(void); void free_lockit(void); +_Lockit* __thiscall _Lockit_ctor_locktype(_Lockit*, int); +void __thiscall _Lockit_dtor(_Lockit*); /* class mutex */ typedef struct {

1 0

Piotr Caban : msvcp90: Added locale::facet class implementation.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: b8f53e57358d0b9afebd47d9a210e7824d29d877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f53e57358d0b9afebd47d9a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 24 14:38:44 2011 +0200 msvcp90: Added locale::facet class implementation. --- dlls/msvcp90/locale.c | 42 +++++++++++++++++++++++++++++++----------- 1 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index c0279db..768cc51 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -139,9 +139,10 @@ int* __cdecl locale_id__Id_cnt_func(void) DEFINE_THISCALL_WRAPPER(locale_facet_ctor, 4) locale_facet* __thiscall locale_facet_ctor(locale_facet *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); this->vtable = MSVCP_locale_facet_vtable; - return NULL; + this->refs = 0; + return this; } /* ??0facet(a)locale@std@@IAE(a)I@Z */ @@ -149,8 +150,10 @@ locale_facet* __thiscall locale_facet_ctor(locale_facet *this) DEFINE_THISCALL_WRAPPER(locale_facet_ctor_refs, 8) locale_facet* __thiscall locale_facet_ctor_refs(locale_facet *this, MSVCP_size_t refs) { - FIXME("(%p %lu) stub\n", this, refs); - return NULL; + TRACE("(%p %lu)\n", this, refs); + this->vtable = MSVCP_locale_facet_vtable; + this->refs = refs; + return this; } /* ??1facet(a)locale@std@@UAE(a)XZ */ @@ -158,13 +161,13 @@ locale_facet* __thiscall locale_facet_ctor_refs(locale_facet *this, MSVCP_size_t DEFINE_THISCALL_WRAPPER(locale_facet_dtor, 4) void __thiscall locale_facet_dtor(locale_facet *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); } DEFINE_THISCALL_WRAPPER(MSVCP_locale_facet_vector_dtor, 8) locale_facet* __thiscall MSVCP_locale_facet_vector_dtor(locale_facet *this, unsigned int flags) { - TRACE("(%p %x) stub\n", this, flags); + TRACE("(%p %x)\n", this, flags); if(flags & 2) { /* we have an array, with the number of elements stored before the first object */ int i, *ptr = (int *)this-1; @@ -186,7 +189,13 @@ locale_facet* __thiscall MSVCP_locale_facet_vector_dtor(locale_facet *this, unsi DEFINE_THISCALL_WRAPPER(locale_facet__Incref, 4) void __thiscall locale_facet__Incref(locale_facet *this) { - FIXME("(%p) stub\n", this); + _Lockit lock; + + TRACE("(%p)\n", this); + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + this->refs++; + _Lockit_dtor(&lock); } /* ?_Decref(a)facet@locale(a)std@@QAEPAV123(a)XZ */ @@ -194,16 +203,27 @@ void __thiscall locale_facet__Incref(locale_facet *this) DEFINE_THISCALL_WRAPPER(locale_facet__Decref, 4) locale_facet* __thiscall locale_facet__Decref(locale_facet *this) { - FIXME("(%p) stub\n", this); - return NULL; + _Lockit lock; + locale_facet *ret; + + TRACE("(%p)\n", this); + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + if(this->refs) + this->refs--; + + ret = this->refs ? this : NULL; + _Lockit_dtor(&lock); + + return ret; } /* ?_Getcat(a)facet@locale(a)std@@SAIPAPBV123(a)PBV23@@Z */ /* ?_Getcat(a)facet@locale(a)std@@SA_KPEAPEBV123(a)PEBV23@@Z */ MSVCP_size_t __cdecl locale_facet__Getcat(const locale_facet **facet, const locale *loc) { - FIXME("(%p %p) stub\n", facet, loc); - return 0; + TRACE("(%p %p)\n", facet, loc); + return -1; } static const vtable_ptr MSVCP_locale_facet_vtable[] = {

1 0

Piotr Caban : msvcp90: Added basic_streambuf<char>::{ctor, dtor} implementation.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: a1bfde59098c33140310156c3d0aefdadea48164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1bfde59098c33140310156c3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 24 14:38:53 2011 +0200 msvcp90: Added basic_streambuf<char>::{ctor, dtor} implementation. --- dlls/msvcp90/ios.c | 61 +++++++++++++++++++++++++++++++++++++++-------- dlls/msvcp90/msvcp90.h | 3 ++ 2 files changed, 53 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 5dd6af8..47d3d5c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -126,6 +126,10 @@ typedef struct { locale *loc; } basic_streambuf_char; +void __thiscall basic_streambuf_char__Init_empty(basic_streambuf_char*); +void __thiscall basic_streambuf_char_setp(basic_streambuf_char*, char*, char*); +void __thiscall basic_streambuf_char_setg(basic_streambuf_char*, char*, char*, char*); + typedef struct { ios_base child; basic_streambuf_char *strbuf; @@ -917,8 +921,9 @@ char __thiscall basic_ios_char_widen(basic_ios_char *this, char ch) DEFINE_THISCALL_WRAPPER(basic_streambuf_char_ctor_uninitialized, 8) basic_streambuf_char* __thiscall basic_streambuf_char_ctor_uninitialized(basic_streambuf_char *this, int uninitialized) { - FIXME("(%p %d) stub\n", this, uninitialized); - return NULL; + TRACE("(%p %d)\n", this, uninitialized); + this->vtable = &MSVCP_basic_streambuf_char_vtable; + return this; } /* ??0?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAE(a)XZ */ @@ -926,8 +931,14 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor_uninitialized(basic_s DEFINE_THISCALL_WRAPPER(basic_streambuf_char_ctor, 4) basic_streambuf_char* __thiscall basic_streambuf_char_ctor(basic_streambuf_char *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + + this->vtable = &MSVCP_basic_streambuf_char_vtable; + this->loc = MSVCRT_operator_new(sizeof(locale)); + locale_ctor(this->loc); + basic_streambuf_char__Init_empty(this); + + return this; } /* ??1?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAE(a)XZ */ @@ -935,13 +946,16 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor(basic_streambuf_char DEFINE_THISCALL_WRAPPER(basic_streambuf_char_dtor, 4) void __thiscall basic_streambuf_char_dtor(basic_streambuf_char *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + locale_dtor(this->loc); + MSVCRT_operator_delete(this->loc); } DEFINE_THISCALL_WRAPPER(MSVCP_basic_streambuf_char_vector_dtor, 8) basic_streambuf_char* __thiscall MSVCP_basic_streambuf_char_vector_dtor(basic_streambuf_char *this, unsigned int flags) { - TRACE("(%p %x) stub\n", this, flags); + TRACE("(%p %x)\n", this, flags); if(flags & 2) { /* we have an array, with the number of elements stored before the first object */ int i, *ptr = (int *)this-1; @@ -999,7 +1013,14 @@ char* __thiscall basic_streambuf_char__Gnpreinc(basic_streambuf_char *this) DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Init, 28) void __thiscall basic_streambuf_char__Init(basic_streambuf_char *this, char **gf, char **gn, int *gc, char **pf, char **pn, int *pc) { - FIXME("(%p %p %p %p %p %p %p) stub\n", this, gf, gn, gc, pf, pn, pc); + TRACE("(%p %p %p %p %p %p %p)\n", this, gf, gn, gc, pf, pn, pc); + + this->prbuf = gf; + this->pwbuf = pf; + this->prpos = gn; + this->pwpos = pn; + this->prsize = gc; + this->pwsize = pc; } /* ?_Init@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEXXZ */ @@ -1007,7 +1028,17 @@ void __thiscall basic_streambuf_char__Init(basic_streambuf_char *this, char **gf DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Init_empty, 4) void __thiscall basic_streambuf_char__Init_empty(basic_streambuf_char *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + this->prbuf = &this->rbuf; + this->pwbuf = &this->wbuf; + this->prpos = &this->rpos; + this->pwpos = &this->wpos; + this->prsize = &this->rsize; + this->pwsize = &this->wsize; + + basic_streambuf_char_setp(this, NULL, NULL); + basic_streambuf_char_setg(this, NULL, NULL, NULL); } /* ?_Lock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ */ @@ -1288,7 +1319,11 @@ basic_streambuf_char* __thiscall basic_streambuf_char_setbuf(basic_streambuf_cha DEFINE_THISCALL_WRAPPER(basic_streambuf_char_setg, 16) void __thiscall basic_streambuf_char_setg(basic_streambuf_char *this, char *first, char *next, char *last) { - FIXME("(%p %p %p %p) stub\n", this, first, next, last); + TRACE("(%p %p %p %p)\n", this, first, next, last); + + this->rbuf = first; + this->rpos = next; + this->rsize = last-next; } /* ?setp@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEXPAD00(a)Z */ @@ -1296,7 +1331,11 @@ void __thiscall basic_streambuf_char_setg(basic_streambuf_char *this, char *firs DEFINE_THISCALL_WRAPPER(basic_streambuf_char_setp_next, 16) void __thiscall basic_streambuf_char_setp_next(basic_streambuf_char *this, char *first, char *next, char *last) { - FIXME("(%p %p %p %p) stub\n", this, first, next, last); + TRACE("(%p %p %p %p)\n", this, first, next, last); + + this->wbuf = first; + this->wpos = next; + this->wsize = last-next; } /* ?setp@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEXPAD0(a)Z */ @@ -1304,7 +1343,7 @@ void __thiscall basic_streambuf_char_setp_next(basic_streambuf_char *this, char DEFINE_THISCALL_WRAPPER(basic_streambuf_char_setp, 12) void __thiscall basic_streambuf_char_setp(basic_streambuf_char *this, char *first, char *last) { - FIXME("(%p %p %p) stub\n", this, first, last); + basic_streambuf_char_setp_next(this, first, first, last); } /* ?sgetc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAEHXZ */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 6bc81ba..d80c361 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -195,6 +195,9 @@ typedef struct struct locale__Locimp *ptr; } locale; +locale* __thiscall locale_ctor(locale*); +void __thiscall locale_dtor(locale*); + /* class _Lockit */ typedef struct { int locktype;

1 0

Piotr Caban : msvcp90: Added basic_streambuf<char> buffer accessing functions implementation.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: f357f4a575827f3c4b75de8d0b00caeef7fdf309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f357f4a575827f3c4b75de8d0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 24 14:39:03 2011 +0200 msvcp90: Added basic_streambuf<char> buffer accessing functions implementation. --- dlls/msvcp90/ios.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 47d3d5c..eef506a 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -977,8 +977,8 @@ basic_streambuf_char* __thiscall MSVCP_basic_streambuf_char_vector_dtor(basic_st DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Gnavail, 4) streamsize __thiscall basic_streambuf_char__Gnavail(const basic_streambuf_char *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return *this->prpos ? *this->prsize : 0; } /* ?_Gndec@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEPADXZ */ @@ -986,8 +986,10 @@ streamsize __thiscall basic_streambuf_char__Gnavail(const basic_streambuf_char * DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Gndec, 4) char* __thiscall basic_streambuf_char__Gndec(basic_streambuf_char *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + (*this->prsize)++; + (*this->prpos)--; + return *this->prpos; } /* ?_Gninc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEPADXZ */ @@ -995,8 +997,9 @@ char* __thiscall basic_streambuf_char__Gndec(basic_streambuf_char *this) DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Gninc, 4) char* __thiscall basic_streambuf_char__Gninc(basic_streambuf_char *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + (*this->prsize)--; + return (*this->prpos)++; } /* ?_Gnpreinc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEPADXZ */ @@ -1004,8 +1007,10 @@ char* __thiscall basic_streambuf_char__Gninc(basic_streambuf_char *this) DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Gnpreinc, 4) char* __thiscall basic_streambuf_char__Gnpreinc(basic_streambuf_char *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + (*this->prsize)--; + (*this->prpos)++; + return *this->prpos; } /* ?_Init@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEXPAPAD0PAH001(a)Z */ @@ -1054,8 +1059,8 @@ void __thiscall basic_streambuf_char__Lock(basic_streambuf_char *this) DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Pnavail, 4) streamsize __thiscall basic_streambuf_char__Pnavail(const basic_streambuf_char *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return *this->pwpos ? *this->pwsize : 0; } /* ?_Pninc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEPADXZ */ @@ -1063,8 +1068,9 @@ streamsize __thiscall basic_streambuf_char__Pnavail(const basic_streambuf_char * DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Pninc, 4) char* __thiscall basic_streambuf_char__Pninc(basic_streambuf_char *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + (*this->pwsize)--; + return (*this->pwpos)++; } /* ?_Sgetn_s@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAEHPADIH(a)Z */

1 0

Piotr Caban : msvcp90: Added basic_streambuf<char>::{Lock, Unlock} implementation.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 4fd4a8aeb35d5ce73aa21f4699557ab899049fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fd4a8aeb35d5ce73aa21f469… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 24 14:39:12 2011 +0200 msvcp90: Added basic_streambuf<char>::{Lock, Unlock} implementation. --- dlls/msvcp90/ios.c | 9 +++++++-- dlls/msvcp90/msvcp90.h | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index eef506a..84dfb17 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -923,6 +923,7 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor_uninitialized(basic_s { TRACE("(%p %d)\n", this, uninitialized); this->vtable = &MSVCP_basic_streambuf_char_vtable; + mutex_ctor(&this->lock); return this; } @@ -934,6 +935,7 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor(basic_streambuf_char TRACE("(%p)\n", this); this->vtable = &MSVCP_basic_streambuf_char_vtable; + mutex_ctor(&this->lock); this->loc = MSVCRT_operator_new(sizeof(locale)); locale_ctor(this->loc); basic_streambuf_char__Init_empty(this); @@ -948,6 +950,7 @@ void __thiscall basic_streambuf_char_dtor(basic_streambuf_char *this) { TRACE("(%p)\n", this); + mutex_dtor(&this->lock); locale_dtor(this->loc); MSVCRT_operator_delete(this->loc); } @@ -1051,7 +1054,8 @@ void __thiscall basic_streambuf_char__Init_empty(basic_streambuf_char *this) DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Lock, 4) void __thiscall basic_streambuf_char__Lock(basic_streambuf_char *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + mutex_lock(&this->lock); } /* ?_Pnavail@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IBEHXZ */ @@ -1087,7 +1091,8 @@ streamsize __thiscall basic_streambuf_char__Sgetn_s(basic_streambuf_char *this, DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Unlock, 4) void __thiscall basic_streambuf_char__Unlock(basic_streambuf_char *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + mutex_unlock(&this->lock); } /* ?_Xsgetn_s@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHPADIH(a)Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index d80c361..7c331b5 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -218,3 +218,8 @@ void __thiscall _Lockit_dtor(_Lockit*); typedef struct { void *mutex; } mutex; + +mutex* __thiscall mutex_ctor(mutex*); +void __thiscall mutex_dtor(mutex*); +void __thiscall mutex_lock(mutex*); +void __thiscall mutex_unlock(mutex*);

1 0

Aric Stewart : usp10: In ScriptXtoX use cChars as the item is the character index.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 74a0a3fdd896e942982b02464ff3bbf4cf4eeaf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a0a3fdd896e942982b02464… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 22 07:18:47 2011 -0500 usp10: In ScriptXtoX use cChars as the item is the character index. --- dlls/usp10/usp10.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index e6933bc..38f6c3a 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1320,7 +1320,7 @@ HRESULT WINAPI ScriptCPtoX(int iCP, } iPosX = 0.0; - for (item=0; item < iCP && item < cGlyphs; item++) + for (item=0; item < iCP && item < cChars; item++) { if (iSpecial == -1 && (iCluster == -1 || (iCluster != -1 && iCluster+clust_size <= item))) { @@ -1330,7 +1330,7 @@ HRESULT WINAPI ScriptCPtoX(int iCP, clust_size = 1; iCluster = -1; - for (check = item+1; check < cGlyphs; check++) + for (check = item+1; check < cChars; check++) { if (pwLogClust[check] == clust) { @@ -1341,9 +1341,9 @@ HRESULT WINAPI ScriptCPtoX(int iCP, else break; } - if (check >= cGlyphs && !iMaxPos) + if (check >= cChars && !iMaxPos) { - for (check = clust; check < cGlyphs; check++) + for (check = clust; check < cChars; check++) special_size += piAdvance[check]; iSpecial = item; special_size /= (cChars - item); @@ -1406,12 +1406,12 @@ HRESULT WINAPI ScriptXtoCP(int iX, if (iX < 0) { - *piCP = cGlyphs; + *piCP = cChars; *piTrailing = 0; return S_OK; } - for (item=0; item < cGlyphs; item++) + for (item=0; item < cChars; item++) if (pwLogClust[item] > max_clust) { ERR("We do not handle non reversed clusters properly\n"); @@ -1430,8 +1430,8 @@ HRESULT WINAPI ScriptXtoCP(int iX, if (direction > 0) item = 0; else - item = cGlyphs - 1; - for (; iPosX <= iX && item < cGlyphs && item >= 0; item+=direction) + item = cChars - 1; + for (; iPosX <= iX && item < cChars && item >= 0; item+=direction) { iLastPosX = iPosX; if (iSpecial == -1 && @@ -1449,7 +1449,7 @@ HRESULT WINAPI ScriptXtoCP(int iX, clust_size = 1; iCluster = -1; - for (check = item+direction; check < cGlyphs && check >= 0; check+=direction) + for (check = item+direction; check < cChars && check >= 0; check+=direction) { if (pwLogClust[check] == clust) { @@ -1460,9 +1460,9 @@ HRESULT WINAPI ScriptXtoCP(int iX, else break; } - if (check >= cGlyphs && direction > 0) + if (check >= cChars && direction > 0) { - for (check = clust; check < cGlyphs; check++) + for (check = clust; check < cChars; check++) special_size += piAdvance[check]; iSpecial = item; special_size /= (cChars - item); @@ -1481,7 +1481,7 @@ HRESULT WINAPI ScriptXtoCP(int iX, { if (iPosX > iX) item--; - if (item < cGlyphs && ((iPosX - iLastPosX) / 2.0) + iX > iPosX) + if (item < cChars && ((iPosX - iLastPosX) / 2.0) + iX > iPosX) *piTrailing = 1; else *piTrailing = 0;

1 0

Alexandre Julliard : advapi32/tests: Skip some tests if QueryServiceStatusEx is missing.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 608b57ea4f827709646aa0297c99ef4543b848e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=608b57ea4f827709646aa0297… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 24 15:25:16 2011 +0200 advapi32/tests: Skip some tests if QueryServiceStatusEx is missing. --- dlls/advapi32/tests/service.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index ee39109..ddfae4d 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -949,6 +949,12 @@ static void test_query_svc(void) CloseServiceHandle(svc_handle); /* More or less the same tests for QueryServiceStatusEx */ + if (!pQueryServiceStatusEx) + { + win_skip( "QueryServiceStatusEx not available\n" ); + CloseServiceHandle(scm_handle); + return; + } /* Open service with not enough rights to query the status */ svc_handle = OpenServiceA(scm_handle, spooler, STANDARD_RIGHTS_READ); @@ -2065,10 +2071,13 @@ static DWORD try_start_stop(SC_HANDLE svc_handle, const char* name, int todo) le1 = GetLastError(); ok(!ret, "%s: StartServiceA() should have failed\n", name); - ret = pQueryServiceStatusEx(svc_handle, SC_STATUS_PROCESS_INFO, (BYTE*)&statusproc, sizeof(statusproc), &needed); - ok(ret, "%s: QueryServiceStatusEx() failed le=%u\n", name, GetLastError()); - todo_wine ok(statusproc.dwCurrentState == SERVICE_STOPPED, "%s: should be stopped state=%x\n", name, statusproc.dwCurrentState); - todo_wine ok(statusproc.dwProcessId == 0, "%s: ProcessId should be 0 instead of %x\n", name, statusproc.dwProcessId); + if (pQueryServiceStatusEx) + { + ret = pQueryServiceStatusEx(svc_handle, SC_STATUS_PROCESS_INFO, (BYTE*)&statusproc, sizeof(statusproc), &needed); + ok(ret, "%s: QueryServiceStatusEx() failed le=%u\n", name, GetLastError()); + todo_wine ok(statusproc.dwCurrentState == SERVICE_STOPPED, "%s: should be stopped state=%x\n", name, statusproc.dwCurrentState); + todo_wine ok(statusproc.dwProcessId == 0, "%s: ProcessId should be 0 instead of %x\n", name, statusproc.dwProcessId); + } ret = StartServiceA(svc_handle, 0, NULL); le2 = GetLastError();

1 0

Piotr Caban : msvcp90: Added basic_ostream<char> class stub.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 85d6355abcc3014a12d29dd6381e7e753a2c836d URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d6355abcc3014a12d29dd63… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 24 14:38:11 2011 +0200 msvcp90: Added basic_ostream<char> class stub. --- dlls/msvcp90/ios.c | 300 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.h | 3 +- dlls/msvcp90/msvcp90.spec | 102 ++++++++-------- 3 files changed, 348 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85d6355abcc3014a12d29…

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: da0ab1bf324300a6c2f2f97ba94dae3a0d9479f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0ab1bf324300a6c2f2f97ba… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 23 23:45:06 2011 +0200 po: Update German translation. --- po/de.po | 33 ++++++++++++--------------------- 1 files changed, 12 insertions(+), 21 deletions(-) diff --git a/po/de.po b/po/de.po index d3e5c12..ae3fdb9 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-08-13 16:35+0200\n" +"PO-Revision-Date: 2011-08-23 23:41+0200\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -2239,13 +2239,8 @@ msgid "&Favorites" msgstr "&Favoriten" #: ieframe.rc:52 regedit.rc:73 -#, fuzzy msgid "&Add to Favorites..." -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Zu den Favoriten hinzufügen...\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Zu den Favoriten &hinzufügen..." +msgstr "Zu den Favoriten &hinzufügen..." #: ieframe.rc:55 shell32.rc:125 clock.rc:41 notepad.rc:57 oleview.rc:69 #: progman.rc:52 regedit.rc:76 taskmgr.rc:87 winefile.rc:85 winemine.rc:48 @@ -9033,21 +9028,19 @@ msgstr "&CoCreateInstance Flag" #: oleview.rc:41 msgid "&In-process server" -msgstr "" +msgstr "&In-Prozess Server" #: oleview.rc:42 msgid "In-process &handler" -msgstr "" +msgstr "In-Prozess &Handler" #: oleview.rc:43 -#, fuzzy msgid "&Local server" -msgstr "Lokaler Fehler" +msgstr "&Lokaler Server" #: oleview.rc:44 -#, fuzzy msgid "&Remote server" -msgstr "&Entfernen" +msgstr "&Entfernter Server" #: oleview.rc:47 msgid "View &Type information" @@ -9199,21 +9192,19 @@ msgstr "Programm-Information, -Version und -Copyright anzeigen" #: oleview.rc:113 msgid "Ask for an in-process server when calling CoGetClassObject" -msgstr "" +msgstr "Für Aufruf von CoGetClassObject nach In-Prozess Server fragen" #: oleview.rc:114 msgid "Ask for an in-process handler when calling CoGetClassObject" -msgstr "" +msgstr "Für Aufruf von CoGetClassObject nach In-Prozess Handler fragen" #: oleview.rc:115 -#, fuzzy msgid "Ask for a local server when calling CoGetClassObject" -msgstr "CLSCTX_LOCAL_SERVER für Aufruf von CoGetClassObject benutzen" +msgstr "Für Aufruf von CoGetClassObject nach lokalem Server fragen" #: oleview.rc:116 -#, fuzzy msgid "Ask for a remote server when calling CoGetClassObject" -msgstr "CLSCTX_LOCAL_SERVER für Aufruf von CoGetClassObject benutzen" +msgstr "Für Aufruf von CoGetClassObject nach entferntem Server fragen" #: oleview.rc:128 msgid "ObjectClasses" @@ -10830,7 +10821,7 @@ msgstr "Inaktiver Titelleistentext" #: winecfg.rc:133 msgid "Message Box Text" -msgstr "Message Box Text" +msgstr "Dialogfeldtext" #: winecfg.rc:134 msgid "Application Workspace" @@ -11401,7 +11392,7 @@ msgstr "&System\tStrg+1" #: wordpad.rc:88 msgid "&Pale yellow\tCtrl+2" -msgstr "&PostIt-Notiz\tStrg+2" +msgstr "&Blassgelb\tStrg+2" #: wordpad.rc:93 msgid "&About Wine Wordpad"

1 0

Hans Leidekker : programs: Add a stub FontCache3.0.0.0 service.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 8959961b425c739247f7d3ea7a56577f56cb29a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8959961b425c739247f7d3ea7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 24 10:23:57 2011 +0200 programs: Add a stub FontCache3.0.0.0 service. --- configure | 1 + configure.ac | 1 + programs/presentationfontcache/Makefile.in | 9 +++ programs/presentationfontcache/main.c | 99 ++++++++++++++++++++++++++++ tools/wine.inf.in | 12 ++++ 5 files changed, 122 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 1497bdb..4d5dcb3 100755 --- a/configure +++ b/configure @@ -15312,6 +15312,7 @@ wine_fn_config_program notepad enable_notepad install,installbin,manpage,po wine_fn_config_program oleview enable_oleview install,po wine_fn_config_program ping enable_ping install wine_fn_config_program plugplay enable_plugplay install +wine_fn_config_program presentationfontcache enable_presentationfontcache install wine_fn_config_program progman enable_progman install,po wine_fn_config_program reg enable_reg install,po wine_fn_config_program regedit enable_regedit install,installbin,manpage,po diff --git a/configure.ac b/configure.ac index 11d22b9..ae89108 100644 --- a/configure.ac +++ b/configure.ac @@ -2926,6 +2926,7 @@ WINE_CONFIG_PROGRAM(notepad,,[install,installbin,manpage,po]) WINE_CONFIG_PROGRAM(oleview,,[install,po]) WINE_CONFIG_PROGRAM(ping,,[install]) WINE_CONFIG_PROGRAM(plugplay,,[install]) +WINE_CONFIG_PROGRAM(presentationfontcache,,[install]) WINE_CONFIG_PROGRAM(progman,,[install,po]) WINE_CONFIG_PROGRAM(reg,,[install,po]) WINE_CONFIG_PROGRAM(regedit,,[install,installbin,manpage,po]) diff --git a/programs/presentationfontcache/Makefile.in b/programs/presentationfontcache/Makefile.in new file mode 100644 index 0000000..edf8b38 --- /dev/null +++ b/programs/presentationfontcache/Makefile.in @@ -0,0 +1,9 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +MODULE = presentationfontcache.exe +APPMODE = -mconsole -municode +IMPORTS = advapi32 + +C_SRCS = \ + main.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/presentationfontcache/main.c b/programs/presentationfontcache/main.c new file mode 100644 index 0000000..b17a177 --- /dev/null +++ b/programs/presentationfontcache/main.c @@ -0,0 +1,99 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN + +#include <windows.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fontcache); + +static WCHAR fontcacheW[] = {'F','o','n','t','C','a','c','h','e','3','.','0','.','0','.','0',0}; + +static SERVICE_STATUS_HANDLE service_handle; +static HANDLE stop_event; + +static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) +{ + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + + switch(ctrl) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + WINE_TRACE( "shutting down\n" ); + status.dwCurrentState = SERVICE_STOP_PENDING; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + SetEvent( stop_event ); + return NO_ERROR; + default: + WINE_FIXME( "got service ctrl %x\n", ctrl ); + status.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus( service_handle, &status ); + return NO_ERROR; + } +} + +static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) +{ + SERVICE_STATUS status; + + WINE_TRACE( "starting service\n" ); + + stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + + service_handle = RegisterServiceCtrlHandlerExW( fontcacheW, service_handler, NULL ); + if (!service_handle) + return; + + status.dwServiceType = SERVICE_WIN32; + status.dwCurrentState = SERVICE_RUNNING; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 10000; + SetServiceStatus( service_handle, &status ); + + WaitForSingleObject( stop_event, INFINITE ); + + status.dwCurrentState = SERVICE_STOPPED; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + WINE_TRACE( "service stopped\n" ); +} + +int wmain( int argc, WCHAR *argv[] ) +{ + static const SERVICE_TABLE_ENTRYW service_table[] = + { + { fontcacheW, ServiceMain }, + { NULL, NULL } + }; + + StartServiceCtrlDispatcherW( service_table ); + return 0; +} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 77c9d4d..af19c90 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -131,6 +131,7 @@ AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService +AddService=FontCache3.0.0.0,0,FontCacheService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService @@ -140,6 +141,7 @@ AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService +AddService=FontCache3.0.0.0,0,FontCacheService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService @@ -149,6 +151,7 @@ AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService +AddService=FontCache3.0.0.0,0,FontCacheService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -2576,6 +2579,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,Microsoft.NET\Framework\v2.0.50727,ngen.exe 10,Microsoft.NET\Framework\v2.0.50727,fusion.dll 10,Microsoft.NET\Framework\v3.0\windows communication foundation,servicemodelreg.exe +10,Microsoft.NET\Framework\v3.0\wpf,presentationfontcache.exe 10,Microsoft.NET\Framework\v4.0.30319,ngen.exe 10,Microsoft.NET\Framework\v4.0.30319,fusion.dll 11,gecko\plugin,npmshtml.dll @@ -3028,6 +3032,14 @@ ServiceType=32 StartType=2 ErrorControl=1 +[FontCacheService] +Description="Windows Presentation Foundation font cache service" +DisplayName="Windows Presentation Foundation Font Cache 3.0.0.0" +ServiceBinary="%10%\Microsoft.Net\Framework\v3.0\wpf\presentationfontcache.exe" +ServiceType=16 +StartType=3 +ErrorControl=1 + [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16

1 0