April 2010 - Wine-Commits - list.winehq.org

Andrew Nguyen : kernel32: Remove superfluous heap reallocation calls in FormatMessageA/W.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: c0e7931954de1d363267ef58ecb23fd87585f005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e7931954de1d363267ef58e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 18 09:08:42 2010 -0500 kernel32: Remove superfluous heap reallocation calls in FormatMessageA/W. The buffer in question is temporary and will be freed on function return, so resizing and leaving the enlarged space unused is pointless. --- dlls/kernel32/format_msg.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index c312acd..f579d21 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -565,9 +565,6 @@ DWORD WINAPI FormatMessageA( *t='\0'; } talloced = strlen(target)+1; - if (nSize && talloced<nSize) { - target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,nSize); - } TRACE("-- %s\n",debugstr_a(target)); if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { *((LPVOID*)lpBuffer) = LocalAlloc(LMEM_ZEROINIT,max(nSize, talloced)); @@ -744,8 +741,6 @@ DWORD WINAPI FormatMessageW( *t='\0'; } talloced = strlenW(target)+1; - if (nSize && talloced<nSize) - target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,nSize*sizeof(WCHAR)); if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { /* nSize is the MINIMUM size */ DWORD len = strlenW(target) + 1;

1 0

Nikolay Sivov : shell32: Move IShellIcon definition to idl source.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: b7d611a80f5ab4ea8cc69163547447acd3baa4de URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7d611a80f5ab4ea8cc691635… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 18 18:54:43 2010 +0400 shell32: Move IShellIcon definition to idl source. --- include/shlguid.h | 1 - include/shlobj.h | 27 --------------------------- include/shobjidl.idl | 15 +++++++++++++++ 3 files changed, 15 insertions(+), 28 deletions(-) diff --git a/include/shlguid.h b/include/shlguid.h index 88d70ce..0055d38 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -38,7 +38,6 @@ DEFINE_OLEGUID(CGID_ShellDocView, 0x000214D1L, 0, 0); DEFINE_OLEGUID(CGID_ShellServiceObject, 0x000214D2L, 0, 0); DEFINE_OLEGUID(CGID_ExplorerBarDoc, 0x000214D3L, 0, 0); -DEFINE_OLEGUID(IID_IShellIcon, 0x000214E5L, 0, 0); DEFINE_OLEGUID(IID_IShellDetails, 0x000214ECL, 0, 0); DEFINE_OLEGUID(IID_IDelayedRelease, 0x000214EDL, 0, 0); DEFINE_OLEGUID(IID_IShellCopyHookA, 0x000214EFL, 0, 0); diff --git a/include/shlobj.h b/include/shlobj.h index a463ca1..df1fc93 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -369,33 +369,6 @@ DECLARE_INTERFACE_(IShellDetails, IUnknown) #define IShellDetails_ColumnClick(p,a) (p)->lpVtbl->ColumnClick(p,a) #endif -/**************************************************************************** - * IShellIcon interface - */ - -#define INTERFACE IShellIcon -DECLARE_INTERFACE_(IShellIcon,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - /*** IShellIcon methods ***/ - STDMETHOD(GetIconOf)(THIS_ LPCITEMIDLIST pidl, UINT flags, LPINT lpIconIndex) PURE; -}; -#undef INTERFACE - -#if !defined(__cplusplus) || defined(CINTERFACE) -/*** IUnknown methods ***/ -#define IShellIcon_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IShellIcon_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IShellIcon_Release(p) (p)->lpVtbl->Release(p) -/*** IShellIcon methods ***/ -#define IShellIcon_GetIconOf(p,a,b,c) (p)->lpVtbl->GetIconOf(p,a,b,c) -#endif - -typedef IShellIcon *LPSHELLICON; - /* IQueryInfo interface */ #define INTERFACE IQueryInfo DECLARE_INTERFACE_(IQueryInfo,IUnknown) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index a050b39..7c4fb78 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -422,6 +422,21 @@ typedef struct } FOLDERSETTINGS, *PFOLDERSETTINGS, *LPFOLDERSETTINGS; typedef const FOLDERSETTINGS *LPCFOLDERSETTINGS; +/***************************************************************************** + * IShellIcon interface + */ +[ + uuid(000214e5-0000-0000-c000-000000000046), + object, + pointer_default(unique) +] +interface IShellIcon : IUnknown +{ + HRESULT GetIconOf( + [in] PCUITEMID_CHILD pidl, + [in] UINT flags, + [out] int *pIconIndex); +} /***************************************************************************** * IShellView interface

1 0

Alistair Leslie-Hughes : msxml4: Register classes.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 4164c308b2cf675e0c10182cc1a682ab2bc6d541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4164c308b2cf675e0c10182cc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 16 06:07:47 2010 +1000 msxml4: Register classes. --- dlls/msxml4/regsvr.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/msxml2.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 0 deletions(-) diff --git a/dlls/msxml4/regsvr.c b/dlls/msxml4/regsvr.c index b3088f1..e4b1a0d 100644 --- a/dlls/msxml4/regsvr.c +++ b/dlls/msxml4/regsvr.c @@ -353,6 +353,38 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.SAXXMLReader", "4.0" }, + { &CLSID_XMLSchemaCache40, + "XML Schema Cache 4.0", + NULL, + "msxml4.dll", + "Both", + "Msxml2.XMLSchemaCache", + "4.0" + }, + { &CLSID_MXXMLWriter40, + "IMXWriter interface 4.0", + NULL, + "msxml4.dll", + "Both", + "Msxml2.MXXMLWriter", + "4.0" + }, + { &CLSID_SAXAttributes40, + "SAX Attribute 4.0", + NULL, + "msxml4.dll", + "Both", + "Msxml2.SAXAttributes", + "4.0" + }, + { &CLSID_FreeThreadedDOMDocument40, + "Free Threaded XML DOM Document 4.0", + NULL, + "msxml4.dll", + "Both", + "Microsoft.FreeThreadedDOMDocument4.0", + "4.0" + }, { NULL } /* list terminator */ }; @@ -370,6 +402,26 @@ static struct progid const progid_list[] = { &CLSID_SAXXMLReader40, NULL }, + { "Msxml2.XMLSchemaCache.4.0", + "XML Schema Cache 4.0", + &CLSID_XMLSchemaCache40, + NULL + }, + { "Msxml2.MXXMLWriter.4.0", + "MXXMLWriter 4.0", + &CLSID_MXXMLWriter40, + NULL + }, + { "Msxml2.SAXAttributes.4.0", + "SAX Attribute 4.0", + &CLSID_SAXAttributes40, + NULL + }, + { "MSXML.FreeThreadedDOMDocument40", + "Free threaded XML DOM Document 4.0", + &CLSID_FreeThreadedDOMDocument40, + NULL + }, { NULL } /* list terminator */ }; diff --git a/include/msxml2.idl b/include/msxml2.idl index 1f28f83..f2841a5 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -1280,6 +1280,15 @@ coclass FreeThreadedDOMDocument30 } [ + uuid(88d969c1-f192-11d4-a65f-0040963251e5), +] +coclass FreeThreadedDOMDocument40 +{ + [default] interface IXMLDOMDocument2; + [default, source] dispinterface XMLDOMDocumentEvents; +}; + +[ uuid(373984c9-b845-449b-91e7-45ac83036ade) ] coclass XMLSchemaCache @@ -1304,6 +1313,14 @@ coclass XMLSchemaCache30 } [ + uuid(88d969c2-f192-11d4-a65f-0040963251e5) +] +coclass XMLSchemaCache40 +{ + [default] interface IXMLDOMSchemaCollection2; +}; + +[ uuid(2933BF94-7B36-11d2-B20E-00C04F983E60) ] coclass XSLTemplate @@ -2639,6 +2656,26 @@ coclass MXXMLWriter30 }; [ + uuid(88d969c8-f192-11d4-a65f-0040963251e5), +] +coclass MXXMLWriter40 +{ + [default] interface IMXWriter; + + interface ISAXContentHandler; + interface ISAXDeclHandler; + interface ISAXDTDHandler; + interface ISAXErrorHandler; + interface ISAXLexicalHandler; + + interface IVBSAXContentHandler; + interface IVBSAXDeclHandler; + interface IVBSAXDTDHandler; + interface IVBSAXErrorHandler; + interface IVBSAXLexicalHandler; +}; + +[ uuid(4dd441ad-526d-4a77-9f1b-9841ed802fb0) ] coclass SAXAttributes @@ -2658,5 +2695,15 @@ coclass SAXAttributes30 interface ISAXAttributes; }; +[ + uuid(88d969ca-f192-11d4-a65f-0040963251e5), +] +coclass SAXAttributes40 +{ + [default] interface IMXAttributes; + interface IVBSAXAttributes; + interface ISAXAttributes; +}; + } /* Library MSXML */

1 0

Alistair Leslie-Hughes : msxml3: Register classes.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 8248040dbee64e69ea614cbf5912d11f8782196e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8248040dbee64e69ea614cbf5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 19 20:53:51 2010 +1000 msxml3: Register classes. --- dlls/msxml3/regsvr.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index d9b47dd..415e5af 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -515,8 +515,23 @@ static struct regsvr_coclass const coclass_list[] = { "Both", "Microsoft.FreeThreadedXMLDOM.1.0", "1.0" + }, + { &CLSID_FreeThreadedDOMDocument26, + "Free Threaded XML DOM Document 2.6", + NULL, + "msxml3.dll", + "Both", + "Microsoft.FreeThreadedXMLDOM.1.0", + "1.0" + }, + { &CLSID_FreeThreadedDOMDocument30, + "Free Threaded XML DOM Document 3.0", + NULL, + "msxml3.dll", + "Both", + "Microsoft.FreeThreadedDOMDocument.1.0", + "1.0" }, - { &CLSID_XMLHTTPRequest, "XML HTTP Request", NULL, @@ -548,6 +563,14 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.XMLSchemaCache", "3.0" }, + { &CLSID_XMLSchemaCache26, + "XML Schema Cache 2.6", + NULL, + "msxml3.dll", + "Both", + "Msxml2.XMLSchemaCache", + "2.6" + }, { &CLSID_XMLSchemaCache30, "XML Schema Cache 3.0", NULL, @@ -588,6 +611,22 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.MXXMLWriter", "3.0" }, + { &CLSID_SAXAttributes, + "SAX Attribute", + NULL, + "msxml3.dll", + "Both", + "Msxml2.SAXAttributes", + NULL + }, + { &CLSID_SAXAttributes30, + "SAX Attribute 3.0", + NULL, + "msxml3.dll", + "Both", + "Msxml2.SAXAttributes", + "3.0" + }, { NULL } /* list terminator */ }; @@ -642,6 +681,16 @@ static struct progid const progid_list[] = { &CLSID_DOMFreeThreadedDocument, "Microsoft.FreeThreadedXMLDOM.1.0" }, + { "MSXML.FreeThreadedDOMDocument26", + "Free threaded XML DOM Document 2.6", + &CLSID_FreeThreadedDOMDocument26, + NULL + }, + { "MSXML.FreeThreadedDOMDocument30", + "Free threaded XML DOM Document 3.0", + &CLSID_FreeThreadedDOMDocument30, + NULL + }, { "Microsoft.XMLHTTP", "XML HTTP Request", &CLSID_XMLHTTPRequest, @@ -672,6 +721,11 @@ static struct progid const progid_list[] = { &CLSID_XMLSchemaCache, "Msxml2.XMLSchemaCache.3.0" }, + { "Msxml2.XMLSchemaCache.2.6", + "XML Schema Cache 2.6", + &CLSID_XMLSchemaCache26, + "Msxml2.XMLSchemaCache.2.6" + }, { "Msxml2.XMLSchemaCache.3.0", "XML Schema Cache 3.0", &CLSID_XMLSchemaCache30, @@ -697,7 +751,16 @@ static struct progid const progid_list[] = { &CLSID_MXXMLWriter30, NULL }, - + { "Msxml2.SAXAttributes", + "SAX Attribute", + &CLSID_SAXAttributes, + NULL + }, + { "Msxml2.SAXAttributes.3.0", + "SAX Attribute 3.0", + &CLSID_SAXAttributes30, + NULL + }, { NULL } /* list terminator */ };

1 0

Andrew Nguyen : kernel32: Only check the buffer pointer in FormatMessageA if buffer allocation is requested .
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: ce61b254d03d3aa4cfb3e803855d22670bb6d8d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce61b254d03d3aa4cfb3e8038… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 18 09:09:06 2010 -0500 kernel32: Only check the buffer pointer in FormatMessageA if buffer allocation is requested. --- dlls/kernel32/format_msg.c | 2 +- dlls/kernel32/tests/format_msg.c | 83 +++++++++++++++++++++++++++++++++++++- 2 files changed, 83 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index fbd133b..8c37434 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -434,7 +434,7 @@ DWORD WINAPI FormatMessageA( &&((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM) || (dwFlags & FORMAT_MESSAGE_FROM_HMODULE))) return 0; - if (!lpBuffer) + if ((dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) && !lpBuffer) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index f48c0f8..21b6377 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -734,6 +734,32 @@ static void test_message_null_buffer(void) { DWORD ret, error; + /* Without FORMAT_MESSAGE_ALLOCATE_BUFFER, only the specified buffer size is checked. */ + SetLastError(0xdeadbeef); + ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 0, NULL); + error = GetLastError(); + ok(!ret, "FormatMessageA returned %u\n", ret); + ok(error == ERROR_INSUFFICIENT_BUFFER || + error == ERROR_INVALID_PARAMETER, /* win9x */ + "last error %u\n", error); + + SetLastError(0xdeadbeef); + ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 1, NULL); + error = GetLastError(); + ok(!ret, "FormatMessageA returned %u\n", ret); + ok(error == ERROR_INSUFFICIENT_BUFFER || + error == ERROR_INVALID_PARAMETER, /* win9x */ + "last error %u\n", error); + + if (0) /* crashes on Windows */ + { + SetLastError(0xdeadbeef); + ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 256, NULL); + error = GetLastError(); + ok(!ret, "FormatMessageA returned %u\n", ret); + trace("last error %u\n", error); + } + SetLastError(0xdeadbeef); ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 0, NULL); error = GetLastError(); @@ -743,7 +769,28 @@ static void test_message_null_buffer(void) "last error %u\n", error); SetLastError(0xdeadbeef); - ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 0, NULL); + ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 1, NULL); + error = GetLastError(); + ok(!ret, "FormatMessageA returned %u\n", ret); + ok(error == ERROR_NOT_ENOUGH_MEMORY || + error == ERROR_INVALID_PARAMETER, /* win9x */ + "last error %u\n", error); + + SetLastError(0xdeadbeef); + ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 256, NULL); + error = GetLastError(); + ok(!ret, "FormatMessageA returned %u\n", ret); + ok(error == ERROR_NOT_ENOUGH_MEMORY || + error == ERROR_INVALID_PARAMETER, /* win9x */ + "last error %u\n", error); +} + +static void test_message_null_buffer_wide(void) +{ + DWORD ret, error; + + SetLastError(0xdeadbeef); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 0, NULL); error = GetLastError(); if (!ret && error == ERROR_CALL_NOT_IMPLEMENTED) { @@ -751,6 +798,39 @@ static void test_message_null_buffer(void) return; } + SetLastError(0xdeadbeef); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 0, NULL); + error = GetLastError(); + ok(!ret, "FormatMessageW returned %u\n", ret); + ok(error == ERROR_INVALID_PARAMETER, "last error %u\n", error); + + SetLastError(0xdeadbeef); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 1, NULL); + error = GetLastError(); + ok(!ret, "FormatMessageW returned %u\n", ret); + ok(error == ERROR_INVALID_PARAMETER, "last error %u\n", error); + + SetLastError(0xdeadbeef); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 256, NULL); + error = GetLastError(); + ok(!ret, "FormatMessageW returned %u\n", ret); + ok(error == ERROR_INVALID_PARAMETER, "last error %u\n", error); + + SetLastError(0xdeadbeef); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 0, NULL); + error = GetLastError(); + ok(!ret, "FormatMessageW returned %u\n", ret); + ok(error == ERROR_INVALID_PARAMETER, "last error %u\n", error); + + SetLastError(0xdeadbeef); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 1, NULL); + error = GetLastError(); + ok(!ret, "FormatMessageW returned %u\n", ret); + ok(error == ERROR_INVALID_PARAMETER, "last error %u\n", error); + + SetLastError(0xdeadbeef); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 256, NULL); + error = GetLastError(); ok(!ret, "FormatMessageW returned %u\n", ret); ok(error == ERROR_INVALID_PARAMETER, "last error %u\n", error); } @@ -822,5 +902,6 @@ START_TEST(format_msg) test_message_insufficient_buffer(); test_message_insufficient_buffer_wide(); test_message_null_buffer(); + test_message_null_buffer_wide(); test_message_from_hmodule(); }

