May 2010 - Wine-commits - list.winehq.org

André Hentschel : winedev: We have a stable release.
by Alexandre Julliard 11 May '10

11 May '10

Module: docs Branch: master Commit: da71254ced4b0162533d75fbcaa28ee36addde7b URL: http://source.winehq.org/git/docs.git/?a=commit;h=da71254ced4b0162533d75fbc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 10 21:06:26 2010 +0200 winedev: We have a stable release. --- en/winedev-architecture.sgml | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/en/winedev-architecture.sgml b/en/winedev-architecture.sgml index 92290f5..e7c0caf 100644 --- a/en/winedev-architecture.sgml +++ b/en/winedev-architecture.sgml @@ -5,13 +5,6 @@ <sect1 id="basic-overview"> <title>Wine Overview</title> - <para> - With the fundamental architecture of Wine stabilizing, and - people starting to think that we might soon be ready to - actually release this thing, it may be time to take a look at - how Wine actually works and operates. - </para> - <sect2> <title>Foreword</title> <para>

1 0

André Hentschel : winedev: Add 64-bit to the table.
by Alexandre Julliard 11 May '10

11 May '10

Module: docs Branch: master Commit: 5255b5f681661cb9f1bbf12da9685105dbf5c1b0 URL: http://source.winehq.org/git/docs.git/?a=commit;h=5255b5f681661cb9f1bbf12da… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 10 21:06:30 2010 +0200 winedev: Add 64-bit to the table. --- en/winedev-architecture.sgml | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/en/winedev-architecture.sgml b/en/winedev-architecture.sgml index e7c0caf..efd60a0 100644 --- a/en/winedev-architecture.sgml +++ b/en/winedev-architecture.sgml @@ -94,6 +94,7 @@ <entry>DOS (.COM or .EXE)</entry> <entry>Win16 (NE)</entry> <entry>Win32 (PE)</entry> + <entry>Win64 (PE)</entry> <entry>Winelib</entry> </row> </thead> @@ -104,6 +105,7 @@ <entry>Cooperative</entry> <entry>Preemptive</entry> <entry>Preemptive</entry> + <entry>Preemptive</entry> </row> <row> <entry>Address space</entry> @@ -123,6 +125,10 @@ Each application has it's own address space. Requires MMU support from CPU. </entry> + <entry> + Each application has it's own address + space. Requires MMU support from CPU. + </entry> </row> <row> <entry>Windows API</entry> @@ -137,7 +143,10 @@ Will call the 32 bit Windows API. </entry> <entry> - Will call the 32 bit Windows API, and possibly + Will call the 64 bit Windows API. + </entry> + <entry> + Will call the 32/64 bit Windows API, and possibly also the Unix APIs. </entry> </row> @@ -160,6 +169,9 @@ 32 bit offsets (hence the 32 bit name). </entry> <entry> + Only available on AMD64 architectures. + </entry> + <entry> Flat model, with 32 bit addresses. </entry> </row> @@ -171,7 +183,10 @@ Available. </entry> <entry> - Available, but must use the Win32 APIs for + Available. + </entry> + <entry> + Available, but must use the Win32/64 APIs for threading and synchronization, not the Unix ones. </entry> </row>

1 0

André Hentschel : winedev: Tests should pass on WTB atm, not on Win9x.
by Alexandre Julliard 11 May '10

11 May '10

Module: docs Branch: master Commit: 50ce09ade42f7c5a9a3a337e6b0d73ab34420669 URL: http://source.winehq.org/git/docs.git/?a=commit;h=50ce09ade42f7c5a9a3a337e6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 10 21:06:35 2010 +0200 winedev: Tests should pass on WTB atm, not on Win9x. --- en/winedev-testing.sgml | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/en/winedev-testing.sgml b/en/winedev-testing.sgml index 20e0b16..1fac42b 100644 --- a/en/winedev-testing.sgml +++ b/en/winedev-testing.sgml @@ -48,8 +48,7 @@ Writing conformance tests is also an easy way to discover bugs in Wine. Of course, before fixing the bugs discovered in this way, one must first make sure that the new tests do pass - successfully on at least one Windows 9x and one Windows NT - version. + successfully on at least the Wine Test Bot base VMs. </para> <para> Bugs discovered this way should also be easier to fix. Unlike

