September 2008 - Wine-commits

Vitaliy Margolen : kernel32: Use FileStandardInformation to get file size.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 0b6f677d10b9a95c7bb20759a5ff3f9d3e21e64d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b6f677d10b9a95c7bb20759a… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Sep 14 11:02:04 2008 -0600 kernel32: Use FileStandardInformation to get file size. --- dlls/kernel32/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index e6e5210..a8b6d30 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -899,11 +899,11 @@ DWORD WINAPI GetFileSize( HANDLE hFile, LPDWORD filesizehigh ) */ BOOL WINAPI GetFileSizeEx( HANDLE hFile, PLARGE_INTEGER lpFileSize ) { - FILE_END_OF_FILE_INFORMATION info; + FILE_STANDARD_INFORMATION info; IO_STATUS_BLOCK io; NTSTATUS status; - status = NtQueryInformationFile( hFile, &io, &info, sizeof(info), FileEndOfFileInformation ); + status = NtQueryInformationFile( hFile, &io, &info, sizeof(info), FileStandardInformation ); if (status == STATUS_SUCCESS) { *lpFileSize = info.EndOfFile;

1 0

Roderick Colenbrander : wined3d: Degrade an ERR to a TRACE.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: e3e113383e261773964c91e16f72d18cca4f241b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3e113383e261773964c91e16… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Sep 14 23:33:01 2008 +0000 wined3d: Degrade an ERR to a TRACE. --- 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 ba52fb1..d972570 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3559,7 +3559,7 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, WINED3DFORMAT fmt, GLenum t if(glDesc->conversion_group != WINED3DFMT_YUY2 && glDesc->conversion_group != WINED3DFMT_UYVY && glDesc->conversion_group != WINED3DFMT_YV12) { - ERR("Format: %s\n", debug_d3dformat(glDesc->conversion_group)); + TRACE("Format: %s\n", debug_d3dformat(glDesc->conversion_group)); /* Don't bother setting up a shader for unconverted formats */ glEnable(textype); checkGLcall("glEnable(textype)");

1 0

Mikołaj Zalewski : appwiz.cpl: French should use SUBLANG_NEUTRAL.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 322edbfe0964c790d6e7ba47da566f52d558ce1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=322edbfe0964c790d6e7ba47d… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Sep 14 15:00:11 2008 +0200 appwiz.cpl: French should use SUBLANG_NEUTRAL. --- dlls/appwiz.cpl/Fr.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/Fr.rc b/dlls/appwiz.cpl/Fr.rc index 18c6f09..ab2e0a3 100644 --- a/dlls/appwiz.cpl/Fr.rc +++ b/dlls/appwiz.cpl/Fr.rc @@ -19,7 +19,7 @@ * */ -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE {

1 0

Francois Gouget : gdiplus: Add some documentation stubs to make winapicheck happy.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 8577025789d00a33dfccdde028d2f4d40f42f360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8577025789d00a33dfccdde02… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 14 02:12:25 2008 +0200 gdiplus: Add some documentation stubs to make winapicheck happy. --- dlls/gdiplus/brush.c | 39 +++++++++++++++++++++++++++++++++------ 1 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 067fdde..f789c74 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -34,6 +34,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); +/****************************************************************************** + * GdipCloneBrush [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) { TRACE("(%p, %p)\n", brush, clone); @@ -121,6 +124,9 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) return Ok; } +/****************************************************************************** + * GdipCreateLineBrush [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint, GDIPCONST GpPointF* endpoint, ARGB startcolor, ARGB endcolor, GpWrapMode wrap, GpLineGradient **line) @@ -212,9 +218,13 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect* rect, return GdipCreateLineBrushFromRect(&rectF, startcolor, endcolor, mode, wrap, line); } -/* FIXME: angle value completely ignored. Don't know how to use it since native - always set Brush rectangle to rect (independetly of this angle). - Maybe it's used only on drawing. */ +/****************************************************************************** + * GdipCreateLineBrushFromRectWithAngle [GDIPLUS.@] + * + * FIXME: angle value completely ignored. Don't know how to use it since native + * always set Brush rectangle to rect (independetly of this angle). + * Maybe it's used only on drawing. + */ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect, ARGB startcolor, ARGB endcolor, REAL angle, BOOL isAngleScalable, GpWrapMode wrap, GpLineGradient **line) @@ -323,7 +333,11 @@ GpStatus WINGDIPAPI GdipCreatePathGradientI(GDIPCONST GpPoint* points, return ret; } -/* FIXME: path gradient brushes not truly supported (drawn as solid brushes) */ +/****************************************************************************** + * GdipCreatePathGradientFromPath [GDIPLUS.@] + * + * FIXME: path gradient brushes not truly supported (drawn as solid brushes) + */ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, GpPathGradient **grad) { @@ -379,6 +393,9 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, return Ok; } +/****************************************************************************** + * GdipCreateSolidFill [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB color, GpSolidFill **sf) { COLORREF col = ARGB2COLORREF(color); @@ -401,7 +418,7 @@ GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB color, GpSolidFill **sf) return Ok; } -/******************************************************************************* +/****************************************************************************** * GdipCreateTexture [GDIPLUS.@] * * PARAMS @@ -435,6 +452,9 @@ GpStatus WINGDIPAPI GdipCreateTexture(GpImage *image, GpWrapMode wrapmode, texture); } +/****************************************************************************** + * GdipCreateTexture2 [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipCreateTexture2(GpImage *image, GpWrapMode wrapmode, REAL x, REAL y, REAL width, REAL height, GpTexture **texture) { @@ -448,7 +468,11 @@ GpStatus WINGDIPAPI GdipCreateTexture2(GpImage *image, GpWrapMode wrapmode, texture); } -/* FIXME: imageattr ignored */ +/****************************************************************************** + * GdipCreateTextureIA [GDIPLUS.@] + * + * FIXME: imageattr ignored + */ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, GDIPCONST GpImageAttributes *imageattr, REAL x, REAL y, REAL width, REAL height, GpTexture **texture) @@ -566,6 +590,9 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, return Ok; } +/****************************************************************************** + * GdipCreateTextureIAI [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipCreateTextureIAI(GpImage *image, GDIPCONST GpImageAttributes *imageattr, INT x, INT y, INT width, INT height, GpTexture **texture) {

1 0

Francois Gouget : mshtml/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 305a48949c843d3dfea0bddce5f32a3b9c581f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=305a48949c843d3dfea0bddce… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 14 02:12:13 2008 +0200 mshtml/tests: Add a trailing '\n' to an ok() call. --- dlls/mshtml/tests/dom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 84c18e6..35cd291 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1063,7 +1063,7 @@ static void _elem_get_scroll_left(unsigned line, IUnknown *unk) HRESULT hres; hres = IHTMLElement2_get_scrollLeft(elem, NULL); - ok(hres == E_INVALIDARG, "expect E_INVALIDARG got 0x%08x", hres); + ok(hres == E_INVALIDARG, "expect E_INVALIDARG got 0x%08x\n", hres); hres = IHTMLElement2_get_scrollLeft(elem, &l); ok(hres == S_OK, "get_scrollTop failed: %08x\n", hres);

1 0

Francois Gouget : d3dx9_36: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 9a13920696ebd20b27387e6dee019e6f699576d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a13920696ebd20b27387e6de… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 14 02:12:19 2008 +0200 d3dx9_36: Fix compilation on systems that don't support nameless unions. --- dlls/d3dx9_36/math.c | 44 ++++--- dlls/d3dx9_36/tests/math.c | 288 ++++++++++++++++++++++---------------------- 2 files changed, 167 insertions(+), 165 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a13920696ebd20b27387…

1 0

Paul Vriens : msi/tests: Prevent a crash on NT4.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 2dfcb9421158246e62bf80ea1a9cab9a2f606f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dfcb9421158246e62bf80ea1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Sep 13 15:48:16 2008 +0200 msi/tests: Prevent a crash on NT4. --- dlls/msi/tests/source.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 30b5be0..9248b70 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -130,6 +130,8 @@ static int get_user_sid(LPSTR *usersid) PTOKEN_USER user; BOOL rc; + if (!pConvertSidToStringSidA) + return 0; rc=OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); if (!rc && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) return 0;

1 0

Paul Vriens : oleaut32/tests: Don't crash on Win95.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 22c5fbdc2c4ed7943ab5abb510b08af196c9e388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22c5fbdc2c4ed7943ab5abb51… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Sep 13 15:13:56 2008 +0200 oleaut32/tests: Don't crash on Win95. --- dlls/oleaut32/tests/typelib.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 23bc85d..8b56466 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -37,10 +37,10 @@ #define expect_hex(expr, value) expect_eq(expr, (int)value, int, "0x%x") #define expect_null(expr) expect_eq(expr, NULL, const void *, "%p") -#define expect_wstr_utf8val(expr, value) \ +#define expect_wstr_acpval(expr, value) \ { \ CHAR buf[260]; \ - expect_eq(!WideCharToMultiByte(CP_UTF8, 0, (expr), -1, buf, 260, NULL, NULL), 0, int, "%d"); \ + expect_eq(!WideCharToMultiByte(CP_ACP, 0, (expr), -1, buf, 260, NULL, NULL), 0, int, "%d"); \ ok(lstrcmp(value, buf) == 0, #expr " expected \"%s\" got \"%s\"\n", value, buf); \ } @@ -1279,7 +1279,7 @@ static void test_dump_typelib(const char *name) int ifcount = sizeof(info)/sizeof(info[0]); int iface, func; - MultiByteToWideChar(CP_UTF8, 0, name, -1, wszName, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, name, -1, wszName, MAX_PATH); ole_check(LoadTypeLibEx(wszName, REGKIND_NONE, &typelib)); expect_eq(ITypeLib_GetTypeInfoCount(typelib), ifcount, UINT, "%d"); for (iface = 0; iface < ifcount; iface++) @@ -1292,7 +1292,7 @@ static void test_dump_typelib(const char *name) trace("Interface %s\n", if_info->name); ole_check(ITypeLib_GetTypeInfo(typelib, iface, &typeinfo)); ole_check(ITypeLib_GetDocumentation(typelib, iface, &bstrIfName, NULL, NULL, NULL)); - expect_wstr_utf8val(bstrIfName, if_info->name); + expect_wstr_acpval(bstrIfName, if_info->name); SysFreeString(bstrIfName); ole_check(ITypeInfo_GetTypeAttr(typeinfo, &typeattr)); @@ -1325,7 +1325,7 @@ static void test_dump_typelib(const char *name) ole_check(ITypeInfo_GetNames(typeinfo, desc->memid, namesTab, 256, &cNames)); for (i = 0; i < cNames; i++) { - expect_wstr_utf8val(namesTab[i], fn_info->names[i]); + expect_wstr_acpval(namesTab[i], fn_info->names[i]); SysFreeString(namesTab[i]); } expect_null(fn_info->names[cNames]);

1 0

Paul Vriens : kernel32/tests: Skip tests on Win95.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: d81aff24c6c900547d3c156b29d7614c76d052dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d81aff24c6c900547d3c156b2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Sep 13 14:05:12 2008 +0200 kernel32/tests: Skip tests on Win95. --- dlls/kernel32/tests/pipe.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 8de2e97..2d45702 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -713,14 +713,17 @@ static int test_DisconnectNamedPipe(void) DWORD written; DWORD readden; + SetLastError(0xdeadbeef); hnp = CreateNamedPipe(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_WAIT, /* nMaxInstances */ 1, /* nOutBufSize */ 1024, /* nInBufSize */ 1024, /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, /* lpSecurityAttrib */ NULL); - if (INVALID_HANDLE_VALUE == hnp) { - trace ("Seems we have no named pipes.\n"); + if ((hnp == INVALID_HANDLE_VALUE /* Win98 */ || !hnp /* Win95 */) + && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { + + win_skip("Named pipes are not implemented\n"); return 1; }

1 0

Marcus Meissner : include: Allocation size markup.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: de530b55afbb6342675693924b20c6490161d5e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de530b55afbb6342675693924… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Sep 12 19:14:45 2008 +0200 include: Allocation size markup. --- dlls/wintrust/wintrust_priv.h | 4 ++-- include/fci.h | 2 +- include/gdiplusmem.h | 2 +- include/snmp.h | 4 ++-- include/wintrust.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wintrust/wintrust_priv.h b/dlls/wintrust/wintrust_priv.h index c73f666..f55a1b2 100644 --- a/dlls/wintrust/wintrust_priv.h +++ b/dlls/wintrust/wintrust_priv.h @@ -18,8 +18,8 @@ #ifndef __WINTRUST_PRIV_H__ #define __WINTRUST_PRIV_H__ -void * WINAPI WINTRUST_Alloc(DWORD cb); -void * WINAPI WINTRUST_ReAlloc(void *ptr, DWORD cb); +void * WINAPI WINTRUST_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1); +void * WINAPI WINTRUST_ReAlloc(void *ptr, DWORD cb) __WINE_ALLOC_SIZE(2); void WINAPI WINTRUST_Free(void *p); BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store); BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, diff --git a/include/fci.h b/include/fci.h index 6ced99f..6ac95fa 100644 --- a/include/fci.h +++ b/include/fci.h @@ -163,7 +163,7 @@ typedef struct { /**********************************************************************/ -typedef void * (__cdecl *PFNFCIALLOC)(ULONG cb); +typedef void * (__cdecl __WINE_ALLOC_SIZE(1) *PFNFCIALLOC)(ULONG cb); #define FNFCIALLOC(fn) void * __cdecl fn(ULONG cb) typedef void (__cdecl *PFNFCIFREE)(void *memory); diff --git a/include/gdiplusmem.h b/include/gdiplusmem.h index a0496ba..fad8ed6 100644 --- a/include/gdiplusmem.h +++ b/include/gdiplusmem.h @@ -25,7 +25,7 @@ extern "C" { #endif -void* WINGDIPAPI GdipAlloc(SIZE_T); +void* WINGDIPAPI GdipAlloc(SIZE_T) __WINE_ALLOC_SIZE(1); void WINGDIPAPI GdipFree(void*); #ifdef __cplusplus diff --git a/include/snmp.h b/include/snmp.h index b41243b..cedf7b0 100644 --- a/include/snmp.h +++ b/include/snmp.h @@ -275,8 +275,8 @@ INT WINAPI SnmpUtilVarBindListCpy(SnmpVarBindList *pVblDst, SnmpVarBindList *pVblSrc); VOID WINAPI SnmpUtilVarBindListFree(SnmpVarBindList *pVbl); -LPVOID WINAPI SnmpUtilMemAlloc(UINT nBytes); -LPVOID WINAPI SnmpUtilMemReAlloc(LPVOID pMem, UINT nBytes); +LPVOID WINAPI SnmpUtilMemAlloc(UINT nBytes) __WINE_ALLOC_SIZE(1); +LPVOID WINAPI SnmpUtilMemReAlloc(LPVOID pMem, UINT nBytes) __WINE_ALLOC_SIZE(2); VOID WINAPI SnmpUtilMemFree(LPVOID pMem); LPSTR WINAPI SnmpUtilOidToA(AsnObjectIdentifier *Oid); diff --git a/include/wintrust.h b/include/wintrust.h index 5408ad4..2e4006b 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -260,7 +260,7 @@ struct _CRYPT_PROVIDER_DATA; #define TRUSTERROR_MAX_STEPS 38 -typedef void * (WINAPI *PFN_CPD_MEM_ALLOC)(DWORD cbSize); +typedef void * (__WINE_ALLOC_SIZE(1) WINAPI *PFN_CPD_MEM_ALLOC)(DWORD cbSize); typedef void (WINAPI *PFN_CPD_MEM_FREE)(void *pvMem2Free); typedef BOOL (WINAPI *PFN_CPD_ADD_STORE)(struct _CRYPT_PROVIDER_DATA *pProvData, HCERTSTORE hStore2Add);

1 0