October 2011 - Wine-Commits

Alexandre Julliard : xcopy: Fix varargs handling for 64-bit.
by Alexandre Julliard Oct. 20, 2011

Oct. 20, 2011

Module: wine Branch: master Commit: 6b59b05244534608a8ab71ef943f84d4568206e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b59b05244534608a8ab71ef9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 14:31:29 2011 +0200 xcopy: Fix varargs handling for 64-bit. --- programs/xcopy/xcopy.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index cfe58f3..f1c011f 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -93,7 +93,7 @@ static WCHAR *XCOPY_LoadMessage(UINT id) { * and hence required WriteConsoleW to output it, however if file i/o is * redirected, it needs to be WriteFile'd using OEM (not ANSI) format * ========================================================================= */ -static int XCOPY_wprintf(const WCHAR *format, ...) { +static int __cdecl XCOPY_wprintf(const WCHAR *format, ...) { static WCHAR *output_bufW = NULL; static char *output_bufA = NULL; @@ -101,7 +101,7 @@ static int XCOPY_wprintf(const WCHAR *format, ...) { static BOOL traceOutput = FALSE; #define MAX_WRITECONSOLE_SIZE 65535 - va_list parms; + __ms_va_list parms; DWORD nOut; int len; DWORD res = 0; @@ -119,11 +119,11 @@ static int XCOPY_wprintf(const WCHAR *format, ...) { return 0; } - va_start(parms, format); + __ms_va_start(parms, format); SetLastError(NO_ERROR); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, format, 0, 0, output_bufW, MAX_WRITECONSOLE_SIZE/sizeof(*output_bufW), &parms); - va_end(parms); + __ms_va_end(parms); if (len == 0 && GetLastError() != NO_ERROR) { WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); return 0;

1 0

Bernhard Loos : msi: Always use WHEREVIEW for sorting.
by Alexandre Julliard Oct. 20, 2011

Oct. 20, 2011

Module: wine Branch: master Commit: 4ac1e8e034a30afd4428653754e4e7878eaf0ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac1e8e034a30afd442865375… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Thu Oct 20 14:22:25 2011 +0200 msi: Always use WHEREVIEW for sorting. --- dlls/msi/distinct.c | 11 +--- dlls/msi/select.c | 10 +--- dlls/msi/sql.y | 62 ++++++++--------- dlls/msi/table.c | 181 +-------------------------------------------------- 4 files changed, 32 insertions(+), 232 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ac1e8e034a30afd44286…

1 0

Alexandre Julliard : winex11: Chain to the next driver when not using a device font.
by Alexandre Julliard Oct. 20, 2011

Oct. 20, 2011

Module: wine Branch: master Commit: f00767807f5077279d70e1c03bf607b1632ef14c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f00767807f5077279d70e1c03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 18 21:58:06 2011 +0200 winex11: Chain to the next driver when not using a device font. --- dlls/winex11.drv/text.c | 13 ++++++++++--- dlls/winex11.drv/xfont.c | 12 ++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/text.c b/dlls/winex11.drv/text.c index bce0af9..96cc00b 100644 --- a/dlls/winex11.drv/text.c +++ b/dlls/winex11.drv/text.c @@ -43,16 +43,21 @@ BOOL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); RGNDATA *saved_region = NULL; unsigned int i; - fontObject* pfo; + fontObject* pfo = XFONT_GetFontObject( physDev->font ); XFontStruct* font; BOOL rotated = FALSE; XChar2b *str2b = NULL; BOOL dibUpdateFlag = FALSE; BOOL result = TRUE; + if (!pfo) + { + dev = GET_NEXT_PHYSDEV( dev, pExtTextOut ); + return dev->funcs->pExtTextOut( dev, x, y, flags, lprect, wstr, count, lpDx ); + } + if (!X11DRV_SetupGCForText( physDev )) return TRUE; - pfo = XFONT_GetFontObject( physDev->font ); font = pfo->fs; if (pfo->lf.lfEscapement && pfo->lpX11Trans) @@ -232,5 +237,7 @@ BOOL X11DRV_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR str, INT count, HeapFree( GetProcessHeap(), 0, p ); return TRUE; } - return FALSE; + + dev = GET_NEXT_PHYSDEV( dev, pGetTextExtentExPoint ); + return dev->funcs->pGetTextExtentExPoint( dev, str, count, maxExt, lpnFit, alpDx, size ); } diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 95a082d..78cefed 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -3391,14 +3391,16 @@ BOOL X11DRV_EnumDeviceFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LP BOOL X11DRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); + fontObject *pfo = XFONT_GetFontObject( physDev->font ); - if( CHECK_PFONT(physDev->font) ) + if (pfo) { - fontObject* pfo = __PFONT(physDev->font); X11DRV_cptable[pfo->fi->cptable].pGetTextMetricsW( pfo, metrics ); return TRUE; } - return FALSE; + + dev = GET_NEXT_PHYSDEV( dev, pGetTextMetrics ); + return dev->funcs->pGetTextMetrics( dev, metrics ); } @@ -3452,5 +3454,7 @@ BOOL X11DRV_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buff return TRUE; } - return FALSE; + + dev = GET_NEXT_PHYSDEV( dev, pGetCharWidth ); + return dev->funcs->pGetCharWidth( dev, firstChar, lastChar, buffer ); }

