wine-commits August 2012

wine-commits@winehq.org

2 participants
541 discussions

Rico Schüller : d3dx9: Remove min() in set_matrix_array(), uses always the desc value.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: edb802a84777ae2ed193daf462d7fe78fab68c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb802a84777ae2ed193daf46… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 28 13:43:09 2012 +0200 d3dx9: Remove min() in set_matrix_array(), uses always the desc value. --- dlls/d3dx9_36/shader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index fa72cfc..4b831e3 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1187,13 +1187,13 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev { if (desc->Class == D3DXPC_VECTOR) return D3D_OK; - num_rows = min(desc->Rows, rows); - num_columns = min(desc->Columns, columns); + num_rows = desc->Rows; + num_columns = desc->Columns; } else { - num_rows = min(desc->Columns, columns); - num_columns = min(desc->Rows, rows); + num_rows = desc->Columns; + num_columns = desc->Rows; } registers_per_matrix = (desc->Class == D3DXPC_MATRIX_COLUMNS) ? desc->Columns : desc->Rows;

1 0

Rico Schüller : d3dx9: Handle D3DXPC_VECTOR in set_matrix_array().
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: b5b052072383cd98a950631f4b9f1f3855b80776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5b052072383cd98a950631f4… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 28 13:43:04 2012 +0200 d3dx9: Handle D3DXPC_VECTOR in set_matrix_array(). --- dlls/d3dx9_36/shader.c | 5 ++++- dlls/d3dx9_36/tests/shader.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 832ba40..fa72cfc 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1177,6 +1177,7 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev if (desc->Class == D3DXPC_MATRIX_ROWS || desc->Class == D3DXPC_MATRIX_COLUMNS + || desc->Class == D3DXPC_VECTOR || desc->Class == D3DXPC_SCALAR) { if (desc->Class == class) row_offset = 4; @@ -1184,6 +1185,8 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev if (class == D3DXPC_MATRIX_ROWS) { + if (desc->Class == D3DXPC_VECTOR) return D3D_OK; + num_rows = min(desc->Rows, rows); num_columns = min(desc->Columns, columns); } @@ -1198,7 +1201,7 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev else { FIXME("Unhandled variable class %s\n", debug_d3dxparameter_class(desc->Class)); - return D3D_OK; + return E_NOTIMPL; } switch (desc->RegisterSet) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index cd69a34..2792327 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -707,7 +707,7 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixTranspose failed on variable f4: 0x%08x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 1); - todo_wine ok(out[0] == S(U(mvp))._11 && out[1] == S(U(mvp))._21 && out[2] == S(U(mvp))._31 && out[3] == S(U(mvp))._41, + ok(out[0] == S(U(mvp))._11 && out[1] == S(U(mvp))._21 && out[2] == S(U(mvp))._31 && out[3] == S(U(mvp))._41, "The variable f4 was not set correctly by ID3DXConstantTable_SetMatrixTranspose, " "got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", out[0], out[1], out[2], out[3],

1 0

Rico Schüller : d3dx9: Improve set_matrix_array().
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: a4dde8151b3a07dbdad600fd5d6798b86867b768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4dde8151b3a07dbdad600fd5… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 28 13:42:55 2012 +0200 d3dx9: Improve set_matrix_array(). --- dlls/d3dx9_36/shader.c | 64 ++++++++++++++++++----------------------------- 1 files changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 1295f08..832ba40 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1158,84 +1158,70 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev UINT count, D3DXPARAMETER_CLASS class, D3DXPARAMETER_TYPE type, UINT rows, UINT columns) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - D3DXCONSTANT_DESC desc; - HRESULT hr; - UINT registers_per_matrix; - UINT i, desc_count = 1; - UINT num_rows, num_columns; - UINT row_offset, column_offset; + struct ctab_constant *c = get_valid_constant(This, constant); + D3DXCONSTANT_DESC *desc; + UINT registers_per_matrix, num_rows, num_columns, i; + UINT row_offset = 1, column_offset = 1; const DWORD *data_ptr; FLOAT matrix[16] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}; - hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); - if (FAILED(hr)) + if (!c) { - TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr); + WARN("Invalid argument specified\n"); return D3DERR_INVALIDCALL; } + desc = &c->desc; - if (desc.Class == D3DXPC_MATRIX_ROWS || desc.Class == D3DXPC_MATRIX_COLUMNS) + if (desc->Class == D3DXPC_MATRIX_ROWS + || desc->Class == D3DXPC_MATRIX_COLUMNS + || desc->Class == D3DXPC_SCALAR) { - if (desc.Class == class) - { - column_offset = 1; - row_offset = 4; - } - else - { - column_offset = 4; - row_offset = 1; - } + if (desc->Class == class) row_offset = 4; + else column_offset = 4; if (class == D3DXPC_MATRIX_ROWS) { - num_rows = min(desc.Rows, rows); - num_columns = min(desc.Columns, columns); + num_rows = min(desc->Rows, rows); + num_columns = min(desc->Columns, columns); } else { - num_rows = min(desc.Columns, columns); - num_columns = min(desc.Rows, rows); + num_rows = min(desc->Columns, columns); + num_columns = min(desc->Rows, rows); } - registers_per_matrix = (desc.Class == D3DXPC_MATRIX_ROWS) ? desc.Rows : desc.Columns; - } - else if (desc.Class == D3DXPC_SCALAR) - { - column_offset = 1; - row_offset = 1; - num_rows = min(desc.Rows, rows); - num_columns = min(desc.Columns, columns); - registers_per_matrix = 1; + registers_per_matrix = (desc->Class == D3DXPC_MATRIX_COLUMNS) ? desc->Columns : desc->Rows; } else { - FIXME("Unhandled variable class %s\n", debug_d3dxparameter_class(desc.Class)); + FIXME("Unhandled variable class %s\n", debug_d3dxparameter_class(desc->Class)); return D3D_OK; } - switch (desc.RegisterSet) + switch (desc->RegisterSet) { case D3DXRS_FLOAT4: data_ptr = data; for (i = 0; i < count; i++) { - if (registers_per_matrix * (i + 1) > desc.RegisterCount) + HRESULT hr; + + if (registers_per_matrix * (i + 1) > desc->RegisterCount) break; - hr = set_float_matrix(matrix, &desc, row_offset, column_offset, num_rows, num_columns, data_ptr, type, columns); + hr = set_float_matrix(matrix, desc, row_offset, column_offset, num_rows, num_columns, data_ptr, type, columns); if (FAILED(hr)) return hr; - set_float_shader_constant(This, device, desc.RegisterIndex + i * registers_per_matrix, matrix, registers_per_matrix); + set_float_shader_constant(This, device, desc->RegisterIndex + i * registers_per_matrix, matrix, registers_per_matrix); data_ptr += rows * columns; } break; default: - FIXME("Unhandled register set %s\n", debug_d3dxparameter_registerset(desc.RegisterSet)); + FIXME("Unhandled register set %s\n", debug_d3dxparameter_registerset(desc->RegisterSet)); return E_NOTIMPL; }