1 0

Andrew Nguyen : kernel32: Reject an insufficiently sized buffer in FormatMessageA/W.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 8b28efaed79c707c72ce9e2f9a7e2877fa485cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b28efaed79c707c72ce9e2f9… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 18 09:08:54 2010 -0500 kernel32: Reject an insufficiently sized buffer in FormatMessageA/W. --- dlls/kernel32/format_msg.c | 34 ++++++++++---- dlls/kernel32/tests/format_msg.c | 94 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index f579d21..fbd133b 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -570,13 +570,20 @@ DWORD WINAPI FormatMessageA( *((LPVOID*)lpBuffer) = LocalAlloc(LMEM_ZEROINIT,max(nSize, talloced)); memcpy(*(LPSTR*)lpBuffer,target,talloced); } else { - lstrcpynA(lpBuffer,target,nSize); + if (nSize < talloced) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + goto failure; + } + strcpy(lpBuffer, target); } + + ret = talloced - 1; /* null terminator */ +failure: HeapFree(GetProcessHeap(),0,target); HeapFree(GetProcessHeap(),0,from); if (!(dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY)) HeapFree( GetProcessHeap(), 0, format_args.args ); - ret = (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ? strlen(*(LPSTR*)lpBuffer) : strlen(lpBuffer); - TRACE("-- returning %d\n", ret); + TRACE("-- returning %u\n", ret); return ret; } #undef ADD_TO_T @@ -595,6 +602,7 @@ DWORD WINAPI FormatMessageW( __ms_va_list* args ) { struct format_args format_args; + DWORD ret = 0; LPWSTR target,t; DWORD talloced; LPWSTR from; @@ -741,21 +749,29 @@ DWORD WINAPI FormatMessageW( *t='\0'; } talloced = strlenW(target)+1; + TRACE("-- %s\n",debugstr_w(target)); if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { /* nSize is the MINIMUM size */ DWORD len = strlenW(target) + 1; *((LPVOID*)lpBuffer) = LocalAlloc(LMEM_ZEROINIT,len*sizeof(WCHAR)); strcpyW(*(LPWSTR*)lpBuffer, target); } - else lstrcpynW(lpBuffer, target, nSize); + else + { + if (nSize < talloced) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + goto failure; + } + strcpyW(lpBuffer, target); + } + ret = talloced - 1; /* null terminator */ +failure: HeapFree(GetProcessHeap(),0,target); HeapFree(GetProcessHeap(),0,from); if (!(dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY)) HeapFree( GetProcessHeap(), 0, format_args.args ); - TRACE("ret=%s\n", wine_dbgstr_w((dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ? - *(LPWSTR*)lpBuffer : lpBuffer)); - return (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ? - strlenW(*(LPWSTR*)lpBuffer): - strlenW(lpBuffer); + TRACE("-- returning %u\n", ret); + return ret; } #undef ADD_TO_T diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index fba932c..f48c0f8 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -638,6 +638,98 @@ static void test_message_from_string(void) ok(r==2,"failed: r=%d\n",r); } +static void test_message_insufficient_buffer(void) +{ + static const char init_buf[] = {'x', 'x', 'x', 'x', 'x'}; + static const char expected_buf[] = {'x', 'x', 'x', 'x', 'x'}; + DWORD ret; + CHAR out[5]; + + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "test", 0, 0, out, 0, NULL); + ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected GetLastError() to return ERROR_INSUFFICIENT_BUFFER, got %u\n", + GetLastError()); + ok(!memcmp(expected_buf, out, sizeof(expected_buf)), + "Expected the buffer to be untouched\n"); + + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "test", 0, 0, out, 1, NULL); + ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected GetLastError() to return ERROR_INSUFFICIENT_BUFFER, got %u\n", + GetLastError()); + ok(!memcmp(expected_buf, out, sizeof(expected_buf)), + "Expected the buffer to be untouched\n"); + + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "test", 0, 0, out, sizeof(out)/sizeof(out[0]) - 1, NULL); + ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected GetLastError() to return ERROR_INSUFFICIENT_BUFFER, got %u\n", + GetLastError()); + ok(!memcmp(expected_buf, out, sizeof(expected_buf)), + "Expected the buffer to be untouched\n"); +} + +static void test_message_insufficient_buffer_wide(void) +{ + static const WCHAR test[] = {'t','e','s','t',0}; + static const WCHAR init_buf[] = {'x', 'x', 'x', 'x', 'x'}; + static const WCHAR expected_buf[] = {'x', 'x', 'x', 'x', 'x'}; + static const WCHAR broken_buf[] = {0, 'x', 'x', 'x', 'x'}; + static const WCHAR broken2_buf[] = {'t','e','s',0,'x'}; + + DWORD ret; + WCHAR out[5]; + + SetLastError(0xdeadbeef); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, NULL, 0, NULL); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("FormatMessageW is not implemented\n"); + return; + } + + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, test, 0, 0, out, 0, NULL); + ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected GetLastError() to return ERROR_INSUFFICIENT_BUFFER, got %u\n", + GetLastError()); + ok(!memcmp(expected_buf, out, sizeof(expected_buf)), + "Expected the buffer to be untouched\n"); + + /* Windows Server 2003 and newer report failure but copy a + * truncated string to the buffer for non-zero buffer sizes. */ + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, test, 0, 0, out, 1, NULL); + ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected GetLastError() to return ERROR_INSUFFICIENT_BUFFER, got %u\n", + GetLastError()); + ok(!memcmp(expected_buf, out, sizeof(expected_buf)) || + broken(!memcmp(broken_buf, out, sizeof(broken_buf))), /* W2K3+ */ + "Expected the buffer to be untouched\n"); + + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, test, 0, 0, out, sizeof(out)/sizeof(out[0]) - 1, NULL); + ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected GetLastError() to return ERROR_INSUFFICIENT_BUFFER, got %u\n", + GetLastError()); + ok(!memcmp(expected_buf, out, sizeof(expected_buf)) || + broken(!memcmp(broken2_buf, out, sizeof(broken2_buf))), /* W2K3+ */ + "Expected the buffer to be untouched\n"); +} + static void test_message_null_buffer(void) { DWORD ret, error; @@ -727,6 +819,8 @@ START_TEST(format_msg) { test_message_from_string(); test_message_from_string_wide(); + test_message_insufficient_buffer(); + test_message_insufficient_buffer_wide(); test_message_null_buffer(); test_message_from_hmodule(); }

