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

Paul Vriens : advapi32/service: Forward GetServiceDisplayNameA to GetServiceDisplayNameW.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 95d2f0461148dbec7f48ed23b6889329757b89ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d2f0461148dbec7f48ed23b… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jul 26 16:09:37 2007 +0200 advapi32/service: Forward GetServiceDisplayNameA to GetServiceDisplayNameW. --- dlls/advapi32/service.c | 61 ++++++++++++++++++++++------------------- dlls/advapi32/tests/service.c | 8 +----- 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 1ecaf70..bee4847 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2266,45 +2266,50 @@ BOOL WINAPI QueryServiceLockStatusW( SC_HANDLE hSCManager, BOOL WINAPI GetServiceDisplayNameA( SC_HANDLE hSCManager, LPCSTR lpServiceName, LPSTR lpDisplayName, LPDWORD lpcchBuffer) { - struct sc_manager *hscm; - DWORD type, size; - LONG ret; + LPWSTR lpServiceNameW, lpDisplayNameW = NULL; + DWORD size, sizeW, GLE; + BOOL ret; TRACE("%p %s %p %p\n", hSCManager, debugstr_a(lpServiceName), lpDisplayName, lpcchBuffer); - hscm = sc_handle_get_handle_data(hSCManager, SC_HTYPE_MANAGER); - if (!hscm) + lpServiceNameW = SERV_dup(lpServiceName); + lpDisplayNameW = HeapAlloc(GetProcessHeap(), 0, *lpcchBuffer * sizeof(WCHAR)); + + size = sizeW = *lpcchBuffer; + ret = GetServiceDisplayNameW(hSCManager, lpServiceNameW, + lpDisplayName ? lpDisplayNameW : NULL, + &sizeW); + /* Last error will be set by GetServiceDisplayNameW and must be preserved */ + GLE = GetLastError(); + + if (!lpDisplayName && lpcchBuffer && !ret && (GLE == ERROR_INSUFFICIENT_BUFFER)) { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + /* Request for buffersize. + * + * Only set the size for ERROR_INSUFFICIENT_BUFFER + */ + size = sizeW * 2; } - - if (!lpServiceName) + else if (lpDisplayName && lpcchBuffer && !ret) { - SetLastError(ERROR_INVALID_ADDRESS); - return FALSE; + /* Request for displayname. + * + * size only has to be set if this fails + */ + size = sizeW * 2; } - size = *lpcchBuffer; - ret = RegGetValueA(hscm->hkey, lpServiceName, "DisplayName", RRF_RT_REG_SZ, &type, lpDisplayName, &size); - if (!ret && !lpDisplayName && size) - ret = ERROR_MORE_DATA; + WideCharToMultiByte(CP_ACP, 0, lpDisplayNameW, (sizeW + 1), lpDisplayName, + *lpcchBuffer, NULL, NULL ); - if (ret) - { - if (lpDisplayName && *lpcchBuffer) *lpDisplayName = 0; + *lpcchBuffer = size; - if (ret == ERROR_MORE_DATA) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - *lpcchBuffer = size - 1; - } - else - SetLastError(ret); - return FALSE; - } - return TRUE; + HeapFree(GetProcessHeap(), 0, lpDisplayNameW); + SERV_free(lpServiceNameW); + + SetLastError(GLE); + return ret; } /****************************************************************************** diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index cf01726..77fc85a 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -459,24 +459,19 @@ static void test_get_displayname(void) SetLastError(0xdeadbeef); displaysize = (tempsize / 2) + 1; ret = GetServiceDisplayNameA(scm_handle, spooler, displayname, &displaysize); - todo_wine - { ok(ret, "Expected success\n"); ok(displaysize == ((tempsize / 2) + 1), "Expected no change for the needed buffer size\n"); ok(GetLastError() == ERROR_SUCCESS /* W2K3 */ || GetLastError() == ERROR_IO_PENDING /* W2K */ || GetLastError() == 0xdeadbeef /* NT4, XP, Vista */, "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); - } /* Now with the original returned size */ SetLastError(0xdeadbeef); displaysize = tempsize; ret = GetServiceDisplayNameA(scm_handle, spooler, displayname, &displaysize); - todo_wine ok(ret, "Expected success\n"); ok(displaysize == tempsize, "Expected no change for the needed buffer size\n"); - todo_wine ok(GetLastError() == ERROR_SUCCESS /* W2K3 */ || GetLastError() == ERROR_IO_PENDING /* W2K */ || GetLastError() == 0xdeadbeef /* NT4, XP, Vista */, @@ -493,7 +488,6 @@ static void test_get_displayname(void) "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); /* Test that shows that if the buffersize is enough, it's not changed */ ok(displaysize == tempsize * 2, "Expected no change for the needed buffer size\n"); - todo_wine ok(lstrlen(displayname) == tempsize/2, "Expected the buffer to be twice the length of the string\n") ; @@ -538,9 +532,9 @@ static void test_get_displayname(void) ok(displaysize == tempsizeW, "Expected the needed buffersize\n"); ok(lstrlenW(displaynameW) == displaysize, "Expected the buffer to be the length of the string\n") ; + } ok(tempsize / 2 == tempsizeW, "Expected the needed buffersize (in bytes) to be the same for the A and W call\n"); - } CloseServiceHandle(scm_handle);