1 0

Rico Schüller : d3dx9: Add some traces to D3DXLoadSurfaceFromMemory().
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: 97ef9f9322cdccb6bd11871faed0d28d1ec8d57d URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ef9f9322cdccb6bd11871fa… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 28 17:04:53 2012 +0200 d3dx9: Add some traces to D3DXLoadSurfaceFromMemory(). --- dlls/d3dx9_36/surface.c | 40 ++++++++++++++++++++++++---------------- 1 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 56e6b8e..34696e6 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1482,11 +1482,17 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, src_pitch, src_palette, wine_dbgstr_rect(src_rect), filter, color_key); if (!dst_surface || !src_memory || !src_rect) + { + WARN("Invalid argument specified.\n"); return D3DERR_INVALIDCALL; + } if (src_format == D3DFMT_UNKNOWN || src_rect->left >= src_rect->right || src_rect->top >= src_rect->bottom) + { + WARN("Invalid src_format or src_rect.\n"); return E_FAIL; + } if (filter == D3DX_DEFAULT) filter = D3DX_FILTER_TRIANGLE | D3DX_FILTER_DITHER; @@ -1503,12 +1509,13 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } else { - if (dst_rect->left > dst_rect->right || dst_rect->right > surfdesc.Width) - return D3DERR_INVALIDCALL; - if (dst_rect->top > dst_rect->bottom || dst_rect->bottom > surfdesc.Height) - return D3DERR_INVALIDCALL; - if (dst_rect->left < 0 || dst_rect->top < 0) + if (dst_rect->left > dst_rect->right || dst_rect->right > surfdesc.Width + || dst_rect->top > dst_rect->bottom || dst_rect->bottom > surfdesc.Height + || dst_rect->left < 0 || dst_rect->top < 0) + { + WARN("Invalid dst_rect specified.\n"); return D3DERR_INVALIDCALL; + } dst_size.width = dst_rect->right - dst_rect->left; dst_size.height = dst_rect->bottom - dst_rect->top; if (!dst_size.width || !dst_size.height) @@ -1517,12 +1524,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, dst_size.depth = 1; srcformatdesc = get_format_info(src_format); - if (srcformatdesc->type == FORMAT_UNKNOWN) - return E_NOTIMPL; - destformatdesc = get_format_info(surfdesc.Format); - if (destformatdesc->type == FORMAT_UNKNOWN) + if (srcformatdesc->type == FORMAT_UNKNOWN || destformatdesc->type == FORMAT_UNKNOWN) + { + FIXME("Unsupported pixel format conversion %#x -> %#x\n", src_format, surfdesc.Format); return E_NOTIMPL; + } if (src_format == surfdesc.Format && dst_size.width == src_size.width @@ -1564,14 +1571,13 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } else /* Stretching or format conversion. */ { - if (srcformatdesc->bytes_per_pixel > 4) - return E_NOTIMPL; - if (destformatdesc->bytes_per_pixel > 4) - return E_NOTIMPL; - if (srcformatdesc->block_height != 1 || srcformatdesc->block_width != 1) - return E_NOTIMPL; - if (destformatdesc->block_height != 1 || destformatdesc->block_width != 1) + if (srcformatdesc->bytes_per_pixel > 4 || destformatdesc->bytes_per_pixel > 4 + || srcformatdesc->block_height != 1 || srcformatdesc->block_width != 1 + || destformatdesc->block_height != 1 || destformatdesc->block_width != 1) + { + FIXME("Format conversion missing %#x -> %#x\n", src_format, surfdesc.Format); return E_NOTIMPL; + } if (FAILED(hr = IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0))) return D3DXERR_INVALIDDATA; @@ -1853,6 +1859,8 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE || src_format_desc->block_height != 1 || src_format_desc->block_width != 1 || dst_format_desc->block_height != 1 || dst_format_desc->block_width != 1) { + FIXME("Format conversion missing %#x -> %#x\n", + src_surface_desc.Format, d3d_pixel_format); hr = E_NOTIMPL; goto cleanup; }

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: f41d3bf40d700ccc494911fe0db1e239e2817fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41d3bf40d700ccc494911fe0… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Aug 28 11:58:35 2012 +0200 po: Update German translation. --- po/de.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index 85d1056..d225ef0 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-08-15 20:07+0200\n" +"PO-Revision-Date: 2012-08-27 01:14+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -3454,8 +3454,8 @@ msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." msgstr "" -"Nach dem deaktivieren oder aktivieren eines Gerätes, wird der verbundene " -"Controller hier bis zum Neustart des Applets nicht mehr aktualisiert." +"Nach dem De-/Aktivieren eines Gerätes wird die Liste der verbundenen " +"Controller bis zum Neustart dieses Applets nicht mehr aktualisiert." #: joy.rc:47 msgid "Test Joystick"

