wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

André Hentschel : kernel32: Remove a useless error message.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: fc38254fed5dbc07a2a61a2411bfaadcc977e40b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc38254fed5dbc07a2a61a241… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 15 19:49:10 2011 +0100 kernel32: Remove a useless error message. --- dlls/kernel32/editline.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index a39fa8d..7664b55 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -97,7 +97,6 @@ static void WCEL_Dump(WCEL_Context* ctx, const char* pfx) static BOOL WCEL_Get(WCEL_Context* ctx, INPUT_RECORD* ir) { if (ReadConsoleInputW(ctx->hConIn, ir, 1, NULL)) return TRUE; - ERR("hmm bad situation\n"); ctx->error = 1; return FALSE; }

1 0

André Hentschel : rsaenh/tests: Test the reported length on success.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: e0d712da619c9819861e105351ad40c5cd013df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d712da619c9819861e10535… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 15 19:49:14 2011 +0100 rsaenh/tests: Test the reported length on success. --- dlls/rsaenh/tests/rsaenh.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 6b0faeb..ccccb59 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -947,10 +947,12 @@ static void test_aes(int keylen) for (i=0; i<sizeof(pbData); i++) pbData[i] = (unsigned char)i; - /* AES provider doesn't support salt */ + /* Does AES provider support salt? */ result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); ok((!result && GetLastError() == NTE_BAD_KEY) || result /* Win7 */, "expected NTE_BAD_KEY, got %08x\n", GetLastError()); + if (result) + ok(!dwLen, "unexpected salt length %d\n", dwLen); dwLen = 13; result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16);

1 0

Andrew Nguyen : propsys: Add a PSRefreshPropertySchema stub.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: 78110088d421af54f01725b2f2eaecdefa76a3c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78110088d421af54f01725b2f… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 15 12:36:28 2011 -0600 propsys: Add a PSRefreshPropertySchema stub. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 6 ++++++ dlls/propsys/tests/propsys.c | 19 +++++++++++++++++++ include/propsys.idl | 1 + 4 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 3e99b94..3726fac 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -88,7 +88,7 @@ @ stub PSGetPropertyValue @ stub PSLookupPropertyHandlerCLSID @ stdcall PSPropertyKeyFromString(wstr ptr) -@ stub PSRefreshPropertySchema +@ stdcall PSRefreshPropertySchema() @ stdcall PSRegisterPropertySchema(wstr) @ stub PSSetPropertyValue @ stdcall PSStringFromPropertyKey(ptr ptr long) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 631c49e..3c2c3ed 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -72,6 +72,12 @@ HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY propkey, REFIID riid, voi return E_NOTIMPL; } +HRESULT WINAPI PSRefreshPropertySchema(void) +{ + FIXME("\n"); + return S_OK; +} + HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch) { static const WCHAR guid_fmtW[] = {'{','%','0','8','X','-','%','0','4','X','-', diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index d734029..e0895f3 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -432,8 +432,27 @@ static void test_PSPropertyKeyFromString(void) } } +static void test_PSRefreshPropertySchema(void) +{ + HRESULT ret; + + ret = PSRefreshPropertySchema(); + todo_wine + ok(ret == CO_E_NOTINITIALIZED, + "Expected PSRefreshPropertySchema to return CO_E_NOTINITIALIZED, got 0x%08x\n", ret); + + CoInitialize(NULL); + + ret = PSRefreshPropertySchema(); + ok(ret == S_OK, + "Expected PSRefreshPropertySchema to return S_OK, got 0x%08x\n", ret); + + CoUninitialize(); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); test_PSPropertyKeyFromString(); + test_PSRefreshPropertySchema(); } diff --git a/include/propsys.idl b/include/propsys.idl index ef9ecfc..993686d 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -802,6 +802,7 @@ cpp_quote("#define PKEYSTR_MAX (GUIDSTRING_MAX + 1 + PKEY_PIDSTR_MAX)") cpp_quote("HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") +cpp_quote("HRESULT WINAPI PSRefreshPropertySchema(void);") /* TODO: Add remainder of the C api here */