1 0

Detlef Riekenberg : winspool: Return most fields for DRIVER_INFO_4 and 6.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 510c4dc749197ec05e5a1e2f620dccc5b38bf455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=510c4dc749197ec05e5a1e2f6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jul 26 23:37:22 2007 +0200 winspool: Return most fields for DRIVER_INFO_4 and 6. --- dlls/winspool.drv/info.c | 96 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 84 insertions(+), 12 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d00afc5..2d892a3 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -205,28 +205,27 @@ static const WCHAR Configuration_FileW[] = {'C','o','n','f','i','g','u','r','a', 'i','o','n',' ','F','i','l','e',0}; static const WCHAR DatatypeW[] = {'D','a','t','a','t','y','p','e',0}; static const WCHAR Data_FileW[] = {'D','a','t','a',' ','F','i','l','e',0}; -static const WCHAR Default_DevModeW[] = {'D','e','f','a','u','l','t',' ','D','e','v', - 'M','o','d','e',0}; -static const WCHAR Dependent_FilesW[] = {'D','e','p','e','n','d','e','n','t',' ','F', - 'i','l','e','s',0}; +static const WCHAR Default_DevModeW[] = {'D','e','f','a','u','l','t',' ','D','e','v','M','o','d','e',0}; +static const WCHAR Dependent_FilesW[] = {'D','e','p','e','n','d','e','n','t',' ','F','i','l','e','s',0}; static const WCHAR DescriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR DriverW[] = {'D','r','i','v','e','r',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 LocationW[] = {'L','o','c','a','t','i','o','n',0}; +static const WCHAR ManufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR MonitorW[] = {'M','o','n','i','t','o','r',0}; static const WCHAR MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; static const WCHAR NameW[] = {'N','a','m','e',0}; +static const WCHAR OEM_UrlW[] = {'O','E','M',' ','U','r','l',0}; static const WCHAR ParametersW[] = {'P','a','r','a','m','e','t','e','r','s',0}; static const WCHAR PortW[] = {'P','o','r','t',0}; static const WCHAR bs_Ports_bsW[] = {'\\','P','o','r','t','s','\\',0}; -static const WCHAR Print_ProcessorW[] = {'P','r','i','n','t',' ','P','r','o','c','e', - 's','s','o','r',0}; -static const WCHAR Printer_DriverW[] = {'P','r','i','n','t','e','r',' ','D','r','i', - 'v','e','r',0}; -static const WCHAR PrinterDriverDataW[] = {'P','r','i','n','t','e','r','D','r','i', - 'v','e','r','D','a','t','a',0}; -static const WCHAR Separator_FileW[] = {'S','e','p','a','r','a','t','o','r',' ','F', - 'i','l','e',0}; +static const WCHAR Previous_NamesW[] = {'P','r','e','v','i','o','u','s',' ','N','a','m','e','s',0}; +static const WCHAR Print_ProcessorW[] = {'P','r','i','n','t',' ','P','r','o','c','e','s','s','o','r',0}; +static const WCHAR Printer_DriverW[] = {'P','r','i','n','t','e','r',' ','D','r','i','v','e','r',0}; +static const WCHAR PrinterDriverDataW[] = {'P','r','i','n','t','e','r','D','r','i','v','e','r','D','a','t','a',0}; +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 WinPrintW[] = {'W','i','n','P','r','i','n','t',0}; static const WCHAR deviceW[] = {'d','e','v','i','c','e',0}; @@ -4523,6 +4522,79 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; } + if (Level == 3 ) { + RegCloseKey(hkeyDriver); + TRACE("buffer space %d required %d\n", cbBuf, *pcbNeeded); + return TRUE; + } + + /* .pszzPreviousNames */ + if (WINSPOOL_GetStringFromReg(hkeyDriver, Previous_NamesW, strPtr, 0, &size, unicode)) { + *pcbNeeded += size; + if(*pcbNeeded <= cbBuf) + WINSPOOL_GetStringFromReg(hkeyDriver, Previous_NamesW, strPtr, size, &size, unicode); + + if (di) di->pszzPreviousNames = (LPWSTR)strPtr; + strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; + } + + if (Level == 4 ) { + RegCloseKey(hkeyDriver); + TRACE("buffer space %d required %d\n", cbBuf, *pcbNeeded); + return TRUE; + } + + /* support is missing, but not important enough for a FIXME */ + TRACE("%s: DriverDate + DriverVersion not supported\n", debugstr_w(DriverName)); + + /* .pszMfgName */ + if (WINSPOOL_GetStringFromReg(hkeyDriver, ManufacturerW, strPtr, 0, &size, unicode)) { + *pcbNeeded += size; + if(*pcbNeeded <= cbBuf) + WINSPOOL_GetStringFromReg(hkeyDriver, ManufacturerW, strPtr, size, &size, unicode); + + if (di) di->pszMfgName = (LPWSTR)strPtr; + strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; + } + + /* .pszOEMUrl */ + if (WINSPOOL_GetStringFromReg(hkeyDriver, OEM_UrlW, strPtr, 0, &size, unicode)) { + *pcbNeeded += size; + if(*pcbNeeded <= cbBuf) + WINSPOOL_GetStringFromReg(hkeyDriver, OEM_UrlW, strPtr, size, &size, unicode); + + if (di) di->pszOEMUrl = (LPWSTR)strPtr; + strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; + } + + /* .pszHardwareID */ + if (WINSPOOL_GetStringFromReg(hkeyDriver, HardwareIDW, strPtr, 0, &size, unicode)) { + *pcbNeeded += size; + if(*pcbNeeded <= cbBuf) + WINSPOOL_GetStringFromReg(hkeyDriver, HardwareIDW, strPtr, size, &size, unicode); + + if (di) di->pszHardwareID = (LPWSTR)strPtr; + strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; + } + + /* .pszProvider */ + if (WINSPOOL_GetStringFromReg(hkeyDriver, ProviderW, strPtr, 0, &size, unicode)) { + *pcbNeeded += size; + if(*pcbNeeded <= cbBuf) + WINSPOOL_GetStringFromReg(hkeyDriver, ProviderW, strPtr, size, &size, unicode); + + if (di) di->pszProvider = (LPWSTR)strPtr; + strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; + } + + if (Level == 6 ) { + RegCloseKey(hkeyDriver); + return TRUE; + } + + /* support is missing, but not important enough for a FIXME */ + TRACE("level 8: incomplete\n"); + TRACE("buffer space %d required %d\n", cbBuf, *pcbNeeded); RegCloseKey(hkeyDriver); return TRUE;

