Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:56:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ComDlg32] Fix Driver String

Browse source 
Use a fixed string for driver name, same as Windows.
This commit is contained in:
James Tabor 2020-08-13 21:31:04 -05:00
parent 3aa9cae13e
commit 96a357b595
1 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
dll/win32/comdlg32/printdlg.c
View file

@ -460,6 +460,11 @@ static INT PRINTDLG_SetUpPrinterListComboW(HWND hDlg, UINT id, LPCWSTR name)
return num; return num;
} }
#ifdef __REACTOS__
static const CHAR cDriverName[] = "winspool";
static const WCHAR wDriverName[] = L"winspool";
#endif
/*********************************************************************** /***********************************************************************
* PRINTDLG_CreateDevNames [internal] * PRINTDLG_CreateDevNames [internal]
* *
@ -481,8 +486,11 @@ static BOOL PRINTDLG_CreateDevNames(HGLOBAL *hmem, const char* DeviceDriverName,
p = strrchr( DeviceDriverName, '\\' ); p = strrchr( DeviceDriverName, '\\' );
if (p) DeviceDriverName = p + 1; if (p) DeviceDriverName = p + 1;
#ifndef __REACTOS__
size = strlen(DeviceDriverName) + 1 size = strlen(DeviceDriverName) + 1
#else
size = strlen(cDriverName) + 1
#endif
+ strlen(DeviceName) + 1 + strlen(DeviceName) + 1
+ strlen(OutputPort) + 1 + strlen(OutputPort) + 1
+ sizeof(DEVNAMES); + sizeof(DEVNAMES);
@ -498,7 +506,11 @@ static BOOL PRINTDLG_CreateDevNames(HGLOBAL *hmem, const char* DeviceDriverName,
lpDevNames = (LPDEVNAMES) pDevNamesSpace; lpDevNames = (LPDEVNAMES) pDevNamesSpace;
pTempPtr = pDevNamesSpace + sizeof(DEVNAMES); pTempPtr = pDevNamesSpace + sizeof(DEVNAMES);
#ifndef __REACTOS__
strcpy(pTempPtr, DeviceDriverName); strcpy(pTempPtr, DeviceDriverName);
#else
strcpy(pTempPtr, cDriverName);
#endif
lpDevNames->wDriverOffset = pTempPtr - pDevNamesSpace; lpDevNames->wDriverOffset = pTempPtr - pDevNamesSpace;
pTempPtr += strlen(DeviceDriverName) + 1; pTempPtr += strlen(DeviceDriverName) + 1;
@ -528,8 +540,11 @@ static BOOL PRINTDLG_CreateDevNamesW(HGLOBAL *hmem, LPCWSTR DeviceDriverName,
p = wcsrchr( DeviceDriverName, '\\' ); p = wcsrchr( DeviceDriverName, '\\' );
if (p) DeviceDriverName = p + 1; if (p) DeviceDriverName = p + 1;
#ifndef __REACTOS__
size = sizeof(WCHAR)*lstrlenW(DeviceDriverName) + 2 size = sizeof(WCHAR)*lstrlenW(DeviceDriverName) + 2
#else
size = sizeof(WCHAR)*lstrlenW(wDriverName) + 2
#endif
+ sizeof(WCHAR)*lstrlenW(DeviceName) + 2 + sizeof(WCHAR)*lstrlenW(DeviceName) + 2
+ sizeof(WCHAR)*lstrlenW(OutputPort) + 2 + sizeof(WCHAR)*lstrlenW(OutputPort) + 2
+ sizeof(DEVNAMES); + sizeof(DEVNAMES);
@ -545,7 +560,11 @@ static BOOL PRINTDLG_CreateDevNamesW(HGLOBAL *hmem, LPCWSTR DeviceDriverName,
lpDevNames = (LPDEVNAMES) pDevNamesSpace; lpDevNames = (LPDEVNAMES) pDevNamesSpace;
pTempPtr = (LPWSTR)((LPDEVNAMES)pDevNamesSpace + 1); pTempPtr = (LPWSTR)((LPDEVNAMES)pDevNamesSpace + 1);
#ifndef __REACTOS__
lstrcpyW(pTempPtr, DeviceDriverName); lstrcpyW(pTempPtr, DeviceDriverName);
#else
lstrcpyW(pTempPtr, wDriverName);
#endif
lpDevNames->wDriverOffset = pTempPtr - pDevNamesSpace; lpDevNames->wDriverOffset = pTempPtr - pDevNamesSpace;
pTempPtr += lstrlenW(DeviceDriverName) + 1; pTempPtr += lstrlenW(DeviceDriverName) + 1;