1 0

Gerald Pfeifer : user32/tests: Remove variable atom which is not really used from test_Expose.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 173a813e6a80d32249633b297d02f54826e0f56b URL: http://source.winehq.org/git/wine.git/?a=commit;h=173a813e6a80d32249633b297… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 9 14:09:05 2010 +0200 user32/tests: Remove variable atom which is not really used from test_Expose. --- dlls/user32/tests/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index eab16e7..8f0f42d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5187,14 +5187,14 @@ static LRESULT CALLBACK TestExposedRegion_WndProc(HWND hwnd, UINT msg, WPARAM wP static void test_Expose(void) { - ATOM atom; WNDCLASSA cls; HWND mw; + memset(&cls, 0, sizeof(WNDCLASSA)); cls.lpfnWndProc = TestExposedRegion_WndProc; cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszClassName = "TestExposeClass"; - atom = RegisterClassA(&cls); + RegisterClassA(&cls); mw = CreateWindowA("TestExposeClass", "MainWindow", WS_VISIBLE|WS_OVERLAPPEDWINDOW, 0, 0, 200, 100, NULL, NULL, 0, NULL);

1 0

Gerald Pfeifer : winmm/tests: Remove two unused variables (and dead code) from check_position.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: eab579dfcba032c7ae11d36c29a3d98e308458ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab579dfcba032c7ae11d36c2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 9 14:12:05 2010 +0200 winmm/tests: Remove two unused variables (and dead code) from check_position. --- dlls/winmm/tests/wave.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 03f4af4..77a4cc1 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -482,14 +482,9 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, LPWAVEFORMATEX pwfx ) { MMTIME mmtime; - DWORD samples; - double duration; MMRESULT rc; DWORD returned; - samples=bytes/(pwfx->wBitsPerSample/8*pwfx->nChannels); - duration=((double)samples)/pwfx->nSamplesPerSec; - mmtime.wType = TIME_BYTES; rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR,

1 0

Gerald Pfeifer : shlwapi: Remove variable retval which is not really used from GetAcceptLanguagesW.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: be6fa3900dc490c28f9328ce60432b23012fae69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be6fa3900dc490c28f9328ce6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 9 18:18:48 2010 +0200 shlwapi: Remove variable retval which is not really used from GetAcceptLanguagesW. --- dlls/shlwapi/ordinal.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 332bdb6..22851d9 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -484,7 +484,6 @@ HRESULT WINAPI GetAcceptLanguagesW( LPWSTR langbuf, LPDWORD buflen) DWORD mystrlen, mytype; DWORD len; HKEY mykey; - HRESULT retval; LCID mylcid; WCHAR *mystr; LONG lres; @@ -512,7 +511,7 @@ HRESULT WINAPI GetAcceptLanguagesW( LPWSTR langbuf, LPDWORD buflen) /* Did not find a value in the registry or the user buffer is too small */ mylcid = GetUserDefaultLCID(); - retval = LcidToRfc1766W(mylcid, mystr, mystrlen); + LcidToRfc1766W(mylcid, mystr, mystrlen); len = lstrlenW(mystr); memcpy( langbuf, mystr, min(*buflen, len+1)*sizeof(WCHAR) );

1 0

Andrey Turkin : oleaut32: Add handling of some more VARIANT types in typelibs.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: cb9a6af538d31b3de90c8dfbf851abcb06cb28db URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb9a6af538d31b3de90c8dfbf… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sun May 9 23:31:31 2010 +0400 oleaut32: Add handling of some more VARIANT types in typelibs. --- dlls/oleaut32/typelib2.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index a93e5a4..f798979 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -814,11 +814,41 @@ static int ctl2_alloc_custdata( switch (V_VT(pVarVal)) { case VT_UI4: + case VT_I4: + case VT_R4: + case VT_INT: + case VT_UINT: + case VT_HRESULT: offset = ctl2_alloc_segment(This, MSFT_SEG_CUSTDATA, 8, 0); if (offset == -1) return offset; - *((unsigned short *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset]) = VT_UI4; - *((unsigned int *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2]) = V_UI4(pVarVal); + *((unsigned short *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset]) = V_VT(pVarVal); + *((DWORD *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2]) = V_UI4(pVarVal); + break; + + case VT_BSTR: { + /* Construct the data */ + UINT cp = CP_ACP; + int stringlen = SysStringLen(V_BSTR(pVarVal)); + int len = 0; + if (stringlen > 0) { + GetLocaleInfoA(This->typelib_header.lcid, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, + (LPSTR)&cp, sizeof(cp)); + len = WideCharToMultiByte(cp, 0, V_BSTR(pVarVal), SysStringLen(V_BSTR(pVarVal)), NULL, 0, NULL, NULL); + if (!len) + return -1; + } + + offset = ctl2_alloc_segment(This, MSFT_SEG_CUSTDATA, (6 + len + 3) & ~0x3, 0); + if (offset == -1) return offset; + + *((unsigned short *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset]) = V_VT(pVarVal); + *((DWORD *)&This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2]) = (DWORD)len; + if (stringlen > 0) { + WideCharToMultiByte(cp, 0, V_BSTR(pVarVal), SysStringLen(V_BSTR(pVarVal)), + &This->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+6], len, NULL, NULL); + } + } break; default:

1 0

Andrey Turkin : oleaut32: Implement ICreateTypeInfo2::SetCustData method.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 658209b57164da96919500468114a6a7eb0bf7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=658209b57164da96919500468… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sun May 9 23:33:24 2010 +0400 oleaut32: Implement ICreateTypeInfo2::SetCustData method. --- dlls/oleaut32/tests/typelib.c | 77 +++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib2.c | 12 +++++-- 2 files changed, 86 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index cf8c8cb..f0f577a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -975,6 +975,7 @@ static void test_CreateTypeLib(void) { static OLECHAR typelibW[] = {'t','y','p','e','l','i','b',0}; static OLECHAR interface1W[] = {'i','n','t','e','r','f','a','c','e','1',0}; static OLECHAR interface2W[] = {'i','n','t','e','r','f','a','c','e','2',0}; + static OLECHAR interface3W[] = {'i','n','t','e','r','f','a','c','e','3',0}; static OLECHAR dualW[] = {'d','u','a','l',0}; static OLECHAR coclassW[] = {'c','o','c','l','a','s','s',0}; static WCHAR defaultW[] = {'d','e','f','a','u','l','t',0x3213,0}; @@ -984,13 +985,16 @@ static void test_CreateTypeLib(void) { static OLECHAR param2W[] = {'p','a','r','a','m','2',0}; static OLECHAR *names1[] = {func1W, param1W, param2W}; static OLECHAR *names2[] = {func2W, param1W, param2W}; + static const GUID custguid = {0xbf611abe,0x5b38,0x11df,{0x91,0x5c,0x08,0x02,0x79,0x79,0x94,0x70}}; char filename[MAX_PATH]; WCHAR filenameW[MAX_PATH]; ICreateTypeLib2 *createtl; ICreateTypeInfo *createti; + ICreateTypeInfo2 *createti2; ITypeLib *tl, *stdole; ITypeInfo *interface1, *interface2, *dual, *unknown, *dispatch, *ti; + ITypeInfo2 *ti2; FUNCDESC funcdesc; ELEMDESC elemdesc[5]; PARAMDESCEX paramdescex; @@ -1001,6 +1005,7 @@ static void test_CreateTypeLib(void) { BSTR name, docstring, helpfile; DWORD helpcontext; int impltypeflags; + VARIANT cust_data; HRESULT hres; trace("CreateTypeLib tests\n"); @@ -1281,6 +1286,78 @@ static void test_CreateTypeLib(void) { ICreateTypeInfo_Release(createti); + VariantInit(&cust_data); + + hres = ICreateTypeLib_CreateTypeInfo(createtl, interface3W, TKIND_INTERFACE, &createti); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_QueryInterface(createti, &IID_ICreateTypeInfo2, (void**)&createti2); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo2_QueryInterface(createti2, &IID_ITypeInfo2, (void**)&ti2); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeInfo2_GetCustData(ti2, NULL, NULL); + todo_wine + ok(hres == E_INVALIDARG, "got %08x\n", hres); + + hres = ITypeInfo2_GetCustData(ti2, &custguid, NULL); + todo_wine + ok(hres == E_INVALIDARG, "got %08x\n", hres); + + hres = ITypeInfo2_GetCustData(ti2, &custguid, &cust_data); + todo_wine + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo2_SetCustData(createti2, NULL, NULL); + ok(hres == E_INVALIDARG, "got %08x\n", hres); + + hres = ICreateTypeInfo2_SetCustData(createti2, &custguid, NULL); + ok(hres == E_INVALIDARG, "got %08x\n", hres); + + hres = ICreateTypeInfo2_SetCustData(createti2, &custguid, &cust_data); + ok(hres == DISP_E_BADVARTYPE, "got %08x\n", hres); + + V_VT(&cust_data) = VT_UI4; + V_I4(&cust_data) = 0xdeadbeef; + + hres = ICreateTypeInfo2_SetCustData(createti2, &custguid, &cust_data); + ok(hres == S_OK, "got %08x\n", hres); + + V_I4(&cust_data) = 0; + V_VT(&cust_data) = VT_EMPTY; + + hres = ITypeInfo2_GetCustData(ti2, &custguid, &cust_data); + todo_wine + ok(hres == S_OK, "got %08x\n", hres); + + todo_wine + ok(V_VT(&cust_data) == VT_UI4, "got %d\n", V_VT(&cust_data)); + todo_wine + ok(V_I4(&cust_data) == 0xdeadbeef, "got 0x%08x\n", V_I4(&cust_data)); + + V_VT(&cust_data) = VT_UI4; + V_I4(&cust_data) = 12345678; + + hres = ICreateTypeInfo2_SetCustData(createti2, &custguid, &cust_data); + ok(hres == S_OK, "got %08x\n", hres); + + V_I4(&cust_data) = 0; + V_VT(&cust_data) = VT_EMPTY; + + hres = ITypeInfo2_GetCustData(ti2, &custguid, &cust_data); + todo_wine + ok(hres == S_OK, "got %08x\n", hres); + + todo_wine + ok(V_VT(&cust_data) == VT_UI4, "got %d\n", V_VT(&cust_data)); + todo_wine + ok(V_I4(&cust_data) == 12345678, "got 0x%08x\n", V_I4(&cust_data)); + + ITypeInfo2_Release(ti2); + ICreateTypeInfo2_Release(createti2); + ICreateTypeInfo_Release(createti); + hres = ICreateTypeLib_CreateTypeInfo(createtl, coclassW, TKIND_COCLASS, &createti); ok(hres == S_OK, "got %08x\n", hres); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index f798979..22a3a23 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -890,7 +890,7 @@ static HRESULT ctl2_set_custdata( if (guidoffset == -1) return E_OUTOFMEMORY; dataoffset = ctl2_alloc_custdata(This, pVarVal); if (dataoffset == -1) return E_OUTOFMEMORY; - if (dataoffset == -2) return E_INVALIDARG; + if (dataoffset == -2) return DISP_E_BADVARTYPE; custoffset = ctl2_alloc_segment(This, MSFT_SEG_CUSTDATAGUID, 12, 0); if (custoffset == -1) return E_OUTOFMEMORY; @@ -2709,8 +2709,14 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetCustData( REFGUID guid, /* [I] The GUID used as a key to retrieve the custom data. */ VARIANT* pVarVal) /* [I] The custom data. */ { - FIXME("(%p,%s,%p), stub!\n", iface, debugstr_guid(guid), pVarVal); - return E_OUTOFMEMORY; + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; + + TRACE("(%p,%s,%p)!\n", iface, debugstr_guid(guid), pVarVal); + + if (!pVarVal) + return E_INVALIDARG; + + return ctl2_set_custdata(This->typelib, guid, pVarVal, &This->typeinfo->oCustData); } /******************************************************************************

1 0

Eric Pouech : dbghelp: Protect PE' s COFF table reading against bogus values in NTHEADER.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 516fc78a2b8afd57d5a1ad219c4886b3ea0d60f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=516fc78a2b8afd57d5a1ad219… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat May 8 21:47:16 2010 +0200 dbghelp: Protect PE's COFF table reading against bogus values in NTHEADER. --- dlls/dbghelp/pe_module.c | 49 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index baddaeb..cd2f248 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -172,6 +172,25 @@ unsigned pe_get_map_size(const struct image_section_map* ism) } /****************************************************************** + * pe_is_valid_pointer_table + * + * Checks whether the PointerToSymbolTable and NumberOfSymbols in file_header contain + * valid information. + */ +static BOOL pe_is_valid_pointer_table(const IMAGE_NT_HEADERS* nthdr, const void* mapping) +{ + DWORD64 offset; + + /* is the iSym table inside file image ? */ + offset = (DWORD64)nthdr->FileHeader.PointerToSymbolTable; + offset += (DWORD64)nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL); + if (offset > (DWORD64)nthdr->OptionalHeader.SizeOfImage) return FALSE; + /* is string table (following iSym table) inside file image ? */ + offset += *(DWORD*)((const char*)mapping + offset); + return offset <= (DWORD64)nthdr->OptionalHeader.SizeOfImage; +} + +/****************************************************************** * pe_map_file * * Maps an PE file into memory (and checks it's a real PE file) @@ -209,16 +228,26 @@ static BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_ty } if (nthdr->FileHeader.PointerToSymbolTable && nthdr->FileHeader.NumberOfSymbols) { - /* FIXME ugly: should rather map the relevant content instead of copying it */ - const char* src = (const char*)mapping + - nthdr->FileHeader.PointerToSymbolTable + - nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL); - char* dst; - DWORD sz = *(DWORD*)src; - - if ((dst = HeapAlloc(GetProcessHeap(), 0, sz))) - memcpy(dst, src, sz); - fmap->u.pe.strtable = dst; + if (pe_is_valid_pointer_table(nthdr, mapping)) + { + /* FIXME ugly: should rather map the relevant content instead of copying it */ + const char* src = (const char*)mapping + + nthdr->FileHeader.PointerToSymbolTable + + nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL); + char* dst; + DWORD sz = *(DWORD*)src; + + if ((dst = HeapAlloc(GetProcessHeap(), 0, sz))) + memcpy(dst, src, sz); + fmap->u.pe.strtable = dst; + } + else + { + /* we have bad information here, wipe it out */ + fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable = 0; + fmap->u.pe.ntheader.FileHeader.NumberOfSymbols = 0; + fmap->u.pe.strtable = NULL; + } } else fmap->u.pe.strtable = NULL; }

1 0

Gerald Pfeifer : oleaut32/tests: Remove variable changed which is not really used from test_SysReAllocStringLen .
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: b98f916dae61ff2f99482797e1e6cb77d2de02bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b98f916dae61ff2f99482797e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 21:31:09 2010 +0200 oleaut32/tests: Remove variable changed which is not really used from test_SysReAllocStringLen. --- dlls/oleaut32/tests/vartype.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 2ee5fea..c46ad8a 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5444,9 +5444,7 @@ static void test_SysReAllocStringLen(void) ok(str != NULL, "Expected non-NULL\n"); if(str) { - int changed; - - changed = SysReAllocStringLen(&str, str, 1000000); + SysReAllocStringLen(&str, str, 1000000); ok(SysStringLen(str)==1000000, "Incorrect string length\n"); ok(!memcmp(szTest, str, 4*sizeof(WCHAR)), "Incorrect string returned\n");

1 0