October 2009 - Wine-commits

Henri Verbeet : wined3d: Don' t apply more than num_contained_render_states in IWineD3DStateBlockImpl_Apply ().
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: ce10d5f18609fde445be4b3e744f81c622c75489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce10d5f18609fde445be4b3e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 15 10:36:41 2009 +0200 wined3d: Don't apply more than num_contained_render_states in IWineD3DStateBlockImpl_Apply(). --- dlls/wined3d/stateblock.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 7de9c7c..fc61b09 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -940,7 +940,8 @@ should really perform a delta so that only the changes get updated*/ } /* Render */ - for (i = 0; i <= This->num_contained_render_states; i++) { + for (i = 0; i < This->num_contained_render_states; i++) + { IWineD3DDevice_SetRenderState(pDevice, This->contained_render_states[i], This->renderState[This->contained_render_states[i]]); }

1 0

Henri Verbeet : wined3d: Simplify IWineD3DStateBlockImpl_Apply().
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 594497f4bb011cb644b11f3314df467967b16dbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=594497f4bb011cb644b11f331… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 15 10:36:42 2009 +0200 wined3d: Simplify IWineD3DStateBlockImpl_Apply(). Consistently use the stateblock's contained states to determine what to apply. --- dlls/wined3d/stateblock.c | 403 ++++++++++++++------------------------------- 1 files changed, 125 insertions(+), 278 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=594497f4bb011cb644b11…

1 0

Henri Verbeet : secur32: Recognize the ARC4 cipher in schannel_get_cipher_algid().
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 5b4790423116e57b6f21f088462eabb682c70e73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b4790423116e57b6f21f0884… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 15 10:36:43 2009 +0200 secur32: Recognize the ARC4 cipher in schannel_get_cipher_algid(). --- dlls/secur32/schannel.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index f776206..380cfed 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -883,6 +883,8 @@ static ALG_ID schannel_get_cipher_algid(gnutls_cipher_algorithm_t cipher) { case GNUTLS_CIPHER_UNKNOWN: case GNUTLS_CIPHER_NULL: return 0; + case GNUTLS_CIPHER_ARCFOUR_40: + case GNUTLS_CIPHER_ARCFOUR_128: return CALG_RC4; case GNUTLS_CIPHER_DES_CBC: case GNUTLS_CIPHER_3DES_CBC: return CALG_DES; case GNUTLS_CIPHER_AES_128_CBC:

1 0

Henri Verbeet : secur32: Don' t try to cleanup uninitialized handles in SECUR32_deinitSchannelSP().
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 226519efbc38c438a5db28ba476ece6ef9d9529b URL: http://source.winehq.org/git/wine.git/?a=commit;h=226519efbc38c438a5db28ba4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 15 10:36:44 2009 +0200 secur32: Don't try to cleanup uninitialized handles in SECUR32_deinitSchannelSP(). --- dlls/secur32/schannel.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 380cfed..8b710a3 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1415,13 +1415,13 @@ fail: void SECUR32_deinitSchannelSP(void) { - int i = schan_handle_table_size; + SIZE_T i = schan_handle_count; if (!libgnutls_handle) return; /* deinitialized sessions first because a pointer to the credentials * are stored for the session by calling gnutls_credentials_set. */ - while (--i) + while (i--) { if (schan_handle_table[i].type == SCHAN_HANDLE_CTX) { @@ -1430,8 +1430,8 @@ void SECUR32_deinitSchannelSP(void) HeapFree(GetProcessHeap(), 0, ctx); } } - i = schan_handle_table_size; - while (--i) + i = schan_handle_count; + while (i--) { if (schan_handle_table[i].type != SCHAN_HANDLE_FREE) {

1 0

Andrew Eikum : mshtml: Add test suite for IHTMLLocation.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: ab857c84931c960738078261addf79f95587aa36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab857c84931c960738078261a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 14 16:33:03 2009 -0500 mshtml: Add test suite for IHTMLLocation. --- dlls/mshtml/tests/Makefile.in | 1 + dlls/mshtml/tests/htmllocation.c | 431 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 432 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab857c84931c960738078…

1 0

Andrew Eikum : mshtml: Add helper function get_url_components.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: a26b82fc32f3ba7a90ce2cd24d9a5d5f96bae32f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26b82fc32f3ba7a90ce2cd24… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 14 16:33:21 2009 -0500 mshtml: Add helper function get_url_components. --- dlls/mshtml/htmllocation.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 891e7b8..4769f03 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -46,6 +46,23 @@ static HRESULT get_url(HTMLLocation *This, const WCHAR **ret) return S_OK; } +static HRESULT get_url_components(HTMLLocation *This, URL_COMPONENTSW *url) +{ + const WCHAR *doc_url; + HRESULT hres; + + hres = get_url(This, &doc_url); + if(FAILED(hres)) + return hres; + + if(!InternetCrackUrlW(doc_url, 0, 0, url)) { + FIXME("InternetCrackUrlW failed: 0x%08x\n", GetLastError()); + SetLastError(0); + return E_FAIL; + } + + return S_OK; +} #define HTMLLOCATION_THIS(iface) DEFINE_THIS(HTMLLocation, HTMLLocation, iface) @@ -270,10 +287,9 @@ static HRESULT WINAPI HTMLLocation_get_pathname(IHTMLLocation *iface, BSTR *p) } url.dwUrlPathLength = 1; - if(!InternetCrackUrlW(doc_url, 0, 0, &url)) { - FIXME("InternetCrackUrl failed\n"); - return E_FAIL; - } + hres = get_url_components(This, &url); + if(FAILED(hres)) + return hres; if(!url.dwUrlPathLength) { *p = NULL;

