December 2011 - Wine-commits

Rico Schüller : d3dx9/tests: Add effect parameter value GetValue() test.
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: 8a58fb3c8422c862975db5c9370bc59b922fd28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a58fb3c8422c862975db5c93… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Dec 21 15:02:44 2011 +0100 d3dx9/tests: Add effect parameter value GetValue() test. --- dlls/d3dx9_36/tests/effect.c | 383 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 383 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a58fb3c8422c862975db…

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetBool() test.
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: bdf8e4642a71181896d20ab447528552396dd729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf8e4642a71181896d20ab44… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Dec 21 15:02:53 2011 +0100 d3dx9/tests: Add effect parameter value GetBool() test. --- dlls/d3dx9_36/tests/effect.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index fcb9414..db5c1f8 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -21,6 +21,12 @@ #include "wine/test.h" #include "d3dx9.h" +/* helper functions */ +static inline BOOL get_bool(LPCVOID data) +{ + return (*(BOOL *)data) ? TRUE : FALSE; +} + static const char effect_desc[] = "Technique\n" "{\n" @@ -502,6 +508,30 @@ static void test_effect_parameter_value_GetValue(const struct test_effect_parame } } +static void test_effect_parameter_value_GetBool(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + BOOL bvalue = 0xabababab; + HRESULT hr; + + hr = effect->lpVtbl->GetBool(effect, parameter, &bvalue); + if (!res_desc->Elements && res_desc->Rows == 1 && res_desc->Columns == 1) + { + ok(hr == D3D_OK, "%u - %s: GetBool failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + ok(bvalue == get_bool(res_value), "%u - %s: GetBool bvalue failed, got %#x, expected %#x\n", + i, res_full_name, bvalue, get_bool(res_value)); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetBool failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + ok(bvalue == 0xabababab, "%u - %s: GetBool bvalue failed, got %#x, expected %#x\n", + i, res_full_name, bvalue, 0xabababab); + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -572,6 +602,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) "%u - %s: Warning: Array size to small\n", i, res_full_name); test_effect_parameter_value_GetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetBool(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetBoolArray() test.
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: cb664abfa0780d8e2f7a411a4ef8c03031cf9b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb664abfa0780d8e2f7a411a4… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Dec 21 15:02:57 2011 +0100 d3dx9/tests: Add effect parameter value GetBoolArray() test. --- dlls/d3dx9_36/tests/effect.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index db5c1f8..517a7de 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -532,6 +532,48 @@ static void test_effect_parameter_value_GetBool(const struct test_effect_paramet } } +static void test_effect_parameter_value_GetBoolArray(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + BOOL bavalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; + HRESULT hr; + UINT l; + + memset(bavalue, 0xab, sizeof(bavalue)); + hr = effect->lpVtbl->GetBoolArray(effect, parameter, bavalue, res_desc->Bytes / sizeof(*bavalue)); + if (res_desc->Class == D3DXPC_SCALAR + || res_desc->Class == D3DXPC_VECTOR + || res_desc->Class == D3DXPC_MATRIX_ROWS) + { + ok(hr == D3D_OK, "%u - %s: GetBoolArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (l = 0; l < res_desc->Bytes / sizeof(*bavalue); ++l) + { + ok(bavalue[l] == get_bool(&res_value[l]), "%u - %s: GetBoolArray bavalue[%u] failed, got %#x, expected %#x\n", + i, res_full_name, l, bavalue[l], get_bool(&res_value[l])); + } + + for (l = res_desc->Bytes / sizeof(*bavalue); l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(bavalue[l] == 0xabababab, "%u - %s: GetBoolArray bavalue[%u] failed, got %#x, expected %#x\n", + i, res_full_name, l, bavalue[l], 0xabababab); + } + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetBoolArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(bavalue[l] == 0xabababab, "%u - %s: GetBoolArray bavalue[%u] failed, got %#x, expected %#x\n", + i, res_full_name, l, bavalue[l], 0xabababab); + } + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -603,6 +645,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetValue(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetBool(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetBoolArray(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetInt() test.
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: d984a524e7ceacca522fab8e62a754169d6ab18f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d984a524e7ceacca522fab8e6… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Dec 21 15:03:00 2011 +0100 d3dx9/tests: Add effect parameter value GetInt() test. --- dlls/d3dx9_36/tests/effect.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 517a7de..0fbe980 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -22,6 +22,33 @@ #include "d3dx9.h" /* helper functions */ +static inline INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) +{ + INT i; + + switch (type) + { + case D3DXPT_FLOAT: + i = *(FLOAT *)data; + break; + + case D3DXPT_INT: + i = *(INT *)data; + break; + + case D3DXPT_BOOL: + i = *(BOOL *)data; + break; + + default: + i = 0; + ok(0, "Unhandled type %x.\n", type); + break; + } + + return i; +} + static inline BOOL get_bool(LPCVOID data) { return (*(BOOL *)data) ? TRUE : FALSE; @@ -465,6 +492,8 @@ test_effect_parameter_value_data[] = #undef ADD_PARAMETER_VALUE #define EFFECT_PARAMETER_VALUE_ARRAY_SIZE 48 +/* Constants for special INT/FLOAT conversation */ +#define INT_FLOAT_MULTI 255.0f static void test_effect_parameter_value_GetValue(const struct test_effect_parameter_value_result *res, ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) @@ -574,6 +603,49 @@ static void test_effect_parameter_value_GetBoolArray(const struct test_effect_pa } } +static void test_effect_parameter_value_GetInt(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + INT ivalue = 0xabababab; + HRESULT hr; + + hr = effect->lpVtbl->GetInt(effect, parameter, &ivalue); + if (!res_desc->Elements && res_desc->Columns == 1 && res_desc->Rows == 1) + { + ok(hr == D3D_OK, "%u - %s: GetInt failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + ok(ivalue == get_int(res_desc->Type, res_value), "%u - %s: GetInt ivalue failed, got %i, expected %i\n", + i, res_full_name, ivalue, get_int(res_desc->Type, res_value)); + } + else if(!res_desc->Elements && res_desc->Type == D3DXPT_FLOAT && + ((res_desc->Class == D3DXPC_VECTOR && res_desc->Columns != 2) || + (res_desc->Class == D3DXPC_MATRIX_ROWS && res_desc->Rows != 2 && res_desc->Columns == 1))) + { + INT tmp; + + ok(hr == D3D_OK, "%u - %s: GetInt failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + tmp = (INT)(min(max(0.0f, *((FLOAT *)res_value + 2)), 1.0f) * INT_FLOAT_MULTI); + tmp += ((INT)(min(max(0.0f, *((FLOAT *)res_value + 1)), 1.0f) * INT_FLOAT_MULTI)) << 8; + tmp += ((INT)(min(max(0.0f, *((FLOAT *)res_value + 0)), 1.0f) * INT_FLOAT_MULTI)) << 16; + if (res_desc->Columns * res_desc->Rows > 3) + { + tmp += ((INT)(min(max(0.0f, *((FLOAT *)res_value + 3)), 1.0f) * INT_FLOAT_MULTI)) << 24; + } + + ok(ivalue == tmp, "%u - %s: GetInt ivalue failed, got %x, expected %x\n", + i, res_full_name, ivalue, tmp); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetInt failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + ok(ivalue == 0xabababab, "%u - %s: GetInt ivalue failed, got %i, expected %i\n", + i, res_full_name, ivalue, 0xabababab); + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -646,6 +718,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetValue(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetBool(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetBoolArray(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetInt(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetIntArray() test.
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: 5341b5518bc3a0526c5044bcb2dd5752c5876df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5341b5518bc3a0526c5044bcb… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Dec 21 15:03:05 2011 +0100 d3dx9/tests: Add effect parameter value GetIntArray() test. --- dlls/d3dx9_36/tests/effect.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 0fbe980..54d6a25 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -646,6 +646,48 @@ static void test_effect_parameter_value_GetInt(const struct test_effect_paramete } } +static void test_effect_parameter_value_GetIntArray(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + INT iavalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; + HRESULT hr; + UINT l; + + memset(iavalue, 0xab, sizeof(iavalue)); + hr = effect->lpVtbl->GetIntArray(effect, parameter, iavalue, res_desc->Bytes / sizeof(*iavalue)); + if (res_desc->Class == D3DXPC_SCALAR + || res_desc->Class == D3DXPC_VECTOR + || res_desc->Class == D3DXPC_MATRIX_ROWS) + { + ok(hr == D3D_OK, "%u - %s: GetIntArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (l = 0; l < res_desc->Bytes / sizeof(*iavalue); ++l) + { + ok(iavalue[l] == get_int(res_desc->Type, &res_value[l]), "%u - %s: GetIntArray iavalue[%u] failed, got %i, expected %i\n", + i, res_full_name, l, iavalue[l], get_int(res_desc->Type, &res_value[l])); + } + + for (l = res_desc->Bytes / sizeof(*iavalue); l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(iavalue[l] == 0xabababab, "%u - %s: GetIntArray iavalue[%u] failed, got %i, expected %i\n", + i, res_full_name, l, iavalue[l], 0xabababab); + } + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetIntArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(iavalue[l] == 0xabababab, "%u - %s: GetIntArray iavalue[%u] failed, got %i, expected %i\n", + i, res_full_name, l, iavalue[l], 0xabababab); + } + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -719,6 +761,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetBool(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetBoolArray(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetInt(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetIntArray(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Piotr Caban : msvcp90: Added partial collate<wchar_t> implementation.
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: bb002e27b35bb4d7f5620f97bcebd0745a1b7efe URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb002e27b35bb4d7f5620f97b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 21 15:57:46 2011 +0100 msvcp90: Added partial collate<wchar_t> implementation. --- dlls/msvcp90/locale.c | 97 ++++++++++++++++++++++++++++++++------------- dlls/msvcp90/msvcp90.spec | 2 +- 2 files changed, 70 insertions(+), 29 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 7b0fa5f..b8c4b11 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -833,14 +833,36 @@ extern const vtable_ptr MSVCP_collate_wchar_vtable; /* ??_7?$collate(a)G@std@@6B@ */ extern const vtable_ptr MSVCP_collate_short_vtable; +/* ?_Init@?$collate(a)_W@std@@IAEXABV_Locinfo(a)2@@Z */ +/* ?_Init@?$collate(a)_W@std@@IEAAXAEBV_Locinfo(a)2@@Z */ +/* ?_Init@?$collate(a)G@std@@IAEXABV_Locinfo(a)2@@Z */ +/* ?_Init@?$collate(a)G@std@@IEAAXAEBV_Locinfo(a)2@@Z */ +DEFINE_THISCALL_WRAPPER(collate_wchar__Init, 8) +void __thiscall collate_wchar__Init(collate *this, const _Locinfo *locinfo) +{ + TRACE("(%p %p)\n", this, locinfo); + this->coll = _Locinfo__Getcoll(locinfo); +} + /* ??0?$collate(a)_W@std@@IAE(a)PBDI@Z */ /* ??0?$collate(a)_W@std@@IEAA(a)PEBD_K@Z */ DEFINE_THISCALL_WRAPPER(collate_wchar_ctor_name, 12) collate* __thiscall collate_wchar_ctor_name(collate *this, const char *name, MSVCP_size_t refs) { - FIXME("(%p %s %lu) stub\n", this, name, refs); + _Lockit lockit; + _Locinfo locinfo; + + TRACE("(%p %s %lu)\n", this, name, refs); + + locale_facet_ctor_refs(&this->facet, refs); this->facet.vtable = &MSVCP_collate_wchar_vtable; - return NULL; + + _Lockit_ctor_locktype(&lockit, _LOCK_LOCALE); + _Locinfo_ctor_cstr(&locinfo, name); + collate_wchar__Init(this, &locinfo); + _Locinfo_dtor(&locinfo); + _Lockit_dtor(&lockit); + return this; } /* ??0?$collate(a)G@std@@IAE(a)PBDI@Z */ @@ -858,9 +880,12 @@ collate* __thiscall collate_short_ctor_name(collate *this, const char *name, MSV DEFINE_THISCALL_WRAPPER(collate_wchar_ctor_locinfo, 12) collate* __thiscall collate_wchar_ctor_locinfo(collate *this, _Locinfo *locinfo, MSVCP_size_t refs) { - FIXME("(%p %p %lu) stub\n", this, locinfo, refs); + TRACE("(%p %p %lu)\n", this, locinfo, refs); + + locale_facet_ctor_refs(&this->facet, refs); this->facet.vtable = &MSVCP_collate_wchar_vtable; - return NULL; + collate_wchar__Init(this, locinfo); + return this; } /* ??0?$collate(a)G@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -878,9 +903,7 @@ collate* __thiscall collate_short_ctor_locinfo(collate *this, _Locinfo *locinfo, DEFINE_THISCALL_WRAPPER(collate_wchar_ctor_refs, 8) collate* __thiscall collate_wchar_ctor_refs(collate *this, MSVCP_size_t refs) { - FIXME("(%p %lu) stub\n", this, refs); - this->facet.vtable = &MSVCP_collate_wchar_vtable; - return NULL; + return collate_wchar_ctor_name(this, "C", refs); } /* ??0?$collate(a)G@std@@QAE(a)I@Z */ @@ -900,7 +923,7 @@ collate* __thiscall collate_short_ctor_refs(collate *this, MSVCP_size_t refs) DEFINE_THISCALL_WRAPPER(collate_wchar_dtor, 4) void __thiscall collate_wchar_dtor(collate *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); } DEFINE_THISCALL_WRAPPER(MSVCP_collate_wchar_vector_dtor, 8) @@ -934,9 +957,7 @@ collate* __thiscall MSVCP_collate_short_vector_dtor(collate *this, unsigned int DEFINE_THISCALL_WRAPPER(collate_wchar_ctor, 4) collate* __thiscall collate_wchar_ctor(collate *this) { - FIXME("(%p) stub\n", this); - this->facet.vtable = &MSVCP_collate_wchar_vtable; - return NULL; + return collate_wchar_ctor_name(this, "C", 0); } /* ??_F?$collate(a)G@std@@QAEXXZ */ @@ -955,18 +976,28 @@ collate* __thiscall collate_short_ctor(collate *this) /* ?_Getcat@?$collate(a)G@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ MSVCP_size_t __cdecl collate_wchar__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(collate)); + if(!*facet) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return 0; + } + collate_wchar_ctor_name((collate*)*facet, + MSVCP_basic_string_char_c_str(&loc->ptr->name), 0); + } + + return LC_COLLATE; } -/* ?_Init@?$collate(a)_W@std@@IAEXABV_Locinfo(a)2@@Z */ -/* ?_Init@?$collate(a)_W@std@@IEAAXAEBV_Locinfo(a)2@@Z */ -/* ?_Init@?$collate(a)G@std@@IAEXABV_Locinfo(a)2@@Z */ -/* ?_Init@?$collate(a)G@std@@IEAAXAEBV_Locinfo(a)2@@Z */ -DEFINE_THISCALL_WRAPPER(collate_wchar__Init, 8) -void __thiscall collate_wchar__Init(collate *this, const _Locinfo *locinfo) +/* _Wcscoll */ +int __cdecl _Wcscoll(const wchar_t *first1, const wchar_t *last1, const wchar_t *first2, + const wchar_t *last2, const _Collvec *coll) { - FIXME("(%p %p) stub\n", this, locinfo); + TRACE("(%s %s)\n", debugstr_wn(first1, last1-first1), debugstr_wn(first2, last2-first2)); + return CompareStringW(coll->handle, 0, first1, last1-first1, first2, last2-first2)-2; } /* ?do_compare@?$collate(a)_W@std@@MBEHPB_W000(a)Z */ @@ -974,11 +1005,14 @@ void __thiscall collate_wchar__Init(collate *this, const _Locinfo *locinfo) /* ?do_compare@?$collate(a)G@std@@MBEHPBG000(a)Z */ /* ?do_compare@?$collate(a)G@std@@MEBAHPEBG000(a)Z */ DEFINE_THISCALL_WRAPPER(collate_wchar_do_compare, 20) +#define call_collate_wchar_do_compare(this, first1, last1, first2, last2) CALL_VTBL_FUNC(this, 4, int, \ + (const collate*, const wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*), \ + (this, first1, last1, first2, last2)) int __thiscall collate_wchar_do_compare(const collate *this, const wchar_t *first1, const wchar_t *last1, const wchar_t *first2, const wchar_t *last2) { - FIXME("(%p %p %p %p %p) stub\n", this, first1, last1, first2, last2); - return 0; + TRACE("(%p %p %p %p %p)\n", this, first1, last1, first2, last2); + return _Wcscoll(first1, last1, first2, last2, &this->coll); } /* ?compare@?$collate(a)_W@std@@QBEHPB_W000(a)Z */ @@ -989,8 +1023,8 @@ DEFINE_THISCALL_WRAPPER(collate_wchar_compare, 20) int __thiscall collate_wchar_compare(const collate *this, const wchar_t *first1, const wchar_t *last1, const wchar_t *first2, const wchar_t *last2) { - FIXME("(%p %p %p %p %p) stub\n", this, first1, last1, first2, last2); - return 0; + TRACE("(%p %p %p %p %p)\n", this, first1, last1, first2, last2); + return call_collate_wchar_do_compare(this, first1, last1, first2, last2); } /* ?do_hash@?$collate(a)_W@std@@MBEJPB_W0(a)Z */ @@ -998,11 +1032,18 @@ int __thiscall collate_wchar_compare(const collate *this, const wchar_t *first1, /* ?do_hash@?$collate(a)G@std@@MBEJPBG0(a)Z */ /* ?do_hash@?$collate(a)G@std@@MEBAJPEBG0(a)Z */ DEFINE_THISCALL_WRAPPER(collate_wchar_do_hash, 12) +#define call_collate_wchar_do_hash(this, first, last) CALL_VTBL_FUNC(this, 12, LONG, \ + (const collate*, const wchar_t*, const wchar_t*), (this, first, last)) LONG __thiscall collate_wchar_do_hash(const collate *this, const wchar_t *first, const wchar_t *last) { - FIXME("(%p %p %p) stub\n", this, first, last); - return 0; + ULONG ret = 0; + + TRACE("(%p %p %p)\n", this, first, last); + + for(; first<last; first++) + ret = (ret<<8 | ret>>24) + *first; + return ret; } /* ?hash@?$collate(a)_W@std@@QBEJPB_W0(a)Z */ @@ -1013,8 +1054,8 @@ DEFINE_THISCALL_WRAPPER(collate_wchar_hash, 12) LONG __thiscall collate_wchar_hash(const collate *this, const wchar_t *first, const wchar_t *last) { - FIXME("(%p %p %p) stub\n", this, first, last); - return 0; + TRACE("(%p %p %p)\n", this, first, last); + return call_collate_wchar_do_hash(this, first, last); } /* ?do_transform@?$collate(a)_W@std@@MBE?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)PB_W0@Z */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 687bacc..f53b579 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5803,7 +5803,7 @@ @ stub _Towlower @ stub _Towupper @ stub _Wcrtomb -@ stub _Wcscoll +@ cdecl _Wcscoll(ptr ptr ptr ptr ptr) @ stub _Wcsxfrm # extern _Xbig @ stub __Wcrtomb_lk

1 0

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

21 Dec '11

Module: wine Branch: master Commit: 72d18e01116e81b8c033b9dfdb76a22cf575a995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d18e01116e81b8c033b9dfd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 21 15:58:03 2011 +0100 msvcp90: Added ctype<char> constructors implementation. --- dlls/msvcp90/locale.c | 60 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index b8c4b11..bf32d85 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -73,7 +73,7 @@ typedef struct { typedef struct { LCID handle; unsigned page; - short *table; + const short *table; int delfl; } _Ctypevec; @@ -477,18 +477,20 @@ _Ctypevec __cdecl _Getctype(void) { _Ctypevec ret; _locale_t locale = _get_current_locale(); + short *table; TRACE("\n"); ret.page = locale->locinfo->lc_codepage; ret.handle = locale->locinfo->lc_handle[LC_COLLATE]; ret.delfl = TRUE; - ret.table = malloc(sizeof(short[256])); - if(!ret.table) { + table = malloc(sizeof(short[256])); + if(!table) { _free_locale(locale); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - memcpy(ret.table, locale->locinfo->pctype, sizeof(short[256])); + memcpy(table, locale->locinfo->pctype, sizeof(short[256])); + ret.table = table; _free_locale(locale); return ret; } @@ -1156,8 +1158,8 @@ extern const vtable_ptr MSVCP_ctype_char_vtable; /* ?_Id_func@?$ctype(a)D@std@@SAAEAVid(a)locale@2(a)XZ */ locale_id* __cdecl ctype_char__Id_func(void) { - FIXME("() stub\n"); - return NULL; + TRACE("()\n"); + return &ctype_char_id; } /* ?_Init@?$ctype(a)D@std@@IAEXABV_Locinfo(a)2@@Z */ @@ -1165,7 +1167,8 @@ locale_id* __cdecl ctype_char__Id_func(void) DEFINE_THISCALL_WRAPPER(ctype_char__Init, 8) void __thiscall ctype_char__Init(ctype_char *this, _Locinfo *locinfo) { - FIXME("(%p %p) stub\n", this, locinfo); + TRACE("(%p %p)\n", this, locinfo); + this->ctype = _Locinfo__Getctype(locinfo); } /* ?_Tidy@?$ctype(a)D@std@@IAEXXZ */ @@ -1173,15 +1176,18 @@ void __thiscall ctype_char__Init(ctype_char *this, _Locinfo *locinfo) DEFINE_THISCALL_WRAPPER(ctype_char__Tidy, 4) void __thiscall ctype_char__Tidy(ctype_char *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + if(this->ctype.delfl) + free((short*)this->ctype.table); } /* ?classic_table@?$ctype(a)D@std@@KAPBFXZ */ /* ?classic_table@?$ctype(a)D@std@@KAPEBFXZ */ const short* __cdecl ctype_char_classic_table(void) { - FIXME("() stub\n"); - return NULL; + TRACE("()\n"); + return &((short*)GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_ctype"))[1]; } /* ??0?$ctype(a)D@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -1190,9 +1196,11 @@ DEFINE_THISCALL_WRAPPER(ctype_char_ctor_locinfo, 12) ctype_char* __thiscall ctype_char_ctor_locinfo(ctype_char *this, _Locinfo *locinfo, MSVCP_size_t refs) { - FIXME("(%p %p %lu) stub\n", this, locinfo, refs); + TRACE("(%p %p %lu)\n", this, locinfo, refs); + ctype_base_ctor_refs(&this->base, refs); this->base.facet.vtable = &MSVCP_ctype_char_vtable; - return NULL; + ctype_char__Init(this, locinfo); + return this; } /* ??0?$ctype(a)D@std@@QAE(a)PBF_NI@Z */ @@ -1201,9 +1209,26 @@ DEFINE_THISCALL_WRAPPER(ctype_char_ctor_table, 16) ctype_char* __thiscall ctype_char_ctor_table(ctype_char *this, const short *table, MSVCP_bool delete, MSVCP_size_t refs) { - FIXME("(%p %p %d %lu) stub\n", this, table, delete, refs); + _Lockit lockit; + _Locinfo locinfo; + + TRACE("(%p %p %d %lu)\n", this, table, delete, refs); + + ctype_base_ctor_refs(&this->base, refs); this->base.facet.vtable = &MSVCP_ctype_char_vtable; - return NULL; + + _Lockit_ctor_locktype(&lockit, _LOCK_LOCALE); + _Locinfo_ctor(&locinfo); + ctype_char__Init(this, &locinfo); + _Locinfo_dtor(&locinfo); + _Lockit_dtor(&lockit); + + if(table) { + ctype_char__Tidy(this); + this->ctype.table = table; + this->ctype.delfl = delete; + } + return this; } /* ??_F?$ctype(a)D@std@@QAEXXZ */ @@ -1211,9 +1236,7 @@ ctype_char* __thiscall ctype_char_ctor_table(ctype_char *this, DEFINE_THISCALL_WRAPPER(ctype_char_ctor, 4) ctype_char* __thiscall ctype_char_ctor(ctype_char *this) { - FIXME("(%p) stub\n", this); - this->base.facet.vtable = &MSVCP_ctype_char_vtable; - return NULL; + return ctype_char_ctor_table(this, NULL, FALSE, 0); } /* ??1?$ctype(a)D@std@@MAE(a)XZ */ @@ -1221,7 +1244,8 @@ ctype_char* __thiscall ctype_char_ctor(ctype_char *this) DEFINE_THISCALL_WRAPPER(ctype_char_dtor, 4) void __thiscall ctype_char_dtor(ctype_char *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + ctype_char__Tidy(this); } DEFINE_THISCALL_WRAPPER(MSVCP_ctype_char_vector_dtor, 8)

1 0

Piotr Caban : msvcp90: Added ctype<char>::narrow functions implementation.
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: facb3e3fe6796f8ade8d9d4edc2d5cd99efe797c URL: http://source.winehq.org/git/wine.git/?a=commit;h=facb3e3fe6796f8ade8d9d4ed… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 21 15:58:19 2011 +0100 msvcp90: Added ctype<char>::narrow functions implementation. --- dlls/msvcp90/locale.c | 36 +++++++++++++++++++++++------------- 1 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index bf32d85..1bae73e 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -1271,30 +1271,40 @@ ctype_char* __thiscall MSVCP_ctype_char_vector_dtor(ctype_char *this, unsigned i /* ?do_narrow@?$ctype(a)D@std@@MBEDDD(a)Z */ /* ?do_narrow@?$ctype(a)D@std@@MEBADDD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char_do_narrow_ch, 12) +#define call_ctype_char_do_narrow_ch(this, ch, unused) CALL_VTBL_FUNC(this, 36, \ + char, (const ctype_char*, char, char), (this, ch, unused)) char __thiscall ctype_char_do_narrow_ch(const ctype_char *this, char ch, char unused) { - FIXME("(%p %c %c) stub\n", this, ch, unused); - return 0; + TRACE("(%p %c %c)\n", this, ch, unused); + return ch; } /* ?do_narrow@?$ctype(a)D@std@@MBEPBDPBD0DPAD(a)Z */ /* ?do_narrow@?$ctype(a)D@std@@MEBAPEBDPEBD0DPEAD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char_do_narrow, 20) +#define call_ctype_char_do_narrow(this, first, last, unused, dest) CALL_VTBL_FUNC(this, 32, \ + const char*, (const ctype_char*, const char*, const char*, char, char*), \ + (this, first, last, unused, dest)) const char* __thiscall ctype_char_do_narrow(const ctype_char *this, const char *first, const char *last, char unused, char *dest) { - FIXME("(%p %p %p %p) stub\n", this, first, last, dest); - return NULL; + TRACE("(%p %p %p %p)\n", this, first, last, dest); + memcpy(dest, first, last-first); + return last; } /* ?_Do_narrow_s@?$ctype(a)D@std@@MBEPBDPBD0DPADI(a)Z */ /* ?_Do_narrow_s@?$ctype(a)D@std@@MEBAPEBDPEBD0DPEAD_K(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char__Do_narrow_s, 24) +#define call_ctype_char__Do_narrow_s(this, first, last, unused, dest, size) CALL_VTBL_FUNC(this, 40, \ + const char*, (const ctype_char*, const char*, const char*, char, char*, MSVCP_size_t), \ + (this, first, last, unused, dest, size)) const char* __thiscall ctype_char__Do_narrow_s(const ctype_char *this, const char *first, const char *last, char unused, char *dest, MSVCP_size_t size) { - FIXME("(%p %p %p %p %lu) stub\n", this, first, last, dest, size); - return NULL; + TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); + memcpy_s(dest, size, first, last-first); + return last; } /* ?narrow@?$ctype(a)D@std@@QBEDDD(a)Z */ @@ -1302,8 +1312,8 @@ const char* __thiscall ctype_char__Do_narrow_s(const ctype_char *this, const cha DEFINE_THISCALL_WRAPPER(ctype_char_narrow_ch, 12) char __thiscall ctype_char_narrow_ch(const ctype_char *this, char ch, char dflt) { - FIXME("(%p %c %c) stub\n", this, ch, dflt); - return 0; + TRACE("(%p %c %c)\n", this, ch, dflt); + return call_ctype_char_do_narrow_ch(this, ch, dflt); } /* ?narrow@?$ctype(a)D@std@@QBEPBDPBD0DPAD(a)Z */ @@ -1312,18 +1322,18 @@ DEFINE_THISCALL_WRAPPER(ctype_char_narrow, 20) const char* __thiscall ctype_char_narrow(const ctype_char *this, const char *first, const char *last, char dflt, char *dest) { - FIXME("(%p %p %p %c %p) stub\n", this, first, last, dflt, dest); - return NULL; + TRACE("(%p %p %p %c %p)\n", this, first, last, dflt, dest); + return call_ctype_char_do_narrow(this, first, last, dflt, dest); } /* ?_Narrow_s@?$ctype(a)D@std@@QBEPBDPBD0DPADI(a)Z */ /* ?_Narrow_s@?$ctype(a)D@std@@QEBAPEBDPEBD0DPEAD_K(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char__Narrow_s, 24) const char* __thiscall ctype_char__Narrow_s(const ctype_char *this, const char *first, - const char *last, char unused, char *dest, MSVCP_size_t size) + const char *last, char dflt, char *dest, MSVCP_size_t size) { - FIXME("(%p %p %p %p %lu) stub\n", this, first, last, dest, size); - return NULL; + TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); + return call_ctype_char__Do_narrow_s(this, first, last, dflt, dest, size); } /* ?do_widen@?$ctype(a)D@std@@MBEDD(a)Z */

1 0

Piotr Caban : msvcp90: Added ctype<char>::widen functions implementation.
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: 8f8f6b3c0dd59507c5d6cc3f0bf9d7ecb912b043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f8f6b3c0dd59507c5d6cc3f0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 21 15:58:35 2011 +0100 msvcp90: Added ctype<char>::widen functions implementation. --- dlls/msvcp90/locale.c | 34 ++++++++++++++++++++++------------ 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 1bae73e..8105ca0 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -1339,30 +1339,40 @@ const char* __thiscall ctype_char__Narrow_s(const ctype_char *this, const char * /* ?do_widen@?$ctype(a)D@std@@MBEDD(a)Z */ /* ?do_widen@?$ctype(a)D@std@@MEBADD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char_do_widen_ch, 8) +#define call_ctype_char_do_widen_ch(this, ch) CALL_VTBL_FUNC(this, 24, \ + char, (const ctype_char*, char), (this, ch)) char __thiscall ctype_char_do_widen_ch(const ctype_char *this, char ch) { - FIXME("(%p %c) stub\n", this, ch); - return 0; + TRACE("(%p %c)\n", this, ch); + return ch; } /* ?do_widen@?$ctype(a)D@std@@MBEPBDPBD0PAD(a)Z */ /* ?do_widen@?$ctype(a)D@std@@MEBAPEBDPEBD0PEAD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char_do_widen, 16) +#define call_ctype_char_do_widen(this, first, last, dest) CALL_VTBL_FUNC(this, 20, \ + const char*, (const ctype_char*, const char*, const char*, char*), \ + (this, first, last, dest)) const char* __thiscall ctype_char_do_widen(const ctype_char *this, const char *first, const char *last, char *dest) { - FIXME("(%p %p %p %p) stub\n", this, first, last, dest); - return NULL; + TRACE("(%p %p %p %p)\n", this, first, last, dest); + memcpy(dest, first, last-first); + return last; } /* ?_Do_widen_s@?$ctype(a)D@std@@MBEPBDPBD0PADI(a)Z */ /* ?_Do_widen_s@?$ctype(a)D@std@@MEBAPEBDPEBD0PEAD_K(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char__Do_widen_s, 20) +#define call_ctype_char__Do_widen_s(this, first, last, dest, size) CALL_VTBL_FUNC(this, 28, \ + const char*, (const ctype_char*, const char*, const char*, char*, MSVCP_size_t), \ + (this, first, last, dest, size)) const char* __thiscall ctype_char__Do_widen_s(const ctype_char *this, const char *first, const char *last, char *dest, MSVCP_size_t size) { - FIXME("(%p %p %p %p %lu) stub\n", this, first, last, dest, size); - return NULL; + TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); + memcpy_s(dest, size, first, last-first); + return last; } /* ?widen@?$ctype(a)D@std@@QBEDD(a)Z */ @@ -1370,8 +1380,8 @@ const char* __thiscall ctype_char__Do_widen_s(const ctype_char *this, DEFINE_THISCALL_WRAPPER(ctype_char_widen_ch, 8) char __thiscall ctype_char_widen_ch(const ctype_char *this, char ch) { - FIXME("(%p %c) stub\n", this, ch); - return 0; + TRACE("(%p %c)\n", this, ch); + return call_ctype_char_do_widen_ch(this, ch); } /* ?widen@?$ctype(a)D@std@@QBEPBDPBD0PAD(a)Z */ @@ -1380,8 +1390,8 @@ DEFINE_THISCALL_WRAPPER(ctype_char_widen, 16) const char* __thiscall ctype_char_widen(const ctype_char *this, const char *first, const char *last, char *dest) { - FIXME("(%p %p %p %p) stub\n", this, first, last, dest); - return NULL; + TRACE("(%p %p %p %p)\n", this, first, last, dest); + return call_ctype_char_do_widen(this, first, last, dest); } /* ?_Widen_s@?$ctype(a)D@std@@QBEPBDPBD0PADI(a)Z */ @@ -1390,8 +1400,8 @@ DEFINE_THISCALL_WRAPPER(ctype_char__Widen_s, 20) const char* __thiscall ctype_char__Widen_s(const ctype_char *this, const char *first, const char *last, char *dest, MSVCP_size_t size) { - FIXME("(%p %p %p %p %lu) stub\n", this, first, last, dest, size); - return NULL; + TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); + return call_ctype_char__Do_widen_s(this, first, last, dest, size); } /* ?_Getcat@?$ctype(a)D@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */

1 0

Nikolay Sivov : msxml3: Support DELETE method in IXMLHttpRequest.
by Alexandre Julliard 21 Dec '11

21 Dec '11

Module: wine Branch: master Commit: 8c03b4e5f0d73297dfbe6feb6a73a6ca785aa500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c03b4e5f0d73297dfbe6feb6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 21 00:05:45 2011 +0300 msxml3: Support DELETE method in IXMLHttpRequest. --- dlls/msxml3/httprequest.c | 42 ++++++++++++++++++++++++++++-------------- 1 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 6b77d2e..3000037 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -47,10 +47,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 -static const WCHAR MethodGetW[] = {'G','E','T',0}; -static const WCHAR MethodPutW[] = {'P','U','T',0}; -static const WCHAR MethodPostW[] = {'P','O','S','T',0}; - static const WCHAR colspaceW[] = {':',' ',0}; static const WCHAR crlfW[] = {'\r','\n',0}; @@ -75,6 +71,7 @@ typedef struct /* request */ BINDVERB verb; + BSTR custom; BSTR url; BOOL async; struct list reqheaders; @@ -334,6 +331,11 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, } pbindinfo->dwBindVerb = This->request->verb; + if (This->request->verb == BINDVERB_CUSTOM) + { + pbindinfo->szCustomVerb = CoTaskMemAlloc(SysStringByteLen(This->request->custom)); + strcpyW(pbindinfo->szCustomVerb, This->request->custom); + } return S_OK; } @@ -732,6 +734,7 @@ static ULONG WINAPI httprequest_Release(IXMLHTTPRequest *iface) if (This->site) IUnknown_Release( This->site ); + SysFreeString(This->custom); SysFreeString(This->url); SysFreeString(This->user); SysFreeString(This->password); @@ -827,9 +830,14 @@ static HRESULT WINAPI httprequest_Invoke(IXMLHTTPRequest *iface, DISPID dispIdMe static HRESULT WINAPI httprequest_open(IXMLHTTPRequest *iface, BSTR method, BSTR url, VARIANT async, VARIANT user, VARIANT password) { + static const WCHAR MethodGetW[] = {'G','E','T',0}; + static const WCHAR MethodPutW[] = {'P','U','T',0}; + static const WCHAR MethodPostW[] = {'P','O','S','T',0}; + static const WCHAR MethodDeleteW[] = {'D','E','L','E','T','E',0}; + httprequest *This = impl_from_IXMLHTTPRequest( iface ); - HRESULT hr; VARIANT str, is_async; + HRESULT hr; TRACE("(%p)->(%s %s %s)\n", This, debugstr_w(method), debugstr_w(url), debugstr_variant(&async)); @@ -842,18 +850,23 @@ static HRESULT WINAPI httprequest_open(IXMLHTTPRequest *iface, BSTR method, BSTR SysFreeString(This->password); This->url = This->user = This->password = NULL; - if (lstrcmpiW(method, MethodGetW) == 0) + if (!strcmpiW(method, MethodGetW)) { This->verb = BINDVERB_GET; } - else if (lstrcmpiW(method, MethodPutW) == 0) + else if (!strcmpiW(method, MethodPutW)) { This->verb = BINDVERB_PUT; } - else if (lstrcmpiW(method, MethodPostW) == 0) + else if (!strcmpiW(method, MethodPostW)) { This->verb = BINDVERB_POST; } + else if (!strcmpiW(method, MethodDeleteW)) + { + This->verb = BINDVERB_CUSTOM; + SysReAllocString(&This->custom, method); + } else { FIXME("unsupported request type %s\n", debugstr_w(method)); @@ -1219,7 +1232,7 @@ static HRESULT WINAPI httprequest_put_onreadystatechange(IXMLHTTPRequest *iface, return S_OK; } -static const struct IXMLHTTPRequestVtbl dimimpl_vtbl = +static const struct IXMLHTTPRequestVtbl XMLHTTPRequestVtbl = { httprequest_QueryInterface, httprequest_AddRef, @@ -1293,7 +1306,7 @@ static HRESULT WINAPI httprequest_ObjectWithSite_SetSite( IObjectWithSite *iface return S_OK; } -static const IObjectWithSiteVtbl httprequestObjectSite = +static const IObjectWithSiteVtbl ObjectWithSiteVtbl = { httprequest_ObjectWithSite_QueryInterface, httprequest_ObjectWithSite_AddRef, @@ -1354,7 +1367,7 @@ static HRESULT WINAPI httprequest_Safety_SetInterfaceSafetyOptions(IObjectSafety #undef SAFETY_SUPPORTED_OPTIONS -static const IObjectSafetyVtbl httprequestObjectSafety = { +static const IObjectSafetyVtbl ObjectSafetyVtbl = { httprequest_Safety_QueryInterface, httprequest_Safety_AddRef, httprequest_Safety_Release, @@ -1373,13 +1386,14 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, void **ppObj) if( !req ) return E_OUTOFMEMORY; - req->IXMLHTTPRequest_iface.lpVtbl = &dimimpl_vtbl; - req->IObjectWithSite_iface.lpVtbl = &httprequestObjectSite; - req->IObjectSafety_iface.lpVtbl = &httprequestObjectSafety; + req->IXMLHTTPRequest_iface.lpVtbl = &XMLHTTPRequestVtbl; + req->IObjectWithSite_iface.lpVtbl = &ObjectWithSiteVtbl; + req->IObjectSafety_iface.lpVtbl = &ObjectSafetyVtbl; req->ref = 1; req->async = FALSE; req->verb = -1; + req->custom = NULL; req->url = req->user = req->password = NULL; req->state = READYSTATE_UNINITIALIZED;

1 0