July 2008 - Wine-commits - list.winehq.org

Piotr Caban : msxml3: Fixed ISAXXMLReader_getContentHandler and ISAXXMLReader_getErrorHandler when second argument is NULL .
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: b3da220229a8fdf887a3ab3fdd1ef44bbb2451a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3da220229a8fdf887a3ab3fd… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 11 00:36:34 2008 +0200 msxml3: Fixed ISAXXMLReader_getContentHandler and ISAXXMLReader_getErrorHandler when second argument is NULL. --- dlls/msxml3/saxreader.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index a5654e9..abb2168 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -514,6 +514,8 @@ static HRESULT WINAPI isaxxmlreader_getContentHandler( saxreader *This = impl_from_ISAXXMLReader( iface ); TRACE("(%p)->(%p)\n", This, pContentHandler); + if(pContentHandler == NULL) + return E_POINTER; if(This->contentHandler) ISAXContentHandler_AddRef(This->contentHandler); *pContentHandler = This->contentHandler; @@ -564,6 +566,8 @@ static HRESULT WINAPI isaxxmlreader_getErrorHandler( saxreader *This = impl_from_ISAXXMLReader( iface ); TRACE("(%p)->(%p)\n", This, pErrorHandler); + if(pErrorHandler == NULL) + return E_POINTER; if(This->errorHandler) ISAXErrorHandler_AddRef(This->errorHandler); *pErrorHandler = This->errorHandler;

1 0

Piotr Caban : msxml3/tests: Added test for getContentHandler with NULL argument.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: f216514dd556e72ed90aaed55148ce58d7f5983d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f216514dd556e72ed90aaed55… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 11 00:36:38 2008 +0200 msxml3/tests: Added test for getContentHandler with NULL argument. --- dlls/msxml3/tests/saxreader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 22d071a..20a3326 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -212,6 +212,9 @@ static void test_saxreader(void) return; } + hr = ISAXXMLReader_getContentHandler(reader, NULL); + ok(hr == E_POINTER, "Expected E_POINTER, got %08x\n", hr); + hr = ISAXXMLReader_getContentHandler(reader, &lpContentHandler); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(lpContentHandler == NULL, "Expected %p, got %p\n", NULL, lpContentHandler);

1 0

Piotr Caban : msxml3: Fixed xmlnode_removeChild.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: d676f7e5bbb9deaadea5c17630034e2a659e75b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d676f7e5bbb9deaadea5c1763… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 11 00:36:12 2008 +0200 msxml3: Fixed xmlnode_removeChild. --- dlls/msxml3/node.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index a33777f..6b1d6b0 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -651,10 +651,13 @@ static HRESULT WINAPI xmlnode_removeChild( xmlUnlinkNode(child_node_ptr); IXMLDOMNode_Release(child); - IXMLDOMNode_AddRef(childNode); if(oldChild) + { + IXMLDOMNode_AddRef(childNode); *oldChild = childNode; + } + return S_OK; }

1 0

Detlef Riekenberg : winspool: Move DeleteMonitorW to the backend.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: f9a18b8fd7776aa80e47b91e69a5f00f8d65ed99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a18b8fd7776aa80e47b91e6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jul 10 23:59:37 2008 +0200 winspool: Move DeleteMonitorW to the backend. --- dlls/localspl/localspl_main.c | 61 ++++++++++++++++++++++++++++++++++++++++- dlls/winspool.drv/info.c | 37 +++---------------------- 2 files changed, 64 insertions(+), 34 deletions(-) diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index cf208f0..a6a7980 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -696,6 +696,65 @@ static BOOL WINAPI fpAddPrinterDriverEx(LPWSTR pName, DWORD level, LPBYTE pDrive return myAddPrinterDriverEx(level, pDriverInfo, dwFileCopyFlags, TRUE); } +/****************************************************************** + * fpDeleteMonitor [exported through PRINTPROVIDOR] + * + * Delete a specific Printmonitor from a Printing-Environment + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * pEnvironment [I] Printing-Environment of the Monitor or NULL (Default) + * pMonitorName [I] Name of the Monitor, that should be deleted + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * pEnvironment is ignored in Windows for the local Computer. + * + */ + +BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorName) +{ + HKEY hroot = NULL; + LONG lres; + + TRACE("(%s, %s, %s)\n",debugstr_w(pName),debugstr_w(pEnvironment), + debugstr_w(pMonitorName)); + + lres = copy_servername_from_name(pName, NULL); + if (lres) { + FIXME("server %s not supported\n", debugstr_w(pName)); + SetLastError(ERROR_INVALID_NAME); + return FALSE; + } + + /* pEnvironment is ignored in Windows for the local Computer */ + if (!pMonitorName || !pMonitorName[0]) { + TRACE("pMonitorName %s is invalid\n", debugstr_w(pMonitorName)); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if(RegCreateKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) != ERROR_SUCCESS) { + ERR("unable to create key %s\n", debugstr_w(monitorsW)); + return FALSE; + } + + if(RegDeleteTreeW(hroot, pMonitorName) == ERROR_SUCCESS) { + TRACE("%s deleted\n", debugstr_w(pMonitorName)); + RegCloseKey(hroot); + return TRUE; + } + + TRACE("%s does not exist\n", debugstr_w(pMonitorName)); + RegCloseKey(hroot); + + /* NT: ERROR_UNKNOWN_PRINT_MONITOR (3000), 9x: ERROR_INVALID_PARAMETER (87) */ + SetLastError(ERROR_UNKNOWN_PRINT_MONITOR); + return FALSE; +} /***************************************************************************** * fpEnumMonitors [exported through PRINTPROVIDOR] @@ -821,7 +880,7 @@ static const PRINTPROVIDOR * get_backend(void) NULL, /* fpDeletePrinterConnection */ NULL, /* fpPrinterMessageBox */ NULL, /* fpAddMonitor */ - NULL, /* fpDeleteMonitor */ + fpDeleteMonitor, NULL, /* fpResetPrinter */ NULL, /* fpGetPrinterDriverEx */ NULL, /* fpFindFirstPrinterChangeNotification */ diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8ecddf0..81d6b61 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2441,47 +2441,18 @@ BOOL WINAPI DeleteMonitorA (LPSTR pName, LPSTR pEnvironment, LPSTR pMonitorName) * pEnvironment is ignored in Windows for the local Computer. * */ - -BOOL WINAPI DeleteMonitorW (LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorName) +BOOL WINAPI DeleteMonitorW(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorName) { - HKEY hroot = NULL; TRACE("(%s, %s, %s)\n",debugstr_w(pName),debugstr_w(pEnvironment), debugstr_w(pMonitorName)); - if (pName && (pName[0])) { - FIXME("for server %s not implemented\n", debugstr_w(pName)); - SetLastError(ERROR_ACCESS_DENIED); - return FALSE; - } - - /* pEnvironment is ignored in Windows for the local Computer */ - - if (!pMonitorName || !pMonitorName[0]) { - WARN("pMonitorName %s is invalid\n", debugstr_w(pMonitorName)); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if(RegCreateKeyW(HKEY_LOCAL_MACHINE, MonitorsW, &hroot) != ERROR_SUCCESS) { - ERR("unable to create key %s\n", debugstr_w(MonitorsW)); - return FALSE; - } - - if(RegDeleteTreeW(hroot, pMonitorName) == ERROR_SUCCESS) { - TRACE("monitor %s deleted\n", debugstr_w(pMonitorName)); - RegCloseKey(hroot); - return TRUE; - } - - WARN("monitor %s does not exist\n", debugstr_w(pMonitorName)); - RegCloseKey(hroot); + if ((backend == NULL) && !load_backend()) return FALSE; - /* NT: ERROR_UNKNOWN_PRINT_MONITOR (3000), 9x: ERROR_INVALID_PARAMETER (87) */ - SetLastError(ERROR_UNKNOWN_PRINT_MONITOR); - return (FALSE); + return backend->fpDeleteMonitor(pName, pEnvironment, pMonitorName); } + /****************************************************************** * DeletePortA [WINSPOOL.@] *

1 0

Detlef Riekenberg : winspool: Move more parameter-checks for EnumMonitorsW to localspl.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: ee1cca51876cb4cad8cf727739349f0c17c7866e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1cca51876cb4cad8cf72773… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jul 10 23:42:55 2008 +0200 winspool: Move more parameter-checks for EnumMonitorsW to localspl. --- dlls/localspl/localspl_main.c | 10 ++++++---- dlls/winspool.drv/info.c | 10 +--------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index b27ae7d..cf208f0 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -736,6 +736,12 @@ BOOL WINAPI fpEnumMonitors(LPWSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cb goto em_cleanup; } + if (!Level || (Level > 2)) { + WARN("level (%d) is ignored in win9x\n", Level); + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } + /* Scan all Monitor-Keys */ numentries = 0; needed = get_local_monitors(Level, NULL, 0, &numentries); @@ -745,10 +751,6 @@ BOOL WINAPI fpEnumMonitors(LPWSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cb SetLastError(ERROR_INSUFFICIENT_BUFFER); goto em_cleanup; } - else if (!pMonitors || !pcReturned) { - SetLastError(RPC_X_NULL_REF_POINTER); - goto em_cleanup; - } /* fill the Buffer with the Monitor-Keys */ needed = get_local_monitors(Level, pMonitors, cbBuf, &numentries); diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index b7b290f..8ecddf0 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -524,7 +524,6 @@ static BOOL CUPS_LoadPrinters(void) TRACE("Printer already exists\n"); RegDeleteValueW(hkeyPrinter, May_Delete_Value); RegCloseKey(hkeyPrinter); - add_printer_driver(dests[i].name); } else { static CHAR data_type[] = "RAW", print_proc[] = "WinPrint", @@ -662,7 +661,6 @@ PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { TRACE("Printer already exists\n"); RegDeleteValueW(hkeyPrinter, May_Delete_Value); RegCloseKey(hkeyPrinter); - add_printer_driver(devname); } else { static CHAR data_type[] = "RAW", print_proc[] = "WinPrint", @@ -7246,13 +7244,7 @@ BOOL WINAPI EnumMonitorsW(LPWSTR pName, DWORD Level, LPBYTE pMonitors, if ((backend == NULL) && !load_backend()) return FALSE; - /* Level is not checked in win9x */ - if (!Level || (Level > 2)) { - WARN("level (%d) is ignored in win9x\n", Level); - SetLastError(ERROR_INVALID_LEVEL); - return FALSE; - } - if (!pcbNeeded) { + if (!pcbNeeded || !pcReturned || (!pMonitors && (cbBuf > 0))) { SetLastError(RPC_X_NULL_REF_POINTER); return FALSE; }

1 0

Detlef Riekenberg : setupapi/tests: Avoid a crash on Win9x.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: 775d4ebdcd31b1ff503972ae68f3ea38659c9ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=775d4ebdcd31b1ff503972ae6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jul 10 23:24:02 2008 +0200 setupapi/tests: Avoid a crash on Win9x. --- dlls/setupapi/tests/query.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 5283bf0..1546ff9 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -158,13 +158,18 @@ static void test_SetupGetInfInformation(void) ok(size == 0xdeadbeef, "Expected size to remain unchanged\n"); /* try an invalid inf filename */ - size = 0xdeadbeef; - SetLastError(0xbeefcafe); - ret = SetupGetInfInformationA(NULL, INFINFO_INF_NAME_IS_ABSOLUTE, NULL, 0, &size); - ok(ret == FALSE, "Expected SetupGetInfInformation to fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - ok(size == 0xdeadbeef, "Expected size to remain unchanged\n"); + /* do not use NULL as absolute inf filename on win9x (crash) */ + if ((GetLastError() != ERROR_BAD_PATHNAME) && /* win95 */ + (GetLastError() != ERROR_FILE_NOT_FOUND)) /* win98 */ + { + size = 0xdeadbeef; + SetLastError(0xbeefcafe); + ret = SetupGetInfInformationA(NULL, INFINFO_INF_NAME_IS_ABSOLUTE, NULL, 0, &size); + ok(ret == FALSE, "Expected SetupGetInfInformation to fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(size == 0xdeadbeef, "Expected size to remain unchanged\n"); + } create_inf_file(inf_filename);

1 0

Maarten Lankhorst : devenum: Call VariantInit instead of VariantClear.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: 6ef8569c52cb58980187e3105c43ccc478c60c92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef8569c52cb58980187e3105… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jul 10 21:40:20 2008 -0700 devenum: Call VariantInit instead of VariantClear. --- dlls/devenum/mediacatenum.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index a4d45dc..6cd2e61 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -399,7 +399,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_BindToObject( MediaCatMoniker *This = (MediaCatMoniker *)iface; - VariantClear(&var); + VariantInit(&var); TRACE("(%p)->(%p, %p, %s, %p)\n", This, pbc, pmkToLeft, debugstr_guid(riidResult), ppvResult);

1 0

Michael Stefaniuc : quartz: Add missing LeaveCriticalSection on error path (Smatch).
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: 5c0ff73db2abc6211d0aeda669cad66da3d52b32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c0ff73db2abc6211d0aeda66… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 11 00:10:02 2008 +0200 quartz: Add missing LeaveCriticalSection on error path (Smatch). --- dlls/quartz/dsoundrender.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 7a6ec3d..aae7e68 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -894,6 +894,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) if (hr != S_OK) { ERR("%08x\n", hr); + LeaveCriticalSection(This->pin.pCritSec); return hr; }

1 0

Alexander Nicolaysen Sørnes : regedit: Null-terminate buffer in Unicode file import.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: 2a9713a6cb8cc41db5a7001201ad4793b82d93cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a9713a6cb8cc41db5a700120… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 11 13:21:17 2008 +0200 regedit: Null-terminate buffer in Unicode file import. --- programs/regedit/regproc.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 98fd8b1..a716f3d 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -737,11 +737,12 @@ void processRegLinesW(FILE *in) } /* Get as much as possible into the buffer, terminated either by - * eof, error, eol or getting the maximum amount. Abort on error. + * eof, error or getting the maximum amount. Abort on error. */ size_to_get = (size_remaining > INT_MAX ? INT_MAX : size_remaining); - check = fread(s, sizeof(WCHAR), size_to_get, in); + check = fread(s, sizeof(WCHAR), size_to_get - 1, in); + s[check] = 0; if (check == 0) { if (ferror(in)) { @@ -762,6 +763,9 @@ void processRegLinesW(FILE *in) { s_eol = strchrW(s, '\n'); + if(!s_eol) + break; + /* If it is a comment line then discard it and go around again */ if (*s == '#') { s = s_eol + 1;

1 0

Alexander Nicolaysen Sørnes : regedit: Use strchrW instead of custom code in Unicode file import.
by Alexandre Julliard 11 Jul '08

11 Jul '08

Module: wine Branch: master Commit: e83d8dad0459abdddf6ff32c11ea39a4c83ed543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e83d8dad0459abdddf6ff32c1… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 11 02:54:04 2008 +0200 regedit: Use strchrW instead of custom code in Unicode file import. --- programs/regedit/regproc.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 2f8b826..4721bf3 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -707,7 +707,6 @@ void processRegLinesW(FILE *in) size_t check = -1; WCHAR* s; /* The pointer into line for where the current fgets should read */ - int i; buf = HeapAlloc(GetProcessHeap(), 0, lineSize * sizeof(WCHAR)); CHECK_ENOUGH_MEMORY(buf); @@ -761,14 +760,7 @@ void processRegLinesW(FILE *in) /* If we didn't read the eol nor the eof go around for the rest */ while(1) { - for(i = 0; s[i] != 0; i++) - { - if(s[i] == '\n') - { - s_eol = &s[i]; - break; - } - } + s_eol = strchrW(s, '\n'); /* If it is a comment line then discard it and go around again */ if (buf[0] == '#') {

1 0