1 0

Alexandre Julliard : gdi32/tests: Add intermediate pointers to color tables to simplify the code and avoid array bounds warnings .
by Alexandre Julliard Oct. 20, 2011

Oct. 20, 2011

Module: wine Branch: master Commit: 86b4fe7b0ee00148eab14b2953e8f7c4660909ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b4fe7b0ee00148eab14b295… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 12:34:58 2011 +0200 gdi32/tests: Add intermediate pointers to color tables to simplify the code and avoid array bounds warnings. --- dlls/gdi32/tests/bitmap.c | 330 +++++++++++++++++++++----------------------- dlls/gdi32/tests/dib.c | 66 +++++----- 2 files changed, 191 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=86b4fe7b0ee00148eab14…

1 0

Marcus Meissner : ntdll: Avoid shadowing size variable.
by Alexandre Julliard Oct. 20, 2011

Oct. 20, 2011

Module: wine Branch: master Commit: cfd5bfa86e492e4b792e181373a84bc67b0eea18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd5bfa86e492e4b792e18137… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Oct 20 01:53:36 2011 +0200 ntdll: Avoid shadowing size variable. --- dlls/ntdll/heap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 2e945e9..022045f 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -655,8 +655,9 @@ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) if (((char *)pFree == (char *)subheap->base + subheap->headerSize) && (subheap != &subheap->heap->subheap)) { - SIZE_T size = 0; void *addr = subheap->base; + + size = 0; /* Remove the free block from the list */ list_remove( &pFree->entry ); /* Remove the subheap from the list */

1 0

Jacek Caban : vbscript: Added Global_isNull implementation.
by Alexandre Julliard Oct. 20, 2011

Oct. 20, 2011

Module: wine Branch: master Commit: a37ea54183d93e1e9c0ce3551575161b49c5f0f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37ea54183d93e1e9c0ce3551… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 20 12:57:18 2011 +0200 vbscript: Added Global_isNull implementation. --- dlls/vbscript/global.c | 11 +++++++++-- dlls/vbscript/tests/api.vbs | 12 ++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 98f41f2..56cedf6 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -291,8 +291,15 @@ static HRESULT Global_IsEmpty(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, V static HRESULT Global_IsNull(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + if(res) { + V_VT(res) = VT_BOOL; + V_BOOL(res) = V_VT(arg) == VT_NULL ? VARIANT_TRUE : VARIANT_FALSE; + } + return S_OK; } static HRESULT Global_IsNumeric(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index d5b75db..126f1e0 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -44,6 +44,18 @@ Call ok(not isEmpty(4), "isEmpty(4) is true?") Call ok(not isEmpty("x"), "isEmpty(""x"") is true?") Call ok(not isEmpty(Null), "isEmpty(Null) is true?") +Call ok(not isNull(new EmptyClass), "isNull(new EmptyClass) is true?") +Set x = new EmptyClass +Call ok(not isNull(x), "isNull(x) is true?") +x = null +Call ok(isNull(x), "isNull(x) is not true?") +Call ok(not isNull(empty), "isNull(empty) is true?") +Call ok(not isNull(Nothing), "isNull(Nothing) is true?") +Call ok(not isNull(true), "isNull(true) is true?") +Call ok(not isNull(4), "isNull(4) is true?") +Call ok(not isNull("x"), "isNull(""x"") is true?") +Call ok(isNull(Null), "isNull(Null) is not true?") + Call ok(getVT(err) = "VT_DISPATCH", "getVT(err) = " & getVT(err)) Sub TestHex(x, ex)

1 0

Marcus Meissner : ntdll: Avoid shadowing "p" variable.
by Alexandre Julliard Oct. 20, 2011

Oct. 20, 2011

Module: wine Branch: master Commit: 9ed15fbf142d3735ec5f594aa59faefaf59527b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed15fbf142d3735ec5f594aa… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Oct 20 02:02:38 2011 +0200 ntdll: Avoid shadowing "p" variable. --- dlls/ntdll/relay.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 3bf7791..23e6675 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -119,15 +119,15 @@ static const WCHAR **build_list( const WCHAR *buffer ) (count+1) * sizeof(WCHAR*) + (strlenW(buffer)+1) * sizeof(WCHAR) ))) { WCHAR *str = (WCHAR *)(ret + count + 1); - WCHAR *p = str; + WCHAR *q = str; strcpyW( str, buffer ); count = 0; for (;;) { - ret[count++] = p; - if (!(p = strchrW( p, ';' ))) break; - *p++ = 0; + ret[count++] = q; + if (!(q = strchrW( q, ';' ))) break; + *q++ = 0; } ret[count++] = NULL; }

