31 Dec
2004
31 Dec
'04
2:38 p.m.
Import and merge Wine-20041201
Added: trunk/reactos/lib/comdlg32/
Added: trunk/reactos/lib/comdlg32/Makefile.ros-template
Added: trunk/reactos/lib/comdlg32/makefile
Modified: trunk/reactos/lib/comdlg32/printdlg.c
_____
Copied: trunk/reactos/lib/comdlg32 (from rev 12485,
vendor/wine/dlls/commdlg/current)
_____
Added: trunk/reactos/lib/comdlg32/Makefile.ros-template
--- vendor/wine/dlls/commdlg/current/Makefile.ros-template
2004-12-31 14:36:08 UTC (rev 12485)
+++ trunk/reactos/lib/comdlg32/Makefile.ros-template 2004-12-31
14:38:10 UTC (rev 12486)
@@ -0,0 +1,20 @@
+
+TARGET_NAME = comdlg32
+
+TARGET_OBJECTS = @C_SRCS@
+
+TARGET_CFLAGS = -D__REACTOS__ @EXTRADEFS@
+
+TARGET_SDKLIBS = @IMPORTS@ wine.a wine_unicode.a wine_uuid.a ntdll.a
winspool.a
+
+TARGET_BASE = $(TARGET_BASE_LIB_COMDLG32)
+
+TARGET_RC_SRCS = @RC_SRCS@
+TARGET_RC_BINSRC = @RC_BINSRC@
+TARGET_RC_BINARIES = @RC_BINARIES@
+
+default: all
+
+DEP_OBJECTS = $(TARGET_OBJECTS)
+
+include $(TOOLS_PATH)/depend.mk
_____
Added: trunk/reactos/lib/comdlg32/makefile
--- vendor/wine/dlls/commdlg/current/makefile 2004-12-31 14:36:08 UTC
(rev 12485)
+++ trunk/reactos/lib/comdlg32/makefile 2004-12-31 14:38:10 UTC (rev
12486)
@@ -0,0 +1,9 @@
+# $Id: makefile 7520 2004-01-09 01:58:22Z sedwards $
+
+PATH_TO_TOP = ../..
+
+TARGET_TYPE = winedll
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
_____
Modified: trunk/reactos/lib/comdlg32/printdlg.c
--- vendor/wine/dlls/commdlg/current/printdlg.c 2004-12-31 14:36:08 UTC
(rev 12485)
+++ trunk/reactos/lib/comdlg32/printdlg.c 2004-12-31 14:38:10 UTC
(rev 12486)
@@ -339,7 +339,7 @@
lpdm->dmCollate =
(IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED);
if (lpdm->dmFields & DM_COPIES)
- lpdm->dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
+ lpdm->u.s.dmCopies = GetDlgItemInt(hDlg, edt3, NULL,
FALSE);
} else {
if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
lppd->Flags |= PD_COLLATE;
@@ -414,7 +414,7 @@
lpdm->dmCollate =
(IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED);
if (lpdm->dmFields & DM_COPIES)
- lpdm->dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
+ lpdm->u.s.dmCopies = GetDlgItemInt(hDlg, edt3, NULL,
FALSE);
} else {
if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
lppd->Flags |= PD_COLLATE;
@@ -579,9 +579,9 @@
Sel, 0);
if (dm) {
if (nIDComboBox == cmb2)
- dm->u1.s1.dmPaperSize = oldWord;
+ dm->u.s.dmPaperSize = oldWord;
else
- dm->dmDefaultSource = oldWord;
+ dm->u.s.dmDefaultSource = oldWord;
}
}
else {
@@ -591,9 +591,9 @@
*/
if (dm) {
if (nIDComboBox == cmb2)
- oldWord = dm->u1.s1.dmPaperSize;
+ oldWord = dm->u.s.dmPaperSize;
else
- oldWord = dm->dmDefaultSource;
+ oldWord = dm->u.s.dmDefaultSource;
}
}
@@ -689,9 +689,9 @@
Sel, 0);
if (dm) {
if (nIDComboBox == cmb2)
- dm->u1.s1.dmPaperSize = oldWord;
+ dm->u.s.dmPaperSize = oldWord;
else
- dm->dmDefaultSource = oldWord;
+ dm->u.s.dmDefaultSource = oldWord;
}
}
else {
@@ -701,9 +701,9 @@
*/
if (dm) {
if (nIDComboBox == cmb2)
- oldWord = dm->u1.s1.dmPaperSize;
+ oldWord = dm->u.s.dmPaperSize;
else
- oldWord = dm->dmDefaultSource;
+ oldWord = dm->u.s.dmDefaultSource;
}
}
@@ -966,7 +966,7 @@
if (lppd->hDevMode == 0)
copies = lppd->nCopies;
else
- copies = lpdm->dmCopies;
+ copies = lpdm->u.s.dmCopies;
if(copies == 0) copies = 1;
else if(copies < 0) copies = MAX_COPIES;
SetDlgItemInt(hDlg, edt3, copies, FALSE);
@@ -988,7 +988,7 @@
ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE);
} else { /* PD_PRINTSETUP */
- BOOL bPortrait = (lpdm->u1.s1.dmOrientation ==
DMORIENT_PORTRAIT);
+ BOOL bPortrait = (lpdm->u.s.dmOrientation == DMORIENT_PORTRAIT);
PRINTDLG_SetUpPaperComboBoxA(hDlg, cmb2,
PrintStructures->lpPrinterInfo->pPrinterName,
@@ -1128,7 +1128,7 @@
if (lppd->hDevMode == 0)
copies = lppd->nCopies;
else
- copies = lpdm->dmCopies;
+ copies = lpdm->u.s.dmCopies;
if(copies == 0) copies = 1;
else if(copies < 0) copies = MAX_COPIES;
SetDlgItemInt(hDlg, edt3, copies, FALSE);
@@ -1150,7 +1150,7 @@
ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE);
} else { /* PD_PRINTSETUP */
- BOOL bPortrait = (lpdm->u1.s1.dmOrientation ==
DMORIENT_PORTRAIT);
+ BOOL bPortrait = (lpdm->u.s.dmOrientation == DMORIENT_PORTRAIT);
PRINTDLG_SetUpPaperComboBoxW(hDlg, cmb2,
PrintStructures->lpPrinterInfo->pPrinterName,
@@ -1499,7 +1499,7 @@
case rad1: /* Paperorientation */
if (lppd->Flags & PD_PRINTSETUP)
{
- lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
+ lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM)
IMAGE_ICON,
(LPARAM)(PrintStructures->hPortraitIcon));
}
@@ -1508,7 +1508,7 @@
case rad2: /* Paperorientation */
if (lppd->Flags & PD_PRINTSETUP)
{
- lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
+ lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM)
IMAGE_ICON,
(LPARAM)(PrintStructures->hLandscapeIcon));
}
@@ -1532,7 +1532,7 @@
{
DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0,
0);
if(Sel != CB_ERR)
- lpdm->u1.s1.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2,
+ lpdm->u.s.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2,
CB_GETITEMDATA,
Sel, 0);
}
@@ -1542,7 +1542,7 @@
{
DWORD Sel = SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0,
0);
if(Sel != CB_ERR)
- lpdm->dmDefaultSource = SendDlgItemMessageA(hDlg, cmb3,
+ lpdm->u.s.dmDefaultSource = SendDlgItemMessageA(hDlg,
cmb3,
CB_GETITEMDATA, Sel,
0);
}
@@ -1553,8 +1553,8 @@
case rad1: /* orientation */
case rad2:
if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) {
- if(lpdm->u1.s1.dmOrientation != DMORIENT_PORTRAIT) {
- lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
+ if(lpdm->u.s.dmOrientation != DMORIENT_PORTRAIT) {
+ lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hPortraitIcon);
@@ -1563,8 +1563,8 @@
(LPARAM)PrintStructures->hPortraitIcon);
}
} else {
- if(lpdm->u1.s1.dmOrientation != DMORIENT_LANDSCAPE) {
- lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
+ if(lpdm->u.s.dmOrientation != DMORIENT_LANDSCAPE) {
+ lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hLandscapeIcon);
@@ -1663,7 +1663,7 @@
case rad1: /* Paperorientation */
if (lppd->Flags & PD_PRINTSETUP)
{
- lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
+ lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, (WPARAM)
IMAGE_ICON,
(LPARAM)(PrintStructures->hPortraitIcon));
}
@@ -1672,7 +1672,7 @@
case rad2: /* Paperorientation */
if (lppd->Flags & PD_PRINTSETUP)
{
- lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
+ lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, (WPARAM)
IMAGE_ICON,
(LPARAM)(PrintStructures->hLandscapeIcon));
}
@@ -1696,7 +1696,7 @@
{
DWORD Sel = SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0,
0);
if(Sel != CB_ERR)
- lpdm->u1.s1.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2,
+ lpdm->u.s.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2,
CB_GETITEMDATA,
Sel, 0);
}
@@ -1706,7 +1706,7 @@
{
DWORD Sel = SendDlgItemMessageW(hDlg, cmb3, CB_GETCURSEL, 0,
0);
if(Sel != CB_ERR)
- lpdm->dmDefaultSource = SendDlgItemMessageW(hDlg, cmb3,
+ lpdm->u.s.dmDefaultSource = SendDlgItemMessageW(hDlg,
cmb3,
CB_GETITEMDATA, Sel,
0);
}
@@ -1717,8 +1717,8 @@
case rad1: /* orientation */
case rad2:
if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) {
- if(lpdm->u1.s1.dmOrientation != DMORIENT_PORTRAIT) {
- lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
+ if(lpdm->u.s.dmOrientation != DMORIENT_PORTRAIT) {
+ lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hPortraitIcon);
@@ -1727,8 +1727,8 @@
(LPARAM)PrintStructures->hPortraitIcon);
}
} else {
- if(lpdm->u1.s1.dmOrientation != DMORIENT_LANDSCAPE) {
- lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
+ if(lpdm->u.s.dmOrientation != DMORIENT_LANDSCAPE) {
+ lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hLandscapeIcon);
@@ -2936,7 +2936,7 @@
/***********************************************************************
* PrintDlgExA (COMDLG32.@)
*/
-HRESULT WINAPI PrintDlgExA(LPVOID lpPrintDlgExA) /* [???] FIXME:
LPPRINTDLGEXA */
+HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lpPrintDlgExA)
{
FIXME("stub\n");
return E_NOTIMPL;
@@ -2944,7 +2944,7 @@
/***********************************************************************
* PrintDlgExW (COMDLG32.@)
*/
-HRESULT WINAPI PrintDlgExW(LPVOID lpPrintDlgExW) /* [???] FIXME:
LPPRINTDLGEXW */
+HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lpPrintDlgExW)
{
FIXME("stub\n");
return E_NOTIMPL;