July 2012 - Wine-Commits - list.winehq.org

Piotr Caban : msvcp90: Keep class definitions in separate file.
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: 6c864c699d85aa8bf6f849c285d3dc70e350c28e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c864c699d85aa8bf6f849c28… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 3 16:52:39 2012 +0200 msvcp90: Keep class definitions in separate file. --- dlls/msvcp90/cxx.h | 224 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 212 +-------------------------------------------- 2 files changed, 227 insertions(+), 209 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c864c699d85aa8bf6f84…

1 0

Piotr Caban : msvcp71: Forward basic_string::operator{<, <=, >, >=} to msvcp90 .
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: c5cd3d4d765bcc02c88bef6d87e6348154845a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5cd3d4d765bcc02c88bef6d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 3 16:55:09 2012 +0200 msvcp71: Forward basic_string::operator{<,<=,>,>=} to msvcp90. --- dlls/msvcp70/msvcp70.spec | 120 ++++++++++++++++++++++---------------------- 1 files changed, 60 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5cd3d4d765bcc02c88be…

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetMatrixTransposePointerArray().
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: 929c669b4ff61eb3fabd0941d0eb33ee881a0224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=929c669b4ff61eb3fabd0941d… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jul 3 12:27:57 2012 +0200 d3dx9: Implement ID3DXBaseEffect::SetMatrixTransposePointerArray(). --- dlls/d3dx9_36/effect.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 08ae633..877df29 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2592,10 +2592,38 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTransposeArray(ID3DXBaseEffec static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTransposePointerArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX **matrix, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); + D3DXMATRIX m; - FIXME("iface %p, parameter %p, matrix %p, count %u stub\n", This, parameter, matrix, count); + TRACE("iface %p, parameter %p, matrix %p, count %u\n", This, parameter, matrix, count); - return E_NOTIMPL; + if (param && count <= param->element_count) + { + UINT i; + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + { + set_matrix(get_parameter_struct(param->member_handles[i]), D3DXMatrixTranspose(&m, matrix[i])); + } + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTransposePointerArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count)

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetMatrixPointerArray() test.
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: 1ae494a9bb52cae2bf67cb6d3bb3192b041aa7b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae494a9bb52cae2bf67cb6d3… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jul 3 12:28:01 2012 +0200 d3dx9/tests: Add effect parameter value SetMatrixPointerArray() test. --- dlls/d3dx9_36/tests/effect.c | 69 ++++++++++++++++++++++++++++++++--------- 1 files changed, 54 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index c4046c7..46406a4 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -885,6 +885,7 @@ test_effect_parameter_value_data[] = #undef ADD_PARAMETER_VALUE +/* Multiple of 16 to cover complete matrices */ #define EFFECT_PARAMETER_VALUE_ARRAY_SIZE 48 /* Constants for special INT/FLOAT conversation */ #define INT_FLOAT_MULTI 255.0f @@ -1640,7 +1641,8 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) FLOAT fvalue; DWORD input_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; DWORD expected_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; - UINT l, element; + UINT l, n, m, element; + const D3DXMATRIX *matrix_pointer_array[sizeof(input_value)/sizeof(D3DXMATRIX)]; parameter = effect->lpVtbl->GetParameterByName(effect, NULL, res_full_name); ok(parameter != NULL, "%u - %s: GetParameterByName failed\n", i, res_full_name); @@ -1693,6 +1695,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) * effect->lpVtbl->SetMatrix(effect, parameter, NULL); * effect->lpVtbl->GetMatrix(effect, parameter, NULL); * effect->lpVtbl->SetMatrixArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); + * effect->lpVtbl->SetMatrixPointerArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); * effect->lpVtbl->SetMatrixTranspose(effect, parameter, NULL); * effect->lpVtbl->SetMatrixTransposeArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); * effect->lpVtbl->GetValue(effect, parameter, NULL, res_desc->Bytes); @@ -1814,6 +1817,14 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->SetMatrixPointerArray(effect, NULL, matrix_pointer_array, res_desc->Elements ? res_desc->Elements : 1); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixPointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + hr = effect->lpVtbl->SetMatrixPointerArray(effect, NULL, matrix_pointer_array, 0); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixPointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->SetMatrixTranspose(effect, NULL, (D3DXMATRIX *)input_value); ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTranspose failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); @@ -2054,8 +2065,6 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) hr = effect->lpVtbl->SetVectorArray(effect, parameter, (D3DXVECTOR4 *)input_value, element); if (res_desc->Elements && res_desc->Class == D3DXPC_VECTOR && element <= res_desc->Elements) { - UINT m; - for (m = 0; m < element; ++m) { for (l = 0; l < res_desc->Columns; ++l) @@ -2087,8 +2096,6 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) { for (l = 0; l < 4; ++l) { - UINT m; - for (m = 0; m < 4; ++m) { if (m < res_desc->Rows && l < res_desc->Columns) @@ -2120,14 +2127,10 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) hr = effect->lpVtbl->SetMatrixArray(effect, parameter, (D3DXMATRIX *)input_value, element); if (res_desc->Class == D3DXPC_MATRIX_ROWS && element <= res_desc->Elements) { - UINT n; - for (n = 0; n < element; ++n) { for (l = 0; l < 4; ++l) { - UINT m; - for (m = 0; m < 4; ++m) { if (m < res_desc->Rows && l < res_desc->Columns) @@ -2148,6 +2151,48 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } + /* SetMatrixPointerArray */ + for (element = 0; element < res_desc->Elements + 1; ++element) + { + fvalue = 1.33; + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + for (l = 0; l < element; ++l) + { + matrix_pointer_array[l] = (D3DXMATRIX *)&input_value[l * sizeof(**matrix_pointer_array) / sizeof(*matrix_pointer_array)]; + } + hr = effect->lpVtbl->SetMatrixPointerArray(effect, parameter, matrix_pointer_array, element); + if (res_desc->Class == D3DXPC_MATRIX_ROWS && res_desc->Elements >= element) + { + for (n = 0; n < element; ++n) + { + for (l = 0; l < 4; ++l) + { + for (m = 0; m < 4; ++m) + { + if (m < res_desc->Rows && l < res_desc->Columns) + set_number(expected_value + l + m * res_desc->Columns + n * res_desc->Columns * res_desc->Rows, + res_desc->Type, input_value + l + m * 4 + n * 16, D3DXPT_FLOAT); + } + + } + } + ok(hr == D3D_OK, "%u - %s: SetMatrixPointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixPointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + } + /* SetMatrixTranspose */ fvalue = 1.33; for (l = 0; l < 16; ++l) @@ -2161,8 +2206,6 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) { for (l = 0; l < 4; ++l) { - UINT m; - for (m = 0; m < 4; ++m) { if (m < res_desc->Rows && l < res_desc->Columns) @@ -2194,14 +2237,10 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) hr = effect->lpVtbl->SetMatrixTransposeArray(effect, parameter, (D3DXMATRIX *)input_value, element); if (res_desc->Class == D3DXPC_MATRIX_ROWS && element <= res_desc->Elements) { - UINT n; - for (n = 0; n < element; ++n) { for (l = 0; l < 4; ++l) { - UINT m; - for (m = 0; m < 4; ++m) { if (m < res_desc->Rows && l < res_desc->Columns)

