Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Jacek Caban <jack@itma.pwr.wroc.pl>

Browse source 
- Added/updated Polish translations.
Robert Shearman <rob@codeweavers.com>
- GetWindowLong -> GetWindowLongPtr.
Vincent Beron <vberon@mecano.gme.usherb.ca>
- Fix various function prototypes.
- Better document some apis in commdlg and mscms.
Francois Gouget <fgouget@free.fr>
- Don't define COBJMACROS in objbase.h.
- Update the Wine sources accordingly.
Jon Griffiths <jon_p_griffiths@yahoo.com>
- Constify some statics and make them smaller.
Steven Edwards <steven_ed4153@yahoo.com>
- Remove unneeded include statements.
Dimitrie O. Paun <dpaun@rogers.com>
- Avoid W->A transitions.

svn path=/trunk/; revision=11343
This commit is contained in:
Gé van Geldorp 2004-10-20 08:53:06 +00:00
parent 695f33412e
commit b48649a01d
11 changed files with 194 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
reactos/lib/comdlg32/cdlg_Pl.rc
View file

@ -24,7 +24,7 @@
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 285, 134
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Otwórz" CAPTION "Otwórz"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -39,14 +39,14 @@ FONT 8, "MS Shell Dlg"
COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
LTEXT "&Dyski:", 1091, 110, 104, 92, 9 LTEXT "&Dyski:", 1091, 110, 104, 92, 9
COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "Otwórz", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "Otwórz", 1, 208, 6, 66, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
PUSHBUTTON "Anuluj", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Anuluj", 2, 208, 24, 66, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Pomoc", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Pomoc", pshHelp, 208, 46, 66, 14, WS_GROUP | WS_TABSTOP
CHECKBOX "Tylko do &odczytu", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Tylko do &odczytu", chx1, 208, 68, 66, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
} }
SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 285, 134
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Zapisz jako..." CAPTION "Zapisz jako..."
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -61,10 +61,10 @@ FONT 8, "MS Shell Dlg"
COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
LTEXT "&Dyski:", 1091, 110, 104, 92, 9 LTEXT "&Dyski:", 1091, 110, 104, 92, 9
COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "Zapisz jako", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "Zapisz jako", 1, 208, 6, 66, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
PUSHBUTTON "Anuluj", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Anuluj", 2, 208, 24, 66, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Pomoc", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Pomoc", pshHelp, 208, 46, 66, 14, WS_GROUP | WS_TABSTOP
CHECKBOX "Tylko do &odczytu", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Tylko do &odczytu", chx1, 208, 68, 66, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
} }
@ -125,7 +125,7 @@ FONT 8, "MS Shell Dlg"
LTEXT "&Czcionka:",stc1 ,6,3,40,9 LTEXT "&Czcionka:",stc1 ,6,3,40,9
COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
LTEXT "St&yl:",stc2 ,108,3,44,9 LTEXT "&Styl:",stc2 ,108,3,44,9
COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
LTEXT "&Rozmiar:",stc3,179,3,30,9 LTEXT "&Rozmiar:",stc3,179,3,30,9
@ -136,8 +136,8 @@ FONT 8, "MS Shell Dlg"
PUSHBUTTON "&Zastosuj", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Zastosuj", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Pomoc" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Pomoc" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP
GROUPBOX "Efekty specialne",grp1,6,72,84,34,WS_GROUP GROUPBOX "Efekty specialne",grp1,6,72,84,34,WS_GROUP
CHECKBOX "Prz&ekreœlona", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "Prz&ekreœlona", chx1, 10,82,65,10, BS_AUTOCHECKBOX | WS_TABSTOP
CHECKBOX "P&odkreœlona", chx2, 10,94,50,10, BS_AUTOCHECKBOX CHECKBOX "P&odkreœlona", chx2, 10,94,65,10, BS_AUTOCHECKBOX
LTEXT "&Kolor:", stc4 ,6,110,30,9 LTEXT "&Kolor:", stc4 ,6,110,30,9
COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
@ -183,26 +183,26 @@ FONT 8, "MS Shell Dlg"
} }
FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 246, 62 FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 62
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "ZnajdŸ" CAPTION "ZnajdŸ"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
{ {
LTEXT "&ZnajdŸ:", -1, 4, 8, 42, 8 LTEXT "&ZnajdŸ:", -1, 4, 8, 42, 8
EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP EDITTEXT edt1, 35, 7, 160, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
CHECKBOX "Uwzglêdniaj tylko ca³e wyrazy", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Uwzglêdniaj tylko ca³e wyrazy", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
CHECKBOX "&Uwzglêdniaj wielkoœæ liter", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "&Uwzglêdniaj wielkoœæ liter", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP
GROUPBOX "Kierunek", grp1, 107, 26, 68, 28 GROUPBOX "Kierunek", grp1, 127, 26, 68, 28
CONTROL "W &górê", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 CONTROL "W &górê", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 20, 12
CONTROL "W &dó³", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 CONTROL "W &dó³", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 158, 38, 30, 12
DEFPUSHBUTTON "&ZnajdŸ nastêpny", IDOK, 182, 5, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON DEFPUSHBUTTON "&ZnajdŸ nastêpny", IDOK, 202, 5, 69, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
PUSHBUTTON "Anuluj", IDCANCEL , 182, 23, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Anuluj", IDCANCEL , 202, 23, 69, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Pomoc", pshHelp , 182, 45, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Pomoc", pshHelp , 202, 45, 69, 14, WS_GROUP | WS_TABSTOP
} }
REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 240, 94 REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 94
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Zamieñ" CAPTION "Zamieñ"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -211,14 +211,14 @@ FONT 8, "MS Shell Dlg"
EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
LTEXT "Zanieñ &na:", -1, 4, 26, 48, 8 LTEXT "Zanieñ &na:", -1, 4, 26, 48, 8
EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
CHECKBOX "Uwzglêdniaj &tylko ca³e wyrazy", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Uwzglêdniaj &tylko ca³e wyrazy", chx1, 5, 46, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
CHECKBOX "&Uwzglêdniaj wielkoœæ liter", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "&Uwzglêdniaj wielkoœæ liter", chx2, 5, 62, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP
DEFPUSHBUTTON "ZnajdŸ nastêpny", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON DEFPUSHBUTTON "ZnajdŸ nastêpny", IDOK, 174, 4, 70, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
PUSHBUTTON "&Zamieñ", psh1 , 174, 21, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Zamieñ", psh1 , 174, 21, 70, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "Zamieñ &wszystkie", psh2 , 174, 38, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Zamieñ &wszystkie", psh2 , 174, 38, 70, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "Anuluj", IDCANCEL , 174, 55, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Anuluj", IDCANCEL , 174, 55, 70, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Pomoc", pshHelp , 174, 75, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Pomoc", pshHelp , 174, 75, 70, 14, WS_GROUP | WS_TABSTOP
} }

2
reactos/lib/comdlg32/colordlg16.c
View file

@ -463,7 +463,7 @@ BOOL16 WINAPI ChooseColor16( LPCHOOSECOLOR16 lpChCol )
} }
ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 8); ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 8);
hInst = GetWindowLongA(HWND_32(lpChCol->hwndOwner), GWL_HINSTANCE); hInst = GetWindowLongPtrA(HWND_32(lpChCol->hwndOwner), GWLP_HINSTANCE);
bRet = DialogBoxIndirectParam16(hInst, hDlgTmpl16, lpChCol->hwndOwner, bRet = DialogBoxIndirectParam16(hInst, hDlgTmpl16, lpChCol->hwndOwner,
(DLGPROC16) ptr, (DWORD)lpChCol); (DLGPROC16) ptr, (DWORD)lpChCol);
if (hResource16) FreeResource16(hDlgTmpl16); if (hResource16) FreeResource16(hDlgTmpl16);