1 0

Aric Stewart : wininet: Strip Accept-Encoding from http/1.0 requests.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: c8dfc02bfb77bb3186fbcad2cef373d580939d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8dfc02bfb77bb3186fbcad2c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jul 26 08:59:00 2007 -0500 wininet: Strip Accept-Encoding from http/1.0 requests. --- dlls/wininet/http.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 71f7800..8c50ec9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -118,6 +118,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD lpdwIndex); static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl); static UINT HTTP_DecodeBase64(LPCWSTR base64, LPSTR bin); +static BOOL HTTP_VerifyValidHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field); LPHTTPHEADERW HTTP_GetHeader(LPWININETHTTPREQW req, LPCWSTR head) @@ -636,8 +637,10 @@ static BOOL WINAPI HTTP_HttpAddRequestHeadersW(LPWININETHTTPREQW lpwhr, pFieldAndValue = HTTP_InterpretHttpHeader(lpszStart); if (pFieldAndValue) { - bSuccess = HTTP_ProcessHeader(lpwhr, pFieldAndValue[0], - pFieldAndValue[1], dwModifier | HTTP_ADDHDR_FLAG_REQ); + bSuccess = HTTP_VerifyValidHeader(lpwhr, pFieldAndValue[0]); + if (bSuccess) + bSuccess = HTTP_ProcessHeader(lpwhr, pFieldAndValue[0], + pFieldAndValue[1], dwModifier | HTTP_ADDHDR_FLAG_REQ); HTTP_FreeTokens(pFieldAndValue); } @@ -3516,6 +3519,24 @@ static BOOL HTTP_DeleteCustomHeader(LPWININETHTTPREQW lpwhr, DWORD index) return TRUE; } + +/*********************************************************************** + * HTTP_VerifyValidHeader (internal) + * + * Verify the given header is not invalid for the given http request + * + */ +static BOOL HTTP_VerifyValidHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field) +{ + BOOL rc = TRUE; + + /* Accept-Encoding is stripped from HTTP/1.0 requests. It is invalid */ + if (strcmpiW(field,szAccept_Encoding)==0) + return FALSE; + + return rc; +} + /*********************************************************************** * IsHostInProxyBypassList (@) *

1 0

Paul Vriens : advapi32/service: More tests for GetServiceDisplayName.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: adb3bbf274f0a720c0f65d0b1c62507dd305f632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb3bbf274f0a720c0f65d0b1… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jul 26 13:51:30 2007 +0200 advapi32/service: More tests for GetServiceDisplayName. --- dlls/advapi32/tests/service.c | 70 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 64 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 476c26e..e5711e4 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -440,9 +440,49 @@ static void test_get_displayname(void) ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + /* Buffer is too small */ SetLastError(0xdeadbeef); tempsize = displaysize; - displaysize *= 2; + displaysize = (tempsize / 2); + ret = GetServiceDisplayNameA(scm_handle, spooler, displayname, &displaysize); + ok(!ret, "Expected failure\n"); + ok(displaysize == tempsize, "Expected the needed buffersize\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + /* First try with a buffer that should be big enough to hold + * the ANSI string (and terminating character). This succeeds on Windows + * although when asked (see above 2 tests) it will return twice the needed size. + */ + SetLastError(0xdeadbeef); + displaysize = (tempsize / 2) + 1; + ret = GetServiceDisplayNameA(scm_handle, spooler, displayname, &displaysize); + todo_wine + { + ok(ret, "Expected success\n"); + ok(displaysize == ((tempsize / 2) + 1), "Expected no change for the needed buffer size\n"); + ok(GetLastError() == ERROR_SUCCESS /* W2K3 */ || + GetLastError() == ERROR_IO_PENDING /* W2K */ || + GetLastError() == 0xdeadbeef /* NT4, XP, Vista */, + "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); + } + + /* Now with the original returned size */ + SetLastError(0xdeadbeef); + displaysize = tempsize; + ret = GetServiceDisplayNameA(scm_handle, spooler, displayname, &displaysize); + todo_wine + ok(ret, "Expected success\n"); + ok(displaysize == tempsize, "Expected no change for the needed buffer size\n"); + todo_wine + ok(GetLastError() == ERROR_SUCCESS /* W2K3 */ || + GetLastError() == ERROR_IO_PENDING /* W2K */ || + GetLastError() == 0xdeadbeef /* NT4, XP, Vista */, + "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); + + /* And with a bigger then needed buffer */ + SetLastError(0xdeadbeef); + displaysize = tempsize * 2; ret = GetServiceDisplayNameA(scm_handle, spooler, displayname, &displaysize); ok(ret, "Expected success\n"); ok(GetLastError() == ERROR_SUCCESS /* W2K3 */ || @@ -450,12 +490,12 @@ static void test_get_displayname(void) GetLastError() == 0xdeadbeef /* NT4, XP, Vista */, "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); /* Test that shows that if the buffersize is enough, it's not changed */ - ok(displaysize == tempsize * 2, "Didn't expect a change in the needed size of the buffer\n"); + ok(displaysize == tempsize * 2, "Expected no change for the needed buffer size\n"); todo_wine ok(lstrlen(displayname) == tempsize/2, "Expected the buffer to be twice the length of the string\n") ; - /* Do the last 2 tests also for GetServiceDisplayNameW */ + /* Do the buffer(size) tests also for GetServiceDisplayNameW */ SetLastError(0xdeadbeef); displaysize = -1; ret = GetServiceDisplayNameW(scm_handle, spoolerW, NULL, &displaysize); @@ -463,19 +503,37 @@ static void test_get_displayname(void) ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + /* Buffer is too small */ SetLastError(0xdeadbeef); tempsizeW = displaysize; - displaysize *= 2; + displaysize = tempsizeW / 2; + ret = GetServiceDisplayNameW(scm_handle, spoolerW, displaynameW, &displaysize); + ok(!ret, "Expected failure\n"); + ok(displaysize = tempsizeW, "Expected the needed buffersize\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + /* Now with the original returned size */ + SetLastError(0xdeadbeef); + displaysize = tempsizeW; + ret = GetServiceDisplayNameW(scm_handle, spoolerW, displaynameW, &displaysize); + ok(!ret, "Expected failure\n"); + ok(displaysize = tempsizeW, "Expected the needed buffersize\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + /* And with a bigger then needed buffer */ + SetLastError(0xdeadbeef); + displaysize = tempsizeW + 1; /* This caters for the null terminating character */ ret = GetServiceDisplayNameW(scm_handle, spoolerW, displaynameW, &displaysize); ok(ret, "Expected success\n"); ok(GetLastError() == ERROR_SUCCESS /* W2K3 */ || GetLastError() == ERROR_IO_PENDING /* W2K */ || GetLastError() == 0xdeadbeef /* NT4, XP, Vista */, "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); - /* Test that shows that the buffersize is changed to the needed size */ todo_wine { - ok(displaysize == tempsizeW, "Did expect a change in the needed size of the buffer\n"); + ok(displaysize == tempsizeW, "Expected the needed buffersize\n"); ok(lstrlenW(displaynameW) == displaysize, "Expected the buffer to be the length of the string\n") ; ok(tempsize / 2 == tempsizeW,

1 0

Detlef Riekenberg : winspool: Return the full path in DRIVER_INFO_2 and 3.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 7a2c4fb1df1b439094e3b4aec20adf7590c5afeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2c4fb1df1b439094e3b4aec… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jul 26 23:24:31 2007 +0200 winspool: Return the full path in DRIVER_INFO_2 and 3. --- dlls/winspool.drv/info.c | 84 +++++++++++++++++++++++----------------------- 1 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 0c735d3..d00afc5 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4451,75 +4451,75 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( strPtr = (pDriverStrings) ? (pDriverStrings + (*pcbNeeded)) : NULL; } - if(WINSPOOL_GetStringFromReg(hkeyDriver, Data_FileW, strPtr, 0, &size, - unicode)) { + /* .pDataFile: For postscript-drivers, this is the ppd-file */ + if (get_filename_from_reg(hkeyDriver, driverdir, dirlen, Data_FileW, strPtr, 0, &size, unicode)) { *pcbNeeded += size; - if(*pcbNeeded <= cbBuf) - WINSPOOL_GetStringFromReg(hkeyDriver, Data_FileW, strPtr, size, - &tmp, unicode); - if(ptr) - ((PDRIVER_INFO_2W) ptr)->pDataFile = (LPWSTR)strPtr; + if (*pcbNeeded <= cbBuf) + get_filename_from_reg(hkeyDriver, driverdir, dirlen, Data_FileW, strPtr, size, &size, unicode); + + if (di) di->pDataFile = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; } - if(WINSPOOL_GetStringFromReg(hkeyDriver, Configuration_FileW, strPtr, - 0, &size, unicode)) { + /* .pConfigFile is the Driver user Interface */ + if (get_filename_from_reg(hkeyDriver, driverdir, dirlen, Configuration_FileW, strPtr, 0, &size, unicode)) { *pcbNeeded += size; - if(*pcbNeeded <= cbBuf) - WINSPOOL_GetStringFromReg(hkeyDriver, Configuration_FileW, strPtr, - size, &tmp, unicode); - if(ptr) - ((PDRIVER_INFO_2W) ptr)->pConfigFile = (LPWSTR)strPtr; + if (*pcbNeeded <= cbBuf) + get_filename_from_reg(hkeyDriver, driverdir, dirlen, Configuration_FileW, strPtr, size, &size, unicode); + + if (di) di->pConfigFile = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; } - if(Level == 2 ) { + if (Level == 2 ) { RegCloseKey(hkeyDriver); TRACE("buffer space %d required %d\n", cbBuf, *pcbNeeded); return TRUE; } - if (Level != 5 && WINSPOOL_GetStringFromReg(hkeyDriver, Help_FileW, strPtr, 0, &size, - unicode)) { + if (Level == 5 ) { + RegCloseKey(hkeyDriver); + FIXME("level 5: incomplete\n"); + return TRUE; + } + + /* .pHelpFile */ + if (get_filename_from_reg(hkeyDriver, driverdir, dirlen, Help_FileW, strPtr, 0, &size, unicode)) { *pcbNeeded += size; - if(*pcbNeeded <= cbBuf) - WINSPOOL_GetStringFromReg(hkeyDriver, Help_FileW, strPtr, - size, &tmp, unicode); - if(ptr) - ((PDRIVER_INFO_3W) ptr)->pHelpFile = (LPWSTR)strPtr; + if (*pcbNeeded <= cbBuf) + get_filename_from_reg(hkeyDriver, driverdir, dirlen, Help_FileW, strPtr, size, &size, unicode); + + if (di) di->pHelpFile = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; } - if (Level != 5 && WINSPOOL_GetStringFromReg(hkeyDriver, Dependent_FilesW, strPtr, 0, - &size, unicode)) { + /* .pDependentFiles */ + if (get_filename_from_reg(hkeyDriver, driverdir, dirlen, Dependent_FilesW, strPtr, 0, &size, unicode)) { *pcbNeeded += size; - if(*pcbNeeded <= cbBuf) - WINSPOOL_GetStringFromReg(hkeyDriver, Dependent_FilesW, strPtr, - size, &tmp, unicode); - if(ptr) - ((PDRIVER_INFO_3W) ptr)->pDependentFiles = (LPWSTR)strPtr; + if (*pcbNeeded <= cbBuf) + get_filename_from_reg(hkeyDriver, driverdir, dirlen, Dependent_FilesW, strPtr, size, &size, unicode); + + if (di) di->pDependentFiles = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; } - if (Level != 5 && WINSPOOL_GetStringFromReg(hkeyDriver, MonitorW, strPtr, 0, &size, - unicode)) { + /* .pMonitorName is the optional Language Monitor */ + if (WINSPOOL_GetStringFromReg(hkeyDriver, MonitorW, strPtr, 0, &size, unicode)) { *pcbNeeded += size; - if(*pcbNeeded <= cbBuf) - WINSPOOL_GetStringFromReg(hkeyDriver, MonitorW, strPtr, - size, &tmp, unicode); - if(ptr) - ((PDRIVER_INFO_3W) ptr)->pMonitorName = (LPWSTR)strPtr; + if (*pcbNeeded <= cbBuf) + WINSPOOL_GetStringFromReg(hkeyDriver, MonitorW, strPtr, size, &size, unicode); + + if (di) di->pMonitorName = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; } - if (Level != 5 && WINSPOOL_GetStringFromReg(hkeyDriver, DatatypeW, strPtr, 0, &size, - unicode)) { + /* .pDefaultDataType */ + if (WINSPOOL_GetStringFromReg(hkeyDriver, DatatypeW, strPtr, 0, &size, unicode)) { *pcbNeeded += size; if(*pcbNeeded <= cbBuf) - WINSPOOL_GetStringFromReg(hkeyDriver, DatatypeW, strPtr, - size, &tmp, unicode); - if(ptr) - ((PDRIVER_INFO_3W) ptr)->pDefaultDataType = (LPWSTR)strPtr; + WINSPOOL_GetStringFromReg(hkeyDriver, DatatypeW, strPtr, size, &size, unicode); + + if (di) di->pDefaultDataType = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; }

1 0

Detlef Riekenberg : winspool: Enable all levels for EnumPrinterDrivers + GetPrinterDriver.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: a2daf754c2fb869fa881a04ac0b521d368b6cb3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2daf754c2fb869fa881a04ac… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jul 26 23:14:55 2007 +0200 winspool: Enable all levels for EnumPrinterDrivers + GetPrinterDriver. --- dlls/winspool.drv/info.c | 54 ++++++++++----------------------------------- 1 files changed, 12 insertions(+), 42 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9e4414b..0c735d3 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -245,6 +245,10 @@ static const WCHAR LPR_Port[] = {'L','P','R',':',0}; static const WCHAR default_doc_title[] = {'L','o','c','a','l',' ','D','o','w','n','l','e','v','e','l',' ', 'D','o','c','u','m','e','n','t',0}; +static const DWORD di_sizeof[] = {0, sizeof(DRIVER_INFO_1W), sizeof(DRIVER_INFO_2W), + sizeof(DRIVER_INFO_3W), sizeof(DRIVER_INFO_4W), + sizeof(DRIVER_INFO_5W), sizeof(DRIVER_INFO_6W), + 0, sizeof(DRIVER_INFO_8W)}; /****************************************************************** * validate the user-supplied printing-environment [internal] @@ -4371,6 +4375,8 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( debugstr_w(DriverName), env, Level, di, pDriverStrings, cbBuf, unicode); + if (di) ZeroMemory(di, di_sizeof[Level]); + if (unicode) { *pcbNeeded = (lstrlenW(DriverName) + 1) * sizeof(WCHAR); if (*pcbNeeded <= cbBuf) @@ -4540,14 +4546,13 @@ static BOOL WINSPOOL_GetPrinterDriver(HANDLE hPrinter, LPCWSTR pEnvironment, TRACE("(%p,%s,%d,%p,%d,%p)\n",hPrinter,debugstr_w(pEnvironment), Level,pDriverInfo,cbBuf, pcbNeeded); - ZeroMemory(pDriverInfo, cbBuf); if (!(name = get_opened_printer_name(hPrinter))) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if(Level < 1 || Level > 6) { + if (Level < 1 || Level == 7 || Level > 8) { SetLastError(ERROR_INVALID_LEVEL); return FALSE; } @@ -4584,36 +4589,12 @@ static BOOL WINSPOOL_GetPrinterDriver(HANDLE hPrinter, LPCWSTR pEnvironment, return FALSE; } - switch(Level) { - case 1: - size = sizeof(DRIVER_INFO_1W); - break; - case 2: - size = sizeof(DRIVER_INFO_2W); - break; - case 3: - size = sizeof(DRIVER_INFO_3W); - break; - case 4: - size = sizeof(DRIVER_INFO_4W); - break; - case 5: - size = sizeof(DRIVER_INFO_5W); - break; - case 6: - size = sizeof(DRIVER_INFO_6W); - break; - default: - ERR("Invalid level\n"); - return FALSE; - } - - if(size <= cbBuf) + size = di_sizeof[Level]; + if ((size <= cbBuf) && pDriverInfo) ptr = pDriverInfo + size; if(!WINSPOOL_GetDriverInfoFromReg(hkeyDrivers, DriverName, - env, Level, pDriverInfo, - (cbBuf < size) ? NULL : ptr, + env, Level, pDriverInfo, ptr, (cbBuf < size) ? 0 : cbBuf - size, &needed, unicode)) { RegCloseKey(hkeyDrivers); @@ -5044,8 +5025,7 @@ static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment, if (!env) return FALSE; /* SetLastError() is in validate_envW */ /* check input parameter */ - if((Level < 1) || (Level > 3)) { - ERR("unsupported level %d\n", Level); + if ((Level < 1) || (Level == 7) || (Level > 8)) { SetLastError(ERROR_INVALID_LEVEL); return FALSE; } @@ -5073,17 +5053,7 @@ static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment, /* get size of single struct * unicode and ascii structure have the same size */ - switch (Level) { - case 1: - size = sizeof(DRIVER_INFO_1A); - break; - case 2: - size = sizeof(DRIVER_INFO_2A); - break; - case 3: - size = sizeof(DRIVER_INFO_3A); - break; - } + size = di_sizeof[Level]; /* calculate required buffer size */ *pcbNeeded = size * number;

1 0

Misha Koshelev : urlmon/tests: Make http protocol tests refractory to timing issues.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 0a9dfa0d27fa9da5ca8a2f4a87505d61e995abc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a9dfa0d27fa9da5ca8a2f4a8… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Jul 27 00:44:33 2007 -0500 urlmon/tests: Make http protocol tests refractory to timing issues. --- dlls/urlmon/tests/protocol.c | 220 +++++++++++++++++++----------------------- 1 files changed, 98 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a9dfa0d27fa9da5ca8a2…

1 0

Detlef Riekenberg : winspool: Use correct path for 16bit drivers.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 36a6515d4e9b6c97838b1d58d2bd090dd274ba2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a6515d4e9b6c97838b1d58d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jul 26 22:54:14 2007 +0200 winspool: Use correct path for 16bit drivers. --- dlls/winspool.drv/info.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f5ed7ef..ffe729f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -192,6 +192,8 @@ static const WCHAR envname_win40W[] = {'W','i','n','d','o','w','s',' ','4','.',' static const 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_x86W[] = {'w','3','2','x','8','6',0}; +static const WCHAR Version0_RegPathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; +static const WCHAR Version0_SubdirW[] = {'\\','0',0}; static const WCHAR Version3_RegPathW[] = {'\\','V','e','r','s','i','o','n','-','3',0}; static const WCHAR Version3_SubdirW[] = {'\\','3',0}; @@ -264,7 +266,8 @@ static const printenv_t * validate_envW(LPCWSTR env) static const printenv_t env_x86 = {envname_x86W, subdir_x86W, 3, Version3_RegPathW, Version3_SubdirW}; static const printenv_t env_win40 = {envname_win40W, subdir_win40W, - 0, emptyStringW, emptyStringW}; + 0, Version0_RegPathW, Version0_SubdirW}; + static const printenv_t * const all_printenv[]={&env_x86, &env_win40}; const printenv_t *result = NULL;

1 0

Detlef Riekenberg : winspool: Return the full path for the driver.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 4b53154f361b9fdc504be5e099e84c6686f940fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b53154f361b9fdc504be5e09… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jul 26 23:05:27 2007 +0200 winspool: Return the full path for the driver. --- dlls/winspool.drv/info.c | 137 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 129 insertions(+), 8 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index ffe729f..9e4414b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -200,6 +200,7 @@ static const WCHAR Version3_SubdirW[] = {'\\','3',0}; static const WCHAR spooldriversW[] = {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\',0}; static const WCHAR spoolprtprocsW[] = {'\\','s','p','o','o','l','\\','p','r','t','p','r','o','c','s','\\',0}; +static const WCHAR backslashW[] = {'\\',0}; static const WCHAR Configuration_FileW[] = {'C','o','n','f','i','g','u','r','a','t', 'i','o','n',' ','F','i','l','e',0}; static const WCHAR DatatypeW[] = {'D','a','t','a','t','y','p','e',0}; @@ -3416,6 +3417,112 @@ static DWORD WINSPOOL_GetDWORDFromReg(HKEY hkey, LPCSTR ValueName) return value; } + +/***************************************************************************** + * get_filename_from_reg [internal] + * + * Get ValueName from hkey storing result in out + * when the Value in the registry has only a filename, use driverdir as prefix + * outlen is space left in out + * String is stored either as unicode or ascii + * + */ + +static BOOL get_filename_from_reg(HKEY hkey, LPCWSTR driverdir, DWORD dirlen, LPCWSTR ValueName, + LPBYTE out, DWORD outlen, LPDWORD needed, BOOL unicode) +{ + WCHAR filename[MAX_PATH]; + DWORD size; + DWORD type; + LONG ret; + LPWSTR buffer = filename; + LPWSTR ptr; + + *needed = 0; + size = sizeof(filename); + buffer[0] = '\0'; + ret = RegQueryValueExW(hkey, ValueName, NULL, &type, (LPBYTE) buffer, &size); + if (ret == ERROR_MORE_DATA) { + TRACE("need dynamic buffer: %u\n", size); + buffer = HeapAlloc(GetProcessHeap(), 0, size); + if (!buffer) { + /* No Memory is bad */ + return FALSE; + } + buffer[0] = '\0'; + ret = RegQueryValueExW(hkey, ValueName, NULL, &type, (LPBYTE) buffer, &size); + } + + if ((ret != ERROR_SUCCESS) || (!buffer[0])) { + if (buffer != filename) HeapFree(GetProcessHeap(), 0, buffer); + return FALSE; + } + + ptr = buffer; + while (ptr) { + /* do we have a full path ? */ + ret = (((buffer[0] == '\\') && (buffer[1] == '\\')) || + (buffer[0] && (buffer[1] == ':') && (buffer[2] == '\\')) ); + + if (!ret) { + /* we must build the full Path */ + *needed += dirlen; + if ((out) && (outlen > dirlen)) { + if (unicode) { + lstrcpyW((LPWSTR)out, driverdir); + } + else + { + WideCharToMultiByte(CP_ACP, 0, driverdir, -1, (LPSTR)out, outlen, NULL, NULL); + } + out += dirlen; + outlen -= dirlen; + } + else + out = NULL; + } + + /* write the filename */ + if (unicode) { + size = (lstrlenW(ptr) + 1) * sizeof(WCHAR); + if ((out) && (outlen >= size)) { + lstrcpyW((LPWSTR)out, ptr); + out += size; + outlen -= size; + } + else + out = NULL; + } + else + { + size = WideCharToMultiByte(CP_ACP, 0, ptr, -1, NULL, 0, NULL, NULL); + if ((out) && (outlen >= size)) { + WideCharToMultiByte(CP_ACP, 0, ptr, -1, (LPSTR)out, outlen, NULL, NULL); + out += size; + outlen -= size; + } + else + out = NULL; + } + *needed += size; + ptr += lstrlenW(ptr)+1; + if ((type != REG_MULTI_SZ) || (!ptr[0])) ptr = NULL; + } + + if (buffer != filename) HeapFree(GetProcessHeap(), 0, buffer); + + /* write the multisz-termination */ + if (type == REG_MULTI_SZ) { + size = (unicode) ? sizeof(WCHAR) : 1; + + *needed += size; + if (out && (outlen >= size)) { + memset (out, 0, size); + } + } + return TRUE; +} + /***************************************************************************** * WINSPOOL_GetStringFromReg * @@ -4255,6 +4362,8 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( { DWORD size, tmp; HKEY hkeyDriver; + WCHAR driverdir[MAX_PATH]; + DWORD dirlen; LPBYTE strPtr = pDriverStrings; LPDRIVER_INFO_8W di = (LPDRIVER_INFO_8W) ptr; @@ -4287,6 +4396,19 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( strPtr = (pDriverStrings) ? (pDriverStrings + (*pcbNeeded)) : NULL; } + /* Reserve Space for the largest subdir and a Backslash*/ + size = sizeof(driverdir) - sizeof(Version3_SubdirW) - sizeof(WCHAR); + if (!GetPrinterDriverDirectoryW(NULL, (LPWSTR) env->envname, 1, (LPBYTE) driverdir, size, &size)) { + /* Should never Fail */ + return FALSE; + } + lstrcatW(driverdir, env->versionsubdir); + lstrcatW(driverdir, backslashW); + + /* dirlen must not include the terminating zero */ + dirlen = (unicode) ? lstrlenW(driverdir) * sizeof(WCHAR) : + WideCharToMultiByte(CP_ACP, 0, driverdir, -1, NULL, 0, NULL, NULL) -1; + if (!DriverName[0] || RegOpenKeyW(hkeyDrivers, DriverName, &hkeyDriver) != ERROR_SUCCESS) { ERR("Can't find driver %s in registry\n", debugstr_w(DriverName)); SetLastError(ERROR_UNKNOWN_PRINTER_DRIVER); /* ? */ @@ -4312,15 +4434,14 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( strPtr = (pDriverStrings) ? (pDriverStrings + (*pcbNeeded)) : NULL; } - - if(WINSPOOL_GetStringFromReg(hkeyDriver, DriverW, strPtr, 0, &size, - unicode)) { + /* .pDriverPath is the Graphics rendering engine. + The full Path is required to avoid a crash in some apps */ + if (get_filename_from_reg(hkeyDriver, driverdir, dirlen, DriverW, strPtr, 0, &size, unicode)) { *pcbNeeded += size; - if(*pcbNeeded <= cbBuf) - WINSPOOL_GetStringFromReg(hkeyDriver, DriverW, strPtr, size, &tmp, - unicode); - if(ptr) - ((PDRIVER_INFO_2W) ptr)->pDriverPath = (LPWSTR)strPtr; + if (*pcbNeeded <= cbBuf) + get_filename_from_reg(hkeyDriver, driverdir, dirlen, DriverW, strPtr, size, &tmp, unicode); + + if (di) di->pDriverPath = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? (pDriverStrings + (*pcbNeeded)) : NULL; }

1 0

James Hawkins : msi: Implement the MSIMODIFY_UPDATE command in the SELECT view.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: b830fb0a3435a6072ccce407b0605b4742efab6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b830fb0a3435a6072ccce407b… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jul 26 17:40:38 2007 -0700 msi: Implement the MSIMODIFY_UPDATE command in the SELECT view. --- dlls/msi/alter.c | 12 +++++- dlls/msi/create.c | 3 +- dlls/msi/delete.c | 3 +- dlls/msi/distinct.c | 5 +- dlls/msi/insert.c | 3 +- dlls/msi/join.c | 30 ++++++++++++- dlls/msi/msipriv.h | 10 +++- dlls/msi/msiquery.c | 120 ++++++++++++++++++++++++++++----------------------- dlls/msi/order.c | 19 +++++++- dlls/msi/select.c | 81 +++++++++++++++++++++++++++++++++- dlls/msi/streams.c | 12 +++++- dlls/msi/table.c | 28 +++++++++--- dlls/msi/tests/db.c | 20 ++------- dlls/msi/update.c | 3 +- dlls/msi/where.c | 22 ++++++++- 15 files changed, 276 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b830fb0a3435a6072ccce…

1 0