1 0

Piotr Caban : msvcp90: Added locale::empty implementation.
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: 0bd5ba82de606bc4a4091c0ad396bbdc78311244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd5ba82de606bc4a4091c0ad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 3 16:55:29 2012 +0200 msvcp90: Added locale::empty implementation. --- dlls/msvcp90/locale.c | 16 ++++++++++++++++ dlls/msvcp90/msvcp90.spec | 2 +- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index d3b0262..8e3778f 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -8175,6 +8175,22 @@ const locale* __cdecl locale_classic(void) return &classic_locale; } +/* ?empty(a)locale@std@@SA?AV12(a)XZ */ +locale* __cdecl locale_empty(locale *ret) +{ + TRACE("\n"); + + locale__Init(); + + ret->ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); + if(!ret->ptr) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + locale__Locimp_ctor_transparent(ret->ptr, TRUE); + return ret; +} + /* ?name(a)locale@std@@QBE?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ */ /* ?name(a)locale@std@@QEBA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ */ DEFINE_THISCALL_WRAPPER(locale_name, 8) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 35fe11d..8cffefb 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3704,7 +3704,7 @@ @ cdecl -arch=win64 ?empty@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_NXZ(ptr) MSVCP_basic_string_wchar_empty @ thiscall -arch=win32 ?empty@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE_NXZ(ptr) MSVCP_basic_string_wchar_empty @ cdecl -arch=win64 ?empty@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_NXZ(ptr) MSVCP_basic_string_wchar_empty -@ stub ?empty(a)locale@std@@SA?AV12(a)XZ +@ cdecl ?empty(a)locale@std@@SA?AV12(a)XZ(ptr) locale_empty @ thiscall -arch=win32 ?encoding(a)codecvt_base@std@@QBEHXZ(ptr) codecvt_base_encoding @ cdecl -arch=win64 ?encoding(a)codecvt_base@std@@QEBAHXZ(ptr) codecvt_base_encoding @ thiscall -arch=win32 ?end@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ(ptr ptr) MSVCP_basic_string_char_end

