December 2011 - Wine-commits

Piotr Caban : msvcp90: Added numpunct<char> constructors implementation.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 8a8d5cd36237398f10bad7fd55acc96496670033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8d5cd36237398f10bad7fd5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 29 12:45:12 2011 +0100 msvcp90: Added numpunct<char> constructors implementation. --- dlls/msvcp90/locale.c | 88 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 76 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 2bd07c1..21faf77 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -2438,7 +2438,46 @@ extern const vtable_ptr MSVCP_numpunct_char_vtable; DEFINE_THISCALL_WRAPPER(numpunct_char__Init, 12) void __thiscall numpunct_char__Init(numpunct_char *this, _Locinfo *locinfo, MSVCP_bool isdef) { - FIXME("(%p %p %d) stub\n", this, locinfo, isdef); + const struct lconv *lc = _Locinfo__Getlconv(locinfo); + int len; + + TRACE("(%p %p %d)\n", this, locinfo, isdef); + + len = strlen(_Locinfo__Getfalse(locinfo))+1; + this->false_name = MSVCRT_operator_new(len); + if(this->false_name) + memcpy((char*)this->false_name, _Locinfo__Getfalse(locinfo), len); + + len = strlen(_Locinfo__Gettrue(locinfo))+1; + this->true_name = MSVCRT_operator_new(len); + if(this->true_name) + memcpy((char*)this->true_name, _Locinfo__Gettrue(locinfo), len); + + if(isdef) { + this->grouping = MSVCRT_operator_new(1); + if(this->grouping) + *(char*)this->grouping = 0; + + this->dp = '.'; + this->sep = ','; + } else { + len = strlen(lc->grouping)+1; + this->grouping = MSVCRT_operator_new(len); + if(this->grouping) + memcpy((char*)this->grouping, lc->grouping, len); + + this->dp = lc->decimal_point[0]; + this->sep = lc->thousands_sep[0]; + } + + if(!this->false_name || !this->true_name || !this->grouping) { + MSVCRT_operator_delete((char*)this->grouping); + MSVCRT_operator_delete((char*)this->false_name); + MSVCRT_operator_delete((char*)this->true_name); + + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } } /* ?_Tidy@?$numpunct(a)D@std@@AAEXXZ */ @@ -2446,7 +2485,11 @@ void __thiscall numpunct_char__Init(numpunct_char *this, _Locinfo *locinfo, MSVC DEFINE_THISCALL_WRAPPER(numpunct_char__Tidy, 4) void __thiscall numpunct_char__Tidy(numpunct_char *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + MSVCRT_operator_delete((char*)this->grouping); + MSVCRT_operator_delete((char*)this->false_name); + MSVCRT_operator_delete((char*)this->true_name); } /* ??0?$numpunct(a)D@std@@QAE(a)ABV_Locinfo@1(a)I_N@Z */ @@ -2455,9 +2498,11 @@ DEFINE_THISCALL_WRAPPER(numpunct_char_ctor_locinfo, 16) numpunct_char* __thiscall numpunct_char_ctor_locinfo(numpunct_char *this, _Locinfo *locinfo, MSVCP_size_t refs, MSVCP_bool usedef) { - FIXME("(%p %p %lu %d) stub\n", this, locinfo, refs, usedef); + TRACE("(%p %p %lu %d)\n", this, locinfo, refs, usedef); + locale_facet_ctor_refs(&this->facet, refs); this->facet.vtable = &MSVCP_numpunct_char_vtable; - return NULL; + numpunct_char__Init(this, locinfo, usedef); + return this; } /* ??0?$numpunct(a)D@std@@IAE(a)PBDI_N@Z */ @@ -2466,9 +2511,16 @@ DEFINE_THISCALL_WRAPPER(numpunct_char_ctor_name, 16) numpunct_char* __thiscall numpunct_char_ctor_name(numpunct_char *this, const char *name, MSVCP_size_t refs, MSVCP_bool usedef) { - FIXME("(%p %s %lu %d) stub\n", this, debugstr_a(name), refs, usedef); + _Locinfo locinfo; + + TRACE("(%p %s %lu %d)\n", this, debugstr_a(name), refs, usedef); + locale_facet_ctor_refs(&this->facet, refs); this->facet.vtable = &MSVCP_numpunct_char_vtable; - return NULL; + + _Locinfo_ctor_cstr(&locinfo, name); + numpunct_char__Init(this, &locinfo, usedef); + _Locinfo_dtor(&locinfo); + return this; } /* ??0?$numpunct(a)D@std@@QAE(a)I@Z */ @@ -2476,9 +2528,8 @@ numpunct_char* __thiscall numpunct_char_ctor_name(numpunct_char *this, DEFINE_THISCALL_WRAPPER(numpunct_char_ctor_refs, 8) numpunct_char* __thiscall numpunct_char_ctor_refs(numpunct_char *this, MSVCP_size_t refs) { - FIXME("(%p %lu) stub\n", this, refs); - this->facet.vtable = &MSVCP_numpunct_char_vtable; - return NULL; + TRACE("(%p %lu)\n", this, refs); + return numpunct_char_ctor_name(this, "C", refs, FALSE); } /* ??_F?$numpunct(a)D@std@@QAEXXZ */ @@ -2494,7 +2545,8 @@ numpunct_char* __thiscall numpunct_char_ctor(numpunct_char *this) DEFINE_THISCALL_WRAPPER(numpunct_char_dtor, 4) void __thiscall numpunct_char_dtor(numpunct_char *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + numpunct_char__Tidy(this); } DEFINE_THISCALL_WRAPPER(MSVCP_numpunct_char_vector_dtor, 8) @@ -2521,8 +2573,20 @@ numpunct_char* __thiscall MSVCP_numpunct_char_vector_dtor(numpunct_char *this, u /* ?_Getcat@?$numpunct(a)D@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ MSVCP_size_t __cdecl numpunct_char__Getcat(const locale_facet **facet, const locale *loc) { - FIXME("(%p %p) stub\n", facet, loc); - return 0; + TRACE("(%p %p)\n", facet, loc); + + if(facet && !*facet) { + *facet = MSVCRT_operator_new(sizeof(numpunct_char)); + if(!*facet) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return 0; + } + numpunct_char_ctor_name((numpunct_char*)*facet, + MSVCP_basic_string_char_c_str(&loc->ptr->name), 0, TRUE); + } + + return LC_NUMERIC; } /* ?do_decimal_point@?$numpunct(a)D@std@@MBEDXZ */

1 0

Piotr Caban : msvcp90: Added numpunct<char> class implementation.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 330b042f5cba3e1e2c224f2756e45a11c2ffd120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=330b042f5cba3e1e2c224f275… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 29 12:45:30 2011 +0100 msvcp90: Added numpunct<char> class implementation. --- dlls/msvcp90/locale.c | 59 +++++++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 23 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 21faf77..aef22f0 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -2592,10 +2592,12 @@ MSVCP_size_t __cdecl numpunct_char__Getcat(const locale_facet **facet, const loc /* ?do_decimal_point@?$numpunct(a)D@std@@MBEDXZ */ /* ?do_decimal_point@?$numpunct(a)D@std@@MEBADXZ */ DEFINE_THISCALL_WRAPPER(numpunct_char_do_decimal_point, 4) +#define call_numpunct_char_do_decimal_point(this) CALL_VTBL_FUNC(this, 4, \ + char, (const numpunct_char *this), (this)) char __thiscall numpunct_char_do_decimal_point(const numpunct_char *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->dp; } /* ?decimal_point@?$numpunct(a)D@std@@QBEDXZ */ @@ -2603,17 +2605,19 @@ char __thiscall numpunct_char_do_decimal_point(const numpunct_char *this) DEFINE_THISCALL_WRAPPER(numpunct_char_decimal_point, 4) char __thiscall numpunct_char_decimal_point(const numpunct_char *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return call_numpunct_char_do_decimal_point(this); } /* ?do_thousands_sep@?$numpunct(a)D@std@@MBEDXZ */ /* ?do_thousands_sep@?$numpunct(a)D@std@@MEBADXZ */ DEFINE_THISCALL_WRAPPER(numpunct_char_do_thousands_sep, 4) +#define call_numpunct_char_do_thousands_sep(this) CALL_VTBL_FUNC(this, 8, \ + char, (const numpunct_char*), (this)) char __thiscall numpunct_char_do_thousands_sep(const numpunct_char *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->sep; } /* ?thousands_sep@?$numpunct(a)D@std@@QBEDXZ */ @@ -2621,17 +2625,20 @@ char __thiscall numpunct_char_do_thousands_sep(const numpunct_char *this) DEFINE_THISCALL_WRAPPER(numpunct_char_thousands_sep, 4) char __thiscall numpunct_char_thousands_sep(const numpunct_char *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return call_numpunct_char_do_thousands_sep(this); } /* ?do_grouping@?$numpunct(a)D@std@@MBE?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ */ /* ?do_grouping@?$numpunct(a)D@std@@MEBA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ */ DEFINE_THISCALL_WRAPPER(numpunct_char_do_grouping, 8) -basic_string_char* __thiscall numpunct_char_do_grouping(const numpunct_char *this, basic_string_char *ret) +#define call_numpunct_char_do_grouping(this, ret) CALL_VTBL_FUNC(this, 12, \ + basic_string_char*, (const numpunct_char*, basic_string_char*), (this, ret)) +basic_string_char* __thiscall numpunct_char_do_grouping( + const numpunct_char *this, basic_string_char *ret) { - FIXME("(%p) stub\n", this); - return ret; + TRACE("(%p)\n", this); + return MSVCP_basic_string_char_ctor_cstr(ret, this->grouping); } /* ?grouping@?$numpunct(a)D@std@@QBE?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ */ @@ -2639,17 +2646,20 @@ basic_string_char* __thiscall numpunct_char_do_grouping(const numpunct_char *thi DEFINE_THISCALL_WRAPPER(numpunct_char_grouping, 8) basic_string_char* __thiscall numpunct_char_grouping(const numpunct_char *this, basic_string_char *ret) { - FIXME("(%p) stub\n", this); - return ret; + TRACE("(%p)\n", this); + return call_numpunct_char_do_grouping(this, ret); } /* ?do_falsename@?$numpunct(a)D@std@@MBE?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ */ /* ?do_falsename@?$numpunct(a)D@std@@MEBA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ */ DEFINE_THISCALL_WRAPPER(numpunct_char_do_falsename, 8) -basic_string_char* __thiscall numpunct_char_do_falsename(const numpunct_char *this, basic_string_char *ret) +#define call_numpunct_char_do_falsename(this, ret) CALL_VTBL_FUNC(this, 16, \ + basic_string_char*, (const numpunct_char*, basic_string_char*), (this, ret)) +basic_string_char* __thiscall numpunct_char_do_falsename( + const numpunct_char *this, basic_string_char *ret) { - FIXME("(%p) stub\n", this); - return ret; + TRACE("(%p)\n", this); + return MSVCP_basic_string_char_ctor_cstr(ret, this->false_name); } /* ?falsename@?$numpunct(a)D@std@@QBE?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ */ @@ -2657,17 +2667,20 @@ basic_string_char* __thiscall numpunct_char_do_falsename(const numpunct_char *th DEFINE_THISCALL_WRAPPER(numpunct_char_falsename, 8) basic_string_char* __thiscall numpunct_char_falsename(const numpunct_char *this, basic_string_char *ret) { - FIXME("(%p) stub\n", this); - return ret; + TRACE("(%p)\n", this); + return call_numpunct_char_do_falsename(this, ret); } /* ?do_truename@?$numpunct(a)D@std@@MBE?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ */ /* ?do_truename@?$numpunct(a)D@std@@MEBA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ */ DEFINE_THISCALL_WRAPPER(numpunct_char_do_truename, 8) -basic_string_char* __thiscall numpunct_char_do_truename(const numpunct_char *this, basic_string_char *ret) +#define call_numpunct_char_do_truename(this, ret) CALL_VTBL_FUNC(this, 20, \ + basic_string_char*, (const numpunct_char*, basic_string_char*), (this, ret)) +basic_string_char* __thiscall numpunct_char_do_truename( + const numpunct_char *this, basic_string_char *ret) { - FIXME("(%p) stub\n", this); - return ret; + TRACE("(%p)\n", this); + return MSVCP_basic_string_char_ctor_cstr(ret, this->true_name); } /* ?truename@?$numpunct(a)D@std@@QBE?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ */ @@ -2675,8 +2688,8 @@ basic_string_char* __thiscall numpunct_char_do_truename(const numpunct_char *thi DEFINE_THISCALL_WRAPPER(numpunct_char_truename, 8) basic_string_char* __thiscall numpunct_char_truename(const numpunct_char *this, basic_string_char *ret) { - FIXME("(%p) stub\n", this); - return ret; + TRACE("(%p)\n", this); + return call_numpunct_char_do_truename(this, ret); } /* ?id@?$numpunct(a)_W@std@@2V0locale(a)2@A */

1 0

Piotr Caban : msvcp90/tests: Test virtual function calls returning structures.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: ecbe1ff21113c50cb4260599283f7a13cb56ce77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecbe1ff21113c50cb42605992… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 29 12:45:44 2011 +0100 msvcp90/tests: Test virtual function calls returning structures. --- dlls/msvcp90/tests/misc.c | 54 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 8e77e95..688f344 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -30,6 +30,19 @@ typedef struct { int delfl; } MSVCP__Ctypevec; +/* basic_string<char, char_traits<char>, allocator<char>> */ +#define BUF_SIZE_CHAR 16 +typedef struct +{ + void *allocator; + union { + char buf[BUF_SIZE_CHAR]; + char *ptr; + } data; + size_t size; + size_t res; +} basic_string_char; + static void* (__cdecl *p_set_invalid_parameter_handler)(void*); static _locale_t (__cdecl *p__get_current_locale)(void); static void (__cdecl *p_free)(void*); @@ -64,6 +77,11 @@ void* (__thiscall *p_collate_char_ctor_refs)(void*, size_t); int (__thiscall *p_collate_char_compare)(const void*, const char*, const char*, const char*, const char*); void (__thiscall *p_collate_char_dtor)(void*); +void* (__thiscall *p_numpunct_char_ctor)(void*); +basic_string_char* (__thiscall *p_numpunct_char_falsename)(void*,basic_string_char*); +void (__thiscall *p_numpunct_char_dtor)(void*); +static void (__thiscall *p_basic_string_char_dtor)(basic_string_char*); +static const char* (__thiscall *p_basic_string_char_cstr)(basic_string_char*); static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, @@ -97,6 +115,7 @@ static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, const void *b ); static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void *a, const void *b, const void *c, const void *d ); +struct thiscall_thunk_retptr *thunk_retptr; static void init_thiscall_thunk(void) { @@ -173,6 +192,13 @@ static BOOL init(void) SET(p_collate_char_ctor_refs, "??0?$collate(a)D@std@@QEAA(a)_K@Z"); SET(p_collate_char_compare, "?compare@?$collate(a)D@std@@QEBAHPEBD000(a)Z"); SET(p_collate_char_dtor, "??1?$collate(a)D@std@@MEAA(a)XZ"); + SET(p_numpunct_char_ctor, "??_F?$numpunct(a)D@std@@QEAAXXZ"); + SET(p_numpunct_char_falsename, "?falsename@?$numpunct(a)D@std@@QEBA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ"); + SET(p_numpunct_char_dtor, "??1?$numpunct(a)D@std@@MEAA(a)XZ"); + SET(p_basic_string_char_dtor, + "??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ"); + SET(p_basic_string_char_cstr, + "?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAPEBDXZ"); } else { SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); @@ -194,6 +220,13 @@ static BOOL init(void) SET(p_collate_char_ctor_refs, "??0?$collate(a)D@std@@QAE(a)I@Z"); SET(p_collate_char_compare, "?compare@?$collate(a)D@std@@QBEHPBD000(a)Z"); SET(p_collate_char_dtor, "??1?$collate(a)D@std@@MAE(a)XZ"); + SET(p_numpunct_char_ctor, "??_F?$numpunct(a)D@std@@QAEXXZ"); + SET(p_numpunct_char_falsename, "?falsename@?$numpunct(a)D@std@@QBE?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ"); + SET(p_numpunct_char_dtor, "??1?$numpunct(a)D@std@@MAE(a)XZ"); + SET(p_basic_string_char_dtor, + "??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ"); + SET(p_basic_string_char_cstr, + "?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ"); } init_thiscall_thunk(); @@ -377,19 +410,28 @@ static void test_allocator_char(void) static void test_virtual_call(void) { - BYTE collate_char[16]; + BYTE this[256]; + basic_string_char bstr; + const char *p; char str1[] = "test"; char str2[] = "TEST"; int ret; - call_func2(p_collate_char_ctor_refs, collate_char, 0); - ret = (int)call_func5(p_collate_char_compare, collate_char, str1, str1+4, str1, str1+4); + call_func2(p_collate_char_ctor_refs, this, 0); + ret = (int)call_func5(p_collate_char_compare, this, str1, str1+4, str1, str1+4); ok(ret == 0, "collate<char>::compare returned %d\n", ret); - ret = (int)call_func5(p_collate_char_compare, collate_char, str2, str2+4, str1, str1+4); + ret = (int)call_func5(p_collate_char_compare, this, str2, str2+4, str1, str1+4); ok(ret == 1, "collate<char>::compare returned %d\n", ret); - ret = (int)call_func5(p_collate_char_compare, collate_char, str1, str1+3, str1, str1+4); + ret = (int)call_func5(p_collate_char_compare, this, str1, str1+3, str1, str1+4); ok(ret == -1, "collate<char>::compare returned %d\n", ret); - call_func1(p_collate_char_dtor, collate_char); + call_func1(p_collate_char_dtor, this); + + call_func1(p_numpunct_char_ctor, this); + call_func2(p_numpunct_char_falsename, this, &bstr); + p = call_func1(p_basic_string_char_cstr, &bstr); + ok(!strcmp(p, "false"), "numpunct<char>::falsename returned %s\n", p); + call_func1(p_basic_string_char_dtor, &bstr); + call_func1(p_numpunct_char_dtor, this); } START_TEST(misc)

1 0

Francois Gouget : winemine: Use sentence capitalization for group box labels.
by Alexandre Julliard 29 Dec '11

29 Dec '11

1 0

Francois Gouget : winefile: Fix the group box labels to follow the Windows GUI guidelines, .
by Alexandre Julliard 29 Dec '11

29 Dec '11

1 0

Francois Gouget : inetcpl: Don't pad group box labels with spaces.
by Alexandre Julliard 29 Dec '11

29 Dec '11

1 0

André Hentschel : d3drm: Add IDirect3DRMMeshBuilder3 interface.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 7164806b561644423c08668ddeca2eba1e9bae5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7164806b561644423c08668dd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 29 02:25:42 2011 +0100 d3drm: Add IDirect3DRMMeshBuilder3 interface. --- dlls/d3drm/d3drm.c | 4 +- dlls/d3drm/d3drm_private.h | 2 +- dlls/d3drm/meshbuilder.c | 961 +++++++++++++++++++++++++++++++++++++++++--- include/d3drmobj.h | 2 +- 4 files changed, 899 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7164806b561644423c086…

1 0

André Hentschel : d3drm: Add IDirect3DRM3 interface.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 723ae056b90bfc5fbdb0c2a116cd7bb39c59633d URL: http://source.winehq.org/git/wine.git/?a=commit;h=723ae056b90bfc5fbdb0c2a11… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 29 02:26:40 2011 +0100 d3drm: Add IDirect3DRM3 interface. --- dlls/d3drm/d3drm.c | 491 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 491 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=723ae056b90bfc5fbdb0c…

1 0

Jacek Caban : mshtml: Use IUri in IHTMLLocation:: get_protocol implementation.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 98b8ebaff79c27861415e1f01d859b913e0becf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98b8ebaff79c27861415e1f01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 12:02:41 2011 +0100 mshtml: Use IUri in IHTMLLocation::get_protocol implementation. --- dlls/mshtml/htmllocation.c | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index cd24f12..b5d6b5e 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -276,7 +276,8 @@ static HRESULT WINAPI HTMLLocation_put_protocol(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_protocol(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + BSTR protocol, ret; + unsigned len; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -284,22 +285,28 @@ static HRESULT WINAPI HTMLLocation_get_protocol(IHTMLLocation *iface, BSTR *p) if(!p) return E_POINTER; - url.dwSchemeLength = 1; - hres = get_url_components(This, &url); + if(!This->window || !This->window->uri) { + FIXME("No current URI\n"); + return E_NOTIMPL; + } + + hres = IUri_GetSchemeName(This->window->uri, &protocol); if(FAILED(hres)) return hres; - - if(!url.dwSchemeLength) { - FIXME("Unexpected blank protocol\n"); - return E_NOTIMPL; - }else { - WCHAR *buf; - buf = *p = SysAllocStringLen(NULL, url.dwSchemeLength + 1); - memcpy(buf, url.lpszScheme, url.dwSchemeLength * sizeof(WCHAR)); - buf[url.dwSchemeLength] = ':'; + if(hres == S_FALSE) { + SysFreeString(protocol); + *p = NULL; + return S_OK; } - if(!*p) + + len = SysStringLen(protocol); + ret = SysAllocStringLen(protocol, len+1); + SysFreeString(protocol); + if(!ret) return E_OUTOFMEMORY; + + ret[len] = ':'; + *p = ret; return S_OK; }

1 0

Jacek Caban : mshtml: Reorder nsIURL functions to match vtbl order.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 5c8c46db181aa74371513bab157f7be1c712dfc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8c46db181aa74371513bab1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 13:49:36 2011 +0100 mshtml: Reorder nsIURL functions to match vtbl order. --- dlls/mshtml/nsio.c | 102 ++++++++++++++++++++++++++-------------------------- 1 files changed, 51 insertions(+), 51 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 251c4b2..4e31534 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2174,57 +2174,6 @@ static nsresult NSAPI nsURI_SetPath(nsIURL *iface, const nsACString *aPath) return NS_OK; } -static nsresult NSAPI nsURL_GetRef(nsIURL *iface, nsACString *aRef) -{ - nsWineURI *This = impl_from_nsIURL(iface); - char *refa = NULL; - BSTR ref; - HRESULT hres; - - TRACE("(%p)->(%p)\n", This, aRef); - - if(!ensure_uri(This)) - return NS_ERROR_UNEXPECTED; - - hres = IUri_GetFragment(This->uri, &ref); - if(FAILED(hres)) - return NS_ERROR_UNEXPECTED; - - refa = heap_strdupWtoA(ref); - SysFreeString(ref); - if(ref && !refa) - return NS_ERROR_OUT_OF_MEMORY; - - nsACString_SetData(aRef, refa && *refa == '#' ? refa+1 : refa); - heap_free(refa); - return NS_OK; -} - -static nsresult NSAPI nsURL_SetRef(nsIURL *iface, const nsACString *aRef) -{ - nsWineURI *This = impl_from_nsIURL(iface); - const char *refa; - WCHAR *ref; - HRESULT hres; - - TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aRef)); - - if(!ensure_uri_builder(This)) - return NS_ERROR_UNEXPECTED; - - nsACString_GetData(aRef, &refa); - ref = heap_strdupAtoW(refa); - if(!ref) - return NS_ERROR_OUT_OF_MEMORY; - - hres = IUriBuilder_SetFragment(This->uri_builder, ref); - heap_free(ref); - if(FAILED(hres)) - return NS_ERROR_UNEXPECTED; - - return NS_OK; -} - static nsresult NSAPI nsURI_Equals(nsIURL *iface, nsIURI *other, PRBool *_retval) { nsWineURI *This = impl_from_nsIURL(iface); @@ -2386,6 +2335,57 @@ static nsresult NSAPI nsURI_GetOriginCharset(nsIURL *iface, nsACString *aOriginC return NS_ERROR_NOT_IMPLEMENTED; } +static nsresult NSAPI nsURL_GetRef(nsIURL *iface, nsACString *aRef) +{ + nsWineURI *This = impl_from_nsIURL(iface); + char *refa = NULL; + BSTR ref; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, aRef); + + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + hres = IUri_GetFragment(This->uri, &ref); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; + + refa = heap_strdupWtoA(ref); + SysFreeString(ref); + if(ref && !refa) + return NS_ERROR_OUT_OF_MEMORY; + + nsACString_SetData(aRef, refa && *refa == '#' ? refa+1 : refa); + heap_free(refa); + return NS_OK; +} + +static nsresult NSAPI nsURL_SetRef(nsIURL *iface, const nsACString *aRef) +{ + nsWineURI *This = impl_from_nsIURL(iface); + const char *refa; + WCHAR *ref; + HRESULT hres; + + TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aRef)); + + if(!ensure_uri_builder(This)) + return NS_ERROR_UNEXPECTED; + + nsACString_GetData(aRef, &refa); + ref = heap_strdupAtoW(refa); + if(!ref) + return NS_ERROR_OUT_OF_MEMORY; + + hres = IUriBuilder_SetFragment(This->uri_builder, ref); + heap_free(ref); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; + + return NS_OK; +} + static nsresult NSAPI nsURI_EqualsExceptRef(nsIURL *iface, nsIURI *other, PRBool *_retval) { nsWineURI *This = impl_from_nsIURL(iface);

1 0