1 0

Andrew Eikum : mshtml: Implement IHTMLLocation::get_port.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 4172d6820c3558f4092ccd64de5a6db276669231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4172d6820c3558f4092ccd64d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 14 16:33:37 2009 -0500 mshtml: Implement IHTMLLocation::get_port. --- dlls/mshtml/htmllocation.c | 23 +++++++++++++++++++++-- dlls/mshtml/tests/htmllocation.c | 12 ++++++------ 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 4769f03..e86cee6 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -245,12 +245,31 @@ static HRESULT WINAPI HTMLLocation_put_port(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_port(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); if(!p) return E_POINTER; - return E_NOTIMPL; + hres = get_url_components(This, &url); + if(FAILED(hres)) + return hres; + + if(url.nPort) { + const WCHAR format[] = {'%','d',0}; + WCHAR buf[6]; + snprintfW(buf, 6, format, url.nPort); + *p = SysAllocString(buf); + }else { + const WCHAR empty[] = {0}; + *p = SysAllocString(empty); + } + + if(!*p) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI HTMLLocation_put_pathname(IHTMLLocation *iface, BSTR v) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index c245707..e271f00 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -60,7 +60,7 @@ static const struct location_test http_test = { "http:", FALSE, "www.winehq.org:80", FALSE, "www.winehq.org", FALSE, - "80", FALSE, + "80", TRUE, "", FALSE, "?search", FALSE, "#hash", FALSE @@ -74,7 +74,7 @@ static const struct location_test http_file_test = { "http:", FALSE, "www.winehq.org:80", FALSE, "www.winehq.org", FALSE, - "80", FALSE, + "80", TRUE, "file", FALSE, "?search", FALSE, "#hash", FALSE @@ -88,7 +88,7 @@ static const struct location_test ftp_test = { "ftp:", FALSE, "ftp.winehq.org:21", FALSE, "ftp.winehq.org", FALSE, - "21", FALSE, + "21", TRUE, "", FALSE, NULL, FALSE, NULL, FALSE @@ -102,7 +102,7 @@ static const struct location_test ftp_file_test = { "ftp:", FALSE, "ftp.winehq.org:21", FALSE, "ftp.winehq.org", FALSE, - "21", FALSE, + "21", TRUE, "file", FALSE, NULL, FALSE, NULL, FALSE @@ -116,7 +116,7 @@ static const struct location_test file_test = { "file:", FALSE, NULL, FALSE, NULL, FALSE, - "", FALSE, + "", TRUE, "C:\\windows\\win.ini", TRUE, NULL, FALSE, NULL, FALSE @@ -243,7 +243,7 @@ static void test_port(IHTMLLocation *loc, const struct location_test *test) test->name, E_POINTER, hres); hres = IHTMLLocation_get_port(loc, &str); - todo_wine ok(hres == S_OK, "%s: get_port failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_port failed: 0x%08x\n", test->name, hres); if(hres == S_OK){ if(test->port_ok) ok(str_eq_wa(str, test->port),

1 0

Detlef Riekenberg : localspl: Implement fpEnumPrintProcessors.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 212d1e36bf2ccd530b4495cd80f084b6e8636b24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=212d1e36bf2ccd530b4495cd8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Oct 14 23:33:01 2009 +0200 localspl: Implement fpEnumPrintProcessors. --- dlls/localspl/provider.c | 176 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 175 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 790a1ef..5e4ba31 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -110,6 +110,12 @@ static const WCHAR fmt_driversW[] = { 'S','y','s','t','e','m','\\', 'P','r','i','n','t','\\', 'E','n','v','i','r','o','n','m','e','n','t','s','\\', '%','s','\\','D','r','i','v','e','r','s','%','s',0 }; +static const WCHAR fmt_printprocessorsW[] = { 'S','y','s','t','e','m','\\', + 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'P','r','i','n','t','\\', + 'E','n','v','i','r','o','n','m','e','n','t','s','\\','%','s','\\', + 'P','r','i','n','t',' ','P','r','o','c','e','s','s','o','r','s',0 }; static const WCHAR hardwareidW[] = {'H','a','r','d','w','a','r','e','I','D',0}; static const WCHAR help_fileW[] = {'H','e','l','p',' ','F','i','l','e',0}; static const WCHAR localportW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; @@ -145,6 +151,7 @@ static const WCHAR winnt_cv_portsW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','d','o','w','s',' ','N','T','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'P','o','r','t','s',0}; +static const WCHAR winprintW[] = {'w','i','n','p','r','i','n','t',0}; static const WCHAR x64_envnameW[] = {'W','i','n','d','o','w','s',' ','x','6','4',0}; static const WCHAR x64_subdirW[] = {'x','6','4',0}; static const WCHAR x86_envnameW[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; @@ -819,6 +826,92 @@ static DWORD get_local_monitors(DWORD level, LPBYTE pMonitors, DWORD cbBuf, LPDW return needed; } +/***************************************************************************** + * enumerate the local print processors (INTERNAL) + * + * returns the needed size (in bytes) for pPPInfo + * and *lpreturned is set to number of entries returned in pPPInfo + * + */ +static DWORD get_local_printprocessors(LPWSTR regpathW, LPBYTE pPPInfo, DWORD cbBuf, LPDWORD lpreturned) +{ + HKEY hroot = NULL; + HKEY hentry = NULL; + LPWSTR ptr; + PPRINTPROCESSOR_INFO_1W ppi; + WCHAR buffer[MAX_PATH]; + WCHAR dllname[MAX_PATH]; + DWORD dllsize; + DWORD len; + DWORD index = 0; + DWORD needed = 0; + DWORD numentries; + + numentries = *lpreturned; /* this is 0, when we scan the registry */ + len = numentries * sizeof(PRINTPROCESSOR_INFO_1W); + ptr = (LPWSTR) &pPPInfo[len]; + + numentries = 0; + len = sizeof(buffer)/sizeof(buffer[0]); + buffer[0] = '\0'; + + if (RegCreateKeyW(HKEY_LOCAL_MACHINE, regpathW, &hroot) == ERROR_SUCCESS) { + /* add "winprint" first */ + numentries++; + needed = sizeof(PRINTPROCESSOR_INFO_1W) + sizeof(winprintW); + if (pPPInfo && (cbBuf >= needed)){ + ppi = (PPRINTPROCESSOR_INFO_1W) pPPInfo; + pPPInfo += sizeof(PRINTPROCESSOR_INFO_1W); + + TRACE("%p: writing PRINTPROCESSOR_INFO_1W #%d\n", ppi, numentries); + ppi->pName = ptr; + lstrcpyW(ptr, winprintW); /* Name of the Print Processor */ + ptr += sizeof(winprintW) / sizeof(WCHAR); + } + + /* Scan all Printprocessor Keys */ + while ((RegEnumKeyExW(hroot, index, buffer, &len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) && + (lstrcmpiW(buffer, winprintW) != 0)) { + TRACE("PrintProcessor_%d: %s\n", numentries, debugstr_w(buffer)); + dllsize = sizeof(dllname); + dllname[0] = '\0'; + + /* The Print Processor must have a Driver-DLL */ + if (RegOpenKeyExW(hroot, buffer, 0, KEY_READ, &hentry) == ERROR_SUCCESS) { + if (RegQueryValueExW(hentry, driverW, NULL, NULL, (LPBYTE) dllname, &dllsize) == ERROR_SUCCESS) { + /* We found a valid DLL for this Print Processor */ + TRACE("using Driver: %s\n", debugstr_w(dllname)); + } + RegCloseKey(hentry); + } + + if (dllname[0]) { + numentries++; + needed += sizeof(PRINTPROCESSOR_INFO_1W); + needed += (len+1) * sizeof(WCHAR); /* len is lstrlenW(printprocessor name) */ + + /* required size is calculated. Now fill the user-buffer */ + if (pPPInfo && (cbBuf >= needed)){ + ppi = (PPRINTPROCESSOR_INFO_1W) pPPInfo; + pPPInfo += sizeof(PRINTPROCESSOR_INFO_1W); + + TRACE("%p: writing PRINTPROCESSOR_INFO_1W #%d\n", ppi, numentries); + ppi->pName = ptr; + lstrcpyW(ptr, buffer); /* Name of the Print Processor */ + ptr += (len+1); /* len is lstrlenW(printprosessor name) */ + } + } + index++; + len = sizeof(buffer)/sizeof(buffer[0]); + buffer[0] = '\0'; + } + RegCloseKey(hroot); + } + *lpreturned = numentries; + TRACE("need %d byte for %d entries\n", needed, numentries); + return needed; +} + /****************************************************************** * enumerate the local Ports from all loaded monitors (internal) * @@ -2000,6 +2093,87 @@ emP_cleanup: return (res); } +/***************************************************************************** + * fpEnumPrintProcessors [exported through PRINTPROVIDOR] + * + * Enumerate available Print Processors + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * pEnvironment [I] Printing-Environment or NULL (Default) + * Level [I] Structure-Level (Only 1 is allowed) + * pPPInfo [O] PTR to Buffer that receives the Result + * cbBuf [I] Size of Buffer at pMonitors + * pcbNeeded [O] PTR to DWORD that receives the size in Bytes used / required for pPPInfo + * pcReturned [O] PTR to DWORD that receives the number of Print Processors in pPPInfo + * + * RETURNS + * Success: TRUE + * Failure: FALSE and in pcbNeeded the Bytes required for pPPInfo, if cbBuf is too small + * + */ +static BOOL WINAPI fpEnumPrintProcessors(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, + LPBYTE pPPInfo, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) +{ + const printenv_t * env; + LPWSTR regpathW = NULL; + DWORD numentries = 0; + DWORD needed = 0; + LONG lres; + BOOL res = FALSE; + + TRACE("(%s, %s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment), + Level, pPPInfo, cbBuf, pcbNeeded, pcReturned); + + lres = copy_servername_from_name(pName, NULL); + if (lres) { + FIXME("server %s not supported\n", debugstr_w(pName)); + SetLastError(ERROR_INVALID_NAME); + goto epp_cleanup; + } + + if (Level != 1) { + SetLastError(ERROR_INVALID_LEVEL); + goto epp_cleanup; + } + + env = validate_envW(pEnvironment); + if (!env) + goto epp_cleanup; /* ERROR_INVALID_ENVIRONMENT */ + + regpathW = heap_alloc(sizeof(fmt_printprocessorsW) + + (lstrlenW(env->envname) * sizeof(WCHAR))); + + if (!regpathW) + goto epp_cleanup; + + wsprintfW(regpathW, fmt_printprocessorsW, env->envname); + + /* Scan all Printprocessor-Keys */ + numentries = 0; + needed = get_local_printprocessors(regpathW, NULL, 0, &numentries); + + /* we calculated the needed buffersize. now do more error-checks */ + if (cbBuf < needed) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + goto epp_cleanup; + } + + /* fill the Buffer with the Printprocessor Infos */ + needed = get_local_printprocessors(regpathW, pPPInfo, cbBuf, &numentries); + res = TRUE; + +epp_cleanup: + heap_free(regpathW); + if (pcbNeeded) *pcbNeeded = needed; + if (pcReturned) *pcReturned = numentries; + + TRACE("returning %d with %d (%d byte for %d entries)\n", + res, GetLastError(), needed, numentries); + + return (res); +} + /****************************************************************************** * fpOpenPrinter [exported through PRINTPROVIDOR] * @@ -2123,7 +2297,7 @@ void setup_provider(void) fpGetPrinterDriverDirectory, NULL, /* fpDeletePrinterDriver */ NULL, /* fpAddPrintProcessor */ - NULL, /* fpEnumPrintProcessors */ + fpEnumPrintProcessors, NULL, /* fpGetPrintProcessorDirectory */ NULL, /* fpDeletePrintProcessor */ NULL, /* fpEnumPrintProcessorDatatypes */

1 0

Detlef Riekenberg : winspool: Implement EnumPrintProcessors[A|W].
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 353fe2ed156cc94b44ad0211806b1d8ecf82ab0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=353fe2ed156cc94b44ad02118… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Oct 14 23:45:00 2009 +0200 winspool: Implement EnumPrintProcessors[A|W]. --- dlls/winspool.drv/info.c | 149 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 140 insertions(+), 9 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 4bd88a2..f0e1de6 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -6634,26 +6634,157 @@ BOOL WINAPI EnumPrintProcessorDatatypesW(LPWSTR pName, LPWSTR pPrintProcessorNam /***************************************************************************** * EnumPrintProcessorsA [WINSPOOL.@] * + * See EnumPrintProcessorsW. + * */ BOOL WINAPI EnumPrintProcessorsA(LPSTR pName, LPSTR pEnvironment, DWORD Level, - LPBYTE pPrintProcessorInfo, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcbReturned) + LPBYTE pPPInfo, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) { - FIXME("Stub: %s %s %d %p %d %p %p\n", pName, pEnvironment, Level, - pPrintProcessorInfo, cbBuf, pcbNeeded, pcbReturned); - return FALSE; + BOOL res; + LPBYTE bufferW = NULL; + LPWSTR nameW = NULL; + LPWSTR envW = NULL; + DWORD needed = 0; + DWORD numentries = 0; + INT len; + + TRACE("(%s, %s, %d, %p, %d, %p, %p)\n", debugstr_a(pName), debugstr_a(pEnvironment), + Level, pPPInfo, cbBuf, pcbNeeded, pcReturned); + + /* convert names to unicode */ + if (pName) { + len = MultiByteToWideChar(CP_ACP, 0, pName, -1, NULL, 0); + nameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pName, -1, nameW, len); + } + if (pEnvironment) { + len = MultiByteToWideChar(CP_ACP, 0, pEnvironment, -1, NULL, 0); + envW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pEnvironment, -1, envW, len); + } + + /* alloc (userbuffersize*sizeof(WCHAR) and try to enum the monitors */ + needed = cbBuf * sizeof(WCHAR); + if (needed) bufferW = HeapAlloc(GetProcessHeap(), 0, needed); + res = EnumPrintProcessorsW(nameW, envW, Level, bufferW, needed, pcbNeeded, pcReturned); + + if(!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + if (pcbNeeded) needed = *pcbNeeded; + /* HeapReAlloc return NULL, when bufferW was NULL */ + bufferW = (bufferW) ? HeapReAlloc(GetProcessHeap(), 0, bufferW, needed) : + HeapAlloc(GetProcessHeap(), 0, needed); + + /* Try again with the large Buffer */ + res = EnumPrintProcessorsW(nameW, envW, Level, bufferW, needed, pcbNeeded, pcReturned); + } + numentries = pcReturned ? *pcReturned : 0; + needed = 0; + + if (res) { + /* EnumPrintProcessorsW collected all Data. Parse them to calculate ANSI-Size */ + DWORD index; + LPSTR ptr; + PPRINTPROCESSOR_INFO_1W ppiw; + PPRINTPROCESSOR_INFO_1A ppia; + + /* First pass: calculate the size for all Entries */ + ppiw = (PPRINTPROCESSOR_INFO_1W) bufferW; + ppia = (PPRINTPROCESSOR_INFO_1A) pPPInfo; + index = 0; + while (index < numentries) { + index++; + needed += sizeof(PRINTPROCESSOR_INFO_1A); + TRACE("%p: parsing #%d (%s)\n", ppiw, index, debugstr_w(ppiw->pName)); + + needed += WideCharToMultiByte(CP_ACP, 0, ppiw->pName, -1, + NULL, 0, NULL, NULL); + + ppiw = (PPRINTPROCESSOR_INFO_1W) (((LPBYTE)ppiw) + sizeof(PRINTPROCESSOR_INFO_1W)); + ppia = (PPRINTPROCESSOR_INFO_1A) (((LPBYTE)ppia) + sizeof(PRINTPROCESSOR_INFO_1A)); + } + + /* check for errors and quit on failure */ + if (cbBuf < needed) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + res = FALSE; + goto epp_cleanup; + } + + len = numentries * sizeof(PRINTPROCESSOR_INFO_1A); /* room for structs */ + ptr = (LPSTR) &pPPInfo[len]; /* start of strings */ + cbBuf -= len ; /* free Bytes in the user-Buffer */ + ppiw = (PPRINTPROCESSOR_INFO_1W) bufferW; + ppia = (PPRINTPROCESSOR_INFO_1A) pPPInfo; + index = 0; + /* Second Pass: Fill the User Buffer (if we have one) */ + while ((index < numentries) && pPPInfo) { + index++; + TRACE("%p: writing PRINTPROCESSOR_INFO_1A #%d\n", ppia, index); + ppia->pName = ptr; + len = WideCharToMultiByte(CP_ACP, 0, ppiw->pName, -1, + ptr, cbBuf , NULL, NULL); + ptr += len; + cbBuf -= len; + + ppiw = (PPRINTPROCESSOR_INFO_1W) (((LPBYTE)ppiw) + sizeof(PRINTPROCESSOR_INFO_1W)); + ppia = (PPRINTPROCESSOR_INFO_1A) (((LPBYTE)ppia) + sizeof(PRINTPROCESSOR_INFO_1A)); + + } + } +epp_cleanup: + if (pcbNeeded) *pcbNeeded = needed; + if (pcReturned) *pcReturned = (res) ? numentries : 0; + + HeapFree(GetProcessHeap(), 0, nameW); + HeapFree(GetProcessHeap(), 0, envW); + HeapFree(GetProcessHeap(), 0, bufferW); + + TRACE("returning %d with %d (%d byte for %d entries)\n", + (res), GetLastError(), needed, numentries); + + return (res); } /***************************************************************************** * EnumPrintProcessorsW [WINSPOOL.@] * + * Enumerate available Print Processors + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * pEnvironment [I] Printing-Environment or NULL (Default) + * Level [I] Structure-Level (Only 1 is allowed) + * pPPInfo [O] PTR to Buffer that receives the Result + * cbBuf [I] Size of Buffer at pMonitors + * pcbNeeded [O] PTR to DWORD that receives the size in Bytes used / required for pPPInfo + * pcReturned [O] PTR to DWORD that receives the number of Print Processors in pPPInfo + * + * RETURNS + * Success: TRUE + * Failure: FALSE and in pcbNeeded the Bytes required for pPPInfo, if cbBuf is too small + * */ BOOL WINAPI EnumPrintProcessorsW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, - LPBYTE pPrintProcessorInfo, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcbReturned) + LPBYTE pPPInfo, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) { - FIXME("Stub: %s %s %d %p %d %p %p\n", debugstr_w(pName), - debugstr_w(pEnvironment), Level, pPrintProcessorInfo, - cbBuf, pcbNeeded, pcbReturned); - return FALSE; + + TRACE("(%s, %s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment), + Level, pPPInfo, cbBuf, pcbNeeded, pcReturned); + + if ((backend == NULL) && !load_backend()) return FALSE; + + if (!pcbNeeded || !pcReturned) { + SetLastError(RPC_X_NULL_REF_POINTER); + return FALSE; + } + + if (!pPPInfo && (cbBuf > 0)) { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + return backend->fpEnumPrintProcessors(pName, pEnvironment, Level, pPPInfo, + cbBuf, pcbNeeded, pcReturned); } /*****************************************************************************

1 0

Detlef Riekenberg : winspool/tests: Add tests for EnumPrintProcessors.
by Alexandre Julliard 15 Oct '09

15 Oct '09

Module: wine Branch: master Commit: 289ed3ada76030fb24ed7042309f2b4d9060e303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=289ed3ada76030fb24ed70423… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Oct 14 23:50:49 2009 +0200 winspool/tests: Add tests for EnumPrintProcessors. --- dlls/winspool.drv/tests/info.c | 121 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 121 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 9a7acf6..f7e6ed5 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1238,6 +1238,126 @@ static void test_EnumPrinterDrivers(void) /* ########################### */ +static void test_EnumPrintProcessors(void) +{ + DWORD res; + LPBYTE buffer; + DWORD cbBuf; + DWORD pcbNeeded; + DWORD pcReturned; + + + cbBuf = 0xdeadbeef; + pcReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = EnumPrintProcessorsA(NULL, NULL, 1, NULL, 0, &cbBuf, &pcReturned); + RETURN_ON_DEACTIVATED_SPOOLER(res) + + if (res && !cbBuf) { + skip("No Printprocessor installed\n"); + return; + } + + ok((!res) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "got %u with %u (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", + res, GetLastError()); + + buffer = HeapAlloc(GetProcessHeap(), 0, cbBuf + 4); + if (buffer == NULL) + return; + + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, NULL, 1, buffer, cbBuf, &pcbNeeded, &pcReturned); + ok(res, "got %u with %u (expected '!=0')\n", res, GetLastError()); + /* validate the returned Data here. */ + + + SetLastError(0xdeadbeef); + pcReturned = 0xdeadbeef; + pcbNeeded = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, NULL, 1, buffer, cbBuf+1, &pcbNeeded, &pcReturned); + ok(res, "got %u with %u (expected '!=0')\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, NULL, 1, buffer, cbBuf-1, &pcbNeeded, &pcReturned); + ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "got %u with %u (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", + res, GetLastError()); + + /* only level 1 is valid */ + if (0) { + /* both tests crash on win98se */ + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + pcReturned = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, NULL, 0, buffer, cbBuf, &pcbNeeded, &pcReturned); + ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), + "got %u with %u (expected '0' with ERROR_INVALID_LEVEL)\n", + res, GetLastError()); + + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, NULL, 2, buffer, cbBuf, &pcbNeeded, &pcReturned); + ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), + "got %u with %u (expected '0' with ERROR_INVALID_LEVEL)\n", + res, GetLastError()); + } + + /* an empty environment is ignored */ + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, empty, 1, buffer, cbBuf, &pcbNeeded, &pcReturned); + ok(res, "got %u with %u (expected '!=0')\n", res, GetLastError()); + + /* the environment is checked */ + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, invalid_env, 1, buffer, cbBuf, &pcbNeeded, &pcReturned); + /* NT5: ERROR_INVALID_ENVIRONMENT, 9x: ERROR_INVALID_PARAMETER */ + ok( !res && ((GetLastError() == ERROR_INVALID_ENVIRONMENT) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "got %u with %u (expected '0' with ERROR_INVALID_ENVIRONMENT or " + "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + + + /* failure-Codes for NULL */ + if (0) { + /* this test crash on win98se */ + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + pcReturned = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, NULL, 1, NULL, cbBuf, &pcbNeeded, &pcReturned); + ok( !res && (GetLastError() == ERROR_INVALID_USER_BUFFER) , + "got %u with %u (expected '0' with ERROR_INVALID_USER_BUFFER)\n", + res, GetLastError()); + } + + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + pcReturned = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, NULL, 1, buffer, cbBuf, NULL, &pcReturned); + /* the NULL is ignored on win9x */ + ok( broken(res) || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)), + "got %u with %u (expected '0' with RPC_X_NULL_REF_POINTER)\n", + res, GetLastError()); + + pcbNeeded = 0xdeadbeef; + pcReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = EnumPrintProcessorsA(NULL, NULL, 1, buffer, cbBuf, &pcbNeeded, NULL); + /* the NULL is ignored on win9x */ + ok( broken(res) || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)), + "got %u with %u (expected '0' with RPC_X_NULL_REF_POINTER)\n", + res, GetLastError()); + + HeapFree(GetProcessHeap(), 0, buffer); + +} + +/* ########################### */ + static void test_GetDefaultPrinter(void) { BOOL retval; @@ -2426,6 +2546,7 @@ START_TEST(info) test_EnumPorts(); test_EnumPrinterDrivers(); test_EnumPrinters(); + test_EnumPrintProcessors(); test_GetDefaultPrinter(); test_GetPrinterDriverDirectory(); test_GetPrintProcessorDirectory();

1 0