October 2010 - Wine-Commits

Piotr Caban : jscrpt: Added VBScript.lbound() implementation.
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: 10a11d539ceaeb92cd716150e3d7de087f6a83cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a11d539ceaeb92cd716150e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 18 18:47:27 2010 +0200 jscrpt: Added VBScript.lbound() implementation. --- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 6 ++++++ dlls/jscript/vbarray.c | 28 ++++++++++++++++++++++++++-- 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 7906637..3ba373f 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -24,6 +24,7 @@ STRINGTABLE { IDS_TO_PRIMITIVE "Error converting object to primitive type" IDS_INVALID_CALL_ARG "Invalid procedure call or argument" + IDS_SUBSCRIPT_OUT_OF_RANGE "Subscript out of range" IDS_CREATE_OBJ_ERROR "Automation server can't create object" IDS_NO_PROPERTY "Object doesn't support this property or method" IDS_UNSUPPORTED_ACTION "Object doesn't support this action" diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 76f45e2..be569e0 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -20,6 +20,7 @@ #define IDS_TO_PRIMITIVE 0x0001 #define IDS_INVALID_CALL_ARG 0x0005 +#define IDS_SUBSCRIPT_OUT_OF_RANGE 0x0009 #define IDS_CREATE_OBJ_ERROR 0x01AD #define IDS_NO_PROPERTY 0x01B6 #define IDS_UNSUPPORTED_ACTION 0x01BD diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 16572ad..a6c0c5a 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1901,6 +1901,9 @@ exception_test(function() {new null;}, "TypeError", -2146823281); exception_test(function() {new nullDisp;}, "TypeError", -2146827850); exception_test(function() {new VBArray();}, "TypeError", -2146823275); exception_test(function() {new VBArray(new VBArray(createArray()));}, "TypeError", -2146823275); +exception_test(function() {(new VBArray(createArray())).lbound("aaa");}, "RangeError", -2146828279); +exception_test(function() {(new VBArray(createArray())).lbound(3);}, "RangeError", -2146828279); +exception_test(function() {tmp = new Object(); tmp.lb = VBArray.prototype.lbound; tmp.lb();}, "TypeError", -2146823275); function testThisExcept(func, number) { exception_test(function() {func.call(new Object())}, "TypeError", number); @@ -2250,5 +2253,8 @@ ok(String.length == 1, "String.length = " + String.length); var tmp = new VBArray(createArray()); tmp = new VBArray(VBArray(createArray())); +ok(tmp.lbound() == 0, "tmp.lbound() = " + tmp.lbound()); +ok(tmp.lbound(1) == 0, "tmp.lbound(1) = " + tmp.lbound(1)); +ok(tmp.lbound(2, 1) == 2, "tmp.lbound(2, 1) = " + tmp.lbound(2, 1)); reportSuccess(); diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index e7388a9..12bb7c0 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -61,8 +61,32 @@ static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DI static HRESULT VBArray_lbound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + VBArrayInstance *vbarray; + int dim; + HRESULT hres; + + TRACE("\n"); + + vbarray = vbarray_this(vthis); + if(!vbarray) + return throw_type_error(ctx, ei, IDS_NOT_VBARRAY, NULL); + + if(arg_cnt(dp)) { + hres = to_int32(ctx, get_arg(dp, 0), ei, &dim); + if(FAILED(hres)) + return hres; + } else + dim = 1; + + hres = SafeArrayGetLBound(vbarray->safearray, dim, &dim); + if(hres == DISP_E_BADINDEX) + return throw_range_error(ctx, ei, IDS_SUBSCRIPT_OUT_OF_RANGE, NULL); + else if(FAILED(hres)) + return hres; + + if(retv) + num_set_val(retv, dim); + return S_OK; } static HRESULT VBArray_toArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp,

1 0

Detlef Riekenberg : winspool: Use Unicode for CUPS printer names.
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: e61f27299a62a72a6b1cb188ab9e16e2101ce4c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e61f27299a62a72a6b1cb188a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Oct 18 17:49:19 2010 +0200 winspool: Use Unicode for CUPS printer names. --- dlls/winspool.drv/info.c | 67 ++++++++++++++++++++++----------------------- 1 files changed, 33 insertions(+), 34 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 0494584..4a084d1 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -208,7 +208,7 @@ static const WCHAR ProviderW[] = {'P','r','o','v','i','d','e','r',0}; static const WCHAR Separator_FileW[] = {'S','e','p','a','r','a','t','o','r',' ','F','i','l','e',0}; static const WCHAR Share_NameW[] = {'S','h','a','r','e',' ','N','a','m','e',0}; static const WCHAR VersionW[] = {'V','e','r','s','i','o','n',0}; -static const WCHAR WinPrintW[] = {'W','i','n','P','r','i','n','t',0}; +static WCHAR WinPrintW[] = {'W','i','n','P','r','i','n','t',0}; static const WCHAR deviceW[] = {'d','e','v','i','c','e',0}; static const WCHAR devicesW[] = {'d','e','v','i','c','e','s',0}; static const WCHAR windowsW[] = {'w','i','n','d','o','w','s',0}; @@ -218,7 +218,7 @@ static WCHAR driver_9x[] = {'w','i','n','e','p','s','1','6','.','d','r','v static WCHAR driver_nt[] = {'w','i','n','e','p','s','.','d','r','v',0}; static const WCHAR timeout_15_45[] = {',','1','5',',','4','5',0}; static const WCHAR commaW[] = {',',0}; -static const WCHAR emptyStringW[] = {0}; +static WCHAR emptyStringW[] = {0}; static const WCHAR May_Delete_Value[] = {'W','i','n','e','M','a','y','D','e','l','e','t','e','M','e',0}; @@ -425,8 +425,8 @@ static BOOL CUPS_LoadPrinters(void) int i, nrofdests; BOOL hadprinter = FALSE, haddefault = FALSE; cups_dest_t *dests; - PRINTER_INFO_2A pinfo2a; - char *port; + PRINTER_INFO_2W pi2; + WCHAR *port; HKEY hkeyPrinter, hkeyPrinters; char loaderror[256]; WCHAR nameW[MAX_PATH]; @@ -457,57 +457,56 @@ static BOOL CUPS_LoadPrinters(void) nrofdests = pcupsGetDests(&dests); TRACE("Found %d CUPS %s:\n", nrofdests, (nrofdests == 1) ? "printer" : "printers"); for (i=0;i<nrofdests;i++) { - MultiByteToWideChar(CP_ACP, 0, dests[i].name, -1, nameW, sizeof(nameW) / sizeof(WCHAR)); + MultiByteToWideChar(CP_UNIXCP, 0, dests[i].name, -1, nameW, sizeof(nameW) / sizeof(WCHAR)); - port = HeapAlloc(GetProcessHeap(), 0, strlen("CUPS:") + strlen(dests[i].name)+1); - sprintf(port,"CUPS:%s", dests[i].name); + port = HeapAlloc(GetProcessHeap(), 0, sizeof(CUPS_Port) + lstrlenW(nameW) * sizeof(WCHAR)); + lstrcpyW(port, CUPS_Port); + lstrcatW(port, nameW); - TRACE("Printer %d: %s\n", i, dests[i].name); - if(RegOpenKeyA(hkeyPrinters, dests[i].name, &hkeyPrinter) == ERROR_SUCCESS) { + TRACE("Printer %d: %s\n", i, debugstr_w(nameW)); + if(RegOpenKeyW(hkeyPrinters, nameW, &hkeyPrinter) == ERROR_SUCCESS) { /* Printer already in registry, delete the tag added in WINSPOOL_LoadSystemPrinters and continue */ TRACE("Printer already exists\n"); - RegSetValueExA(hkeyPrinter, "Port", 0, REG_SZ, (LPBYTE)port, strlen(port) + 1); /* overwrite LPR:* port */ + /* overwrite old LPR:* port */ + RegSetValueExW(hkeyPrinter, PortW, 0, REG_SZ, (LPBYTE)port, (lstrlenW(port) + 1) * sizeof(WCHAR)); RegDeleteValueW(hkeyPrinter, May_Delete_Value); RegCloseKey(hkeyPrinter); } else { - static CHAR data_type[] = "RAW", - print_proc[] = "WinPrint", - comment[] = "WINEPS Printer using CUPS", - location[] = "<physical location of printer>", - params[] = "<parameters?>", - share_name[] = "<share name?>", - sep_file[] = "<sep file?>"; + static WCHAR comment_cups[] = {'W','I','N','E','P','S',' ','P','r','i','n','t','e','r', + ' ','u','s','i','n','g',' ','C','U','P','S',0}; add_printer_driver(nameW); - memset(&pinfo2a,0,sizeof(pinfo2a)); - pinfo2a.pPrinterName = dests[i].name; - pinfo2a.pDatatype = data_type; - pinfo2a.pPrintProcessor = print_proc; - pinfo2a.pDriverName = dests[i].name; - pinfo2a.pComment = comment; - pinfo2a.pLocation = location; - pinfo2a.pPortName = port; - pinfo2a.pParameters = params; - pinfo2a.pShareName = share_name; - pinfo2a.pSepFile = sep_file; - - if (!AddPrinterA(NULL,2,(LPBYTE)&pinfo2a)) { + memset(&pi2, 0, sizeof(PRINTER_INFO_2W)); + pi2.pPrinterName = nameW; + pi2.pDatatype = rawW; + pi2.pPrintProcessor = WinPrintW; + pi2.pDriverName = nameW; + pi2.pComment = comment_cups; + pi2.pLocation = emptyStringW; + pi2.pPortName = port; + pi2.pParameters = emptyStringW; + pi2.pShareName = emptyStringW; + pi2.pSepFile = emptyStringW; + + if (!AddPrinterW(NULL, 2, (LPBYTE)&pi2)) { if (GetLastError() != ERROR_PRINTER_ALREADY_EXISTS) - ERR("printer '%s' not added by AddPrinterA (error %d)\n",dests[i].name,GetLastError()); + ERR("printer '%s' not added by AddPrinter (error %d)\n", debugstr_w(nameW), GetLastError()); } } HeapFree(GetProcessHeap(),0,port); hadprinter = TRUE; if (dests[i].is_default) { - SetDefaultPrinterA(dests[i].name); + SetDefaultPrinterW(nameW); haddefault = TRUE; } } - if (hadprinter & !haddefault) - SetDefaultPrinterA(dests[0].name); + if (hadprinter & !haddefault) { + MultiByteToWideChar(CP_UNIXCP, 0, dests[0].name, -1, nameW, sizeof(nameW) / sizeof(WCHAR)); + SetDefaultPrinterW(nameW); + } pcupsFreeDests(nrofdests, dests); RegCloseKey(hkeyPrinters); return hadprinter;

1 0

Adam Martinson : msxml3: IXMLDOMSchemaCollection/XMLSchemaCache backend.
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: 6e97fcf94ee2d80e4f3b824d951872b3e766869e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e97fcf94ee2d80e4f3b824d9… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Fri Oct 15 09:25:32 2010 -0500 msxml3: IXMLDOMSchemaCollection/XMLSchemaCache backend. Implemented on top of libxml's hash table. --- dlls/msxml3/schema.c | 376 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 326 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e97fcf94ee2d80e4f3b8…

1 0

Dan Kegel : ws2_32: Null select() should fail with WSAEINVAL.
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: 6733c40d789744ec0ee6fa30f8e14816968a0887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6733c40d789744ec0ee6fa30f… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Oct 18 10:42:16 2010 +0000 ws2_32: Null select() should fail with WSAEINVAL. --- dlls/ws2_32/socket.c | 8 ++++++-- dlls/ws2_32/tests/sock.c | 11 +++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 22e6138..66726a7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3496,7 +3496,11 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set if (writefds) count += writefds->fd_count; if (exceptfds) count += exceptfds->fd_count; *count_ptr = count; - if (!count) return NULL; + if (!count) + { + SetLastError(WSAEINVAL); + return NULL; + } if (!(fds = HeapAlloc( GetProcessHeap(), 0, count * sizeof(fds[0])))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); @@ -3619,7 +3623,7 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, TRACE("read %p, write %p, excp %p timeout %p\n", ws_readfds, ws_writefds, ws_exceptfds, ws_timeout); - if (!(pollfds = fd_sets_to_poll( ws_readfds, ws_writefds, ws_exceptfds, &count )) && count) + if (!(pollfds = fd_sets_to_poll( ws_readfds, ws_writefds, ws_exceptfds, &count ))) return SOCKET_ERROR; if (ws_timeout) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e0f9ccf..fd61e78 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1943,6 +1943,17 @@ static void test_select(void) FD_ZERO(&readfds); FD_ZERO(&writefds); FD_ZERO(&exceptfds); + + SetLastError(0); + ret = select(maxfd+1, 0, 0, 0, &select_timeout); + ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); + ok ( GetLastError() == WSAEINVAL, "expected WSAEINVAL, got %i\n", ret); + + SetLastError(0); + ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); + ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); + ok ( GetLastError() == WSAEINVAL, "expected WSAEINVAL, got %i\n", ret); + FD_SET(INVALID_SOCKET, &readfds); SetLastError(0); ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout);

