Andrew Talbot : wineps.drv: Assign to structs instead of using memcpy.
Alexandre Julliard
julliard at winehq.org
Sat Mar 22 08:18:43 CDT 2008
Module: wine
Branch: master
Commit: 94dc49ed128247fb6bfab4cb47971578a2ea1076
URL: http://source.winehq.org/git/wine.git/?a=commit;h=94dc49ed128247fb6bfab4cb47971578a2ea1076
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Fri Mar 21 15:29:55 2008 +0000
wineps.drv: Assign to structs instead of using memcpy.
---
dlls/wineps.drv/driver.c | 4 ++--
dlls/wineps.drv/escape.c | 2 +-
dlls/wineps.drv/init.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c
index 42e537a..d698065 100644
--- a/dlls/wineps.drv/driver.c
+++ b/dlls/wineps.drv/driver.c
@@ -279,7 +279,7 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg,
di = (PSDRV_DLGINFO *)GetWindowLongPtrW(hwnd, DWLP_USER);
switch(nmhdr->code) {
case PSN_APPLY:
- memcpy(di->pi->Devmode, di->dlgdm, sizeof(PSDRV_DEVMODEA));
+ *di->pi->Devmode = *di->dlgdm;
SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, PSNRET_NOERROR);
return TRUE;
@@ -370,7 +370,7 @@ INT PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput,
pPropertySheet = (void*)GetProcAddress(hinstComctl32, "PropertySheetW");
memset(&psp,0,sizeof(psp));
dlgdm = HeapAlloc( PSDRV_Heap, 0, sizeof(*dlgdm) );
- memcpy(dlgdm, pi->Devmode, sizeof(*dlgdm));
+ *dlgdm = *pi->Devmode;
di = HeapAlloc( PSDRV_Heap, 0, sizeof(*di) );
di->pi = pi;
di->dlgdm = dlgdm;
diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c
index e440047..b397461 100644
--- a/dlls/wineps.drv/escape.c
+++ b/dlls/wineps.drv/escape.c
@@ -107,7 +107,7 @@ INT PSDRV_ExtEscape( PSDRV_PDEVICE *physDev, INT nEscape, INT cbInput, LPCVOID i
ibi->GraphicsRect.left,
ibi->GraphicsRect.right
);
- memcpy (obi, ibi, sizeof(*ibi));
+ *obi = *ibi;
return 1;
}
case NEXTBAND:
diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c
index e492730..5b85c45 100644
--- a/dlls/wineps.drv/init.c
+++ b/dlls/wineps.drv/init.c
@@ -352,7 +352,7 @@ BOOL PSDRV_CreateDC( HDC hdc, PSDRV_PDEVICE **pdev, LPCWSTR driver, LPCWSTR devi
return FALSE;
}
- memcpy( physDev->Devmode, pi->Devmode, sizeof(PSDRV_DEVMODEA) );
+ *physDev->Devmode = *pi->Devmode;
physDev->logPixelsX = physDev->pi->ppd->DefaultResolution;
physDev->logPixelsY = physDev->pi->ppd->DefaultResolution;
@@ -566,7 +566,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name)
pi->Devmode = HeapAlloc( PSDRV_Heap, 0, sizeof(DefaultDevmode) );
if (pi->Devmode == NULL)
goto cleanup;
- memcpy(pi->Devmode, &DefaultDevmode, sizeof(DefaultDevmode) );
+ *pi->Devmode = DefaultDevmode;
lstrcpynA((LPSTR)pi->Devmode->dmPublic.dmDeviceName,name,CCHDEVICENAME);
using_default_devmode = TRUE;
More information about the wine-cvs
mailing list