1 0

Alexandre Julliard : gdiplus/tests: Add an intermediate variable to avoid array bounds warnings.
by Alexandre Julliard Oct. 20, 2011

Oct. 20, 2011

Module: wine Branch: master Commit: 7c1f665627202c98ecba8e5db0fa752d64720ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1f665627202c98ecba8e5db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 12:49:53 2011 +0200 gdiplus/tests: Add an intermediate variable to avoid array bounds warnings. --- dlls/gdiplus/tests/image.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 8535aad..6e4aca5 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1776,6 +1776,7 @@ static void test_palette(void) INT size; BYTE buffer[1040]; ColorPalette *palette=(ColorPalette*)buffer; + ARGB *entries = palette->Entries; ARGB color=0; /* test initial palette from non-indexed bitmap */ @@ -1819,8 +1820,8 @@ static void test_palette(void) expect(PaletteFlagsGrayScale, palette->Flags); expect(2, palette->Count); - expect(0xff000000, palette->Entries[0]); - expect(0xffffffff, palette->Entries[1]); + expect(0xff000000, entries[0]); + expect(0xffffffff, entries[1]); /* test getting/setting pixels */ stat = GdipBitmapGetPixel(bitmap, 0, 0, &color); @@ -1905,12 +1906,12 @@ static void test_palette(void) } /* test setting/getting a different palette */ - palette->Entries[1] = 0xffcccccc; + entries[1] = 0xffcccccc; stat = GdipSetImagePalette((GpImage*)bitmap, palette); expect(Ok, stat); - palette->Entries[1] = 0; + entries[1] = 0; stat = GdipGetImagePaletteSize((GpImage*)bitmap, &size); expect(Ok, stat); @@ -1920,7 +1921,7 @@ static void test_palette(void) expect(Ok, stat); expect(PaletteFlagsHalftone, palette->Flags); expect(256, palette->Count); - expect(0xffcccccc, palette->Entries[1]); + expect(0xffcccccc, entries[1]); /* test count < 256 */ palette->Flags = 12345; @@ -1929,8 +1930,8 @@ static void test_palette(void) stat = GdipSetImagePalette((GpImage*)bitmap, palette); expect(Ok, stat); - palette->Entries[1] = 0; - palette->Entries[3] = 0xdeadbeef; + entries[1] = 0; + entries[3] = 0xdeadbeef; stat = GdipGetImagePaletteSize((GpImage*)bitmap, &size); expect(Ok, stat); @@ -1940,8 +1941,8 @@ static void test_palette(void) expect(Ok, stat); expect(12345, palette->Flags); expect(3, palette->Count); - expect(0xffcccccc, palette->Entries[1]); - expect(0xdeadbeef, palette->Entries[3]); + expect(0xffcccccc, entries[1]); + expect(0xdeadbeef, entries[3]); /* test count > 256 */ palette->Count = 257;

1 0

Alexandre Julliard : gdi32: Add an intermediate variable to avoid array bounds warnings.
by Alexandre Julliard Oct. 20, 2011

Oct. 20, 2011

