January 2007 - Wine-commits

Hans Leidekker : snmpapi: Add a bunch of tests.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: 396f6c05d148b6de1927679b931045bf837264da URL: http://source.winehq.org/git/wine.git/?a=commit;h=396f6c05d148b6de1927679b9… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jan 22 15:31:00 2007 +0100 snmpapi: Add a bunch of tests. --- .gitignore | 4 + Makefile.in | 2 + configure | 3 +- configure.ac | 1 + dlls/Makefile.in | 1 + dlls/snmpapi/tests/Makefile.in | 13 ++ dlls/snmpapi/tests/util.c | 361 ++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 9 files changed, 388 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=396f6c05d148b6de19276…

1 0

Hans Leidekker : snmpapi: Implement SnmpUtil{DbgPrint, IdsToA, OidToA, PrintAsnAny, PrintOid}.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: d3e51291359ad81baf5eb2ee2549472f25d81d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e51291359ad81baf5eb2ee2… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jan 22 15:30:01 2007 +0100 snmpapi: Implement SnmpUtil{DbgPrint, IdsToA, OidToA, PrintAsnAny, PrintOid}. --- dlls/snmpapi/main.c | 166 +++++++++++++++++++++++++++++++++++++++++++++ dlls/snmpapi/snmpapi.spec | 10 ++-- 2 files changed, 171 insertions(+), 5 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index e385638..24a2da1 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -21,6 +21,7 @@ #include "config.h" +#include <stdio.h> #include <stdarg.h> #include "windef.h" @@ -134,6 +135,14 @@ BOOL WINAPI DllMain( } /*********************************************************************** + * SnmpUtilDbgPrint (SNMPAPI.@) + */ +void WINAPI SnmpUtilDbgPrint(INT loglevel, LPSTR format, ...) +{ + FIXME("(%d, %s)\n", loglevel, debugstr_a(format)); +} + +/*********************************************************************** * SnmpUtilMemAlloc (SNMPAPI.@) */ LPVOID WINAPI SnmpUtilMemAlloc(UINT nbytes) @@ -448,3 +457,160 @@ void WINAPI SnmpUtilVarBindListFree(Snmp for (i = 0; i < vb->len; i++) SnmpUtilVarBindFree(entry++); HeapFree(GetProcessHeap(), 0, vb->list); } + +/*********************************************************************** + * SnmpUtilIdsToA (SNMPAPI.@) + */ +LPSTR WINAPI SnmpUtilIdsToA(UINT *ids, UINT length) +{ + static char one[10], oid[514], null_oid[] = "<null oid>"; + unsigned int i, len, left = sizeof(oid) - 1; + + TRACE("(%p, %d)\n", ids, length); + + if (!ids || !length) return null_oid; + + *oid = 0; + for (i = 0; i < length; i++) + { + sprintf(one, "%d", ids[i]); + len = strlen(one); + if (left >= len) + { + strcat(oid, one); + left -= len; + } + else return oid; + + if (i < length - 1) + { + if (left > 0) + { + strcat(oid, "."); + left--; + } + else return oid; + } + } + return oid; +} + +/*********************************************************************** + * SnmpUtilOidToA (SNMPAPI.@) + */ +LPSTR WINAPI SnmpUtilOidToA(AsnObjectIdentifier *oid) +{ + static char null_oid[] = "<null oid>"; + + TRACE("(%p)\n", oid); + + if (oid) + return SnmpUtilIdsToA(oid->ids, oid->idLength); + else + return null_oid; +} + +/*********************************************************************** + * SnmpUtilPrintOid (SNMPAPI.@) + */ +void WINAPI SnmpUtilPrintOid(AsnObjectIdentifier *oid) +{ + unsigned int i; + + TRACE("(%p)\n", oid); + + if (!oid) return; + + for (i = 0; i < oid->idLength; i++) + { + TRACE("%u", oid->ids[i]); + if (i < oid->idLength - 1) TRACE("."); + } +} + +/*********************************************************************** + * SnmpUtilPrintAsnAny (SNMPAPI.@) + */ +void WINAPI SnmpUtilPrintAsnAny(AsnAny *any) +{ + unsigned int i; + + TRACE("(%p)\n", any); + + switch (any->asnType) + { + case ASN_NULL: TRACE("Null value\n"); return; + case ASN_INTEGER32: TRACE("Integer32 %d\n", any->asnValue.number); return; + case ASN_UNSIGNED32: TRACE("Unsigned32 %u\n", any->asnValue.unsigned32); return; + case ASN_COUNTER32: TRACE("Counter32 %u\n", any->asnValue.counter); return; + case ASN_GAUGE32: TRACE("Gauge32 %u\n", any->asnValue.gauge); return; + case ASN_TIMETICKS: TRACE("Timeticks %u\n", any->asnValue.ticks); return; + case ASN_COUNTER64: + { + TRACE("Counter64 %llu\n", any->asnValue.counter64.QuadPart); + return; + } + case ASN_OCTETSTRING: + { + TRACE("String "); + for (i = 0; i < any->asnValue.string.length; i++) + TRACE("%c", any->asnValue.string.stream[i]); + TRACE("\n"); + return; + } + case ASN_IPADDRESS: + { + TRACE("IpAddress "); + if (any->asnValue.string.length < 4) + { + TRACE("Invalid\n"); + return; + } + for (i = 0; i < 4; i++) + { + TRACE("%u", any->asnValue.string.stream[i]); + if (i < 3) TRACE("."); + } + TRACE("\n"); + return; + } + case ASN_BITS: + { + TRACE("Bits "); + for (i = 0; i < any->asnValue.string.length; i++) + { + TRACE("0x%02x", any->asnValue.string.stream[i]); + if (i < any->asnValue.object.idLength - 1) TRACE(" "); + } + TRACE("\n"); + return; + } + case ASN_OPAQUE: + { + TRACE("Opaque "); + for (i = 0; i < any->asnValue.string.length; i++) + { + TRACE("0x%02x", any->asnValue.string.stream[i]); + if (i < any->asnValue.object.idLength - 1) TRACE(" "); + } + TRACE("\n"); + return; + } + case ASN_OBJECTIDENTIFIER: + { + TRACE("ObjectID "); + for (i = 0; i < any->asnValue.object.idLength; i++) + { + TRACE("%u", any->asnValue.object.ids[i]); + if (i < any->asnValue.object.idLength - 1) TRACE("."); + } + TRACE("\n"); + return; + } + default: + { + TRACE("Invalid type %d\n", any->asnType); + return; + } + } +} diff --git a/dlls/snmpapi/snmpapi.spec b/dlls/snmpapi/snmpapi.spec index b98d029..2ada750 100644 --- a/dlls/snmpapi/snmpapi.spec +++ b/dlls/snmpapi/snmpapi.spec @@ -20,8 +20,8 @@ @ stub SnmpUtilAnsiToUnicode @ stdcall SnmpUtilAsnAnyCpy(ptr ptr) @ stdcall SnmpUtilAsnAnyFree(ptr) -@ stub SnmpUtilDbgPrint -@ stub SnmpUtilIdsToA +@ stdcall SnmpUtilDbgPrint(long str) +@ stdcall SnmpUtilIdsToA(ptr long) @ stdcall SnmpUtilMemAlloc(long) @ stdcall SnmpUtilMemFree(ptr) @ stdcall SnmpUtilMemReAlloc(ptr long) @@ -34,9 +34,9 @@ @ stdcall SnmpUtilOidCpy(ptr ptr) @ stdcall SnmpUtilOidFree(ptr) @ stdcall SnmpUtilOidNCmp(ptr ptr long) -@ stub SnmpUtilOidToA -@ stub SnmpUtilPrintAsnAny -@ stub SnmpUtilPrintOid +@ stdcall SnmpUtilOidToA(ptr) +@ stdcall SnmpUtilPrintAsnAny(ptr) +@ stdcall SnmpUtilPrintOid(ptr) @ stub SnmpUtilStrlenW @ stub SnmpUtilUnicodeToAnsi @ stdcall SnmpUtilVarBindCpy(ptr ptr)