1 0

Andrew Nguyen : usp10/tests: Avoid passing optional pointers to uninitialized structures in ScriptString tests .
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: 6d0983972e9213c54c722468ead6ea79f5bd8212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0983972e9213c54c722468e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 15 12:36:01 2011 -0600 usp10/tests: Avoid passing optional pointers to uninitialized structures in ScriptString tests. --- dlls/usp10/tests/usp10.c | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 8a06bd9..109b1db 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1229,10 +1229,7 @@ static void test_ScriptString(HDC hdc) int Charset; DWORD Flags = SSA_GLYPHS; int ReqWidth = 100; - SCRIPT_CONTROL Control; - SCRIPT_STATE State; const int Dx[5] = {10, 10, 10, 10, 10}; - SCRIPT_TABDEF Tabdef; const BYTE InClass = 0; SCRIPT_STRING_ANALYSIS ssa = NULL; @@ -1251,20 +1248,20 @@ static void test_ScriptString(HDC hdc) Charset = -1; /* this flag indicates unicode input */ /* Test without hdc to get E_PENDING */ hr = ScriptStringAnalyse( NULL, teststr, len, Glyphs, Charset, Flags, - ReqWidth, &Control, &State, Dx, &Tabdef, - &InClass, &ssa); + ReqWidth, NULL, NULL, Dx, NULL, + &InClass, &ssa); ok(hr == E_PENDING, "ScriptStringAnalyse Stub should return E_PENDING not %08x\n", hr); /* test with hdc, this should be a valid test */ hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, - ReqWidth, &Control, &State, Dx, &Tabdef, + ReqWidth, NULL, NULL, Dx, NULL, &InClass, &ssa); ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); ScriptStringFree(&ssa); /* test makes sure that a call with a valid pssa still works */ hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, - ReqWidth, &Control, &State, Dx, &Tabdef, + ReqWidth, NULL, NULL, Dx, NULL, &InClass, &ssa); ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); ok(ssa != NULL, "ScriptStringAnalyse pssa should not be NULL\n"); @@ -1309,9 +1306,6 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) int Charset = -1; /* unicode */ DWORD Flags = SSA_GLYPHS; int ReqWidth = 100; - SCRIPT_CONTROL Control; - SCRIPT_STATE State; - SCRIPT_TABDEF Tabdef; const BYTE InClass = 0; SCRIPT_STRING_ANALYSIS ssa = NULL; @@ -1326,12 +1320,9 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) * Here we generate an SCRIPT_STRING_ANALYSIS that will be used as input to the * following character positions to X and X to character position functions. */ - memset(&Control, 0, sizeof(SCRIPT_CONTROL)); - memset(&State, 0, sizeof(SCRIPT_STATE)); - memset(&Tabdef, 0, sizeof(SCRIPT_TABDEF)); hr = ScriptStringAnalyse( hdc, String, String_len, Glyphs, Charset, Flags, - ReqWidth, &Control, &State, NULL, &Tabdef, + ReqWidth, NULL, NULL, NULL, NULL, &InClass, &ssa); ok(hr == S_OK || hr == E_INVALIDARG, /* NT */ @@ -1471,7 +1462,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) * generate an SSA for the subsequent tests. */ hr = ScriptStringAnalyse( hdc, String, String_len, Glyphs, Charset, Flags, - ReqWidth, &Control, &State, NULL, &Tabdef, + ReqWidth, NULL, NULL, NULL, NULL, &InClass, &ssa); ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr);

1 0