1 0

Andrew Nguyen : kernel32/tests: Remove a superfluous comment in the FormatMessage tests.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: f35ca2a77c07e375c7af5dda92efeca9c27de7fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f35ca2a77c07e375c7af5dda9… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 18 09:08:15 2010 -0500 kernel32/tests: Remove a superfluous comment in the FormatMessage tests. --- dlls/kernel32/tests/format_msg.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 228f4d0..fba932c 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -24,8 +24,6 @@ #include "winbase.h" #include "winnls.h" -/* #define ok(cond,failstr) if(!(cond)) {printf("line %d : %s\n",__LINE__,failstr);exit(1);} */ - static DWORD __cdecl doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, LPSTR out, DWORD outsize, ... ) {

1 0

Nikolay Sivov : shell32: Fallback to IShellDetails while filling shell view columns if IShellFolder2 is missed .
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 066063541ddf79422c600144f9e3d9bc6dd67c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=066063541ddf79422c600144f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 18 18:51:45 2010 +0400 shell32: Fallback to IShellDetails while filling shell view columns if IShellFolder2 is missed. --- dlls/shell32/shlview.c | 39 +++++++++++++++++++++++---------------- include/shlobj.h | 22 ++++++++++++++++++++++ 2 files changed, 45 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 938ec13..c7d9ee8 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -389,40 +389,47 @@ static BOOL ShellView_CreateList (IShellViewImpl * This) */ static void ShellView_InitList(IShellViewImpl *This) { + IShellDetails *details = NULL; LVCOLUMNW lvColumn; SHELLDETAILS sd; WCHAR nameW[50]; + HRESULT hr; + INT i; TRACE("(%p)\n", This); SendMessageW(This->hWndList, LVM_DELETEALLITEMS, 0, 0); + SendMessageW(This->hWndList, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)ShellSmallIconList); + SendMessageW(This->hWndList, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)ShellBigIconList); lvColumn.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT; lvColumn.pszText = nameW; - if (This->pSF2Parent) + if (!This->pSF2Parent) { - HRESULT hr; - INT i; - - for (i = 0; 1; i++) + hr = IShellFolder_QueryInterface(This->pSFParent, &IID_IShellDetails, (void**)&details); + if (hr != S_OK) { - hr = IShellFolder2_GetDetailsOf(This->pSF2Parent, NULL, i, &sd); - if (FAILED(hr)) break; - - lvColumn.fmt = sd.fmt; - lvColumn.cx = sd.cxChar*8; /* chars->pixel */ - StrRetToStrNW(nameW, sizeof(nameW)/sizeof(WCHAR), &sd.str, NULL); - SendMessageW(This->hWndList, LVM_INSERTCOLUMNW, i, (LPARAM) &lvColumn); + WARN("IShellFolder2/IShellDetails not supported\n"); + return; } } - else + + for (i = 0; 1; i++) { - FIXME("no SF2\n"); + if (This->pSFParent) + hr = IShellFolder2_GetDetailsOf(This->pSF2Parent, NULL, i, &sd); + else + hr = IShellDetails_GetDetailsOf(details, NULL, i, &sd); + if (FAILED(hr)) break; + + lvColumn.fmt = sd.fmt; + lvColumn.cx = sd.cxChar*8; /* chars->pixel */ + StrRetToStrNW(nameW, sizeof(nameW)/sizeof(WCHAR), &sd.str, NULL); + SendMessageW(This->hWndList, LVM_INSERTCOLUMNW, i, (LPARAM) &lvColumn); } - SendMessageW(This->hWndList, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)ShellSmallIconList); - SendMessageW(This->hWndList, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)ShellBigIconList); + if (details) IShellDetails_Release(details); } /********************************************************** diff --git a/include/shlobj.h b/include/shlobj.h index 9f87a0a..a463ca1 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -346,6 +346,28 @@ typedef struct #define FCIDM_TOOLBAR (FCIDM_BROWSERFIRST + 0) #define FCIDM_STATUS (FCIDM_BROWSERFIRST + 1) +#define INTERFACE IShellDetails +DECLARE_INTERFACE_(IShellDetails, IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface) (THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + /*** IShellDetails methods ***/ + STDMETHOD(GetDetailsOf)(THIS_ PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *pDetails) PURE; + STDMETHOD(ColumnClick)(THIS_ UINT iColumn) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IShellDetails_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IShellDetails_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IShellDetails_Release(p) (p)->lpVtbl->Release(p) +/*** IShellDetails methods ***/ +#define IShellDetails_GetDetailsOf(p,a,b,c) (p)->lpVtbl->GetDetailsOf(p,a,b,c) +#define IShellDetails_ColumnClick(p,a) (p)->lpVtbl->ColumnClick(p,a) +#endif /**************************************************************************** * IShellIcon interface