1 0

Jacek Caban : mshtml: Fixed protocol tests on IE7.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: f79ffe473536c4169f95f04c2121a00675916442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f79ffe473536c4169f95f04c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 22 20:29:53 2007 +0100 mshtml: Fixed protocol tests on IE7. --- dlls/mshtml/protocol.c | 8 ++++---- dlls/mshtml/tests/protocol.c | 16 +++++++++++----- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 376d1f0..5f197fd 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -584,9 +584,9 @@ static HRESULT WINAPI ResProtocol_Start( if(len < sizeof(wszRes)/sizeof(wszRes[0]) || memcmp(url, wszRes, sizeof(wszRes))) { WARN("Wrong protocol of url: %s\n", debugstr_w(url)); - IInternetProtocolSink_ReportResult(pOIProtSink, MK_E_SYNTAX, 0, NULL); + IInternetProtocolSink_ReportResult(pOIProtSink, E_INVALIDARG, 0, NULL); mshtml_free(url); - return MK_E_SYNTAX; + return E_INVALIDARG; } url_dll = url + sizeof(wszRes)/sizeof(wszRes[0]); @@ -803,11 +803,11 @@ static HRESULT WINAPI ResProtocolInfo_Pa static const WCHAR wszRes[] = {'r','e','s',':','/','/'}; if(strlenW(pwzUrl) <= sizeof(wszRes)/sizeof(WCHAR) || memcmp(pwzUrl, wszRes, sizeof(wszRes))) - return MK_E_SYNTAX; + return E_INVALIDARG; ptr = strchrW(pwzUrl + sizeof(wszRes)/sizeof(WCHAR), '/'); if(!ptr) - return MK_E_SYNTAX; + return E_INVALIDARG; size = ptr-pwzUrl + sizeof(wszFile)/sizeof(WCHAR) - sizeof(wszRes)/sizeof(WCHAR); if(size >= cchResult) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index a76791d..0164a52 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -126,7 +126,9 @@ static HRESULT WINAPI ProtocolSink_Repor ok((hrResult&0xffff0000) == ((FACILITY_WIN32 << 16)|0x80000000) || expect_hrResult, "expected win32 err or %08x got: %08x\n", expect_hrResult, hrResult); else - ok(hrResult == expect_hrResult, "expected: %08x got: %08x\n", expect_hrResult, hrResult); + ok(hrResult == expect_hrResult || ((expect_hrResult == E_INVALIDARG || + expect_hrResult == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND)) && + hrResult == MK_E_SYNTAX), "expected: %08x got: %08x\n", expect_hrResult, hrResult); ok(dwError == 0, "dwError = %d\n", dwError); ok(!szResult, "szResult != NULL\n"); @@ -213,7 +215,9 @@ static void test_protocol_fail(IInternet ok((hres&0xffff0000) == ((FACILITY_WIN32 << 16)|0x80000000) || hres == expect_hrResult, "expected win32 err or %08x got: %08x\n", expected_hres, hres); else - ok(hres == expected_hres, "expected: %08x got: %08x\n", expected_hres, hres); + ok(hres == expected_hres || ((expected_hres == E_INVALIDARG || + expected_hres == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND)) && hres == MK_E_SYNTAX), + "expected: %08x got: %08x\n", expected_hres, hres); CHECK_CALLED(GetBindInfo); CHECK_CALLED(ReportResult); @@ -290,7 +294,8 @@ static void test_res_protocol(void) hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url1, PARSE_SECURITY_URL, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); - ok(hres == MK_E_SYNTAX, "ParseUrl failed: %08x, expected MK_E_SYNTAX\n", hres); + ok(hres == MK_E_SYNTAX || hres == E_INVALIDARG, + "ParseUrl failed: %08x, expected MK_E_SYNTAX\n", hres); size = 0xdeadbeef; buf[0] = '?'; @@ -375,8 +380,9 @@ static void test_res_protocol(void) ok(hres == S_OK, "Could not get IInternetProtocol: %08x\n", hres); if(SUCCEEDED(hres)) { - test_protocol_fail(protocol, wrong_url1, MK_E_SYNTAX, FALSE); - test_protocol_fail(protocol, wrong_url2, MK_E_SYNTAX, FALSE); + test_protocol_fail(protocol, wrong_url1, E_INVALIDARG, FALSE); + test_protocol_fail(protocol, wrong_url2, + HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), FALSE); test_protocol_fail(protocol, wrong_url3, E_FAIL, TRUE); test_protocol_fail(protocol, wrong_url4, E_FAIL, TRUE);

