wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

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@DU?$char_traits@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@DU?$char_traits@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@DU?$char_traits@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@DU?$char_traits@D@std@@@std@@IAEXPAPAD0PAH001@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@DU?$char_traits@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@DU?$char_traits@D@std@@@std@@QAEHPADIH@Z */

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@DU?$char_traits@D@std@@@std@@IAE@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@DU?$char_traits@D@std@@@std@@UAE@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@DU?$char_traits@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@DU?$char_traits@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@DU?$char_traits@D@std@@@std@@IAEXPAD00@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@DU?$char_traits@D@std@@@std@@IAEXPAD0@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@DU?$char_traits@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 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@locale@std@@IAE@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@locale@std@@UAE@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@facet@locale@std@@QAEPAV123@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@facet@locale@std@@SAIPAPBV123@PBV23@@Z */ /* ?_Getcat@facet@locale@std@@SA_KPEAPEBV123@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 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@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@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@id@locale@std@@CAAAHXZ */ /* ?_Id_cnt_func@id@locale@std@@CAAEAHXZ */ int* __cdecl locale_id__Id_cnt_func(void) { - FIXME("stub\n"); - return NULL; + TRACE("\n"); + return &locale_id__Id_cnt; } /* ??_Ffacet@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@_Lockit@std@@SAXH@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 : msvcp: Sync spec files.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 553a093fbf9f92f5f9e342c9651dd04b48b6e096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=553a093fbf9f92f5f9e342c96… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 24 14:38:21 2011 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 98 ++++++++++++++++++++-------------------- dlls/msvcp60/msvcp60.spec | 86 ++++++++++++++++++------------------ dlls/msvcp70/msvcp70.spec | 98 ++++++++++++++++++++-------------------- dlls/msvcp71/msvcp71.spec | 98 ++++++++++++++++++++-------------------- dlls/msvcp80/msvcp80.spec | 102 +++++++++++++++++++++--------------------- 5 files changed, 241 insertions(+), 241 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=553a093fbf9f92f5f9e34…

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

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

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

Aric Stewart : usp10/tests: Refactor test_ScriptXtoX to make testing varying datasets easier.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 126c779832059575f9f8126c1d413ef7aa07d445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=126c779832059575f9f8126c1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 22 07:18:39 2011 -0500 usp10/tests: Refactor test_ScriptXtoX to make testing varying datasets easier. --- dlls/usp10/tests/usp10.c | 227 ++++++++++++++++++---------------------------- 1 files changed, 88 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=126c779832059575f9f81…

1 0

André Hentschel : shell32/tests: Initial directory tests for ShellExecuteEx.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 176555354c956c0496cea23109f4315c46397c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=176555354c956c0496cea2310… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 14 19:19:11 2011 +0200 shell32/tests: Initial directory tests for ShellExecuteEx. --- dlls/shell32/tests/shlexec.c | 56 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 252aed7..31b0930 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -527,7 +527,7 @@ static void CALLBACK childTimeout(HWND wnd, UINT msg, UINT_PTR timer, DWORD time static void doChild(int argc, char** argv) { - char* filename; + char *filename, longpath[MAX_PATH] = ""; HANDLE hFile, map; int i; int rc; @@ -553,6 +553,8 @@ static void doChild(int argc, char** argv) trace("argvA%d=%s\n", i, argv[i]); childPrintf(hFile, "argvA%d=%s\r\n", i, encodeA(argv[i])); } + GetModuleFileNameA(GetModuleHandleA(NULL), longpath, MAX_PATH); + childPrintf(hFile, "longPath=%s\r\n", encodeA(longpath)); map = OpenFileMappingA(FILE_MAP_READ, FALSE, "winetest_shlexec_dde_map"); if (map != NULL) @@ -778,6 +780,26 @@ static DWORD get_long_path_name(const char* shortpath, char* longpath, DWORD lon /*** * + * PathFindFileNameA equivalent that supports WinNT + * + ***/ + +static LPSTR path_find_file_name(LPCSTR lpszPath) +{ + LPCSTR lastSlash = lpszPath; + + while (lpszPath && *lpszPath) + { + if ((*lpszPath == '\\' || *lpszPath == '/' || *lpszPath == ':') && + lpszPath[1] && lpszPath[1] != '\\' && lpszPath[1] != '/') + lastSlash = lpszPath + 1; + lpszPath = CharNext(lpszPath); + } + return (LPSTR)lastSlash; +} + +/*** + * * Tests * ***/ @@ -2179,6 +2201,37 @@ static void test_commandline(void) } } +static void test_directory(void) +{ + char path[MAX_PATH], newdir[MAX_PATH]; + char params[1024]; + int rc; + + /* copy this executable to a new folder and cd to it */ + sprintf(newdir, "%s\\newfolder", tmpdir); + rc = CreateDirectoryA( newdir, NULL ); + ok( rc, "failed to create %s err %u\n", path, GetLastError() ); + sprintf(path, "%s\\%s", newdir, path_find_file_name(argv0)); + CopyFileA(argv0, path, FALSE); + SetCurrentDirectory(tmpdir), + + sprintf(params, "shlexec \"%s\" Exec", child_file); + + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, path_find_file_name(argv0), params, NULL); + todo_wine ok(rc == SE_ERR_FNF, "%s returned %d\n", shell_call, rc); + + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, path_find_file_name(argv0), params, newdir); + ok(rc > 32, "%s returned %d\n", shell_call, rc); + okChildInt("argcA", 4); + okChildString("argvA3", "Exec"); + todo_wine okChildPath("longPath", path); + + DeleteFile(path); + RemoveDirectoryA(newdir); +} + START_TEST(shlexec) { @@ -2201,6 +2254,7 @@ START_TEST(shlexec) test_dde(); test_dde_default_app(); test_commandline(); + test_directory(); cleanup_test(); }

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
77
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 August 2011