1 0

Adam Martinson : msxml3: Add a function to initialize xmlDoc->_private data .
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: 8db0dd5335d9b2f26810b5663835d4fee59223b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db0dd5335d9b2f26810b5663… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Fri Oct 15 09:25:11 2010 -0500 msxml3: Add a function to initialize xmlDoc->_private data. --- dlls/msxml3/domdoc.c | 6 ++++++ dlls/msxml3/msxml_private.h | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 781261e..1adc84d 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -393,6 +393,12 @@ static xmlDocPtr doparse(domdoc* This, char *ptr, int len) return doc; } +void xmldoc_init(xmlDocPtr doc, const GUID *clsid) +{ + doc->_private = create_priv(); + priv_from_xmlDocPtr(doc)->properties = create_properties(clsid); +} + LONG xmldoc_add_ref(xmlDocPtr doc) { LONG ref = InterlockedIncrement(&priv_from_xmlDocPtr(doc)->refs); diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 0fa1f45..b16267c 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -130,6 +130,7 @@ xmlNodePtr xmlNodePtr_from_domnode( IXMLDOMNode *iface, xmlElementType type ); /* helpers */ extern xmlChar *xmlChar_from_wchar( LPCWSTR str ); +extern void xmldoc_init( xmlDocPtr doc, const GUID *clsid ); extern LONG xmldoc_add_ref( xmlDocPtr doc ); extern LONG xmldoc_release( xmlDocPtr doc ); extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node );