1 0

H. Verbeet : wined3d: Remove some unused methods from the IWineD3DVertexShader interface.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: 6e58579e8fbf0588d9b690a7a1273b79bc021193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e58579e8fbf0588d9b690a7a… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 22 19:38:29 2007 +0100 wined3d: Remove some unused methods from the IWineD3DVertexShader interface. --- include/wine/wined3d_interface.h | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 3da219a..305616b 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1451,14 +1451,6 @@ DECLARE_INTERFACE_(IWineD3DVertexShader, /*** IWineD3DVertexShader methods ***/ STDMETHOD(GetDevice)(THIS_ IWineD3DDevice** ppDevice) PURE; STDMETHOD(GetFunction)(THIS_ VOID *pData, UINT *pSizeOfData) PURE; - STDMETHOD(SetConstantB)(THIS_ UINT StartRegister, CONST BOOL* pConstantData, UINT BoolCount) PURE; - STDMETHOD(SetConstantI)(THIS_ UINT StartRegister, CONST INT* pConstantData, UINT Vector4iCount) PURE; - STDMETHOD(SetConstantF)(THIS_ UINT StartRegister, CONST FLOAT* pConstantData, UINT Vector4fCount) PURE; - STDMETHOD(GetConstantB)(THIS_ UINT StartRegister, BOOL* pConstantData, UINT BoolCount) PURE; - STDMETHOD(GetConstantI)(THIS_ UINT StartRegister, INT* pConstantData, UINT Vector4iCount) PURE; - STDMETHOD(GetConstantF)(THIS_ UINT StartRegister, FLOAT* pConstantData, UINT Vector4fCount) PURE; - /* Internal Interfaces */ - STDMETHOD_(DWORD, GetVersion)(THIS) PURE; }; #undef INTERFACE @@ -1475,13 +1467,6 @@ DECLARE_INTERFACE_(IWineD3DVertexShader, /*** IWineD3DVertexShader methods ***/ #define IWineD3DVertexShader_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) #define IWineD3DVertexShader_GetFunction(p,a,b) (p)->lpVtbl->GetFunction(p,a,b) -#define IWineD3DVertexShader_SetConstantB(p,a,b,c) (p)->lpVtbl->SetConstantB(p,a,b,c) -#define IWineD3DVertexShader_SetConstantI(p,a,b,c) (p)->lpVtbl->SetConstantI(p,a,b,c) -#define IWineD3DVertexShader_SetConstantF(p,a,b,c) (p)->lpVtbl->SetConstantF(p,a,b,c) -#define IWineD3DVertexShader_GetConstantB(p,a,b,c) (p)->lpVtbl->GetConstantB(p,a,b,c) -#define IWineD3DVertexShader_GetConstantI(p,a,b,c) (p)->lpVtbl->GetConstantI(p,a,b,c) -#define IWineD3DVertexShader_GetConstantF(p,a,b,c) (p)->lpVtbl->GetConstantF(p,a,b,c) -#define IWineD3DVertexShader_GetVersion(p) (p)->lpVtbl->GetVersion(p) #endif /*****************************************************************************