1 0

Piotr Caban : msvcp80: Fixed basic_string::rbegin and basic_string:: rend implementation.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: f9ff5fe3e6ebfa95cb814a587a4bb5a3c103e00b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ff5fe3e6ebfa95cb814a587… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 28 12:13:34 2012 +0200 msvcp80: Fixed basic_string::rbegin and basic_string::rend implementation. --- dlls/msvcp80/Makefile.in | 3 + dlls/msvcp80/msvcp80.c | 135 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp80/msvcp80.spec | 48 ++++++++-------- 3 files changed, 162 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9ff5fe3e6ebfa95cb814…

1 0

Piotr Caban : msvcp80: Forward basic_string::erase functions to msvcp90.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: 27d0551b908f09a1c6b708de042687ce22ef89a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27d0551b908f09a1c6b708de0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 28 12:12:46 2012 +0200 msvcp80: Forward basic_string::erase functions to msvcp90. --- dlls/msvcp80/msvcp80.spec | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index a174651..e99c552 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -3744,16 +3744,16 @@ @ cdecl -arch=win64 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V32@@Z(ptr ptr ptr) msvcp90.?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z @ thiscall -arch=win32 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@II@Z(ptr long long) msvcp90.?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@II@Z @ cdecl -arch=win64 ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@_K0@Z(ptr long long) msvcp90.?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@_K0@Z -@ stub -arch=win32 ?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE?AV?$_String_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@V32@0@Z -@ stub -arch=win64 ?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA?AV?$_String_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@V32@0@Z -@ stub -arch=win32 ?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE?AV?$_String_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@V32@@Z -@ stub -arch=win64 ?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA?AV?$_String_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@V32@@Z +@ thiscall -arch=win32 ?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE?AV?$_String_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@V32@0@Z(ptr ptr ptr ptr ptr ptr) msvcp90.?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE?AV?$_String_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@V?$_String_const_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@0@Z +@ cdecl -arch=win64 ?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA?AV?$_String_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@V32@0@Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA?AV?$_String_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@V?$_String_const_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@0@Z +@ thiscall -arch=win32 ?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE?AV?$_String_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@V32@@Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE?AV?$_String_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@V?$_String_const_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@@Z +@ cdecl -arch=win64 ?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA?AV?$_String_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@V32@@Z(ptr ptr ptr) msvcp90.?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA?AV?$_String_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@V?$_String_const_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@@Z @ thiscall -arch=win32 ?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAV12@II@Z(ptr long long) msvcp90.?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAV12@II@Z @ cdecl -arch=win64 ?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAAEAV12@_K0@Z(ptr long long) msvcp90.?erase@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAAEAV12@_K0@Z -@ stub -arch=win32 ?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE?AV?$_String_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@V32@0@Z -@ stub -arch=win64 ?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA?AV?$_String_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@V32@0@Z -@ stub -arch=win32 ?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE?AV?$_String_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@V32@@Z -@ stub -arch=win64 ?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA?AV?$_String_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@V32@@Z +@ thiscall -arch=win32 ?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE?AV?$_String_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@V32@0@Z(ptr ptr ptr ptr ptr ptr) msvcp90.?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE?AV?$_String_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@V?$_String_const_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@0@Z +@ cdecl -arch=win64 ?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA?AV?$_String_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@V32@0@Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA?AV?$_String_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@V?$_String_const_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@0@Z +@ thiscall -arch=win32 ?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE?AV?$_String_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@V32@@Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE?AV?$_String_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@V?$_String_const_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@@Z +@ cdecl -arch=win64 ?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA?AV?$_String_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@V32@@Z(ptr ptr ptr) msvcp90.?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA?AV?$_String_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@V?$_String_const_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@@Z @ thiscall -arch=win32 ?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@II@Z(ptr long long) msvcp90.?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@II@Z @ cdecl -arch=win64 ?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@_K0@Z(ptr long long) msvcp90.?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@_K0@Z @ thiscall -arch=win32 ?exceptions@ios_base@std@@QAEXH@Z(ptr long) msvcp90.?exceptions@ios_base@std@@QAEXH@Z