1 0

Detlef Riekenberg : winspool: Use Unicode to add a driver entry for a unix printer.
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: d07673ecf377607e7445517378a48595431d3da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d07673ecf377607e744551737… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Oct 18 17:49:18 2010 +0200 winspool: Use Unicode to add a driver entry for a unix printer. --- dlls/winspool.drv/info.c | 66 +++++++++++++++++++++++---------------------- 1 files changed, 34 insertions(+), 32 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f757af6..0494584 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -167,9 +167,9 @@ static const WCHAR WinNT_CV_PrinterPortsW[] = { 'S','o','f','t','w','a','r','e', 'P','r','i','n','t','e','r','P','o','r','t','s',0}; static const WCHAR DefaultEnvironmentW[] = {'W','i','n','e',0}; -static const WCHAR envname_win40W[] = {'W','i','n','d','o','w','s',' ','4','.','0',0}; +static WCHAR envname_win40W[] = {'W','i','n','d','o','w','s',' ','4','.','0',0}; static const WCHAR envname_x64W[] = {'W','i','n','d','o','w','s',' ','x','6','4',0}; -static const WCHAR envname_x86W[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; +static WCHAR envname_x86W[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; static const WCHAR subdir_win40W[] = {'w','i','n','4','0',0}; static const WCHAR subdir_x64W[] = {'x','6','4',0}; static const WCHAR subdir_x86W[] = {'w','3','2','x','8','6',0}; @@ -212,7 +212,10 @@ static const WCHAR WinPrintW[] = {'W','i','n','P','r','i','n','t',0}; static const WCHAR deviceW[] = {'d','e','v','i','c','e',0}; static const WCHAR devicesW[] = {'d','e','v','i','c','e','s',0}; static const WCHAR windowsW[] = {'w','i','n','d','o','w','s',0}; -static const WCHAR driver_nt[] = {'w','i','n','e','p','s','.','d','r','v',0}; +static WCHAR generic_ppdW[] = {'g','e','n','e','r','i','c','.','p','p','d',0}; +static WCHAR rawW[] = {'R','A','W',0}; +static WCHAR driver_9x[] = {'w','i','n','e','p','s','1','6','.','d','r','v',0}; +static WCHAR driver_nt[] = {'w','i','n','e','p','s','.','d','r','v',0}; static const WCHAR timeout_15_45[] = {',','1','5',',','4','5',0}; static const WCHAR commaW[] = {',',0}; static const WCHAR emptyStringW[] = {0}; @@ -380,41 +383,33 @@ WINSPOOL_SetDefaultPrinter(const char *devname, const char *name, BOOL force) { } } -static BOOL add_printer_driver(const char *name) +static BOOL add_printer_driver(WCHAR *name) { - DRIVER_INFO_3A di3a; + DRIVER_INFO_3W di3; - static char driver_9x[] = "wineps16.drv", - driver_nt[] = "wineps.drv", - env_9x[] = "Windows 4.0", - env_nt[] = "Windows NT x86", - data_file[] = "generic.ppd", - default_data_type[] = "RAW"; + ZeroMemory(&di3, sizeof(DRIVER_INFO_3W)); + di3.cVersion = 3; + di3.pName = name; + di3.pEnvironment = envname_x86W; + di3.pDriverPath = driver_nt; + di3.pDataFile = generic_ppdW; + di3.pConfigFile = driver_nt; + di3.pDefaultDataType = rawW; - ZeroMemory(&di3a, sizeof(DRIVER_INFO_3A)); - di3a.cVersion = 3; - di3a.pName = (char *)name; - di3a.pEnvironment = env_nt; - di3a.pDriverPath = driver_nt; - di3a.pDataFile = data_file; - di3a.pConfigFile = driver_nt; - di3a.pDefaultDataType = default_data_type; - - if (AddPrinterDriverA(NULL, 3, (LPBYTE)&di3a) || + if (AddPrinterDriverW(NULL, 3, (LPBYTE)&di3) || (GetLastError() == ERROR_PRINTER_DRIVER_ALREADY_INSTALLED )) { - di3a.cVersion = 0; - di3a.pEnvironment = env_9x; - di3a.pDriverPath = driver_9x; - di3a.pConfigFile = driver_9x; - if (AddPrinterDriverA(NULL, 3, (LPBYTE)&di3a) || + di3.cVersion = 0; + di3.pEnvironment = envname_win40W; + di3.pDriverPath = driver_9x; + di3.pConfigFile = driver_9x; + if (AddPrinterDriverW(NULL, 3, (LPBYTE)&di3) || (GetLastError() == ERROR_PRINTER_DRIVER_ALREADY_INSTALLED )) { return TRUE; } } - ERR("Failed adding driver %s (%s): %u\n", debugstr_a(di3a.pDriverPath), - debugstr_a(di3a.pEnvironment), GetLastError()); + ERR("failed with %u for %s (%s)\n", GetLastError(), debugstr_w(di3.pDriverPath), debugstr_w(di3.pEnvironment)); return FALSE; } @@ -434,6 +429,7 @@ static BOOL CUPS_LoadPrinters(void) char *port; HKEY hkeyPrinter, hkeyPrinters; char loaderror[256]; + WCHAR nameW[MAX_PATH]; cupshandle = wine_dlopen(SONAME_LIBCUPS, RTLD_NOW, loaderror, sizeof(loaderror)); if (!cupshandle) { @@ -461,6 +457,8 @@ static BOOL CUPS_LoadPrinters(void) nrofdests = pcupsGetDests(&dests); TRACE("Found %d CUPS %s:\n", nrofdests, (nrofdests == 1) ? "printer" : "printers"); for (i=0;i<nrofdests;i++) { + MultiByteToWideChar(CP_ACP, 0, dests[i].name, -1, nameW, sizeof(nameW) / sizeof(WCHAR)); + port = HeapAlloc(GetProcessHeap(), 0, strlen("CUPS:") + strlen(dests[i].name)+1); sprintf(port,"CUPS:%s", dests[i].name); @@ -481,7 +479,7 @@ static BOOL CUPS_LoadPrinters(void) share_name[] = "<share name?>", sep_file[] = "<sep file?>"; - add_printer_driver(dests[i].name); + add_printer_driver(nameW); memset(&pinfo2a,0,sizeof(pinfo2a)); pinfo2a.pPrinterName = dests[i].name; @@ -523,6 +521,7 @@ PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { BOOL ret = FALSE, set_default = FALSE; char *port = NULL, *env_default; HKEY hkeyPrinter, hkeyPrinters; + WCHAR devnameW[MAX_PATH]; while (isspace(*pent)) pent++; s = strchr(pent,':'); @@ -586,6 +585,9 @@ PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { ret = FALSE; goto end; } + + MultiByteToWideChar(CP_ACP, 0, devname, -1, devnameW, sizeof(devnameW) / sizeof(WCHAR)); + if(RegOpenKeyA(hkeyPrinters, devname, &hkeyPrinter) == ERROR_SUCCESS) { /* Printer already in registry, delete the tag added in WINSPOOL_LoadSystemPrinters and continue */ @@ -600,7 +602,7 @@ PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { share_name[] = "<share name?>", sep_file[] = "<sep file?>"; - add_printer_driver(devname); + add_printer_driver(devnameW); memset(&pinfo2a,0,sizeof(pinfo2a)); pinfo2a.pPrinterName = devname;

1 0

Detlef Riekenberg : winspool: Set devices and printerports in AddPrinterW.
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: 815c24b369e40fafcd86117c8aebc0bae5a91295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=815c24b369e40fafcd86117c8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Oct 18 17:49:17 2010 +0200 winspool: Set devices and printerports in AddPrinterW. --- dlls/winspool.drv/info.c | 88 +++++++++++++++++++++++++-------------------- 1 files changed, 49 insertions(+), 39 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 135f8a3..f757af6 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -212,6 +212,9 @@ static const WCHAR WinPrintW[] = {'W','i','n','P','r','i','n','t',0}; static const WCHAR deviceW[] = {'d','e','v','i','c','e',0}; static const WCHAR devicesW[] = {'d','e','v','i','c','e','s',0}; static const WCHAR windowsW[] = {'w','i','n','d','o','w','s',0}; +static const WCHAR driver_nt[] = {'w','i','n','e','p','s','.','d','r','v',0}; +static const WCHAR timeout_15_45[] = {',','1','5',',','4','5',0}; +static const WCHAR commaW[] = {',',0}; static const WCHAR emptyStringW[] = {0}; static const WCHAR May_Delete_Value[] = {'W','i','n','e','M','a','y','D','e','l','e','t','e','M','e',0}; @@ -428,8 +431,8 @@ static BOOL CUPS_LoadPrinters(void) BOOL hadprinter = FALSE, haddefault = FALSE; cups_dest_t *dests; PRINTER_INFO_2A pinfo2a; - char *port,*devline; - HKEY hkeyPrinter, hkeyPrinters, hkey; + char *port; + HKEY hkeyPrinter, hkeyPrinters; char loaderror[256]; cupshandle = wine_dlopen(SONAME_LIBCUPS, RTLD_NOW, loaderror, sizeof(loaderror)); @@ -460,23 +463,6 @@ static BOOL CUPS_LoadPrinters(void) for (i=0;i<nrofdests;i++) { port = HeapAlloc(GetProcessHeap(), 0, strlen("CUPS:") + strlen(dests[i].name)+1); sprintf(port,"CUPS:%s", dests[i].name); - /* FIXME: remove extension. Fix gdi32/drivers and comdlg32/printdlg first */ - devline = HeapAlloc(GetProcessHeap(), 0, sizeof("WINEPS.DRV,,15,45") + strlen(port)); - sprintf(devline, "WINEPS.DRV,%s", port); - WriteProfileStringA("devices", dests[i].name, devline); - if(RegCreateKeyW(HKEY_CURRENT_USER, user_printers_reg_key, &hkey) == ERROR_SUCCESS) { - RegSetValueExA(hkey, dests[i].name, 0, REG_SZ, (LPBYTE)devline, strlen(devline) + 1); - RegCloseKey(hkey); - } - - lstrcatA(devline, ",15,45"); - WriteProfileStringA("PrinterPorts", dests[i].name, devline); - if(RegCreateKeyW(HKEY_CURRENT_USER, WinNT_CV_PrinterPortsW, &hkey) == ERROR_SUCCESS) { - RegSetValueExA(hkey, dests[i].name, 0, REG_SZ, (LPBYTE)devline, strlen(devline) + 1); - RegCloseKey(hkey); - } - - HeapFree(GetProcessHeap(), 0, devline); TRACE("Printer %d: %s\n", i, dests[i].name); if(RegOpenKeyA(hkeyPrinters, dests[i].name, &hkeyPrinter) == ERROR_SUCCESS) { @@ -535,8 +521,8 @@ PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { PRINTER_INFO_2A pinfo2a; char *e,*s,*name,*prettyname,*devname; BOOL ret = FALSE, set_default = FALSE; - char *port = NULL, *devline,*env_default; - HKEY hkeyPrinter, hkeyPrinters, hkey; + char *port = NULL, *env_default; + HKEY hkeyPrinter, hkeyPrinters; while (isspace(*pent)) pent++; s = strchr(pent,':'); @@ -594,24 +580,6 @@ PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { port = HeapAlloc(GetProcessHeap(),0,strlen("LPR:")+strlen(name)+1); sprintf(port,"LPR:%s",name); - /* FIXME: remove extension. Fix gdi32/drivers and comdlg32/printdlg first */ - devline = HeapAlloc(GetProcessHeap(), 0, sizeof("WINEPS.DRV,,15,45") + strlen(port)); - sprintf(devline, "WINEPS.DRV,%s", port); - WriteProfileStringA("devices", devname, devline); - if(RegCreateKeyW(HKEY_CURRENT_USER, user_printers_reg_key, &hkey) == ERROR_SUCCESS) { - RegSetValueExA(hkey, devname, 0, REG_SZ, (LPBYTE)devline, strlen(devline) + 1); - RegCloseKey(hkey); - } - - lstrcatA(devline, ",15,45"); - WriteProfileStringA("PrinterPorts", devname, devline); - if(RegCreateKeyW(HKEY_CURRENT_USER, WinNT_CV_PrinterPortsW, &hkey) == ERROR_SUCCESS) { - RegSetValueExA(hkey, devname, 0, REG_SZ, (LPBYTE)devline, strlen(devline) + 1); - RegCloseKey(hkey); - } - - HeapFree(GetProcessHeap(),0,devline); - if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { ERR("Can't create Printers key\n"); @@ -2438,6 +2406,46 @@ static HKEY WINSPOOL_OpenDriverReg( LPCVOID pEnvironment) } /***************************************************************************** + * set_devices_and_printerports [internal] + * + * set the [Devices] and [PrinterPorts] entries for a printer. + * + */ +static void set_devices_and_printerports(PRINTER_INFO_2W *pi) +{ + DWORD portlen = lstrlenW(pi->pPortName) * sizeof(WCHAR); + WCHAR *devline; + HKEY hkey; + + TRACE("(%p) %s\n", pi, debugstr_w(pi->pPrinterName)); + + /* FIXME: the driver must change to "winspool" */ + devline = HeapAlloc(GetProcessHeap(), 0, sizeof(driver_nt) + portlen + sizeof(timeout_15_45)); + if (devline) { + lstrcpyW(devline, driver_nt); + lstrcatW(devline, commaW); + lstrcatW(devline, pi->pPortName); + + TRACE("using %s\n", debugstr_w(devline)); + WriteProfileStringW(devicesW, pi->pPrinterName, devline); + if (!RegCreateKeyW(HKEY_CURRENT_USER, user_printers_reg_key, &hkey)) { + RegSetValueExW(hkey, pi->pPrinterName, 0, REG_SZ, (LPBYTE)devline, + (lstrlenW(devline) + 1) * sizeof(WCHAR)); + RegCloseKey(hkey); + } + + lstrcatW(devline, timeout_15_45); + WriteProfileStringW(PrinterPortsW, pi->pPrinterName, devline); + if (!RegCreateKeyW(HKEY_CURRENT_USER, WinNT_CV_PrinterPortsW, &hkey)) { + RegSetValueExW(hkey, pi->pPrinterName, 0, REG_SZ, (LPBYTE)devline, + (lstrlenW(devline) + 1) * sizeof(WCHAR)); + RegCloseKey(hkey); + } + HeapFree(GetProcessHeap(), 0, devline); + } +} + +/***************************************************************************** * AddPrinterW [WINSPOOL.@] */ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) @@ -2516,6 +2524,8 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) RegCloseKey(hkeyPrinters); return 0; } + + set_devices_and_printerports(pi); RegSetValueExW(hkeyPrinter, attributesW, 0, REG_DWORD, (LPBYTE)&pi->Attributes, sizeof(DWORD)); set_reg_szW(hkeyPrinter, DatatypeW, pi->pDatatype);

1 0

Damjan Jovanovic : msvcrt: Implement wcsncat_s.
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: 302d63a2255907f9a7cc92b5479ba79202cc03ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=302d63a2255907f9a7cc92b54… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Oct 18 14:06:16 2010 +0200 msvcrt: Implement wcsncat_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 37 +++++++++++++++++++++++++++++++ dlls/msvcrt/wcs.c | 50 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 91 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3468cbb..6573f1c 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1640,7 +1640,7 @@ @ cdecl wcsftime(ptr long wstr ptr) msvcrt.wcsftime @ cdecl wcslen(wstr) msvcrt.wcslen @ cdecl wcsncat(wstr wstr long) msvcrt.wcsncat -@ stub wcsncat_s +@ cdecl wcsncat_s(wstr long wstr long) msvcrt.wcsncat_s @ cdecl wcsncmp(wstr wstr long) msvcrt.wcsncmp @ cdecl wcsncpy(ptr wstr long) msvcrt.wcsncpy @ cdecl wcsncpy_s(ptr long wstr long) msvcrt.wcsncpy_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8f70693..819ed0a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1494,7 +1494,7 @@ @ cdecl wcsftime(ptr long wstr ptr) msvcrt.wcsftime @ cdecl wcslen(wstr) msvcrt.wcslen @ cdecl wcsncat(wstr wstr long) msvcrt.wcsncat -@ stub wcsncat_s +@ cdecl wcsncat_s(wstr long wstr long) msvcrt.wcsncat_s @ cdecl wcsncmp(wstr wstr long) msvcrt.wcsncmp @ cdecl wcsncpy(ptr wstr long) msvcrt.wcsncpy @ cdecl wcsncpy_s(ptr long wstr long) msvcrt.wcsncpy_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a9f6b01..7a8123d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1478,7 +1478,7 @@ @ cdecl wcsftime(ptr long wstr ptr) msvcrt.wcsftime @ cdecl wcslen(wstr) msvcrt.wcslen @ cdecl wcsncat(wstr wstr long) msvcrt.wcsncat -@ stub wcsncat_s +@ cdecl wcsncat_s(wstr long wstr long) msvcrt.wcsncat_s @ cdecl wcsncmp(wstr wstr long) msvcrt.wcsncmp @ cdecl wcsncpy(ptr wstr long) msvcrt.wcsncpy @ cdecl wcsncpy_s(ptr long wstr long) msvcrt.wcsncpy_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e6a8670..c0f3d35 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1440,7 +1440,7 @@ @ cdecl wcsftime(ptr long wstr ptr) MSVCRT_wcsftime @ cdecl wcslen(wstr) ntdll.wcslen @ cdecl wcsncat(wstr wstr long) ntdll.wcsncat -# stub wcsncat_s +@ cdecl wcsncat_s(wstr long wstr long) MSVCRT_wcsncat_s @ cdecl wcsncmp(wstr wstr long) ntdll.wcsncmp @ cdecl wcsncpy(ptr wstr long) ntdll.wcsncpy @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index a7d033a..b568345 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -52,6 +52,7 @@ static int (__cdecl *pstrcpy_s)(char *dst, size_t len, const char *src); static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); static int (__cdecl *p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); static int (__cdecl *p_wcscpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc); +static int (__cdecl *p_wcsncat_s)(wchar_t *dst, size_t elem, const wchar_t *src, size_t count); static int (__cdecl *p_wcsupr_s)(wchar_t *str, size_t size); static size_t (__cdecl *p_strnlen)(const char *, size_t); static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); @@ -1428,6 +1429,40 @@ static void test__strlwr_s(void) buffer); } +static void test_wcsncat_s(void) +{ + static wchar_t abcW[] = {'a','b','c',0}; + int ret; + wchar_t dst[4]; + wchar_t src[4]; + + if (!p_wcsncat_s) + { + win_skip("skipping wcsncat_s tests\n"); + return; + } + + memcpy(src, abcW, sizeof(abcW)); + dst[0] = 0; + ret = p_wcsncat_s(NULL, 4, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); + ret = p_wcsncat_s(dst, 0, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); + ret = p_wcsncat_s(dst, 0, src, _TRUNCATE); + ok(ret == EINVAL, "err = %d\n", ret); + ret = p_wcsncat_s(dst, 4, NULL, 0); + ok(ret == 0, "err = %d\n", ret); + + dst[0] = 0; + ret = p_wcsncat_s(dst, 2, src, 4); + ok(ret == ERANGE, "err = %d\n", ret); + + dst[0] = 0; + ret = p_wcsncat_s(dst, 2, src, _TRUNCATE); + todo_wine ok(ret == 80, "err = %d\n", ret); + ok(dst[0] == 'a' && dst[1] == 0, "dst is %s\n", wine_dbgstr_w(dst)); +} + START_TEST(string) { char mem[100]; @@ -1446,6 +1481,7 @@ START_TEST(string) pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" ); p_wcscpy_s = (void *)GetProcAddress( hMsvcrt,"wcscpy_s" ); + p_wcsncat_s = (void *)GetProcAddress( hMsvcrt,"wcsncat_s" ); p_wcsupr_s = (void *)GetProcAddress( hMsvcrt,"_wcsupr_s" ); p_strnlen = (void *)GetProcAddress( hMsvcrt,"strnlen" ); p_strtoi64 = (void *)GetProcAddress(hMsvcrt, "_strtoi64"); @@ -1491,4 +1527,5 @@ START_TEST(string) test_gcvt(); test__itoa_s(); test__strlwr_s(); + test_wcsncat_s(); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 47a50b6..98aa6c5 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1581,6 +1581,56 @@ INT CDECL MSVCRT_wcscat_s(MSVCRT_wchar_t* dst, MSVCRT_size_t elem, const MSVCRT_ } /********************************************************************* + * wcsncat_s (MSVCRT.@) + * + */ +INT CDECL MSVCRT_wcsncat_s(MSVCRT_wchar_t *dst, MSVCRT_size_t elem, + const MSVCRT_wchar_t *src, MSVCRT_size_t count) +{ + MSVCRT_size_t srclen; + MSVCRT_size_t i; + MSVCRT_wchar_t dststart; + + if (src == NULL && count > 0) + return MSVCRT_EINVAL; + if (dst == NULL) + return MSVCRT_EINVAL; + if (elem == 0) + return MSVCRT_EINVAL; + + for (i = 0; i < elem; i++) + { + dststart = i; + if (dst[i] == '\0') + break; + } + if (dststart == elem) + return MSVCRT_EINVAL; + + if (count == MSVCRT__TRUNCATE) + srclen = elem - dststart - 1; + else + srclen = count; + for (i = 0; i < srclen; i++) + { + if (src[i] == '\0') + { + srclen = i; + break; + } + } + + if (srclen < (elem - dststart)) + { + memcpy(&dst[dststart], src, srclen*sizeof(MSVCRT_wchar_t)); + dst[srclen] = '\0'; + return 0; + } + dst[0] = '\0'; + return MSVCRT_ERANGE; +} + +/********************************************************************* * _wcstoi64_l (MSVCRT.@) * * FIXME: locale parameter is ignored

1 0

Henri Verbeet : d3dcompiler: Make some variables static.
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: 3db5163fd0176938eee698b7d11c4fda173ad7ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db5163fd0176938eee698b7d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 18 13:05:48 2010 +0200 d3dcompiler: Make some variables static. --- dlls/d3dcompiler_43/blob.c | 2 +- dlls/d3dcompiler_43/compiler.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index cd47024..c22a9b1 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -92,7 +92,7 @@ static SIZE_T STDMETHODCALLTYPE d3dcompiler_blob_GetBufferSize(ID3DBlob *iface) return blob->size; } -const struct ID3D10BlobVtbl d3dcompiler_blob_vtbl = +static const struct ID3D10BlobVtbl d3dcompiler_blob_vtbl = { /* IUnknown methods */ d3dcompiler_blob_QueryInterface, diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 45f85ad..ca48611 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -39,8 +39,8 @@ struct mem_file_desc unsigned int pos; }; -struct mem_file_desc current_shader; -LPD3DINCLUDE current_include; +static struct mem_file_desc current_shader; +static ID3DInclude *current_include; #define INCLUDES_INITIAL_CAPACITY 4 @@ -50,15 +50,15 @@ struct loaded_include const char *data; }; -struct loaded_include *includes; -int includes_capacity, includes_size; -const char *parent_include; +static struct loaded_include *includes; +static int includes_capacity, includes_size; +static const char *parent_include; -char *wpp_output; -int wpp_output_capacity, wpp_output_size; +static char *wpp_output; +static int wpp_output_capacity, wpp_output_size; -char *wpp_messages; -int wpp_messages_capacity, wpp_messages_size; +static char *wpp_messages; +static int wpp_messages_capacity, wpp_messages_size; /* Mutex used to guarantee a single invocation of the D3DXAssembleShader function (or its variants) at a time.

1 0

David Hedberg : ole32: OleLoad should not fail even if IOleObject:: GetMiscStatus fails.
by Alexandre Julliard Oct. 18, 2010

Oct. 18, 2010

Module: wine Branch: master Commit: d95e2dbd62dad2a4446c4bff9e9dd7e63061703b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95e2dbd62dad2a4446c4bff9… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon Oct 18 04:19:23 2010 +0200 ole32: OleLoad should not fail even if IOleObject::GetMiscStatus fails. --- dlls/ole32/ole2.c | 13 ++++++------- dlls/ole32/tests/ole2.c | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 03cb7f0..ca4cd4c 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -1181,13 +1181,12 @@ HRESULT WINAPI OleLoad( } } - if (SUCCEEDED(hres)) - /* - * Initialize the object with it's IPersistStorage interface. - */ - hres = IOleObject_QueryInterface(pUnk, - &IID_IPersistStorage, - (void**)&persistStorage); + /* + * Initialize the object with its IPersistStorage interface. + */ + hres = IOleObject_QueryInterface(pUnk, + &IID_IPersistStorage, + (void**)&persistStorage); if (SUCCEEDED(hres)) { diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index cd83a3b..d8c2bab 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -57,6 +57,7 @@ static FORMATETC *g_expected_fetc = NULL; static BOOL g_showRunnable = TRUE; static BOOL g_isRunning = TRUE; +static BOOL g_failGetMiscStatus; #define CHECK_EXPECTED_METHOD(method_name) \ do { \ @@ -328,8 +329,16 @@ static HRESULT WINAPI OleObject_GetMiscStatus ) { CHECK_EXPECTED_METHOD("OleObject_GetMiscStatus"); - *pdwStatus = DVASPECT_CONTENT; - return S_OK; + if(!g_failGetMiscStatus) + { + *pdwStatus = OLEMISC_RECOMPOSEONRESIZE; + return S_OK; + } + else + { + *pdwStatus = 0x1234; + return E_FAIL; + } } static HRESULT WINAPI OleObject_SetColorScheme @@ -899,10 +908,32 @@ static void test_OleLoad(IStorage *pStorage) { "OleObject_SetClientSite", 0 }, { "OleObject_Release", 0 }, { "OleObject_QueryInterface", 0 }, + { "OleObject_GetMiscStatus", 0 }, { "OleObject_Release", 0 }, { NULL, 0 } }; + /* Test once with IOleObject_GetMiscStatus failing */ + expected_method_list = methods_oleload; + g_failGetMiscStatus = TRUE; + trace("OleLoad:\n"); + hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject); + ok(hr == S_OK || + broken(hr == E_INVALIDARG), /* win98 and win2k */ + "OleLoad failed with error 0x%08x\n", hr); + if(pObject) + { + DWORD dwStatus = 0xdeadbeef; + hr = IOleObject_GetMiscStatus(pObject, DVASPECT_CONTENT, &dwStatus); + ok(hr == E_FAIL, "Got 0x%08x\n", hr); + ok(dwStatus == 0x1234, "Got 0x%08x\n", dwStatus); + + IOleObject_Release(pObject); + CHECK_NO_EXTRA_METHODS(); + } + + /* Test again, let IOleObject_GetMiscStatus succeed. */ + g_failGetMiscStatus = FALSE; expected_method_list = methods_oleload; trace("OleLoad:\n"); hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject); @@ -911,6 +942,11 @@ static void test_OleLoad(IStorage *pStorage) "OleLoad failed with error 0x%08x\n", hr); if (pObject) { + DWORD dwStatus = 0xdeadbeef; + hr = IOleObject_GetMiscStatus(pObject, DVASPECT_CONTENT, &dwStatus); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(dwStatus == 1, "Got 0x%08x\n", dwStatus); + IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); }

1 0