1 0

H. Verbeet : wined3d: Use ARB_VERTEX_PROGRAM instead of GL_VERTEX_PROGRAM_ARB with GL_SUPPORT.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: 32778357f83379c8901f6b7dc7294ac06c720d74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32778357f83379c8901f6b7dc… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 22 19:38:13 2007 +0100 wined3d: Use ARB_VERTEX_PROGRAM instead of GL_VERTEX_PROGRAM_ARB with GL_SUPPORT. Spotted by Marcus Meissner. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f76e4c7..3e4e38a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -947,7 +947,7 @@ static void shader_arb_select(IWineD3DDe checkGLcall("glEnable(GL_VERTEX_PROGRAM_ARB);"); TRACE("(%p) : Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", This, ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->baseShader.prgId); - } else if(GL_SUPPORT(GL_VERTEX_PROGRAM_ARB)) { + } else if(GL_SUPPORT(ARB_VERTEX_PROGRAM)) { glDisable(GL_VERTEX_PROGRAM_ARB); checkGLcall("glDisable(GL_VERTEX_PROGRAM_ARB)"); }

1 0

H. Verbeet : wined3d: Remove the d3d9types.h include from wined3d_private.h .
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: 7c40799df04d2377525be30988c5b89e81b1ec40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c40799df04d2377525be3098… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 22 19:38:20 2007 +0100 wined3d: Remove the d3d9types.h include from wined3d_private.h. --- dlls/wined3d/wined3d_private.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e4c82b6..5fc8871 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -38,7 +38,6 @@ #include "wine/unicode.h" #include "d3d9.h" -#include "d3d9types.h" #include "wined3d_private_types.h" #include "ddraw.h" #include "wine/wined3d_interface.h"