8
reactos/lib/comdlg32/filedlg.c
View file

@ -55,8 +55,10 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#define COBJMACROS
#define NONAMELESSUNION #define NONAMELESSUNION
#define NONAMELESSSTRUCT #define NONAMELESSSTRUCT
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h" #include "winreg.h"
@ -2118,7 +2120,7 @@ ret:
* *
* Initialisation of the shell objects * Initialisation of the shell objects
*/ */
static HRESULT FILEDLG95_SHELL_Init(HWND hwnd) static LRESULT FILEDLG95_SHELL_Init(HWND hwnd)
{ {
FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
@ -3635,7 +3637,7 @@ static BOOL GetFileName31A(LPOPENFILENAMEA lpofn, /* addess of structure with da
lfs = FD31_AllocPrivate((LPARAM) lpofn, dlgType, &callbacks, (DWORD) FALSE); lfs = FD31_AllocPrivate((LPARAM) lpofn, dlgType, &callbacks, (DWORD) FALSE);
if (lfs) if (lfs)
{ {
hInst = (HINSTANCE)GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE ); hInst = (HINSTANCE)GetWindowLongPtrA( lpofn->hwndOwner, GWLP_HINSTANCE );
bRet = DialogBoxIndirectParamA( hInst, lfs->template, lpofn->hwndOwner, bRet = DialogBoxIndirectParamA( hInst, lfs->template, lpofn->hwndOwner,
FD32_FileOpenDlgProc, (LPARAM)lfs); FD32_FileOpenDlgProc, (LPARAM)lfs);
FD31_DestroyPrivate(lfs); FD31_DestroyPrivate(lfs);
@ -3665,7 +3667,7 @@ static BOOL GetFileName31W(LPOPENFILENAMEW lpofn, /* addess of structure with da
lfs = FD31_AllocPrivate((LPARAM) lpofn, dlgType, &callbacks, (DWORD) FALSE); lfs = FD31_AllocPrivate((LPARAM) lpofn, dlgType, &callbacks, (DWORD) FALSE);
if (lfs) if (lfs)
{ {
hInst = (HINSTANCE)GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE ); hInst = (HINSTANCE)GetWindowLongPtrW( lpofn->hwndOwner, GWLP_HINSTANCE );
bRet = DialogBoxIndirectParamW( hInst, lfs->template, lpofn->hwndOwner, bRet = DialogBoxIndirectParamW( hInst, lfs->template, lpofn->hwndOwner,
FD32_FileOpenDlgProc, (LPARAM)lfs); FD32_FileOpenDlgProc, (LPARAM)lfs);
FD31_DestroyPrivate(lfs); FD31_DestroyPrivate(lfs);

8
reactos/lib/comdlg32/filedlg16.c
View file

@ -329,7 +329,7 @@ static LONG FD16_WMMeasureItem(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
/* ------------------ Dialog procedures ---------------------- */ /* ------------------ Dialog procedures ---------------------- */
/*********************************************************************** /***********************************************************************
* FileOpenDlgProc16 (COMMDLG.6) * FileOpenDlgProc (COMMDLG.6)
*/ */
BOOL16 CALLBACK FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam) BOOL16 CALLBACK FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam)
{ {
@ -377,7 +377,7 @@ BOOL16 CALLBACK FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, L
} }
/*********************************************************************** /***********************************************************************
* FileSaveDlgProc16 (COMMDLG.7) * FileSaveDlgProc (COMMDLG.7)
*/ */
BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam) BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam)
{ {
@ -459,7 +459,7 @@ BOOL16 WINAPI GetOpenFileName16(
if (lfs) if (lfs)
{ {
priv = (PFD16_PRIVATE) lfs->private1632; priv = (PFD16_PRIVATE) lfs->private1632;
hInst = GetWindowWord( HWND_32(lpofn->hwndOwner), GWL_HINSTANCE ); hInst = GetWindowLongPtrA( HWND_32(lpofn->hwndOwner), GWLP_HINSTANCE );
ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 6); ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 6);
bRet = DialogBoxIndirectParam16( hInst, priv->hDlgTmpl16, lpofn->hwndOwner, bRet = DialogBoxIndirectParam16( hInst, priv->hDlgTmpl16, lpofn->hwndOwner,
(DLGPROC16) ptr, (LPARAM) lfs); (DLGPROC16) ptr, (LPARAM) lfs);
@ -501,7 +501,7 @@ BOOL16 WINAPI GetSaveFileName16(
if (lfs) if (lfs)
{ {
priv = (PFD16_PRIVATE) lfs->private1632; priv = (PFD16_PRIVATE) lfs->private1632;
hInst = GetWindowWord( HWND_32(lpofn->hwndOwner), GWL_HINSTANCE ); hInst = GetWindowLongPtrA( HWND_32(lpofn->hwndOwner), GWLP_HINSTANCE );
ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 7); ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 7);
bRet = DialogBoxIndirectParam16( hInst, priv->hDlgTmpl16, lpofn->hwndOwner, bRet = DialogBoxIndirectParam16( hInst, priv->hDlgTmpl16, lpofn->hwndOwner,
(DLGPROC16) ptr, (LPARAM) lfs); (DLGPROC16) ptr, (LPARAM) lfs);

2
reactos/lib/comdlg32/filedlgbrowser.c
View file

@ -23,8 +23,10 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#define COBJMACROS
#define NONAMELESSUNION #define NONAMELESSUNION
#define NONAMELESSSTRUCT #define NONAMELESSSTRUCT
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winnls.h" #include "winnls.h"

4
reactos/lib/comdlg32/finddlg.c
View file

@ -182,7 +182,7 @@ HWND16 WINAPI FindText16( SEGPTR find )
lfr->find = TRUE; lfr->find = TRUE;
if (FINDDLG_Get16BitsTemplate(lfr)) if (FINDDLG_Get16BitsTemplate(lfr))
{ {
hInst = GetWindowLongA( HWND_32(lfr->fr16->hwndOwner), GWL_HINSTANCE); hInst = GetWindowLongPtrA( HWND_32(lfr->fr16->hwndOwner), GWLP_HINSTANCE);
ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 13); ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 13);
ret = CreateDialogIndirectParam16( hInst, lfr->template, ret = CreateDialogIndirectParam16( hInst, lfr->template,
lfr->fr16->hwndOwner, (DLGPROC16) ptr, find); lfr->fr16->hwndOwner, (DLGPROC16) ptr, find);
@ -212,7 +212,7 @@ HWND16 WINAPI ReplaceText16( SEGPTR find )
lfr->find = FALSE; lfr->find = FALSE;
if (FINDDLG_Get16BitsTemplate(lfr)) if (FINDDLG_Get16BitsTemplate(lfr))
{ {
hInst = GetWindowLongA( HWND_32(lfr->fr16->hwndOwner), GWL_HINSTANCE); hInst = GetWindowLongPtrA( HWND_32(lfr->fr16->hwndOwner), GWLP_HINSTANCE);
ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 14); ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 14);
ret = CreateDialogIndirectParam16( hInst, lfr->template, ret = CreateDialogIndirectParam16( hInst, lfr->template,
lfr->fr16->hwndOwner, (DLGPROC16) ptr, find); lfr->fr16->hwndOwner, (DLGPROC16) ptr, find);

37
reactos/lib/comdlg32/fontdlg.c
View file

@ -29,9 +29,6 @@
#include "winnls.h" #include "winnls.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "heap.h"
#include "commdlg.h" #include "commdlg.h"
#include "dlgs.h" #include "dlgs.h"
#include "wine/debug.h" #include "wine/debug.h"
@ -99,7 +96,7 @@ static const WCHAR *sample_lang_text[]={
stKOI8,stIso88593,stIso88594,stIso885910,stCeltic}; stKOI8,stIso88593,stIso88594,stIso885910,stCeltic};
static const int CHARSET_ORDER[256]={ static const BYTE CHARSET_ORDER[256]={
CI(ANSI), 0, CI(SYMBOL), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CI(ANSI), 0, CI(SYMBOL), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -118,9 +115,9 @@ static const int CHARSET_ORDER[256]={
CI(VISCII), CI(TCVN), CI(KOI8), CI(ISO3), CI(ISO4), CI(ISO10), CI(CELTIC), 0, 0, 0, 0, 0, 0, 0, 0, CI(OEM), CI(VISCII), CI(TCVN), CI(KOI8), CI(ISO3), CI(ISO4), CI(ISO10), CI(CELTIC), 0, 0, 0, 0, 0, 0, 0, 0, CI(OEM),
}; };
struct { static const struct {
int mask; DWORD mask;
char *name; const char *name;
} cfflags[] = { } cfflags[] = {
#define XX(x) { x, #x }, #define XX(x) { x, #x },
XX(CF_SCREENFONTS) XX(CF_SCREENFONTS)
@ -149,17 +146,16 @@ struct {
XX(CF_NOSCRIPTSEL) XX(CF_NOSCRIPTSEL)
XX(CF_NOVERTFONTS) XX(CF_NOVERTFONTS)
#undef XX #undef XX
{0,NULL},
}; };
void _dump_cf_flags(DWORD cflags) void _dump_cf_flags(DWORD cflags)
{ {
int i; int i;
for (i=0;cfflags[i].name;i++) for (i = 0; i < sizeof(cfflags)/sizeof(cfflags[0]); i++)
if (cfflags[i].mask & cflags) if (cfflags[i].mask & cflags)
MESSAGE("%s|",cfflags[i].name); TRACE("%s|",cfflags[i].name);
MESSAGE("\n"); TRACE("\n");
} }
/*********************************************************************** /***********************************************************************
@ -350,9 +346,9 @@ static int SetFontStylesToCombo2(HWND hwnd, HDC hdc, const LOGFONTA *lplf)
{ {
int italic; int italic;
int weight; int weight;
char stname[20]; const char *stname;
}; };
static struct FONTSTYLE fontstyles[FSTYLES]={ static const struct FONTSTYLE fontstyles[FSTYLES]={
{ 0,FW_NORMAL,"Regular"}, { 1,FW_NORMAL,"Italic"}, { 0,FW_NORMAL,"Regular"}, { 1,FW_NORMAL,"Italic"},
{ 0,FW_BOLD,"Bold"}, { 1,FW_BOLD,"Bold Italic"} { 0,FW_BOLD,"Bold"}, { 1,FW_BOLD,"Bold Italic"}
}; };
@ -414,10 +410,10 @@ static int AddFontSizeToCombo3(HWND hwnd, UINT h, LPCHOOSEFONTA lpcf)
*/ */
static int SetFontSizesToCombo3(HWND hwnd, LPCHOOSEFONTA lpcf) static int SetFontSizesToCombo3(HWND hwnd, LPCHOOSEFONTA lpcf)
{ {
static const int sizes[]={8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72,0}; static const char sizes[]={8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72};
int i; int i;
for (i=0; sizes[i]; i++) for (i = 0; i < sizeof(sizes)/sizeof(sizes[0]); i++)
if (AddFontSizeToCombo3(hwnd, sizes[i], lpcf)) return 1; if (AddFontSizeToCombo3(hwnd, sizes[i], lpcf)) return 1;
return 0; return 0;
} }
@ -617,7 +613,7 @@ LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam,
strcpy( name, "[color name]" ); strcpy( name, "[color name]" );
} }
j=SendDlgItemMessageA(hDlg, cmb4, CB_ADDSTRING, 0, (LPARAM)name); j=SendDlgItemMessageA(hDlg, cmb4, CB_ADDSTRING, 0, (LPARAM)name);
SendDlgItemMessageA(hDlg, cmb4, CB_SETITEMDATA16, j, textcolors[j]); SendDlgItemMessageA(hDlg, cmb4, CB_SETITEMDATA, j, textcolors[j]);
/* look for a fitting value in color combobox */ /* look for a fitting value in color combobox */
if (textcolors[j]==lpcf->rgbColors) if (textcolors[j]==lpcf->rgbColors)
SendDlgItemMessageA(hDlg,cmb4, CB_SETCURSEL,j,0); SendDlgItemMessageA(hDlg,cmb4, CB_SETCURSEL,j,0);
@ -1039,7 +1035,11 @@ LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam,
LOGFONTA lf = *(lpcf->lpLogFont); LOGFONTA lf = *(lpcf->lpLogFont);
MapWindowPoints( 0, hDlg, (LPPOINT) &info.rcWindow, 2); MapWindowPoints( 0, hDlg, (LPPOINT) &info.rcWindow, 2);
hdc=BeginPaint( hDlg, &ps ); hdc = BeginPaint( hDlg, &ps );
TRACE("erase %d, rect=(%ld,%ld)-(%ld,%ld)\n", ps.fErase,
ps.rcPaint.left, ps.rcPaint.top,
ps.rcPaint.right, ps.rcPaint.bottom);
/* Paint frame */ /* Paint frame */
MoveToEx( hdc, info.rcWindow.left, info.rcWindow.bottom, NULL ); MoveToEx( hdc, info.rcWindow.left, info.rcWindow.bottom, NULL );
@ -1068,7 +1068,6 @@ LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam,
DeleteObject(SelectObject( hdc, hOrigFont )); DeleteObject(SelectObject( hdc, hOrigFont ));
EndPaint( hDlg, &ps ); EndPaint( hDlg, &ps );
} }
return FALSE; return FALSE;
} }
@ -1080,6 +1079,7 @@ INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
{ {
LPCHOOSEFONTA lpcf; LPCHOOSEFONTA lpcf;
INT_PTR res = FALSE; INT_PTR res = FALSE;
if (uMsg!=WM_INITDIALOG) if (uMsg!=WM_INITDIALOG)
{ {
lpcf=(LPCHOOSEFONTA)GetPropA(hDlg, WINE_FONTDATA); lpcf=(LPCHOOSEFONTA)GetPropA(hDlg, WINE_FONTDATA);
@ -1130,6 +1130,7 @@ INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
{ {
LPCHOOSEFONTW lpcf32w; LPCHOOSEFONTW lpcf32w;
INT_PTR res = FALSE; INT_PTR res = FALSE;
if (uMsg!=WM_INITDIALOG) if (uMsg!=WM_INITDIALOG)
{ {
lpcf32w=(LPCHOOSEFONTW)GetPropA(hDlg, WINE_FONTDATA); lpcf32w=(LPCHOOSEFONTW)GetPropA(hDlg, WINE_FONTDATA);

2
reactos/lib/comdlg32/fontdlg16.c
View file

@ -231,7 +231,7 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont)
lpChFont->lpTemplateName=(SEGPTR)&cf32a; lpChFont->lpTemplateName=(SEGPTR)&cf32a;
ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 16); ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 16);
hInst = GetWindowLongA(HWND_32(lpChFont->hwndOwner), GWL_HINSTANCE); hInst = GetWindowLongPtrA(HWND_32(lpChFont->hwndOwner), GWLP_HINSTANCE);
bRet = DialogBoxIndirectParam16(hInst, hDlgTmpl16, lpChFont->hwndOwner, bRet = DialogBoxIndirectParam16(hInst, hDlgTmpl16, lpChFont->hwndOwner,
(DLGPROC16) ptr, (DWORD)lpChFont); (DLGPROC16) ptr, (DWORD)lpChFont);
if (hResource16) FreeResource16(hDlgTmpl16); if (hResource16) FreeResource16(hDlgTmpl16);

155
reactos/lib/comdlg32/printdlg.c
View file

@ -156,17 +156,15 @@ static INT PRINTDLG_SetUpPrinterListComboW(HWND hDlg, UINT id, LPCWSTR name)
if(!name || if(!name ||
(i = SendDlgItemMessageW(hDlg, id, CB_FINDSTRINGEXACT, -1, (i = SendDlgItemMessageW(hDlg, id, CB_FINDSTRINGEXACT, -1,
(LPARAM)name)) == CB_ERR) { (LPARAM)name)) == CB_ERR) {
WCHAR buf[260];
/* ansi is ok */ DWORD dwBufLen = sizeof(buf)/sizeof(buf[0]);
char buf[260]; TRACE("Can't find '%s' in printer list so trying to find default\n",
DWORD dwBufLen = sizeof(buf);
FIXME("Can't find '%s' in printer list so trying to find default\n",
debugstr_w(name)); debugstr_w(name));
if(!GetDefaultPrinterA(buf, &dwBufLen)) if(!GetDefaultPrinterW(buf, &dwBufLen))
return num; return num;
i = SendDlgItemMessageA(hDlg, id, CB_FINDSTRINGEXACT, -1, (LPARAM)buf); i = SendDlgItemMessageW(hDlg, id, CB_FINDSTRINGEXACT, -1, (LPARAM)buf);
if(i == CB_ERR) if(i == CB_ERR)
FIXME("Can't find default printer in printer list\n"); TRACE("Can't find default printer in printer list\n");
} }
SendDlgItemMessageW(hDlg, id, CB_SETCURSEL, i, 0); SendDlgItemMessageW(hDlg, id, CB_SETCURSEL, i, 0);
return num; return num;
@ -378,14 +376,14 @@ static BOOL PRINTDLG_UpdatePrintDlgW(HWND hDlg,
nToPage = GetDlgItemInt(hDlg, edt2, NULL, FALSE); nToPage = GetDlgItemInt(hDlg, edt2, NULL, FALSE);
if (nFromPage < lppd->nMinPage || nFromPage > lppd->nMaxPage || if (nFromPage < lppd->nMinPage || nFromPage > lppd->nMaxPage ||
nToPage < lppd->nMinPage || nToPage > lppd->nMaxPage) { nToPage < lppd->nMinPage || nToPage > lppd->nMaxPage) {
char resourcestr[256]; WCHAR resourcestr[256];
char resultstr[256]; WCHAR resultstr[256];
LoadStringA(COMDLG32_hInstance, PD32_INVALID_PAGE_RANGE, LoadStringW(COMDLG32_hInstance, PD32_INVALID_PAGE_RANGE,
resourcestr, 255); resourcestr, 255);
sprintf(resultstr,resourcestr, lppd->nMinPage, lppd->nMaxPage); wsprintfW(resultstr,resourcestr, lppd->nMinPage, lppd->nMaxPage);
LoadStringA(COMDLG32_hInstance, PD32_PRINT_TITLE, LoadStringW(COMDLG32_hInstance, PD32_PRINT_TITLE,
resourcestr, 255); resourcestr, 255);
MessageBoxA(hDlg, resultstr, resourcestr, MessageBoxW(hDlg, resultstr, resourcestr,
MB_OK | MB_ICONWARNING); MB_OK | MB_ICONWARNING);
return FALSE; return FALSE;
} }
@ -681,13 +679,13 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg,
TRACE(" Printer: %s, Port: %s, ComboID: %d\n",debugstr_w(PrinterName),debugstr_w(PortName),nIDComboBox); TRACE(" Printer: %s, Port: %s, ComboID: %d\n",debugstr_w(PrinterName),debugstr_w(PortName),nIDComboBox);
/* query the dialog box for the current selected value */ /* query the dialog box for the current selected value */
Sel = SendDlgItemMessageA(hDlg, nIDComboBox, CB_GETCURSEL, 0, 0); Sel = SendDlgItemMessageW(hDlg, nIDComboBox, CB_GETCURSEL, 0, 0);
if(Sel != CB_ERR) { if(Sel != CB_ERR) {
/* we enter here only if a different printer is selected after /* we enter here only if a different printer is selected after
* the Print Setup dialog is opened. The current settings are * the Print Setup dialog is opened. The current settings are
* stored into the newly selected printer. * stored into the newly selected printer.
*/ */
oldWord = SendDlgItemMessageA(hDlg, nIDComboBox, CB_GETITEMDATA, oldWord = SendDlgItemMessageW(hDlg, nIDComboBox, CB_GETITEMDATA,
Sel, 0); Sel, 0);
if (dm) { if (dm) {
if (nIDComboBox == cmb2) if (nIDComboBox == cmb2)
@ -745,7 +743,7 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg,
fwCapability_Words, (LPWSTR)Words, dm); fwCapability_Words, (LPWSTR)Words, dm);
/* reset any current content in the combobox */ /* reset any current content in the combobox */
SendDlgItemMessageA(hDlg, nIDComboBox, CB_RESETCONTENT, 0, 0); SendDlgItemMessageW(hDlg, nIDComboBox, CB_RESETCONTENT, 0, 0);
/* store new content */ /* store new content */
for (i = 0; i < NrOfEntries; i++) { for (i = 0; i < NrOfEntries; i++) {
@ -759,13 +757,13 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg,
item order will change as more items are added */ item order will change as more items are added */
Sel = 0; Sel = 0;
for (i = 0; i < NrOfEntries; i++) { for (i = 0; i < NrOfEntries; i++) {
if(SendDlgItemMessageA(hDlg, nIDComboBox, CB_GETITEMDATA, i, 0) == if(SendDlgItemMessageW(hDlg, nIDComboBox, CB_GETITEMDATA, i, 0) ==
oldWord) { oldWord) {
Sel = i; Sel = i;
break; break;
} }
} }
SendDlgItemMessageA(hDlg, nIDComboBox, CB_SETCURSEL, Sel, 0); SendDlgItemMessageW(hDlg, nIDComboBox, CB_SETCURSEL, Sel, 0);
HeapFree(GetProcessHeap(),0,Words); HeapFree(GetProcessHeap(),0,Words);
HeapFree(GetProcessHeap(),0,Names); HeapFree(GetProcessHeap(),0,Names);
@ -1094,13 +1092,12 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name,
} }
/* "All xxx pages"... */ /* "All xxx pages"... */
{ {
/* ansi is ok */ WCHAR resourcestr[64];
char resourcestr[64]; WCHAR result[64];
char result[64]; LoadStringW(COMDLG32_hInstance, PD32_PRINT_ALL_X_PAGES,
LoadStringA(COMDLG32_hInstance, PD32_PRINT_ALL_X_PAGES,
resourcestr, 49); resourcestr, 49);
sprintf(result,resourcestr,lppd->nMaxPage - lppd->nMinPage + 1); wsprintfW(result,resourcestr,lppd->nMaxPage - lppd->nMinPage + 1);
SendDlgItemMessageA(hDlg, rad1, WM_SETTEXT, 0, (LPARAM) result); SendDlgItemMessageW(hDlg, rad1, WM_SETTEXT, 0, (LPARAM) result);
} }
/* Collate pages /* Collate pages
@ -1108,11 +1105,11 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name,
* FIXME: The ico3 is not displayed for some reason. I don't know why. * FIXME: The ico3 is not displayed for some reason. I don't know why.
*/ */
if (lppd->Flags & PD_COLLATE) { if (lppd->Flags & PD_COLLATE) {
SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageW(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)PrintStructures->hCollateIcon); (LPARAM)PrintStructures->hCollateIcon);
CheckDlgButton(hDlg, chx2, 1); CheckDlgButton(hDlg, chx2, 1);
} else { } else {
SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageW(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)PrintStructures->hNoCollateIcon); (LPARAM)PrintStructures->hNoCollateIcon);
CheckDlgButton(hDlg, chx2, 0); CheckDlgButton(hDlg, chx2, 0);
} }
@ -1164,7 +1161,7 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name,
PrintStructures->lpPrinterInfo->pPortName, PrintStructures->lpPrinterInfo->pPortName,
lpdm); lpdm);
CheckRadioButton(hDlg, rad1, rad2, bPortrait ? rad1: rad2); CheckRadioButton(hDlg, rad1, rad2, bPortrait ? rad1: rad2);
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)(bPortrait ? PrintStructures->hPortraitIcon : (LPARAM)(bPortrait ? PrintStructures->hPortraitIcon :
PrintStructures->hLandscapeIcon)); PrintStructures->hLandscapeIcon));
@ -1292,6 +1289,10 @@ static LRESULT PRINTDLG_WMInitDialog(HWND hDlg, WPARAM wParam,
static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, WPARAM wParam, static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, WPARAM wParam,
PRINT_PTRW* PrintStructures) PRINT_PTRW* PrintStructures)
{ {
const static WCHAR PD32_COLLATE[] = { 'P', 'D', '3', '2', '_', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 };
const static WCHAR PD32_NOCOLLATE[] = { 'P', 'D', '3', '2', '_', 'N', 'O', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 };
const static WCHAR PD32_PORTRAIT[] = { 'P', 'D', '3', '2', '_', 'P', 'O', 'R', 'T', 'R', 'A', 'I', 'T', 0 };
const static WCHAR PD32_LANDSCAPE[] = { 'P', 'D', '3', '2', '_', 'L', 'A', 'N', 'D', 'S', 'C', 'A', 'P', 'E', 0 };
LPPRINTDLGW lppd = PrintStructures->lpPrintDlg; LPPRINTDLGW lppd = PrintStructures->lpPrintDlg;
DEVNAMES *pdn; DEVNAMES *pdn;
DEVMODEW *pdm; DEVMODEW *pdm;
@ -1302,18 +1303,18 @@ static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, WPARAM wParam,
/* We load these with LoadImage because they are not a standard /* We load these with LoadImage because they are not a standard
size and we don't want them rescaled */ size and we don't want them rescaled */
PrintStructures->hCollateIcon = PrintStructures->hCollateIcon =
LoadImageA(COMDLG32_hInstance, "PD32_COLLATE", IMAGE_ICON, 0, 0, 0); LoadImageW(COMDLG32_hInstance, PD32_COLLATE, IMAGE_ICON, 0, 0, 0);
PrintStructures->hNoCollateIcon = PrintStructures->hNoCollateIcon =
LoadImageA(COMDLG32_hInstance, "PD32_NOCOLLATE", IMAGE_ICON, 0, 0, 0); LoadImageW(COMDLG32_hInstance, PD32_NOCOLLATE, IMAGE_ICON, 0, 0, 0);
/* These can be done with LoadIcon */ /* These can be done with LoadIcon */
PrintStructures->hPortraitIcon = PrintStructures->hPortraitIcon =
LoadIconA(COMDLG32_hInstance, "PD32_PORTRAIT"); LoadIconW(COMDLG32_hInstance, PD32_PORTRAIT);
PrintStructures->hLandscapeIcon = PrintStructures->hLandscapeIcon =
LoadIconA(COMDLG32_hInstance, "PD32_LANDSCAPE"); LoadIconW(COMDLG32_hInstance, PD32_LANDSCAPE);
/* display the collate/no_collate icon */ /* display the collate/no_collate icon */
SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageW(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)PrintStructures->hNoCollateIcon); (LPARAM)PrintStructures->hNoCollateIcon);
if(PrintStructures->hCollateIcon == 0 || if(PrintStructures->hCollateIcon == 0 ||
@ -1331,7 +1332,7 @@ static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, WPARAM wParam,
*/ */
if (lppd->Flags & PD_SHOWHELP) { if (lppd->Flags & PD_SHOWHELP) {
if((PrintStructures->HelpMessageID = if((PrintStructures->HelpMessageID =
RegisterWindowMessageA(HELPMSGSTRINGA)) == 0) { RegisterWindowMessageW(HELPMSGSTRINGW)) == 0) {
COMDLG32_SetCommDlgExtendedError(CDERR_REGISTERMSGFAIL); COMDLG32_SetCommDlgExtendedError(CDERR_REGISTERMSGFAIL);
return FALSE; return FALSE;
} }
@ -1608,10 +1609,10 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
case chx2: /* collate pages checkbox */ case chx2: /* collate pages checkbox */
if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED) if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageW(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)PrintStructures->hCollateIcon); (LPARAM)PrintStructures->hCollateIcon);
else else
SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageW(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)PrintStructures->hNoCollateIcon); (LPARAM)PrintStructures->hNoCollateIcon);
break; break;
case edt1: /* from page nr editbox */ case edt1: /* from page nr editbox */
@ -1663,7 +1664,7 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
if (lppd->Flags & PD_PRINTSETUP) if (lppd->Flags & PD_PRINTSETUP)
{ {
lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT; lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)(PrintStructures->hPortraitIcon)); (LPARAM)(PrintStructures->hPortraitIcon));
} }
break; break;
@ -1672,7 +1673,7 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
if (lppd->Flags & PD_PRINTSETUP) if (lppd->Flags & PD_PRINTSETUP)
{ {
lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE; lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)(PrintStructures->hLandscapeIcon)); (LPARAM)(PrintStructures->hLandscapeIcon));
} }
break; break;
@ -1693,9 +1694,9 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
case cmb2: /* Papersize */ case cmb2: /* Papersize */
{ {
DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0); DWORD Sel = SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0);
if(Sel != CB_ERR) if(Sel != CB_ERR)
lpdm->u.s.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2, lpdm->u.s.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2,
CB_GETITEMDATA, CB_GETITEMDATA,
Sel, 0); Sel, 0);
} }
@ -1703,7 +1704,7 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
case cmb3: /* Bin */ case cmb3: /* Bin */
{ {
DWORD Sel = SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0); DWORD Sel = SendDlgItemMessageW(hDlg, cmb3, CB_GETCURSEL, 0, 0);
if(Sel != CB_ERR) if(Sel != CB_ERR)
lpdm->u.s.dmDefaultSource = SendDlgItemMessageW(hDlg, cmb3, lpdm->u.s.dmDefaultSource = SendDlgItemMessageW(hDlg, cmb3,
CB_GETITEMDATA, Sel, CB_GETITEMDATA, Sel,
@ -1718,20 +1719,20 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) { if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) {
if(lpdm->u.s.dmOrientation != DMORIENT_PORTRAIT) { if(lpdm->u.s.dmOrientation != DMORIENT_PORTRAIT) {
lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT; lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE, SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON, (WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hPortraitIcon); (LPARAM)PrintStructures->hPortraitIcon);
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE,
(WPARAM)IMAGE_ICON, (WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hPortraitIcon); (LPARAM)PrintStructures->hPortraitIcon);
} }
} else { } else {
if(lpdm->u.s.dmOrientation != DMORIENT_LANDSCAPE) { if(lpdm->u.s.dmOrientation != DMORIENT_LANDSCAPE) {
lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE; lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE, SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON, (WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hLandscapeIcon); (LPARAM)PrintStructures->hLandscapeIcon);
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE,
(WPARAM)IMAGE_ICON, (WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hLandscapeIcon); (LPARAM)PrintStructures->hLandscapeIcon);
} }
@ -1978,7 +1979,7 @@ BOOL WINAPI PrintDlgA(
{ {
BOOL bRet = FALSE; BOOL bRet = FALSE;
LPVOID ptr; LPVOID ptr;
HINSTANCE hInst = (HINSTANCE)GetWindowLongA( lppd->hwndOwner, GWL_HINSTANCE ); HINSTANCE hInst = (HINSTANCE)GetWindowLongPtrA( lppd->hwndOwner, GWLP_HINSTANCE );
if(TRACE_ON(commdlg)) { if(TRACE_ON(commdlg)) {
char flagstr[1000] = ""; char flagstr[1000] = "";
@ -2134,7 +2135,7 @@ BOOL WINAPI PrintDlgW(
{ {
BOOL bRet = FALSE; BOOL bRet = FALSE;
LPVOID ptr; LPVOID ptr;
HINSTANCE hInst = (HINSTANCE)GetWindowLongW( lppd->hwndOwner, GWL_HINSTANCE ); HINSTANCE hInst = (HINSTANCE)GetWindowLongPtrW( lppd->hwndOwner, GWLP_HINSTANCE );
if(TRACE_ON(commdlg)) { if(TRACE_ON(commdlg)) {
char flagstr[1000] = ""; char flagstr[1000] = "";
@ -2382,23 +2383,26 @@ _c_size2strA(PageSetupDataA *pda,DWORD size,LPSTR strout) {
return; return;
} }
static void static void
_c_size2strW(PageSetupDataW *pda,DWORD size,LPSTR strout) { _c_size2strW(PageSetupDataW *pda,DWORD size,LPWSTR strout) {
strcpy(strout,"<undef>"); const static WCHAR UNDEF[] = { '<', 'u', 'n', 'd', 'e', 'f', '>', 0 };
const static WCHAR mm_fmt[] = { '%', '.', '2', 'f', 'm', 'm', 0 };
const static WCHAR in_fmt[] = { '%', '.', '2', 'f', 'i', 'n', 0 };
lstrcpyW(strout, UNDEF);
if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) { if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) {
sprintf(strout,"%.2fmm",(size*1.0)/100.0); wsprintfW(strout,mm_fmt,(size*1.0)/100.0);
return; return;
} }
if (pda->dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) { if (pda->dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) {
sprintf(strout,"%.2fin",(size*1.0)/1000.0); wsprintfW(strout,in_fmt,(size*1.0)/1000.0);
return; return;
} }
pda->dlga->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS; pda->dlga->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS;
sprintf(strout,"%.2fmm",(size*1.0)/100.0); wsprintfW(strout,mm_fmt,(size*1.0)/100.0);
return; return;
} }
static DWORD static DWORD
_c_str2size(PAGESETUPDLGA *dlga,LPCSTR strin) { _c_str2sizeA(PAGESETUPDLGA *dlga,LPCSTR strin) {
float val; float val;
char rest[200]; char rest[200];
@ -2437,6 +2441,17 @@ _c_str2size(PAGESETUPDLGA *dlga,LPCSTR strin) {
} }
static DWORD
_c_str2sizeW(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);
}
/* /*
* This is called on finish and will update the output fields of the * This is called on finish and will update the output fields of the
* struct. * struct.
@ -2462,7 +2477,7 @@ PRINTDLG_PS_UpdateDlgStructA(HWND hDlg, PageSetupDataA *pda) {
pda->dlga->ptPaperSize.y = _c_10mm2size(pda->dlga,pda->dlga->ptPaperSize.y); pda->dlga->ptPaperSize.y = _c_10mm2size(pda->dlga,pda->dlga->ptPaperSize.y);
} else } else
FIXME("could not get dialog text for papersize cmbbox?\n"); FIXME("could not get dialog text for papersize cmbbox?\n");
#define GETVAL(id,val) if (GetDlgItemTextA(hDlg,id,buf,sizeof(buf))>0) { val = _c_str2size(pda->dlga,buf); } else { FIXME("could not get dlgitemtexta for %x\n",id); } #define GETVAL(id,val) if (GetDlgItemTextA(hDlg,id,buf,sizeof(buf))>0) { val = _c_str2sizeA(pda->dlga,buf); } else { FIXME("could not get dlgitemtexta for %x\n",id); }
GETVAL(edt4,pda->dlga->rtMargin.left); GETVAL(edt4,pda->dlga->rtMargin.left);
GETVAL(edt5,pda->dlga->rtMargin.top); GETVAL(edt5,pda->dlga->rtMargin.top);
GETVAL(edt6,pda->dlga->rtMargin.right); GETVAL(edt6,pda->dlga->rtMargin.right);
@ -2487,8 +2502,7 @@ PRINTDLG_PS_UpdateDlgStructW(HWND hDlg, PageSetupDataW *pda) {
DEVMODEW *dm; DEVMODEW *dm;
LPWSTR devname,portname; LPWSTR devname,portname;
WCHAR papername[64]; WCHAR papername[64];
WCHAR buf[200];
char buf[200];
dn = GlobalLock(pda->pdlg.hDevNames); dn = GlobalLock(pda->pdlg.hDevNames);
dm = GlobalLock(pda->pdlg.hDevMode); dm = GlobalLock(pda->pdlg.hDevMode);
@ -2503,7 +2517,7 @@ PRINTDLG_PS_UpdateDlgStructW(HWND hDlg, PageSetupDataW *pda) {
pda->dlga->ptPaperSize.y = _c_10mm2size((LPPAGESETUPDLGA)pda->dlga,pda->dlga->ptPaperSize.y); pda->dlga->ptPaperSize.y = _c_10mm2size((LPPAGESETUPDLGA)pda->dlga,pda->dlga->ptPaperSize.y);
} else } else
FIXME("could not get dialog text for papersize cmbbox?\n"); FIXME("could not get dialog text for papersize cmbbox?\n");
#define GETVAL(id,val) if (GetDlgItemTextA(hDlg,id,buf,sizeof(buf))>0) { val = _c_str2size((LPPAGESETUPDLGA)pda->dlga,buf); } else { FIXME("could not get dlgitemtexta for %x\n",id); } #define GETVAL(id,val) if (GetDlgItemTextW(hDlg,id,buf,sizeof(buf)/sizeof(buf[0]))>0) { val = _c_str2sizeW(pda->dlga,buf); } else { FIXME("could not get dlgitemtextw for %x\n",id); }
GETVAL(edt4,pda->dlga->rtMargin.left); GETVAL(edt4,pda->dlga->rtMargin.left);
GETVAL(edt5,pda->dlga->rtMargin.top); GETVAL(edt5,pda->dlga->rtMargin.top);
GETVAL(edt6,pda->dlga->rtMargin.right); GETVAL(edt6,pda->dlga->rtMargin.right);
@ -2703,13 +2717,16 @@ PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
static INT_PTR CALLBACK static INT_PTR CALLBACK
PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
const static WCHAR __WINE_PAGESETUPDLGDATA[] =
{ '_', '_', 'W', 'I', 'N', 'E', '_', 'P', 'A', 'G', 'E',
'S', 'E', 'T', 'U', 'P', 'D', 'L', 'G', 'D', 'A', 'T', 'A', 0 };
PageSetupDataW *pda; PageSetupDataW *pda;
BOOL res = FALSE; BOOL res = FALSE;
if (uMsg==WM_INITDIALOG) { if (uMsg==WM_INITDIALOG) {
res = TRUE; res = TRUE;
pda = (PageSetupDataW*)lParam; pda = (PageSetupDataW*)lParam;
SetPropA(hDlg,"__WINE_PAGESETUPDLGDATA",pda); SetPropW(hDlg, __WINE_PAGESETUPDLGDATA, pda);
if (pda->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) { if (pda->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) {
res = pda->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,(LPARAM)pda->dlga); res = pda->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,(LPARAM)pda->dlga);
if (!res) { if (!res) {
@ -2739,24 +2756,24 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
} }
/* We fill them out enabled or not */ /* We fill them out enabled or not */
if (pda->dlga->Flags & PSD_MARGINS) { if (pda->dlga->Flags & PSD_MARGINS) {
char str[100]; WCHAR str[100];
_c_size2strW(pda,pda->dlga->rtMargin.left,str); _c_size2strW(pda,pda->dlga->rtMargin.left,str);
SetDlgItemTextA(hDlg,edt4,str); SetDlgItemTextW(hDlg,edt4,str);
_c_size2strW(pda,pda->dlga->rtMargin.top,str); _c_size2strW(pda,pda->dlga->rtMargin.top,str);
SetDlgItemTextA(hDlg,edt5,str); SetDlgItemTextW(hDlg,edt5,str);
_c_size2strW(pda,pda->dlga->rtMargin.right,str); _c_size2strW(pda,pda->dlga->rtMargin.right,str);
SetDlgItemTextA(hDlg,edt6,str); SetDlgItemTextW(hDlg,edt6,str);
_c_size2strW(pda,pda->dlga->rtMargin.bottom,str); _c_size2strW(pda,pda->dlga->rtMargin.bottom,str);
SetDlgItemTextA(hDlg,edt7,str); SetDlgItemTextW(hDlg,edt7,str);
} else { } else {
/* default is 1 inch */ /* default is 1 inch */
DWORD size = _c_inch2size((LPPAGESETUPDLGA)pda->dlga,1000); DWORD size = _c_inch2size((LPPAGESETUPDLGA)pda->dlga,1000);
char str[20]; WCHAR str[20];
_c_size2strW(pda,size,str); _c_size2strW(pda,size,str);
SetDlgItemTextA(hDlg,edt4,str); SetDlgItemTextW(hDlg,edt4,str);
SetDlgItemTextA(hDlg,edt5,str); SetDlgItemTextW(hDlg,edt5,str);
SetDlgItemTextA(hDlg,edt6,str); SetDlgItemTextW(hDlg,edt6,str);
SetDlgItemTextA(hDlg,edt7,str); SetDlgItemTextW(hDlg,edt7,str);
} }
PRINTDLG_PS_ChangePrinterW(hDlg,pda); PRINTDLG_PS_ChangePrinterW(hDlg,pda);
if (pda->dlga->Flags & PSD_DISABLEPAPER) { if (pda->dlga->Flags & PSD_DISABLEPAPER) {
@ -2765,7 +2782,7 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
} }
return TRUE; return TRUE;
} else { } else {
pda = (PageSetupDataW*)GetPropA(hDlg,"__WINE_PAGESETUPDLGDATA"); pda = (PageSetupDataW*)GetPropW(hDlg, __WINE_PAGESETUPDLGDATA);
if (!pda) { if (!pda) {
WARN("__WINE_PAGESETUPDLGDATA prop not set?\n"); WARN("__WINE_PAGESETUPDLGDATA prop not set?\n");
return FALSE; return FALSE;

2
reactos/lib/comdlg32/printdlg16.c
View file

@ -345,7 +345,7 @@ BOOL16 WINAPI PrintDlg16(
) { ) {
BOOL bRet = FALSE; BOOL bRet = FALSE;
LPVOID ptr; LPVOID ptr;
HINSTANCE16 hInst = GetWindowWord( HWND_32(lppd->hwndOwner), GWL_HINSTANCE ); HINSTANCE16 hInst = GetWindowLongPtrW( HWND_32(lppd->hwndOwner), GWLP_HINSTANCE );
if(TRACE_ON(commdlg)) { if(TRACE_ON(commdlg)) {
char flagstr[1000] = ""; char flagstr[1000] = "";

72
reactos/lib/comdlg32/winehq2ros.patch
View file

@ -1,11 +1,11 @@
Index: printdlg.c Index: printdlg.c
=================================================================== ===================================================================
RCS file: /home/wine/wine/dlls/commdlg/printdlg.c,v RCS file: /home/wine/wine/dlls/commdlg/printdlg.c,v
retrieving revision 1.78 retrieving revision 1.81
diff -u -r1.78 printdlg.c diff -u -r1.81 printdlg.c
--- printdlg.c 19 Jul 2004 19:35:28 -0000 1.78 --- printdlg.c 22 Sep 2004 19:36:47 -0000 1.81
+++ printdlg.c 14 Aug 2004 19:34:17 -0000 +++ printdlg.c 20 Oct 2004 08:58:30 -0000
@@ -341,7 +341,7 @@ @@ -339,7 +339,7 @@
lpdm->dmCollate = lpdm->dmCollate =
(IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED); (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED);
if (lpdm->dmFields & DM_COPIES) if (lpdm->dmFields & DM_COPIES)
@ -14,7 +14,7 @@ diff -u -r1.78 printdlg.c
} else { } else {
if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED) if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
lppd->Flags |= PD_COLLATE; lppd->Flags |= PD_COLLATE;
@@ -416,7 +416,7 @@ @@ -414,7 +414,7 @@
lpdm->dmCollate = lpdm->dmCollate =
(IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED); (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED);
if (lpdm->dmFields & DM_COPIES) if (lpdm->dmFields & DM_COPIES)
@ -23,7 +23,7 @@ diff -u -r1.78 printdlg.c
} else { } else {
if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED) if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
lppd->Flags |= PD_COLLATE; lppd->Flags |= PD_COLLATE;
@@ -581,9 +581,9 @@ @@ -579,9 +579,9 @@
Sel, 0); Sel, 0);
if (dm) { if (dm) {
if (nIDComboBox == cmb2) if (nIDComboBox == cmb2)
@ -35,7 +35,7 @@ diff -u -r1.78 printdlg.c
} }
} }
else { else {
@@ -593,9 +593,9 @@ @@ -591,9 +591,9 @@
*/ */
if (dm) { if (dm) {
if (nIDComboBox == cmb2) if (nIDComboBox == cmb2)
@ -47,7 +47,7 @@ diff -u -r1.78 printdlg.c
} }
} }
@@ -691,9 +691,9 @@ @@ -689,9 +689,9 @@
Sel, 0); Sel, 0);
if (dm) { if (dm) {
if (nIDComboBox == cmb2) if (nIDComboBox == cmb2)
@ -59,7 +59,7 @@ diff -u -r1.78 printdlg.c
} }
} }
else { else {
@@ -703,9 +703,9 @@ @@ -701,9 +701,9 @@
*/ */
if (dm) { if (dm) {
if (nIDComboBox == cmb2) if (nIDComboBox == cmb2)
@ -71,7 +71,7 @@ diff -u -r1.78 printdlg.c
} }
} }
@@ -968,7 +968,7 @@ @@ -966,7 +966,7 @@
if (lppd->hDevMode == 0) if (lppd->hDevMode == 0)
copies = lppd->nCopies; copies = lppd->nCopies;
else else
@ -80,7 +80,7 @@ diff -u -r1.78 printdlg.c
if(copies == 0) copies = 1; if(copies == 0) copies = 1;
else if(copies < 0) copies = MAX_COPIES; else if(copies < 0) copies = MAX_COPIES;
SetDlgItemInt(hDlg, edt3, copies, FALSE); SetDlgItemInt(hDlg, edt3, copies, FALSE);
@@ -990,7 +990,7 @@ @@ -988,7 +988,7 @@
ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE); ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE);
} else { /* PD_PRINTSETUP */ } else { /* PD_PRINTSETUP */
@ -89,7 +89,7 @@ diff -u -r1.78 printdlg.c
PRINTDLG_SetUpPaperComboBoxA(hDlg, cmb2, PRINTDLG_SetUpPaperComboBoxA(hDlg, cmb2,
PrintStructures->lpPrinterInfo->pPrinterName, PrintStructures->lpPrinterInfo->pPrinterName,
@@ -1131,7 +1131,7 @@ @@ -1128,7 +1128,7 @@
if (lppd->hDevMode == 0) if (lppd->hDevMode == 0)
copies = lppd->nCopies; copies = lppd->nCopies;
else else
@ -98,7 +98,7 @@ diff -u -r1.78 printdlg.c
if(copies == 0) copies = 1; if(copies == 0) copies = 1;
else if(copies < 0) copies = MAX_COPIES; else if(copies < 0) copies = MAX_COPIES;
SetDlgItemInt(hDlg, edt3, copies, FALSE); SetDlgItemInt(hDlg, edt3, copies, FALSE);
@@ -1153,7 +1153,7 @@ @@ -1150,7 +1150,7 @@
ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE); ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE);
} else { /* PD_PRINTSETUP */ } else { /* PD_PRINTSETUP */
@ -107,7 +107,7 @@ diff -u -r1.78 printdlg.c
PRINTDLG_SetUpPaperComboBoxW(hDlg, cmb2, PRINTDLG_SetUpPaperComboBoxW(hDlg, cmb2,
PrintStructures->lpPrinterInfo->pPrinterName, PrintStructures->lpPrinterInfo->pPrinterName,
@@ -1498,7 +1498,7 @@ @@ -1499,7 +1499,7 @@
case rad1: /* Paperorientation */ case rad1: /* Paperorientation */
if (lppd->Flags & PD_PRINTSETUP) if (lppd->Flags & PD_PRINTSETUP)
{ {
@ -116,7 +116,7 @@ diff -u -r1.78 printdlg.c
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)(PrintStructures->hPortraitIcon)); (LPARAM)(PrintStructures->hPortraitIcon));
} }
@@ -1507,7 +1507,7 @@ @@ -1508,7 +1508,7 @@
case rad2: /* Paperorientation */ case rad2: /* Paperorientation */
if (lppd->Flags & PD_PRINTSETUP) if (lppd->Flags & PD_PRINTSETUP)
{ {
@ -125,7 +125,7 @@ diff -u -r1.78 printdlg.c
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)(PrintStructures->hLandscapeIcon)); (LPARAM)(PrintStructures->hLandscapeIcon));
} }
@@ -1531,7 +1531,7 @@ @@ -1532,7 +1532,7 @@
{ {
DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0); DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0);
if(Sel != CB_ERR) if(Sel != CB_ERR)
@ -134,7 +134,7 @@ diff -u -r1.78 printdlg.c
CB_GETITEMDATA, CB_GETITEMDATA,
Sel, 0); Sel, 0);
} }
@@ -1541,7 +1541,7 @@ @@ -1542,7 +1542,7 @@
{ {
DWORD Sel = SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0); DWORD Sel = SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0);
if(Sel != CB_ERR) if(Sel != CB_ERR)
@ -143,7 +143,7 @@ diff -u -r1.78 printdlg.c
CB_GETITEMDATA, Sel, CB_GETITEMDATA, Sel,
0); 0);
} }
@@ -1552,8 +1552,8 @@ @@ -1553,8 +1553,8 @@
case rad1: /* orientation */ case rad1: /* orientation */
case rad2: case rad2:
if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) { if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) {
@ -154,7 +154,7 @@ diff -u -r1.78 printdlg.c
SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE, SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON, (WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hPortraitIcon); (LPARAM)PrintStructures->hPortraitIcon);
@@ -1562,8 +1562,8 @@ @@ -1563,8 +1563,8 @@
(LPARAM)PrintStructures->hPortraitIcon); (LPARAM)PrintStructures->hPortraitIcon);
} }
} else { } else {
@ -165,43 +165,43 @@ diff -u -r1.78 printdlg.c
SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE, SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON, (WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hLandscapeIcon); (LPARAM)PrintStructures->hLandscapeIcon);
@@ -1662,7 +1662,7 @@ @@ -1663,7 +1663,7 @@
case rad1: /* Paperorientation */ case rad1: /* Paperorientation */
if (lppd->Flags & PD_PRINTSETUP) if (lppd->Flags & PD_PRINTSETUP)
{ {
- lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT; - lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
+ lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT; + lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)(PrintStructures->hPortraitIcon)); (LPARAM)(PrintStructures->hPortraitIcon));
} }
@@ -1671,7 +1671,7 @@ @@ -1672,7 +1672,7 @@
case rad2: /* Paperorientation */ case rad2: /* Paperorientation */
if (lppd->Flags & PD_PRINTSETUP) if (lppd->Flags & PD_PRINTSETUP)
{ {
- lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE; - lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
+ lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE; + lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)(PrintStructures->hLandscapeIcon)); (LPARAM)(PrintStructures->hLandscapeIcon));
} }
@@ -1695,7 +1695,7 @@ @@ -1696,7 +1696,7 @@
{ {
DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0); DWORD Sel = SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0);
if(Sel != CB_ERR) if(Sel != CB_ERR)
- lpdm->u1.s1.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2, - lpdm->u1.s1.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2,
+ lpdm->u.s.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2, + lpdm->u.s.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2,
CB_GETITEMDATA, CB_GETITEMDATA,
Sel, 0); Sel, 0);
} }
@@ -1705,7 +1705,7 @@ @@ -1706,7 +1706,7 @@
{ {
DWORD Sel = SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0); DWORD Sel = SendDlgItemMessageW(hDlg, cmb3, CB_GETCURSEL, 0, 0);
if(Sel != CB_ERR) if(Sel != CB_ERR)
- lpdm->dmDefaultSource = SendDlgItemMessageW(hDlg, cmb3, - lpdm->dmDefaultSource = SendDlgItemMessageW(hDlg, cmb3,
+ lpdm->u.s.dmDefaultSource = SendDlgItemMessageW(hDlg, cmb3, + lpdm->u.s.dmDefaultSource = SendDlgItemMessageW(hDlg, cmb3,
CB_GETITEMDATA, Sel, CB_GETITEMDATA, Sel,
0); 0);
} }
@@ -1716,8 +1716,8 @@ @@ -1717,8 +1717,8 @@
case rad1: /* orientation */ case rad1: /* orientation */
case rad2: case rad2:
if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) { if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) {
@ -209,10 +209,10 @@ diff -u -r1.78 printdlg.c
- lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT; - lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
+ if(lpdm->u.s.dmOrientation != DMORIENT_PORTRAIT) { + if(lpdm->u.s.dmOrientation != DMORIENT_PORTRAIT) {
+ lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT; + lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE, SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON, (WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hPortraitIcon); (LPARAM)PrintStructures->hPortraitIcon);
@@ -1726,8 +1726,8 @@ @@ -1727,8 +1727,8 @@
(LPARAM)PrintStructures->hPortraitIcon); (LPARAM)PrintStructures->hPortraitIcon);
} }
} else { } else {
@ -220,10 +220,10 @@ diff -u -r1.78 printdlg.c
- lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE; - lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
+ if(lpdm->u.s.dmOrientation != DMORIENT_LANDSCAPE) { + if(lpdm->u.s.dmOrientation != DMORIENT_LANDSCAPE) {
+ lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE; + lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE, SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON, (WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hLandscapeIcon); (LPARAM)PrintStructures->hLandscapeIcon);
@@ -2919,7 +2919,7 @@ @@ -2936,7 +2936,7 @@
/*********************************************************************** /***********************************************************************
* PrintDlgExA (COMDLG32.@) * PrintDlgExA (COMDLG32.@)
*/ */
@ -232,7 +232,7 @@ diff -u -r1.78 printdlg.c
{ {
FIXME("stub\n"); FIXME("stub\n");
return E_NOTIMPL; return E_NOTIMPL;
@@ -2927,7 +2927,7 @@ @@ -2944,7 +2944,7 @@
/*********************************************************************** /***********************************************************************
* PrintDlgExW (COMDLG32.@) * PrintDlgExW (COMDLG32.@)
*/ */