Rico Schüller : d3dcompiler/tests: Add reflection test .
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: d790be79d70e44d1860985b4f0d81547d222c358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d790be79d70e44d1860985b4f… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Feb 15 19:07:54 2011 +0100 d3dcompiler/tests: Add reflection test. --- dlls/d3dcompiler_43/tests/Makefile.in | 3 +- dlls/d3dcompiler_43/tests/reflection.c | 130 ++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/Makefile.in b/dlls/d3dcompiler_43/tests/Makefile.in index 268c067..5c2bed8 100644 --- a/dlls/d3dcompiler_43/tests/Makefile.in +++ b/dlls/d3dcompiler_43/tests/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = d3dcompiler d3d9 d3dx9 user32 C_SRCS = \ asm.c \ blob.c \ - hlsl.c + hlsl.c \ + reflection.c @MAKE_TEST_RULES@ diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c new file mode 100644 index 0000000..b48f3c8 --- /dev/null +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -0,0 +1,130 @@ +/* + * Copyright 2010 Rico Schüller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* + * Nearly all compiler functions need the shader blob and the size. The size + * is always located at DWORD #6 in the shader blob (blob[6]). + * The functions are e.g.: D3DGet*SignatureBlob, D3DReflect + */ + +#define COBJMACROS +#include "initguid.h" +#include "d3dcompiler.h" +#include "wine/test.h" + +/* includes for older reflection interfaces */ +#include "d3d10.h" +#include "d3d10_1shader.h" + +/* + * This doesn't belong here, but for some functions it is possible to return that value, + * see http://msdn.microsoft.com/en-us/library/bb205278%28v=VS.85%29.aspx + * The original definition is in D3DX10core.h. + */ +#define D3DERR_INVALIDCALL 0x8876086c + +/* + * fxc.exe /E VS /Tvs_4_0 /Fx + */ +#if 0 +float4 VS(float4 position : POSITION, float4 pos : SV_POSITION) : SV_POSITION +{ + return position; +} +#endif +static DWORD test_reflection_blob[] = { +0x43425844, 0x77c6324f, 0xfd27948a, 0xe6958d31, 0x53361cba, 0x00000001, 0x000001d8, 0x00000005, +0x00000034, 0x0000008c, 0x000000e4, 0x00000118, 0x0000015c, 0x46454452, 0x00000050, 0x00000000, +0x00000000, 0x00000000, 0x0000001c, 0xfffe0400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, +0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x39207265, 0x2e39322e, +0x2e323539, 0x31313133, 0xababab00, 0x4e475349, 0x00000050, 0x00000002, 0x00000008, 0x00000038, +0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, 0x00000000, +0x00000003, 0x00000001, 0x0000000f, 0x49534f50, 0x4e4f4954, 0x5f565300, 0x49534f50, 0x4e4f4954, +0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, +0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, +0x00010040, 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, +0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, 0x54415453, +0x00000074, 0x00000002, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, +0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +static void test_reflection_references(void) +{ + HRESULT hr; + ULONG count; + ID3D11ShaderReflection *ref11, *ref11_test; + ID3D10ShaderReflection *ref10; + ID3D10ShaderReflection1 *ref10_1; + + hr = D3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); + ok(hr == S_OK, "D3DReflect failed, got %x, expected %x\n", hr, S_OK); + + hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D11ShaderReflection, (void **)&ref11_test); + ok(hr == S_OK, "QueryInterface failed, got %x, expected %x\n", hr, S_OK); + + count = ref11_test->lpVtbl->Release(ref11_test); + ok(count == 1, "Release failed %u\n", count); + + hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D10ShaderReflection, (void **)&ref10); + ok(hr == E_NOINTERFACE, "QueryInterface failed, got %x, expected %x\n", hr, E_NOINTERFACE); + + hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); + ok(hr == E_NOINTERFACE, "QueryInterface failed, got %x, expected %x\n", hr, E_NOINTERFACE); + + count = ref11->lpVtbl->Release(ref11); + ok(count == 0, "Release failed %u\n", count); + + /* check invalid cases */ + hr = D3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection, (void **)&ref10); + ok(hr == E_NOINTERFACE, "D3DReflect failed, got %x, expected %x\n", hr, E_NOINTERFACE); + + hr = D3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1); + ok(hr == E_NOINTERFACE, "D3DReflect failed, got %x, expected %x\n", hr, E_NOINTERFACE); + + hr = D3DReflect(NULL, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1); + ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DReflect(NULL, test_reflection_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); + ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + + /* returns different errors with different sizes */ + hr = D3DReflect(test_reflection_blob, 31, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); + ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DReflect(test_reflection_blob, 32, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); + ok(hr == E_FAIL, "D3DReflect failed, got %x, expected %x\n", hr, E_FAIL); + + hr = D3DReflect(test_reflection_blob, test_reflection_blob[6]-1, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); + ok(hr == E_FAIL, "D3DReflect failed, got %x, expected %x\n", hr, E_FAIL); + + hr = D3DReflect(test_reflection_blob, 31, &IID_ID3D11ShaderReflection, (void **)&ref11); + ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DReflect(test_reflection_blob, 32, &IID_ID3D11ShaderReflection, (void **)&ref11); + ok(hr == E_FAIL, "D3DReflect failed, got %x, expected %x\n", hr, E_FAIL); + + hr = D3DReflect(test_reflection_blob, test_reflection_blob[6]-1, &IID_ID3D11ShaderReflection, (void **)&ref11); + ok(hr == E_FAIL, "D3DReflect failed, got %x, expected %x\n", hr, E_FAIL); +} + +START_TEST(reflection) +{ + test_reflection_references(); +}