1 0

Francois Gouget : oleaut32/tests: Fix compilation on systems that don' t support nameless structs (e.g. gcc 2.95).
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: 7f05a94f50e214094dcb1305effa73a55f6635db URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f05a94f50e214094dcb1305e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 22 13:07:29 2007 +0100 oleaut32/tests: Fix compilation on systems that don't support nameless structs (e.g. gcc 2.95). --- dlls/oleaut32/tests/vartest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 038dd90..ed00a40 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -301,7 +301,7 @@ static const char *variantstr( const VAR case VT_UINT: sprintf( buffer[current], "VT_UINT(%d)", V_UINT(var) ); break; case VT_CY: - sprintf( buffer[current], "VT_CY(%x%08x)", V_CY(var).Hi, V_CY(var).Lo ); break; + sprintf( buffer[current], "VT_CY(%x%08x)", S(V_CY(var)).Hi, S(V_CY(var)).Lo ); break; case VT_DATE: sprintf( buffer[current], "VT_DATE(%g)", V_DATE(var) ); break; default:

1 0

Paul Vriens : comctl32/tests: Cast-qual warning fixes.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: 81804538cf22f2b2544e389a56dba66982f731b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81804538cf22f2b2544e389a5… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Jan 22 15:15:43 2007 +0100 comctl32/tests: Cast-qual warning fixes. --- dlls/comctl32/tests/header.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 8e077f6..0755f46 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -73,22 +73,22 @@ static BOOL notifies_received(void) return fRet; } -static LONG addItem(HWND hdex, int idx, LPCSTR text) +static LONG addItem(HWND hdex, int idx, LPSTR text) { HDITEMA hdItem; hdItem.mask = HDI_TEXT | HDI_WIDTH; hdItem.cxy = 100; - hdItem.pszText = (LPSTR)text; + hdItem.pszText = text; hdItem.cchTextMax = 0; return (LONG)SendMessage(hdex, HDM_INSERTITEMA, (WPARAM)idx, (LPARAM)&hdItem); } -static LONG setItem(HWND hdex, int idx, LPCSTR text, BOOL fCheckNotifies) +static LONG setItem(HWND hdex, int idx, LPSTR text, BOOL fCheckNotifies) { LONG ret; HDITEMA hdexItem; hdexItem.mask = HDI_TEXT; - hdexItem.pszText = (LPSTR)text; + hdexItem.pszText = text; hdexItem.cchTextMax = 0; if (fCheckNotifies) { @@ -101,17 +101,17 @@ static LONG setItem(HWND hdex, int idx, return ret; } -static LONG setItemUnicodeNotify(HWND hdex, int idx, LPCSTR text, LPCWSTR wText) +static LONG setItemUnicodeNotify(HWND hdex, int idx, LPSTR text, LPWSTR wText) { LONG ret; HDITEMA hdexItem; HDITEMW hdexNotify; hdexItem.mask = HDI_TEXT; - hdexItem.pszText = (LPSTR)text; + hdexItem.pszText = text; hdexItem.cchTextMax = 0; hdexNotify.mask = HDI_TEXT; - hdexNotify.pszText = (LPWSTR)wText; + hdexNotify.pszText = wText; expect_notify(HDN_ITEMCHANGINGW, TRUE, (HDITEMA*)&hdexNotify); expect_notify(HDN_ITEMCHANGEDW, TRUE, (HDITEMA*)&hdexNotify); @@ -207,11 +207,18 @@ static void compare_items(INT iCode, HDI } } -static const char *str_items[] = - {"First Item", "Second Item", "Third Item", "Fourth Item", "Replace Item", "Out Of Range Item"}; +static char pszFirstItem[] = "First Item"; +static char pszSecondItem[] = "Second Item"; +static char pszThirdItem[] = "Third Item"; +static char pszFourthItem[] = "Fourth Item"; +static char pszReplaceItem[] = "Replace Item"; +static char pszOutOfRangeItem[] = "Out Of Range Item"; + +static char *str_items[] = + {pszFirstItem, pszSecondItem, pszThirdItem, pszFourthItem, pszReplaceItem, pszOutOfRangeItem}; -static const char pszUniTestA[] = "TST"; -static const WCHAR pszUniTestW[] = {'T','S','T',0}; +static char pszUniTestA[] = "TST"; +static WCHAR pszUniTestW[] = {'T','S','T',0}; #define TEST_GET_ITEM(i,c)\

1 0

Alexandre Julliard : widl: Convert expression lists to standard Wine lists.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: 43ac6ed995f9332697ec29adf72b2feb964b3835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ac6ed995f9332697ec29adf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 14:31:40 2007 +0100 widl: Convert expression lists to standard Wine lists. Add a specific type for array dimensions. --- tools/widl/header.c | 21 ++++++++++---- tools/widl/header.h | 7 +++-- tools/widl/parser.y | 68 +++++++++++++++++++++++++++++++---------------- tools/widl/typegen.c | 56 +++++++++++++++++++++----------------- tools/widl/widltypes.h | 26 +++--------------- tools/widl/write_msft.c | 14 +++------ 6 files changed, 104 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43ac6ed995f9332697ec2…

1 0

Alexandre Julliard : widl: Convert variable lists to standard Wine lists.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: eed74e4e4a83c9e41fad80968c214d0c88f706e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eed74e4e4a83c9e41fad80968… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 14:26:12 2007 +0100 widl: Convert variable lists to standard Wine lists. --- tools/widl/client.c | 24 ++------ tools/widl/header.c | 87 ++++++++++------------------ tools/widl/header.h | 2 +- tools/widl/parser.y | 113 ++++++++++++++++++++--------------- tools/widl/proxy.c | 149 ++++++++++++++++++++++++++--------------------- tools/widl/server.c | 41 +++---------- tools/widl/typegen.c | 130 +++++++++++++++------------------------- tools/widl/widltypes.h | 13 ++-- tools/widl/write_msft.c | 58 ++++++++++--------- 9 files changed, 278 insertions(+), 339 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eed74e4e4a83c9e41fad8…

1 0