1 0

Jacek Caban : Always define WIDL_C_INLINE_WRAPPERS.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: e679471885594331d47f0ab710bd3c4f9208f3ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=e679471885594331d47f0ab71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 11:15:29 2012 +0200 Always define WIDL_C_INLINE_WRAPPERS. --- Maketest.rules.in | 2 +- dlls/fusion/Makefile.in | 1 - dlls/fusion/tests/Makefile.in | 1 - dlls/mshtml/Makefile.in | 2 +- dlls/msi/Makefile.in | 1 - dlls/msxml3/Makefile.in | 1 - dlls/msxml3/tests/Makefile.in | 1 - dlls/sxs/Makefile.in | 1 - dlls/sxs/tests/Makefile.in | 1 - dlls/windowscodecs/Makefile.in | 2 +- dlls/winhttp/Makefile.in | 1 - include/unknwn.idl | 4 ++++ 12 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Maketest.rules.in b/Maketest.rules.in index 4833f5a..828c375 100644 --- a/Maketest.rules.in +++ b/Maketest.rules.in @@ -10,7 +10,7 @@ # DLLFLAGS = @DLLFLAGS@ -DEFS = -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION $(EXTRADEFS) +DEFS = -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS $(EXTRADEFS) MODULE = $(TESTDLL:%.dll=%)_test.exe TESTRESULTS = $(C_SRCS:.c=.ok) diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in index 2fe6492..63b1b73 100644 --- a/dlls/fusion/Makefile.in +++ b/dlls/fusion/Makefile.in @@ -1,6 +1,5 @@ MODULE = fusion.dll IMPORTS = advapi32 dbghelp shlwapi version user32 -EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ asmcache.c \ diff --git a/dlls/fusion/tests/Makefile.in b/dlls/fusion/tests/Makefile.in index ac360bb..0542f0d 100644 --- a/dlls/fusion/tests/Makefile.in +++ b/dlls/fusion/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = fusion.dll IMPORTS = user32 -EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ asmcache.c \ diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 53cd2e9..26311af 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -1,7 +1,7 @@ MODULE = mshtml.dll IMPORTLIB = mshtml IMPORTS = strmiids uuid urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32 -EXTRADEFS = -DCOM_NO_WINDOWS_H -DWIDL_C_INLINE_WRAPPERS +EXTRADEFS = -DCOM_NO_WINDOWS_H DELAYIMPORTS = wininet C_SRCS = \ diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 9ea0861..140b5f1 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -2,7 +2,6 @@ MODULE = msi.dll IMPORTLIB = msi IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 DELAYIMPORTS = odbccp32 wintrust crypt32 imagehlp -EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ action.c \ diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index fcf78b5..acd571f 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -1,7 +1,6 @@ EXTRADEFS = -DCOM_NO_WINDOWS_H MODULE = msxml3.dll IMPORTS = uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 -EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS EXTRALIBS = @XML2LIBS@ EXTRAINCL = @XML2INCL@ @XSLTINCL@ diff --git a/dlls/msxml3/tests/Makefile.in b/dlls/msxml3/tests/Makefile.in index 1762e1f..a2765a7 100644 --- a/dlls/msxml3/tests/Makefile.in +++ b/dlls/msxml3/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = msxml3.dll IMPORTS = oleaut32 ole32 user32 -EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ domdoc.c \ diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in index a107928..d6d6f2b 100644 --- a/dlls/sxs/Makefile.in +++ b/dlls/sxs/Makefile.in @@ -1,7 +1,6 @@ MODULE = sxs.dll IMPORTS = oleaut32 ole32 IMPORTLIB = sxs -EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ cache.c \ diff --git a/dlls/sxs/tests/Makefile.in b/dlls/sxs/tests/Makefile.in index 69305ae..2f8be9c 100644 --- a/dlls/sxs/tests/Makefile.in +++ b/dlls/sxs/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = sxs.dll IMPORTS = sxs -EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ cache.c \ diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index b462249..65cd913 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -2,7 +2,7 @@ MODULE = windowscodecs.dll IMPORTLIB = windowscodecs IMPORTS = uuid ole32 oleaut32 shlwapi advapi32 rpcrt4 EXTRAINCL = @PNGINCL@ -EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL -DWIDL_C_INLINE_WRAPPERS +EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL EXTRALIBS = @APPLICATIONSERVICESLIB@ C_SRCS = \ diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 130971e..53b5b97 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -3,7 +3,6 @@ IMPORTLIB = winhttp IMPORTS = uuid user32 advapi32 DELAYIMPORTS = oleaut32 ole32 crypt32 EXTRALIBS = @SOCKETLIBS@ -EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ cookie.c \ diff --git a/include/unknwn.idl b/include/unknwn.idl index d6799f4..78a2d9d 100644 --- a/include/unknwn.idl +++ b/include/unknwn.idl @@ -20,6 +20,10 @@ import "wtypes.idl"; #endif +cpp_quote("#ifdef __WINESRC__") +cpp_quote("#define WIDL_C_INLINE_WRAPPERS") +cpp_quote("#endif") + cpp_quote("#ifdef WIDL_C_INLINE_WRAPPERS") cpp_quote("#define SAVE_WIDL_C_INLINE_WRAPPERS") cpp_quote("#undef WIDL_C_INLINE_WRAPPERS")

