comdlg32: Constify some variables (3 of 3)
Andrew Talbot
Andrew.Talbot at talbotville.com
Fri Apr 6 04:56:15 CDT 2007
Changelog:
comdlg32: Constify some variables.
diff -urN a/dlls/comdlg32/printdlg16.c b/dlls/comdlg32/printdlg16.c
--- a/dlls/comdlg32/printdlg16.c 2006-11-29 17:25:58.000000000 +0000
+++ b/dlls/comdlg32/printdlg16.c 2007-04-05 23:25:29.000000000 +0100
@@ -56,8 +56,8 @@
/* Internal Functions */
-static BOOL PRINTDLG_CreateDevNames16(HGLOBAL16 *hmem, char* DeviceDriverName,
- char* DeviceName, char* OutputPort)
+static BOOL PRINTDLG_CreateDevNames16(HGLOBAL16 *hmem, const char* DeviceDriverName,
+ const char* DeviceName, const char* OutputPort)
{
long size;
char* pDevNamesSpace;
@@ -291,7 +291,7 @@
* PRINTDLG_GetDlgTemplate
*
*/
-static HGLOBAL16 PRINTDLG_GetDlgTemplate16(PRINTDLG16 *lppd)
+static HGLOBAL16 PRINTDLG_GetDlgTemplate16(const PRINTDLG16 *lppd)
{
HGLOBAL16 hDlgTmpl, hResInfo;
diff -urN a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c
--- a/dlls/comdlg32/printdlg.c 2007-02-15 16:38:53.000000000 +0000
+++ b/dlls/comdlg32/printdlg.c 2007-04-06 09:37:41.000000000 +0100
@@ -185,8 +185,8 @@
*
* (NB. when we handle unicode the offsets will be in wchars).
*/
-static BOOL PRINTDLG_CreateDevNames(HGLOBAL *hmem, char* DeviceDriverName,
- char* DeviceName, char* OutputPort)
+static BOOL PRINTDLG_CreateDevNames(HGLOBAL *hmem, const char* DeviceDriverName,
+ const char* DeviceName, const char* OutputPort)
{
long size;
char* pDevNamesSpace;
@@ -673,8 +673,8 @@
static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg,
int nIDComboBox,
- WCHAR* PrinterName,
- WCHAR* PortName,
+ const WCHAR* PrinterName,
+ const WCHAR* PortName,
LPDEVMODEW dm)
{
int i;
@@ -785,7 +785,7 @@
/***********************************************************************
* PRINTDLG_UpdatePrinterInfoTexts [internal]
*/
-static void PRINTDLG_UpdatePrinterInfoTextsA(HWND hDlg, LPPRINTER_INFO_2A pi)
+static void PRINTDLG_UpdatePrinterInfoTextsA(HWND hDlg, const PRINTER_INFO_2A *pi)
{
char StatusMsg[256];
char ResourceString[256];
@@ -821,7 +821,7 @@
return;
}
-static void PRINTDLG_UpdatePrinterInfoTextsW(HWND hDlg, LPPRINTER_INFO_2W pi)
+static void PRINTDLG_UpdatePrinterInfoTextsW(HWND hDlg, const PRINTER_INFO_2W *pi)
{
WCHAR StatusMsg[256];
WCHAR ResourceString[256];
@@ -1857,7 +1857,7 @@
* PRINTDLG_GetDlgTemplate
*
*/
-static HGLOBAL PRINTDLG_GetDlgTemplateA(PRINTDLGA *lppd)
+static HGLOBAL PRINTDLG_GetDlgTemplateA(const PRINTDLGA *lppd)
{
HRSRC hResInfo;
HGLOBAL hDlgTmpl;
@@ -1891,7 +1891,7 @@
return hDlgTmpl;
}
-static HGLOBAL PRINTDLG_GetDlgTemplateW(PRINTDLGW *lppd)
+static HGLOBAL PRINTDLG_GetDlgTemplateW(const PRINTDLGW *lppd)
{
HRSRC hResInfo;
HGLOBAL hDlgTmpl;
@@ -2325,7 +2325,7 @@
} PageSetupDataW;
-static HGLOBAL PRINTDLG_GetPGSTemplateA(PAGESETUPDLGA *lppd)
+static HGLOBAL PRINTDLG_GetPGSTemplateA(const PAGESETUPDLGA *lppd)
{
HRSRC hResInfo;
HGLOBAL hDlgTmpl;
@@ -2343,7 +2343,7 @@
return hDlgTmpl;
}
-static HGLOBAL PRINTDLG_GetPGSTemplateW(PAGESETUPDLGW *lppd)
+static HGLOBAL PRINTDLG_GetPGSTemplateW(const PAGESETUPDLGW *lppd)
{
HRSRC hResInfo;
HGLOBAL hDlgTmpl;
@@ -2421,7 +2421,7 @@
}
static DWORD
-_c_str2sizeA(PAGESETUPDLGA *dlga,LPCSTR strin) {
+_c_str2sizeA(const PAGESETUPDLGA *dlga, LPCSTR strin) {
float val;
char rest[200];
@@ -2461,13 +2461,13 @@
static DWORD
-_c_str2sizeW(PAGESETUPDLGW *dlga, LPCWSTR strin) {
+_c_str2sizeW(const PAGESETUPDLGW *dlga, LPCWSTR strin) {
char buf[200];
/* this W -> A transition is OK */
/* we need a unicode version of sscanf to avoid it */
WideCharToMultiByte(CP_ACP, 0, strin, -1, buf, sizeof(buf), NULL, NULL);
- return _c_str2sizeA((PAGESETUPDLGA *)dlga, buf);
+ return _c_str2sizeA((const PAGESETUPDLGA *)dlga, buf);
}
@@ -2685,7 +2685,7 @@
* always - TRUE
*/
static BOOL
-PRINTDLG_PS_ChangePaperPrev(PageSetupDataA *pda)
+PRINTDLG_PS_ChangePaperPrev(const PageSetupDataA *pda)
{
LONG width, height, x, y;
RECT rtTmp;
@@ -2913,7 +2913,8 @@
*/
static UINT_PTR
-PRINTDLG_DefaultPagePaintHook(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam, PageSetupDataA *pda)
+PRINTDLG_DefaultPagePaintHook(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam,
+ const PageSetupDataA *pda)
{
LPRECT lprc = (LPRECT) lParam;
HDC hdc = (HDC) wParam;
More information about the wine-patches
mailing list