1 0

Piotr Caban : msvcp60: Keep class definitions in separate file.
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: e29c3066bc0a1a3716baf9e325fa8855f4113c19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e29c3066bc0a1a3716baf9e32… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 3 16:53:00 2012 +0200 msvcp60: Keep class definitions in separate file. --- dlls/msvcp60/cxx.h | 224 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp60/exception.c | 18 ++-- dlls/msvcp60/msvcp.h | 189 +-------------------------------------- 3 files changed, 237 insertions(+), 194 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e29c3066bc0a1a3716baf…

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetMatrixTransposePointerArray() test.
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: 18126eeb4f7c9233108ef0126bbebcb7f9fb36bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=18126eeb4f7c9233108ef0126… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jul 3 12:28:07 2012 +0200 d3dx9/tests: Add effect parameter value SetMatrixTransposePointerArray() test. --- dlls/d3dx9_36/tests/effect.c | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 46406a4..7627649 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1698,6 +1698,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) * effect->lpVtbl->SetMatrixPointerArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); * effect->lpVtbl->SetMatrixTranspose(effect, parameter, NULL); * effect->lpVtbl->SetMatrixTransposeArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); + * effect->lpVtbl->SetMatrixTransposePointerArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); * effect->lpVtbl->GetValue(effect, parameter, NULL, res_desc->Bytes); * effect->lpVtbl->SetValue(effect, parameter, NULL, res_desc->Bytes); */ @@ -1849,6 +1850,14 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixTransposeArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->SetMatrixTransposePointerArray(effect, NULL, matrix_pointer_array, res_desc->Elements ? res_desc->Elements : 1); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + hr = effect->lpVtbl->SetMatrixTransposePointerArray(effect, NULL, matrix_pointer_array, 0); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->SetValue(effect, NULL, input_value, res_desc->Bytes); ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetValue failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); @@ -2260,6 +2269,48 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } + + /* SetMatrixTransposePointerArray */ + for (element = 0; element < res_desc->Elements + 1; ++element) + { + fvalue = 1.33; + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + for (l = 0; l < element; ++l) + { + matrix_pointer_array[l] = (D3DXMATRIX *)&input_value[l * sizeof(**matrix_pointer_array) / sizeof(*matrix_pointer_array)]; + } + hr = effect->lpVtbl->SetMatrixTransposePointerArray(effect, parameter, matrix_pointer_array, element); + if (res_desc->Class == D3DXPC_MATRIX_ROWS && res_desc->Elements >= element) + { + for (n = 0; n < element; ++n) + { + for (l = 0; l < 4; ++l) + { + for (m = 0; m < 4; ++m) + { + if (m < res_desc->Rows && l < res_desc->Columns) + set_number(expected_value + l + m * res_desc->Columns + n * res_desc->Columns * res_desc->Rows, + res_desc->Type, input_value + l * 4 + m + n * 16, D3DXPT_FLOAT); + } + + } + } + ok(hr == D3D_OK, "%u - %s: SetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + } } count = effect->lpVtbl->Release(effect);

1 0

Piotr Caban : msvcp71: Forward basic_string::_Myptr functions to msvcp90.
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: c7636fe69b1f8de9fd7b4e27996674ff220ad389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7636fe69b1f8de9fd7b4e279… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 3 16:53:23 2012 +0200 msvcp71: Forward basic_string::_Myptr functions to msvcp90. --- dlls/msvcp71/msvcp71.spec | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 671950b..778b50f 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -2317,12 +2317,12 @@ @ stub -arch=win64 ?_Makpat@?$_Mpunct(a)G@std@@AEAAXAEAUpattern(a)money_base@2(a)III@Z @ stub -arch=win32 ?_Makpat@?$_Mpunct(a)_W@std@@AAEXAAUpattern(a)money_base@2(a)III@Z @ stub -arch=win64 ?_Makpat@?$_Mpunct(a)_W@std@@AEAAXAEAUpattern(a)money_base@2(a)III@Z -@ stub -arch=win32 ?_Myptr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEPADXZ -@ stub -arch=win32 ?_Myptr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ -@ stub -arch=win32 ?_Myptr@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEPAGXZ -@ stub -arch=win32 ?_Myptr@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEPBGXZ -@ stub -arch=win32 ?_Myptr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEPA_WXZ -@ stub -arch=win32 ?_Myptr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ +@ thiscall -arch=win32 ?_Myptr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEPADXZ(ptr) msvcp90.?_Myptr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAEPADXZ +@ thiscall -arch=win32 ?_Myptr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ(ptr) msvcp90.?_Myptr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IBEPBDXZ +@ thiscall -arch=win32 ?_Myptr@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEPAGXZ(ptr) msvcp90.?_Myptr@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@IAEPAGXZ +@ thiscall -arch=win32 ?_Myptr@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEPBGXZ(ptr) msvcp90.?_Myptr@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@IBEPBGXZ +@ thiscall -arch=win32 ?_Myptr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEPA_WXZ(ptr) msvcp90.?_Myptr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAEPA_WXZ +@ thiscall -arch=win32 ?_Myptr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ(ptr) msvcp90.?_Myptr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IBEPB_WXZ @ stub ?_Nanv@?$_Ctraits(a)M@std@@SAMM(a)Z @ stub ?_Nanv@?$_Ctraits(a)N@std@@SANN(a)Z @ stub ?_Nanv@?$_Ctraits(a)O@std@@SAOO(a)Z

1 0

Henri Verbeet : d3d9: Introduce a helper function to create D3DPRESENT_PARAMETERS from a wined3d_swapchain_desc .
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: c98725ccc30973eeb4089eea711879d54317b1bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98725ccc30973eeb4089eea7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 3 12:59:40 2012 +0200 d3d9: Introduce a helper function to create D3DPRESENT_PARAMETERS from a wined3d_swapchain_desc. --- dlls/d3d9/d3d9_private.h | 9 +------ dlls/d3d9/device.c | 52 +++++++++++++++++++-------------------------- dlls/d3d9/swapchain.c | 16 +------------- 3 files changed, 25 insertions(+), 52 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 6a080d1..bed2ed0 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -39,17 +39,12 @@ #include "d3d9.h" #include "wine/wined3d.h" -/* =========================================================================== - Internal use - =========================================================================== */ extern HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLSPEC_HIDDEN; D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; +void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, + const struct wined3d_swapchain_desc *swapchain_desc) DECLSPEC_HIDDEN; -/* =========================================================================== - Macros - =========================================================================== */ -/* Not nice, but it lets wined3d support different versions of directx */ #define WINECAPSTOD3D9CAPS(_pD3D9Caps, _pWineCaps) \ _pD3D9Caps->DeviceType = (D3DDEVTYPE) _pWineCaps->DeviceType; \ _pD3D9Caps->AdapterOrdinal = _pWineCaps->AdapterOrdinal; \ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index df8deb2..67a2aad 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -181,6 +181,26 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, + const struct wined3d_swapchain_desc *swapchain_desc) +{ + present_parameters->BackBufferWidth = swapchain_desc->backbuffer_width; + present_parameters->BackBufferHeight = swapchain_desc->backbuffer_height; + present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc->backbuffer_format); + present_parameters->BackBufferCount = swapchain_desc->backbuffer_count; + present_parameters->MultiSampleType = swapchain_desc->multisample_type; + present_parameters->MultiSampleQuality = swapchain_desc->multisample_quality; + present_parameters->SwapEffect = swapchain_desc->swap_effect; + present_parameters->hDeviceWindow = swapchain_desc->device_window; + present_parameters->Windowed = swapchain_desc->windowed; + present_parameters->EnableAutoDepthStencil = swapchain_desc->enable_auto_depth_stencil; + present_parameters->AutoDepthStencilFormat + = d3dformat_from_wined3dformat(swapchain_desc->auto_depth_stencil_format); + present_parameters->Flags = swapchain_desc->flags; + present_parameters->FullScreen_RefreshRateInHz = swapchain_desc->refresh_rate; + present_parameters->PresentationInterval = swapchain_desc->swap_interval; +} + static void wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, const D3DPRESENT_PARAMETERS *present_parameters) { @@ -477,21 +497,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_CreateAdditionalSwapChain(ID wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); if (SUCCEEDED(hr = d3d9_swapchain_create(device, &desc, &object))) *swapchain = &object->IDirect3DSwapChain9_iface; - - present_parameters->BackBufferWidth = desc.backbuffer_width; - present_parameters->BackBufferHeight = desc.backbuffer_height; - present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(desc.backbuffer_format); - present_parameters->BackBufferCount = desc.backbuffer_count; - present_parameters->MultiSampleType = desc.multisample_type; - present_parameters->MultiSampleQuality = desc.multisample_quality; - present_parameters->SwapEffect = desc.swap_effect; - present_parameters->hDeviceWindow = desc.device_window; - present_parameters->Windowed = desc.windowed; - present_parameters->EnableAutoDepthStencil = desc.enable_auto_depth_stencil; - present_parameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(desc.auto_depth_stencil_format); - present_parameters->Flags = desc.flags; - present_parameters->FullScreen_RefreshRateInHz = desc.refresh_rate; - present_parameters->PresentationInterval = desc.swap_interval; + present_parameters_from_wined3d_swapchain_desc(present_parameters, &desc); return hr; } @@ -3425,21 +3431,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine for (i = 0; i < count; ++i) { - parameters[i].BackBufferWidth = swapchain_desc[i].backbuffer_width; - parameters[i].BackBufferHeight = swapchain_desc[i].backbuffer_height; - parameters[i].BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc[i].backbuffer_format); - parameters[i].BackBufferCount = swapchain_desc[i].backbuffer_count; - parameters[i].MultiSampleType = swapchain_desc[i].multisample_type; - parameters[i].MultiSampleQuality = swapchain_desc[i].multisample_quality; - parameters[i].SwapEffect = swapchain_desc[i].swap_effect; - parameters[i].hDeviceWindow = swapchain_desc[i].device_window; - parameters[i].Windowed = swapchain_desc[i].windowed; - parameters[i].EnableAutoDepthStencil = swapchain_desc[i].enable_auto_depth_stencil; - parameters[i].AutoDepthStencilFormat = - d3dformat_from_wined3dformat(swapchain_desc[i].auto_depth_stencil_format); - parameters[i].Flags = swapchain_desc[i].flags; - parameters[i].FullScreen_RefreshRateInHz = swapchain_desc[i].refresh_rate; - parameters[i].PresentationInterval = swapchain_desc[i].swap_interval; + present_parameters_from_wined3d_swapchain_desc(&parameters[i], &swapchain_desc[i]); } HeapFree(GetProcessHeap(), 0, swapchain_desc); diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index dace375..af56d73 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -215,21 +215,7 @@ static HRESULT WINAPI d3d9_swapchain_GetPresentParameters(IDirect3DSwapChain9 *i wined3d_mutex_lock(); hr = wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &desc); wined3d_mutex_unlock(); - - parameters->BackBufferWidth = desc.backbuffer_width; - parameters->BackBufferHeight = desc.backbuffer_height; - parameters->BackBufferFormat = d3dformat_from_wined3dformat(desc.backbuffer_format); - parameters->BackBufferCount = desc.backbuffer_count; - parameters->MultiSampleType = desc.multisample_type; - parameters->MultiSampleQuality = desc.multisample_quality; - parameters->SwapEffect = desc.swap_effect; - parameters->hDeviceWindow = desc.device_window; - parameters->Windowed = desc.windowed; - parameters->EnableAutoDepthStencil = desc.enable_auto_depth_stencil; - parameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(desc.auto_depth_stencil_format); - parameters->Flags = desc.flags; - parameters->FullScreen_RefreshRateInHz = desc.refresh_rate; - parameters->PresentationInterval = desc.swap_interval; + present_parameters_from_wined3d_swapchain_desc(parameters, &desc); return hr; }

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetMatrixPointerArray().
by Alexandre Julliard July 3, 2012

July 3, 2012

Module: wine Branch: master Commit: e5953b6b17b14b5e50b981acc209a2b385dc20aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5953b6b17b14b5e50b981acc… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jul 3 12:27:46 2012 +0200 d3dx9: Implement ID3DXBaseEffect::SetMatrixPointerArray(). --- dlls/d3dx9_36/effect.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5ac79d1..08ae633 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2389,10 +2389,37 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixArray(ID3DXBaseEffect *iface, static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixPointerArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX **matrix, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, matrix %p, count %u stub\n", This, parameter, matrix, count); + TRACE("iface %p, parameter %p, matrix %p, count %u\n", This, parameter, matrix, count); - return E_NOTIMPL; + if (param && count <= param->element_count) + { + UINT i; + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + { + set_matrix(get_parameter_struct(param->member_handles[i]), matrix[i]); + } + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixPointerArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count)

1 0