1 0

Jacek Caban : unknwn.idl: Don't use inline wrappers for IUnknown calls.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: 9d1bec6077bbf25b6551e759f661332d974935e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d1bec6077bbf25b6551e759f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 11:15:12 2012 +0200 unknwn.idl: Don't use inline wrappers for IUnknown calls. --- include/unknwn.idl | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/include/unknwn.idl b/include/unknwn.idl index 9071973..d6799f4 100644 --- a/include/unknwn.idl +++ b/include/unknwn.idl @@ -20,7 +20,10 @@ import "wtypes.idl"; #endif -/* Interfaces */ +cpp_quote("#ifdef WIDL_C_INLINE_WRAPPERS") +cpp_quote("#define SAVE_WIDL_C_INLINE_WRAPPERS") +cpp_quote("#undef WIDL_C_INLINE_WRAPPERS") +cpp_quote("#endif") [ local, @@ -39,6 +42,10 @@ interface IUnknown ULONG Release(); } +cpp_quote("#ifdef SAVE_WIDL_C_INLINE_WRAPPERS") +cpp_quote("#define WIDL_C_INLINE_WRAPPERS") +cpp_quote("#endif") + [ object, uuid(00000001-0000-0000-C000-000000000046),

1 0

Jacek Caban : Fixed remaining wrong iface call helpers.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: 434b696c460b0d80ecac5fe41379b4def6245c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=434b696c460b0d80ecac5fe41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 11:10:56 2012 +0200 Fixed remaining wrong iface call helpers. --- dlls/d3dx9_36/surface.c | 4 ++-- dlls/dxgi/device.c | 2 +- dlls/explorerframe/tests/nstc.c | 2 +- dlls/mshtml/tests/script.c | 4 +++- dlls/wbemprox/tests/services.c | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 1cf77b0..56e6b8e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -622,7 +622,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D IWICImagingFactory_CreateStream(factory, &stream); IWICStream_InitializeFromMemory(stream, (BYTE*)data, datasize); hr = IWICImagingFactory_CreateDecoderFromStream(factory, (IStream*)stream, NULL, 0, &decoder); - IStream_Release(stream); + IWICStream_Release(stream); IWICImagingFactory_Release(factory); } @@ -912,7 +912,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, hr = IWICImagingFactory_CreateDecoderFromStream(factory, (IStream*)stream, NULL, 0, &decoder); - IStream_Release(stream); + IWICStream_Release(stream); IWICImagingFactory_Release(factory); if (FAILED(hr)) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 79a757b..7bbc5e0 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -122,7 +122,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IWineDXGIDevice *iface, R TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); - hr = IDXGIDevice_GetAdapter(iface, &adapter); + hr = IWineDXGIDevice_GetAdapter(iface, &adapter); if (FAILED(hr)) { ERR("Failed to get adapter, hr %#x.\n", hr); diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 59654ac..6287078 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -754,7 +754,7 @@ static void verify_root_order_(INameSpaceTreeControl *pnstc, IShellItem **roots, IShellItem_Release(psi); } } - IShellItem_Release(psia); + IShellItemArray_Release(psia); } } #define verify_root_order(pnstc, psi_a) \ diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index dcad5f7..b5bd91b 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -50,12 +50,14 @@ const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = #define CTXARG_T DWORDLONG #define IActiveScriptParseVtbl IActiveScriptParse64Vtbl #define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_64Vtbl +#define IActiveScriptSiteDebug_Release IActiveScriptSiteDebug64_Release #else #define CTXARG_T DWORD #define IActiveScriptParseVtbl IActiveScriptParse32Vtbl #define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_32Vtbl +#define IActiveScriptSiteDebug_Release IActiveScriptSiteDebug32_Release #endif @@ -2366,7 +2368,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteDebug, (void**)&debug); ok(hres == S_OK, "Could not get IActiveScriptSiteDebug interface: %08x\n", hres); if(SUCCEEDED(hres)) - IActiveScriptSiteDebug32_Release(debug); + IActiveScriptSiteDebug_Release(debug); hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexpection); ok(hres == E_NOINTERFACE, "Could not get IID_ICanHandleException interface: %08x\n", hres); diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index ff798a3..5d659b1 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -77,7 +77,7 @@ static void test_IClientSecurity(void) refs = IWbemServices_Release( services ); todo_wine ok( refs == 1, "unexpected refcount %u\n", refs ); - refs = IWbemServices_Release( security ); + refs = IClientSecurity_Release( security ); todo_wine ok( refs == 0, "unexpected refcount %u\n", refs ); IWbemLocator_Release( locator );

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2012