1 0

Nikolay Sivov : shell32: Load shell folder column names as A/ W strings depending on 9x/NT selector.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 1b31b377b6f4efa9d707541f3c0903e07993fda2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b31b377b6f4efa9d707541f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 18 18:48:58 2010 +0400 shell32: Load shell folder column names as A/W strings depending on 9x/NT selector. --- dlls/shell32/shlfolder.c | 16 ++++++++- dlls/shell32/shlview.c | 60 +++++++++++++++++----------------- dlls/shell32/tests/shfldr_special.c | 14 +++++++- 3 files changed, 57 insertions(+), 33 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 99773b3..230d7c6 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -548,8 +548,20 @@ HRESULT SHELL32_GetColumnDetails(const shvheader *data, int column, SHELLDETAILS { details->fmt = data[column].fmt; details->cxChar = data[column].cxChar; - details->str.uType = STRRET_CSTR; - LoadStringA (shell32_hInstance, data[column].colnameid, details->str.u.cStr, MAX_PATH); + + if (SHELL_OsIsUnicode()) + { + details->str.u.pOleStr = CoTaskMemAlloc(MAX_PATH * sizeof(WCHAR)); + if (!details->str.u.pOleStr) return E_OUTOFMEMORY; + + details->str.uType = STRRET_WSTR; + LoadStringW(shell32_hInstance, data[column].colnameid, details->str.u.pOleStr, MAX_PATH); + } + else + { + details->str.uType = STRRET_CSTR; + LoadStringA(shell32_hInstance, data[column].colnameid, details->str.u.cStr, MAX_PATH); + } return S_OK; } diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 653e5f3..938ec13 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -387,42 +387,44 @@ static BOOL ShellView_CreateList (IShellViewImpl * This) * * - adds all needed columns to the shellview */ -static BOOL ShellView_InitList(IShellViewImpl * This) +static void ShellView_InitList(IShellViewImpl *This) { - LVCOLUMNW lvColumn; - SHELLDETAILS sd; - int i; - WCHAR szTemp[50]; + LVCOLUMNW lvColumn; + SHELLDETAILS sd; + WCHAR nameW[50]; - TRACE("%p\n",This); + TRACE("(%p)\n", This); - SendMessageW(This->hWndList, LVM_DELETEALLITEMS, 0, 0); + SendMessageW(This->hWndList, LVM_DELETEALLITEMS, 0, 0); - lvColumn.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT; - lvColumn.pszText = szTemp; + lvColumn.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT; + lvColumn.pszText = nameW; + + if (This->pSF2Parent) + { + HRESULT hr; + INT i; + + for (i = 0; 1; i++) + { + hr = IShellFolder2_GetDetailsOf(This->pSF2Parent, NULL, i, &sd); + if (FAILED(hr)) break; - if (This->pSF2Parent) - { - for (i=0; 1; i++) - { - if (FAILED(IShellFolder2_GetDetailsOf(This->pSF2Parent, NULL, i, &sd))) - break; lvColumn.fmt = sd.fmt; lvColumn.cx = sd.cxChar*8; /* chars->pixel */ - StrRetToStrNW( szTemp, 50, &sd.str, NULL); + StrRetToStrNW(nameW, sizeof(nameW)/sizeof(WCHAR), &sd.str, NULL); SendMessageW(This->hWndList, LVM_INSERTCOLUMNW, i, (LPARAM) &lvColumn); - } - } - else - { - FIXME("no SF2\n"); - } - - SendMessageW(This->hWndList, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)ShellSmallIconList); - SendMessageW(This->hWndList, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)ShellBigIconList); + } + } + else + { + FIXME("no SF2\n"); + } - return TRUE; + SendMessageW(This->hWndList, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)ShellSmallIconList); + SendMessageW(This->hWndList, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)ShellBigIconList); } + /********************************************************** * ShellView_CompareItems() * @@ -688,10 +690,8 @@ static LRESULT ShellView_OnCreate(IShellViewImpl *This) if (ShellView_CreateList(This)) { - if (ShellView_InitList(This)) - { - ShellView_FillList(This); - } + ShellView_InitList(This); + ShellView_FillList(This); } hr = IShellView2_QueryInterface(iface, &IID_IDropTarget, (LPVOID*)&pdt); diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index 3320130..7be2bdf 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -33,6 +33,11 @@ #include "wine/test.h" +static inline BOOL SHELL_OsIsUnicode(void) +{ + return !(GetVersion() & 0x80000000); +} + /* Tests for My Network Places */ static void test_parse_for_entire_network(void) { @@ -129,8 +134,8 @@ static void test_printers_folder(void) SHELLDETAILS details; SHCOLSTATEF state; LPITEMIDLIST pidl1, pidl2; - INT i; HRESULT hr; + INT i; CoInitialize( NULL ); @@ -166,6 +171,9 @@ if (0) ok(hr == S_OK, "got 0x%08x\n", hr); /* all columns are left-aligned */ ok(details.fmt == LVCFMT_LEFT, "got 0x%x\n", details.fmt); + /* can't be on w9x at this point, IShellFolder2 unsupported there, + check present for running Wine with w9x setup */ + if (SHELL_OsIsUnicode()) SHFree(details.str.u.pOleStr); hr = IShellFolder2_GetDefaultColumnState(folder, i, &state); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -176,6 +184,10 @@ if (0) ok(state == (SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT), "got 0x%x\n", state); } + hr = IShellFolder2_GetDetailsOf(folder, NULL, 0, &details); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(details.str.uType == STRRET_WSTR, "got %d\n", details.str.uType); + /* default pidl */ hr = IShellFolder2_QueryInterface(folder, &IID_IPersistFolder2, (void**)&pf); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : shell32: Add printers CLSID to test, clean up a bit.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: c51b248b48b528c05ba51f6efb0123cb397b8638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51b248b48b528c05ba51f6ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 18 18:31:52 2010 +0400 shell32: Add printers CLSID to test, clean up a bit. --- dlls/shell32/tests/shellpath.c | 297 +++++++++++++++++----------------------- 1 files changed, 126 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c51b248b48b528c05ba51…

1 0