ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winspool.drv: Fix AddPrinterDriverA so that the strings actually get written. 

Include the size of the terminating zero in set_reg_szW.
This commit is contained in:
Huw Davies 2006-11-07 17:16:29 +00:00 committed by Alexandre Julliard
parent 388fd47ce2
commit 1ad05ac701
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/winspool.drv/info.c
View File

@ -325,6 +325,20 @@ static LPWSTR strdupW(LPCWSTR p)
return ret; return ret;
} }
/* Returns the number of bytes in an ansi \0\0 terminated string (multi_sz).
The result includes all \0s (specifically the last two). */
static int multi_sz_lenA(const char *str)
{
const char *ptr = str;
if(!str) return 0;
do
{
ptr += lstrlenA(ptr) + 1;
} while(*ptr);
return ptr - str + 1;
}
static void static void
WINSPOOL_SetDefaultPrinter(const char *devname, const char *name,BOOL force) { WINSPOOL_SetDefaultPrinter(const char *devname, const char *name,BOOL force) {
char qbuf[200]; char qbuf[200];
@ -623,7 +637,7 @@ static inline DWORD set_reg_szW(HKEY hkey, const WCHAR *keyname, const WCHAR *va
{ {
if (value) if (value)
return RegSetValueExW(hkey, keyname, 0, REG_SZ, (const BYTE*)value, return RegSetValueExW(hkey, keyname, 0, REG_SZ, (const BYTE*)value,
lstrlenW(value) * sizeof(WCHAR)); (lstrlenW(value) + 1) * sizeof(WCHAR));
else else
return ERROR_FILE_NOT_FOUND; return ERROR_FILE_NOT_FOUND;
} }
@ -641,7 +655,7 @@ void WINSPOOL_LoadSystemPrinters(void)
data_file[] = "<datafile?>", data_file[] = "<datafile?>",
config_file[] = "wineps16", config_file[] = "wineps16",
help_file[] = "<helpfile?>", help_file[] = "<helpfile?>",
dep_file[] = "<dependend files?>", dep_file[] = "<dependent files?>\0",
monitor_name[] = "<monitor name?>", monitor_name[] = "<monitor name?>",
default_data_type[] = "RAW"; default_data_type[] = "RAW";
@ -4369,16 +4383,16 @@ BOOL WINAPI AddPrinterDriverA(LPSTR pName, DWORD level, LPBYTE pDriverInfo)
return FALSE; return FALSE;
} }
RegSetValueExA(hkeyName, "Configuration File", 0, REG_SZ, (LPBYTE) di3.pConfigFile, RegSetValueExA(hkeyName, "Configuration File", 0, REG_SZ, (LPBYTE) di3.pConfigFile,
0); lstrlenA(di3.pConfigFile) + 1);
RegSetValueExA(hkeyName, "Data File", 0, REG_SZ, (LPBYTE) di3.pDataFile, 0); RegSetValueExA(hkeyName, "Data File", 0, REG_SZ, (LPBYTE) di3.pDataFile, lstrlenA(di3.pDataFile) + 1);
RegSetValueExA(hkeyName, "Driver", 0, REG_SZ, (LPBYTE) di3.pDriverPath, 0); RegSetValueExA(hkeyName, "Driver", 0, REG_SZ, (LPBYTE) di3.pDriverPath, lstrlenA(di3.pDriverPath) + 1);
RegSetValueExA(hkeyName, "Version", 0, REG_DWORD, (LPBYTE) &di3.cVersion, RegSetValueExA(hkeyName, "Version", 0, REG_DWORD, (LPBYTE) &di3.cVersion,
sizeof(DWORD)); sizeof(DWORD));
RegSetValueExA(hkeyName, "Datatype", 0, REG_SZ, (LPBYTE) di3.pDefaultDataType, 0); RegSetValueExA(hkeyName, "Datatype", 0, REG_SZ, (LPBYTE) di3.pDefaultDataType, lstrlenA(di3.pDefaultDataType));
RegSetValueExA(hkeyName, "Dependent Files", 0, REG_MULTI_SZ, RegSetValueExA(hkeyName, "Dependent Files", 0, REG_MULTI_SZ,
(LPBYTE) di3.pDependentFiles, 0); (LPBYTE) di3.pDependentFiles, multi_sz_lenA(di3.pDependentFiles));
RegSetValueExA(hkeyName, "Help File", 0, REG_SZ, (LPBYTE) di3.pHelpFile, 0); RegSetValueExA(hkeyName, "Help File", 0, REG_SZ, (LPBYTE) di3.pHelpFile, lstrlenA(di3.pHelpFile) + 1);
RegSetValueExA(hkeyName, "Monitor", 0, REG_SZ, (LPBYTE) di3.pMonitorName, 0); RegSetValueExA(hkeyName, "Monitor", 0, REG_SZ, (LPBYTE) di3.pMonitorName, lstrlenA(di3.pMonitorName) + 1);
RegCloseKey(hkeyName); RegCloseKey(hkeyName);
RegCloseKey(hkeyDrivers); RegCloseKey(hkeyDrivers);