1 0

Rico Schüller : d3dcompiler: Add argument check in D3DReflect().
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: 14d8b51bacf2c46c27d79c87249efecf00f4eb39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14d8b51bacf2c46c27d79c872… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Feb 15 19:07:47 2011 +0100 d3dcompiler: Add argument check in D3DReflect(). --- dlls/d3dcompiler_43/d3dcompiler_43_main.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c index 365b631..7e130fd 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43_main.c +++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c @@ -128,9 +128,22 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void { struct d3dcompiler_shader_reflection *object; HRESULT hr; + const DWORD *temp = data; TRACE("data %p, data_size %lu, riid %s, blob %p\n", data, data_size, debugstr_guid(riid), reflector); + if (!data || data_size < 32) + { + WARN("Invalid argument supplied.\n"); + return D3DERR_INVALIDCALL; + } + + if (temp[6] != data_size) + { + WARN("Wrong size supplied.\n"); + return E_FAIL; + } + if (!IsEqualGUID(riid, &IID_ID3D11ShaderReflection)) { WARN("Wrong riid %s, accept only %s!\n", debugstr_guid(riid), debugstr_guid(&IID_ID3D11ShaderReflection));

1 0

Amine Khaldi : riched20: Fix a c89 conformance issue in ITextImpl->editor-> rcFormat initialization.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: f8da57ca89d47509f14a18eae3c3a49e05d0a97b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8da57ca89d47509f14a18eae… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Tue Feb 15 18:44:03 2011 +0100 riched20: Fix a c89 conformance issue in ITextImpl->editor->rcFormat initialization. --- dlls/riched20/txtsrv.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index b4625ad..674bf38 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -88,7 +88,11 @@ HRESULT WINAPI CreateTextServices(IUnknown * pUnkOuter, ITextImpl->lpVtbl = &textservices_Vtbl; ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); ITextImpl->editor->exStyleFlags = 0; - ITextImpl->editor->rcFormat = (RECT){0,0,0,0}; + ITextImpl->editor->rcFormat.left = 0; + ITextImpl->editor->rcFormat.top = 0; + ITextImpl->editor->rcFormat.right = 0; + ITextImpl->editor->rcFormat.bottom = 0; + ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); if (pUnkOuter)

1 0

Alexandre Julliard : msvcr90/tests: Fix the type info test for 64-bit.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: de8dc80c85306e152284bd36c000480831ab4ae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8dc80c85306e152284bd36c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 13:59:18 2011 +0100 msvcr90/tests: Fix the type info test for 64-bit. --- dlls/msvcr90/tests/msvcr90.c | 48 ++++++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index ace9e35..3ae76f1 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -87,7 +87,14 @@ typedef struct __type_info char mangled[16]; } type_info; -static char* (WINAPI *p_type_info_name_internal_method)(type_info*); + +struct __type_info_node +{ + void *memPtr; + struct __type_info_node* next; +}; + +static char* (WINAPI *p_type_info_name_internal_method)(type_info*, struct __type_info_node *); static void (WINAPI *ptype_info_dtor)(type_info*); static void* (WINAPI *pEncodePointer)(void *); @@ -104,6 +111,7 @@ static inline int almost_equal_f(float f1, float f2) /* thiscall emulation */ /* Emulate a __thiscall */ +#ifdef __i386__ #ifdef _MSC_VER static inline void* do_call_func1(void *func, void *_this) { @@ -155,8 +163,15 @@ static void* do_call_func2(void *func, void *_this, const void* arg) } #endif -#define call_func1(x,y) do_call_func1((void*)x,(void*)y) -#define call_func2(x,y,z) do_call_func2((void*)x,(void*)y,(void*)z) +#define call_func1(func,_this) do_call_func1(func,_this) +#define call_func2(func,_this,a) do_call_func2(func,_this,(const void*)a) + +#else + +#define call_func1(func,_this) func(_this) +#define call_func2(func,_this,a) func(_this,a) + +#endif /* __i386__ */ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, const wchar_t *function, const wchar_t *file, @@ -863,13 +878,6 @@ if (0) p_free(mem); } -#ifdef __i386__ - -struct __type_info_node { - void *memPtr; - struct __type_info_node* next; -}; - static void test_typeinfo(void) { static type_info t1 = { NULL, NULL,{'.','?','A','V','t','e','s','t','1','@','@',0,0,0,0,0 } }; @@ -894,11 +902,6 @@ static void test_typeinfo(void) ok(t1.name && !strcmp(t1.name, "class test1"), "demangled to '%s' for t1\n", t1.name); call_func1(ptype_info_dtor, &t1); } -#else -static void test_typeinfo(void) -{ -} -#endif START_TEST(msvcr90) { @@ -938,9 +941,18 @@ START_TEST(msvcr90) p_realloc_crt = (void*) GetProcAddress(hcrt, "_realloc_crt"); p_malloc = (void*) GetProcAddress(hcrt, "malloc"); p_free = (void*)GetProcAddress(hcrt, "free"); - p_type_info_name_internal_method = (void*)GetProcAddress(hcrt, - "?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z"); - ptype_info_dtor = (void*)GetProcAddress(hcrt, "??1type_info@@UAE@XZ"); + if (sizeof(void *) == 8) + { + p_type_info_name_internal_method = (void*)GetProcAddress(hcrt, + "?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z"); + ptype_info_dtor = (void*)GetProcAddress(hcrt, "??1type_info@@UEAA@XZ"); + } + else + { + p_type_info_name_internal_method = (void*)GetProcAddress(hcrt, + "?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z"); + ptype_info_dtor = (void*)GetProcAddress(hcrt, "??1type_info@@UAE@XZ"); + } hkernel32 = GetModuleHandleA("kernel32.dll"); pEncodePointer = (void *) GetProcAddress(hkernel32, "EncodePointer");

1 0

Alexandre Julliard : cabinet: Store the data block headers in a memory list instead of on-disk.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: ea22b17065d61b1cd04b8848279b9ba9f0ec7c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea22b17065d61b1cd04b88482… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 00:20:49 2011 +0100 cabinet: Store the data block headers in a memory list instead of on-disk. Compute the checksums only when writing to the final file. --- dlls/cabinet/fci.c | 393 ++++++++++++++++++++++++++-------------------------- 1 files changed, 195 insertions(+), 198 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea22b17065d61b1cd04b8…

1 0

Alexandre Julliard : cabinet: Rewrite the cabinet header output code, and write everything to disk in one step.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: afae86aa1ef376d27f4e94cfad8eb20e80b6593a URL: http://source.winehq.org/git/wine.git/?a=commit;h=afae86aa1ef376d27f4e94cfa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 20:08:44 2011 +0100 cabinet: Rewrite the cabinet header output code, and write everything to disk in one step. --- dlls/cabinet/fci.c | 305 +++++++++++++++++++--------------------------------- 1 files changed, 111 insertions(+), 194 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afae86aa1ef376d27f4e9…

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
68
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 February 2011