Module: wine Branch: master Commit: 328328bb2ce53e45e5951eb98699536f755739f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=328328bb2ce53e45e5951eb98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 12:46:03 2011 +0200 gdi32: Add an intermediate variable to avoid array bounds warnings. --- dlls/gdi32/mfdrv/init.c | 47 ++++++++++++++++++++++++++--------------------- 1 files changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 92680d3..65099d2 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -502,10 +502,11 @@ BOOL MFDRV_MetaParam1(PHYSDEV dev, short func, short param1) { char buffer[8]; METARECORD *mr = (METARECORD *)&buffer; + WORD *params = mr->rdParm; mr->rdSize = 4; mr->rdFunction = func; - *(mr->rdParm) = param1; + params[0] = param1; return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2); } @@ -517,11 +518,12 @@ BOOL MFDRV_MetaParam2(PHYSDEV dev, short func, short param1, short param2) { char buffer[10]; METARECORD *mr = (METARECORD *)&buffer; + WORD *params = mr->rdParm; mr->rdSize = 5; mr->rdFunction = func; - *(mr->rdParm) = param2; - *(mr->rdParm + 1) = param1; + params[0] = param2; + params[1] = param1; return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2); } @@ -535,13 +537,14 @@ BOOL MFDRV_MetaParam4(PHYSDEV dev, short func, short param1, short param2, { char buffer[14]; METARECORD *mr = (METARECORD *)&buffer; + WORD *params = mr->rdParm; mr->rdSize = 7; mr->rdFunction = func; - *(mr->rdParm) = param4; - *(mr->rdParm + 1) = param3; - *(mr->rdParm + 2) = param2; - *(mr->rdParm + 3) = param1; + params[0] = param4; + params[1] = param3; + params[2] = param2; + params[3] = param1; return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2); } @@ -555,15 +558,16 @@ BOOL MFDRV_MetaParam6(PHYSDEV dev, short func, short param1, short param2, { char buffer[18]; METARECORD *mr = (METARECORD *)&buffer; + WORD *params = mr->rdParm; mr->rdSize = 9; mr->rdFunction = func; - *(mr->rdParm) = param6; - *(mr->rdParm + 1) = param5; - *(mr->rdParm + 2) = param4; - *(mr->rdParm + 3) = param3; - *(mr->rdParm + 4) = param2; - *(mr->rdParm + 5) = param1; + params[0] = param6; + params[1] = param5; + params[2] = param4; + params[3] = param3; + params[4] = param2; + params[5] = param1; return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2); } @@ -577,16 +581,17 @@ BOOL MFDRV_MetaParam8(PHYSDEV dev, short func, short param1, short param2, { char buffer[22]; METARECORD *mr = (METARECORD *)&buffer; + WORD *params = mr->rdParm; mr->rdSize = 11; mr->rdFunction = func; - *(mr->rdParm) = param8; - *(mr->rdParm + 1) = param7; - *(mr->rdParm + 2) = param6; - *(mr->rdParm + 3) = param5; - *(mr->rdParm + 4) = param4; - *(mr->rdParm + 5) = param3; - *(mr->rdParm + 6) = param2; - *(mr->rdParm + 7) = param1; + params[0] = param8; + params[1] = param7; + params[2] = param6; + params[3] = param5; + params[4] = param4; + params[5] = param3; + params[6] = param2; + params[7] = param1; return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2); }

1 0

Alexandre Julliard : ntdll/tests: Clear the full atom structure before every test.
by Alexandre Julliard Oct. 20, 2011

Oct. 20, 2011

Module: wine Branch: master Commit: 9801818ff4f0ad625bd63d46453c0b881781fcb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9801818ff4f0ad625bd63d464… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 12:36:02 2011 +0200 ntdll/tests: Clear the full atom structure before every test. --- dlls/ntdll/tests/atom.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/atom.c b/dlls/ntdll/tests/atom.c index 0f18565..0fed630 100644 --- a/dlls/ntdll/tests/atom.c +++ b/dlls/ntdll/tests/atom.c @@ -443,7 +443,7 @@ static void test_Global(void) ok(!res, "Added atom (%x)\n", res); - memset(abi->Name, 0xcc, 255 * sizeof(WCHAR)); + memset( ptr, 0xcc, sizeof(ptr) ); res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); ok(!res, "atom lookup\n"); ok(!lstrcmpW(abi->Name, testAtom1), "ok strings\n"); @@ -457,7 +457,7 @@ static void test_Global(void) ok(abi->NameLength == lstrlenW(testAtom1) * sizeof(WCHAR) || broken(abi->NameLength == sizeof(WCHAR)), /* nt4 */ "string length %u\n",abi->NameLength); - memset(abi->Name, 0xcc, lstrlenW(testAtom1) * sizeof(WCHAR)); + memset( ptr, 0xcc, sizeof(ptr) ); ptr_size = sizeof(ATOM_BASIC_INFORMATION) + lstrlenW(testAtom1) * sizeof(WCHAR); res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); ok(!res, "atom lookup %x\n", res); @@ -466,8 +466,8 @@ static void test_Global(void) ok(abi->Name[lstrlenW(testAtom1)] == 0, "buffer overwrite %x\n", abi->Name[lstrlenW(testAtom1)]); ok(abi->Name[lstrlenW(testAtom1) + 1] == 0xcccc, "buffer overwrite %x\n", abi->Name[lstrlenW(testAtom1) + 1]); + memset( ptr, 0xcc, sizeof(ptr) ); ptr_size = sizeof(ATOM_BASIC_INFORMATION) + 4 * sizeof(WCHAR); - abi->Name[0] = abi->Name[1] = abi->Name[2] = abi->Name[3] = '\0'; res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); ok(!res, "couldn't find atom\n"); ok(abi->NameLength == 8, "wrong string length %u\n", abi->NameLength);

1 0