22 Jan
2012
22 Jan
'12
3:06 a.m.
Author: jimtabor
Date: Sun Jan 22 03:05:59 2012
New Revision: 55060
URL: http://svn.reactos.org/svn/reactos?rev=55060&view=rev
Log:
- Remove 16 bit code.
Removed:
trunk/reactos/dll/win32/comdlg32/cdlg16.h
trunk/reactos/dll/win32/comdlg32/colordlg16.c
trunk/reactos/dll/win32/comdlg32/commdlg.spec
trunk/reactos/dll/win32/comdlg32/filedlg16.c
trunk/reactos/dll/win32/comdlg32/printdlg.h
Removed: trunk/reactos/dll/win32/comdlg32/cdlg16.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg16.…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/cdlg16.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comdlg32/cdlg16.h (removed)
@@ -1,162 +1,0 @@
-/*
- * Common Dialog Boxes interface (16 bit implementation)
- *
- * Copyright 1994 Martin Ayotte
- * Copyright 1996 Albrecht Kleine
- * Copyright 1998 Bertho A. Stultiens
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _WINE_DLL_CDLG16_H
-#define _WINE_DLL_CDLG16_H
-
-#include "dlgs.h"
-#include "wine/windef16.h"
-#include "wine/winbase16.h"
-#include "wine/winuser16.h"
-#include "wownt32.h"
-
-/* 16 bit api */
-
-#include "pshpack1.h"
-
-typedef UINT16 (CALLBACK *LPOFNHOOKPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
-
-typedef struct {
- DWORD lStructSize;
- HWND16 hwndOwner;
- HINSTANCE16 hInstance;
- SEGPTR lpstrFilter;
- SEGPTR lpstrCustomFilter;
- DWORD nMaxCustFilter;
- DWORD nFilterIndex;
- SEGPTR lpstrFile;
- DWORD nMaxFile;
- SEGPTR lpstrFileTitle;
- DWORD nMaxFileTitle;
- SEGPTR lpstrInitialDir;
- SEGPTR lpstrTitle;
- DWORD Flags;
- UINT16 nFileOffset;
- UINT16 nFileExtension;
- SEGPTR lpstrDefExt;
- LPARAM lCustData;
- LPOFNHOOKPROC16 lpfnHook;
- SEGPTR lpTemplateName;
-} OPENFILENAME16,*LPOPENFILENAME16;
-
-typedef UINT16 (CALLBACK *LPCCHOOKPROC16) (HWND16, UINT16, WPARAM16, LPARAM);
-
-typedef struct {
- DWORD lStructSize;
- HWND16 hwndOwner;
- HWND16 hInstance;
- COLORREF rgbResult;
- SEGPTR lpCustColors;
- DWORD Flags;
- LPARAM lCustData;
- LPCCHOOKPROC16 lpfnHook;
- SEGPTR lpTemplateName;
-} CHOOSECOLOR16;
-typedef CHOOSECOLOR16 *LPCHOOSECOLOR16;
-
-typedef UINT16 (CALLBACK *LPFRHOOKPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
-typedef struct {
- DWORD lStructSize; /* size of this struct 0x20 */
- HWND16 hwndOwner; /* handle to owner's window */
- HINSTANCE16 hInstance; /* instance handle of.EXE that */
- /* contains cust. dlg. template */
- DWORD Flags; /* one or more of the FR_?? */
- SEGPTR lpstrFindWhat; /* ptr. to search string */
- SEGPTR lpstrReplaceWith; /* ptr. to replace string */
- UINT16 wFindWhatLen; /* size of find buffer */
- UINT16 wReplaceWithLen; /* size of replace buffer */
- LPARAM lCustData; /* data passed to hook fn. */
- LPFRHOOKPROC16 lpfnHook;
- SEGPTR lpTemplateName; /* custom template name */
-} FINDREPLACE16, *LPFINDREPLACE16;
-
-typedef UINT16 (CALLBACK *LPCFHOOKPROC16)(HWND16,UINT16,WPARAM16,LPARAM);
-typedef struct
-{
- DWORD lStructSize;
- HWND16 hwndOwner; /* caller's window handle */
- HDC16 hDC; /* printer DC/IC or NULL */
- SEGPTR lpLogFont; /* ptr. to a LOGFONT struct */
- short iPointSize; /* 10 * size in points of selected font */
- DWORD Flags; /* enum. type flags */
- COLORREF rgbColors; /* returned text color */
- LPARAM lCustData; /* data passed to hook fn. */
- LPCFHOOKPROC16 lpfnHook;
- SEGPTR lpTemplateName; /* custom template name */
- HINSTANCE16 hInstance; /* instance handle of.EXE that */
- /* contains cust. dlg. template */
- SEGPTR lpszStyle; /* return the style field here */
- /* must be LF_FACESIZE or bigger */
- UINT16 nFontType; /* same value reported to the */
- /* EnumFonts callback with the */
- /* extra FONTTYPE_ bits added */
- short nSizeMin; /* minimum pt size allowed & */
- short nSizeMax; /* max pt size allowed if */
- /* CF_LIMITSIZE is used */
-} CHOOSEFONT16, *LPCHOOSEFONT16;
-
-
-typedef UINT16 (CALLBACK *LPPRINTHOOKPROC16) (HWND16, UINT16, WPARAM16, LPARAM);
-typedef UINT16 (CALLBACK *LPSETUPHOOKPROC16) (HWND16, UINT16, WPARAM16, LPARAM);
-typedef struct
-{
- DWORD lStructSize;
- HWND16 hwndOwner;
- HGLOBAL16 hDevMode;
- HGLOBAL16 hDevNames;
- HDC16 hDC;
- DWORD Flags;
- WORD nFromPage;
- WORD nToPage;
- WORD nMinPage;
- WORD nMaxPage;
- WORD nCopies;
- HINSTANCE16 hInstance;
- LPARAM lCustData;
- LPPRINTHOOKPROC16 lpfnPrintHook;
- LPSETUPHOOKPROC16 lpfnSetupHook;
- SEGPTR lpPrintTemplateName;
- SEGPTR lpSetupTemplateName;
- HGLOBAL16 hPrintTemplate;
- HGLOBAL16 hSetupTemplate;
-} PRINTDLG16, *LPPRINTDLG16;
-
-BOOL16 WINAPI ChooseColor16(LPCHOOSECOLOR16 lpChCol);
-HWND16 WINAPI FindText16( SEGPTR find);
-BOOL16 WINAPI GetOpenFileName16(SEGPTR ofn);
-BOOL16 WINAPI GetSaveFileName16(SEGPTR ofn);
-BOOL16 WINAPI PrintDlg16( LPPRINTDLG16 print);
-HWND16 WINAPI ReplaceText16( SEGPTR find);
-BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16);
-BOOL16 CALLBACK ColorDlgProc16( HWND16 hDlg16, UINT16 message, WPARAM16 wParam, LONG
lParam );
-BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM
lParam);
-BOOL16 CALLBACK FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM
lParam);
-INT16 WINAPI FontFamilyEnumProc16( SEGPTR logfont, SEGPTR metrics, UINT16 nFontType,
LPARAM lParam );
-INT16 WINAPI FontStyleEnumProc16( SEGPTR logfont, SEGPTR metrics, UINT16 nFontType,
LPARAM lParam);
-BOOL16 CALLBACK FormatCharDlgProc16(HWND16 hDlg16, UINT16 message, WPARAM16 wParam,
LPARAM lParam);
-short WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf);
-BOOL16 CALLBACK PrintDlgProc16(HWND16 hDlg16, UINT16 uMsg, WPARAM16 wParam, LPARAM
lParam);
-BOOL16 CALLBACK PrintSetupDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM
lParam);
-
-#include "poppack.h"
-
-#endif /* _WINE_DLL_CDLG16_H */
Removed: trunk/reactos/dll/win32/comdlg32/colordlg16.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/colordl…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/colordlg16.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comdlg32/colordlg16.c (removed)
@@ -1,476 +1,0 @@
-/*
- * COMMDLG - Color Dialog
- *
- * Copyright 1994 Martin Ayotte
- * Copyright 1996 Albrecht Kleine
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/* BUGS : still seems to not refresh correctly
- sometimes, especially when 2 instances of the
- dialog are loaded at the same time */
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "wine/winbase16.h"
-#include "wine/winuser16.h"
-#include "winuser.h"
-#include "commdlg.h"
-#include "dlgs.h"
-#include "wine/debug.h"
-#include "cderr.h"
-#include "cdlg.h"
-#include "cdlg16.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
-
-/* Chose Color PRIVATE Structure:
- *
- * This is a duplicate of the 32bit code with
- * an extra member
- */
-typedef struct CCPRIVATE
-{
- LPCHOOSECOLORW lpcc; /* points to public known data structure */
- LPCHOOSECOLOR16 lpcc16; /* save the 16 bits pointer */
- int nextuserdef; /* next free place in user defined color array */
- HDC hdcMem; /* color graph used for BitBlt() */
- HBITMAP hbmMem; /* color graph bitmap */
- RECT fullsize; /* original dialog window size */
- UINT msetrgb; /* # of SETRGBSTRING message (today not used) */
- RECT old3angle; /* last position of l-marker */
- RECT oldcross; /* last position of color/saturation marker */
- BOOL updating; /* to prevent recursive WM_COMMAND/EN_UPDATE processing */
- int h;
- int s;
- int l; /* for temporary storing of hue,sat,lum */
- int capturedGraph; /* control mouse captured */
- RECT focusRect; /* rectangle last focused item */
- HWND hwndFocus; /* handle last focused item */
-} *LCCPRIV;
-
-/***********************************************************************
- * CC_WMInitDialog16 [internal]
- */
-static LONG CC_WMInitDialog16( HWND hDlg, WPARAM wParam, LPARAM lParam )
-{
- int i, res;
- int r, g, b;
- HWND hwnd;
- RECT rect;
- POINT point;
- LCCPRIV lpp;
- CHOOSECOLORW *ch32;
- CHOOSECOLOR16 *ch16 = (CHOOSECOLOR16 *) lParam;
-
- TRACE("WM_INITDIALOG lParam=%08lX\n", lParam);
- lpp = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct CCPRIVATE) );
-
- if (ch16->lStructSize != sizeof(CHOOSECOLOR16) )
- {
- HeapFree(GetProcessHeap(), 0, lpp);
- EndDialog (hDlg, 0) ;
- return FALSE;
- }
- ch32 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CHOOSECOLORW) );
- lpp->lpcc = ch32;
- lpp->lpcc16 = ch16;
- ch32->lStructSize = sizeof(CHOOSECOLORW);
- ch32->hwndOwner = HWND_32(ch16->hwndOwner);
- /* Should be an HINSTANCE but MS made a typo */
- ch32->hInstance = HWND_32(ch16->hInstance);
- ch32->lpCustColors = MapSL(ch16->lpCustColors);
- ch32->lpfnHook = (LPCCHOOKPROC) ch16->lpfnHook; /* only used as flag */
- ch32->Flags = ch16->Flags;
-
- SetWindowLongPtrW(hDlg, DWLP_USER, (LONG_PTR)lpp);
-
- if (!(lpp->lpcc->Flags & CC_SHOWHELP))
- ShowWindow( GetDlgItem(hDlg,0x40e), SW_HIDE);
- lpp->msetrgb = RegisterWindowMessageA(SETRGBSTRINGA);
-
-#if 0
- cpos = MAKELONG(5,7); /* init */
- if (lpp->lpcc->Flags & CC_RGBINIT)
- {
- for (i = 0; i < 6; i++)
- for (j = 0; j < 8; j++)
- if (predefcolors[i][j] == lpp->lpcc->rgbResult)
- {
- cpos = MAKELONG(i,j);
- goto found;
- }
- }
- found:
- /* FIXME: Draw_a_focus_rect & set_init_values */
-#endif
-
- GetWindowRect(hDlg, &lpp->fullsize);
- if (lpp->lpcc->Flags & CC_FULLOPEN || lpp->lpcc->Flags &
CC_PREVENTFULLOPEN)
- {
- hwnd = GetDlgItem(hDlg, 0x2cf);
- EnableWindow(hwnd, FALSE);
- }
- if (!(lpp->lpcc->Flags & CC_FULLOPEN ) || lpp->lpcc->Flags &
CC_PREVENTFULLOPEN)
- {
- rect = lpp->fullsize;
- res = rect.bottom - rect.top;
- hwnd = GetDlgItem(hDlg, 0x2c6); /* cut at left border */
- point.x = point.y = 0;
- ClientToScreen(hwnd, &point);
- ScreenToClient(hDlg,&point);
- GetClientRect(hDlg, &rect);
- point.x += GetSystemMetrics(SM_CXDLGFRAME);
- SetWindowPos(hDlg, 0, 0, 0, point.x, res, SWP_NOMOVE|SWP_NOZORDER);
-
- for (i = 0x2bf; i < 0x2c5; i++)
- ShowWindow( GetDlgItem(hDlg, i), SW_HIDE);
- for (i = 0x2d3; i < 0x2d9; i++)
- ShowWindow( GetDlgItem(hDlg, i), SW_HIDE);
- ShowWindow( GetDlgItem(hDlg, 0x2c9), SW_HIDE);
- ShowWindow( GetDlgItem(hDlg, 0x2c8), SW_HIDE);
- ShowWindow( GetDlgItem(hDlg, 0x2c6), SW_HIDE);
- ShowWindow( GetDlgItem(hDlg, 0x2c5), SW_HIDE);
- ShowWindow( GetDlgItem(hDlg, 1090 ), SW_HIDE);
- }
- else
- CC_SwitchToFullSize(hDlg, lpp->lpcc->rgbResult, NULL);
- res = TRUE;
- for (i = 0x2bf; i < 0x2c5; i++)
- SendMessageA( GetDlgItem(hDlg, i), EM_LIMITTEXT, 3, 0); /* max 3 digits: xyz */
- if (CC_HookCallChk(lpp->lpcc))
- {
- res = CallWindowProc16( (WNDPROC16)lpp->lpcc16->lpfnHook,
- HWND_16(hDlg), WM_INITDIALOG, wParam, lParam);
- }
-
- /* Set the initial values of the color chooser dialog */
- r = GetRValue(lpp->lpcc->rgbResult);
- g = GetGValue(lpp->lpcc->rgbResult);
- b = GetBValue(lpp->lpcc->rgbResult);
-
- CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult);
- lpp->h = CC_RGBtoHSL('H', r, g, b);
- lpp->s = CC_RGBtoHSL('S', r, g, b);
- lpp->l = CC_RGBtoHSL('L', r, g, b);
-
- /* Doing it the long way because CC_EditSetRGB/HSL doesn't seem to work */
- SetDlgItemInt(hDlg, 703, lpp->h, TRUE);
- SetDlgItemInt(hDlg, 704, lpp->s, TRUE);
- SetDlgItemInt(hDlg, 705, lpp->l, TRUE);
- SetDlgItemInt(hDlg, 706, r, TRUE);
- SetDlgItemInt(hDlg, 707, g, TRUE);
- SetDlgItemInt(hDlg, 708, b, TRUE);
-
- CC_PaintCross(hDlg, lpp->h, lpp->s);
- CC_PaintTriangle(hDlg, lpp->l);
-
- return res;
-}
-
-/***********************************************************************
- * CC_WMCommand16 [internal]
- */
-static LRESULT CC_WMCommand16( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode,
HWND hwndCtl )
-{
- int r, g, b, i, xx;
- UINT cokmsg;
- HDC hdc;
- COLORREF *cr;
- LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER);
- TRACE("CC_WMCommand wParam=%lx lParam=%lx\n", wParam, lParam);
- switch (wParam)
- {
- case 0x2c2: /* edit notify RGB */
- case 0x2c3:
- case 0x2c4:
- if (notifyCode == EN_UPDATE && !lpp->updating)
- {
- i = CC_CheckDigitsInEdit(hwndCtl, 255);
- r = GetRValue(lpp->lpcc->rgbResult);
- g = GetGValue(lpp->lpcc->rgbResult);
- b= GetBValue(lpp->lpcc->rgbResult);
- xx = 0;
- switch (wParam)
- {
- case 0x2c2: if ((xx = (i != r))) r = i; break;
- case 0x2c3: if ((xx = (i != g))) g = i; break;
- case 0x2c4: if ((xx = (i != b))) b = i; break;
- }
- if (xx) /* something has changed */
- {
- lpp->lpcc->rgbResult = RGB(r, g, b);
- CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult);
- lpp->h = CC_RGBtoHSL('H', r, g, b);
- lpp->s = CC_RGBtoHSL('S', r, g, b);
- lpp->l = CC_RGBtoHSL('L', r, g, b);
- CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l);
- CC_PaintCross(hDlg, lpp->h, lpp->s);
- CC_PaintTriangle(hDlg, lpp->l);
- }
- }
- break;
-
- case 0x2bf: /* edit notify HSL */
- case 0x2c0:
- case 0x2c1:
- if (notifyCode == EN_UPDATE && !lpp->updating)
- {
- i = CC_CheckDigitsInEdit(hwndCtl , wParam == 0x2bf ? 239:240);
- xx = 0;
- switch (wParam)
- {
- case 0x2bf: if ((xx = ( i != lpp->h))) lpp->h = i; break;
- case 0x2c0: if ((xx = ( i != lpp->s))) lpp->s = i; break;
- case 0x2c1: if ((xx = ( i != lpp->l))) lpp->l = i; break;
- }
- if (xx) /* something has changed */
- {
- r = CC_HSLtoRGB('R', lpp->h, lpp->s, lpp->l);
- g = CC_HSLtoRGB('G', lpp->h, lpp->s, lpp->l);
- b = CC_HSLtoRGB('B', lpp->h, lpp->s, lpp->l);
- lpp->lpcc->rgbResult = RGB(r, g, b);
- CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult);
- CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult);
- CC_PaintCross(hDlg, lpp->h, lpp->s);
- CC_PaintTriangle(hDlg, lpp->l);
- }
- }
- break;
-
- case 0x2cf:
- CC_SwitchToFullSize(hDlg, lpp->lpcc->rgbResult,
&lpp->fullsize);
- SetFocus( GetDlgItem(hDlg, 0x2bf));
- break;
-
- case 0x2c8: /* add colors ... column by column */
- cr = lpp->lpcc->lpCustColors;
- cr[(lpp->nextuserdef % 2) * 8 + lpp->nextuserdef / 2] =
lpp->lpcc->rgbResult;
- if (++lpp->nextuserdef == 16)
- lpp->nextuserdef = 0;
- CC_PaintUserColorArray(hDlg, 2, 8, lpp->lpcc->lpCustColors);
- break;
-
- case 0x2c9: /* resulting color */
- hdc = GetDC(hDlg);
- lpp->lpcc->rgbResult = GetNearestColor(hdc, lpp->lpcc->rgbResult);
- ReleaseDC(hDlg, hdc);
- CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult);
- CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult);
- r = GetRValue(lpp->lpcc->rgbResult);
- g = GetGValue(lpp->lpcc->rgbResult);
- b = GetBValue(lpp->lpcc->rgbResult);
- lpp->h = CC_RGBtoHSL('H', r, g, b);
- lpp->s = CC_RGBtoHSL('S', r, g, b);
- lpp->l = CC_RGBtoHSL('L', r, g, b);
- CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l);
- CC_PaintCross(hDlg, lpp->h, lpp->s);
- CC_PaintTriangle(hDlg, lpp->l);
- break;
-
- case 0x40e: /* Help! */ /* The Beatles, 1965 ;-) */
- i = RegisterWindowMessageA(HELPMSGSTRINGA);
- if (lpp->lpcc16)
- {
- if (lpp->lpcc->hwndOwner)
- SendMessageA(lpp->lpcc->hwndOwner, i, 0, (LPARAM)lpp->lpcc16);
- if ( CC_HookCallChk(lpp->lpcc))
- CallWindowProc16( (WNDPROC16) lpp->lpcc16->lpfnHook,
- HWND_16(hDlg), WM_COMMAND, psh15,
- (LPARAM)lpp->lpcc16);
- }
- break;
-
- case IDOK :
- cokmsg = RegisterWindowMessageA(COLOROKSTRINGA);
- if (lpp->lpcc16)
- {
- if (lpp->lpcc->hwndOwner)
- if (SendMessageA(lpp->lpcc->hwndOwner, cokmsg, 0, (LPARAM)lpp->lpcc16))
- break; /* do NOT close */
- }
- if (lpp->lpcc16)
- {
- BYTE *ptr = MapSL(lpp->lpcc16->lpCustColors);
- memcpy(ptr, lpp->lpcc->lpCustColors, sizeof(COLORREF)*16);
- lpp->lpcc16->rgbResult = lpp->lpcc->rgbResult;
- }
- EndDialog(hDlg, 1) ;
- return TRUE ;
-
- case IDCANCEL :
- EndDialog(hDlg, 0) ;
- return TRUE ;
-
- }
- return FALSE;
-}
-
-/***********************************************************************
- * ColorDlgProc (COMMDLG.8)
- */
-BOOL16 CALLBACK ColorDlgProc16( HWND16 hDlg16, UINT16 message,
- WPARAM16 wParam, LONG lParam )
-{
- BOOL16 res;
- HWND hDlg = HWND_32(hDlg16);
-
- LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER);
- if (message != WM_INITDIALOG)
- {
- if (!lpp)
- return FALSE;
- res=0;
- if (CC_HookCallChk(lpp->lpcc))
- res = CallWindowProc16( (WNDPROC16)lpp->lpcc16->lpfnHook, hDlg16,
message, wParam, lParam);
- if (res)
- return res;
- }
-
- /* FIXME: SetRGB message
- if (message && message == msetrgb)
- return HandleSetRGB(hDlg, lParam);
- */
-
- switch (message)
- {
- case WM_INITDIALOG:
- return CC_WMInitDialog16(hDlg, wParam, lParam);
- case WM_NCDESTROY:
- DeleteDC(lpp->hdcMem);
- DeleteObject(lpp->hbmMem);
- HeapFree(GetProcessHeap(), 0, lpp->lpcc);
- HeapFree(GetProcessHeap(), 0, lpp);
- SetWindowLongPtrW(hDlg, DWLP_USER, 0); /* we don't need it anymore
*/
- break;
- case WM_COMMAND:
- if (CC_WMCommand16(hDlg, wParam, lParam,
- HIWORD(lParam), HWND_32(LOWORD(lParam))))
- return TRUE;
- break;
- case WM_PAINT:
- if (CC_WMPaint(hDlg, wParam, lParam))
- return TRUE;
- break;
- case WM_LBUTTONDBLCLK:
- if (CC_MouseCheckResultWindow(hDlg,lParam))
- return TRUE;
- break;
- case WM_MOUSEMOVE:
- if (CC_WMMouseMove(hDlg, lParam))
- return TRUE;
- break;
- case WM_LBUTTONUP: /* FIXME: ClipCursor off (if in color graph)*/
- if (CC_WMLButtonUp(hDlg, wParam, lParam))
- return TRUE;
- break;
- case WM_LBUTTONDOWN:/* FIXME: ClipCursor on (if in color graph)*/
- if (CC_WMLButtonDown(hDlg, wParam, lParam))
- return TRUE;
- break;
- }
- return FALSE ;
-}
-
-/***********************************************************************
- * ChooseColor (COMMDLG.5)
- */
-BOOL16 WINAPI ChooseColor16( LPCHOOSECOLOR16 lpChCol )
-{
- HINSTANCE16 hInst;
- HANDLE16 hDlgTmpl16 = 0, hResource16 = 0;
- HGLOBAL16 hGlobal16 = 0;
- BOOL16 bRet = FALSE;
- LPVOID template;
- FARPROC16 ptr;
-
- TRACE("ChooseColor\n");
- if (!lpChCol) return FALSE;
-
- if (lpChCol->Flags & CC_ENABLETEMPLATEHANDLE)
- hDlgTmpl16 = lpChCol->hInstance;
- else if (lpChCol->Flags & CC_ENABLETEMPLATE)
- {
- HANDLE16 hResInfo;
- if (!(hResInfo = FindResource16(lpChCol->hInstance,
- MapSL(lpChCol->lpTemplateName),
- (LPSTR)RT_DIALOG)))
- {
- COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
- return FALSE;
- }
- if (!(hDlgTmpl16 = LoadResource16(lpChCol->hInstance, hResInfo)))
- {
- COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
- return FALSE;
- }
- hResource16 = hDlgTmpl16;
- }
- else
- {
- HRSRC hResInfo;
- HGLOBAL hDlgTmpl32;
- LPCVOID template32;
- DWORD size;
- if (!(hResInfo = FindResourceA(COMDLG32_hInstance, "CHOOSE_COLOR",
(LPSTR)RT_DIALOG)))
- {
- COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
- return FALSE;
- }
- if (!(hDlgTmpl32 = LoadResource(COMDLG32_hInstance, hResInfo)) ||
- !(template32 = LockResource(hDlgTmpl32)))
- {
- COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
- return FALSE;
- }
- size = SizeofResource(COMDLG32_hInstance, hResInfo);
- hGlobal16 = GlobalAlloc16(0, size);
- if (!hGlobal16)
- {
- COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE);
- ERR("alloc failure for %d bytes\n", size);
- return FALSE;
- }
- template = GlobalLock16(hGlobal16);
- if (!template)
- {
- COMDLG32_SetCommDlgExtendedError(CDERR_MEMLOCKFAILURE);
- ERR("global lock failure for %x handle\n", hDlgTmpl16);
- GlobalFree16(hGlobal16);
- return FALSE;
- }
- ConvertDialog32To16(template32, size, template);
- hDlgTmpl16 = hGlobal16;
- }
-
- ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 8);
- hInst = GetWindowLongPtrA(HWND_32(lpChCol->hwndOwner), GWLP_HINSTANCE);
- bRet = DialogBoxIndirectParam16(hInst, hDlgTmpl16, lpChCol->hwndOwner,
- (DLGPROC16) ptr, (DWORD)lpChCol);
- if (hResource16) FreeResource16(hDlgTmpl16);
- if (hGlobal16)
- {
- GlobalUnlock16(hGlobal16);
- GlobalFree16(hGlobal16);
- }
- return bRet;
-}
Removed: trunk/reactos/dll/win32/comdlg32/commdlg.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/commdlg…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/commdlg.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comdlg32/commdlg.spec (removed)
@@ -1,26 +1,0 @@
-1 pascal -ret16 GetOpenFileName(segptr) GetOpenFileName16
-2 pascal -ret16 GetSaveFileName(segptr) GetSaveFileName16
-5 pascal -ret16 ChooseColor(ptr) ChooseColor16
-6 pascal FileOpenDlgProc(word word word long) FileOpenDlgProc16
-7 pascal FileSaveDlgProc(word word word long) FileSaveDlgProc16
-8 pascal ColorDlgProc(word word word long) ColorDlgProc16
-#9 pascal LOADALTERBITMAP exported, shared data
-11 pascal -ret16 FindText(segptr) FindText16
-12 pascal -ret16 ReplaceText(segptr) ReplaceText16
-13 pascal FindTextDlgProc(word word word long) FindTextDlgProc16
-14 pascal ReplaceTextDlgProc(word word word long) ReplaceTextDlgProc16
-15 pascal -ret16 ChooseFont(ptr) ChooseFont16
-16 pascal -ret16 FormatCharDlgProc(word word word long) FormatCharDlgProc16
-18 pascal -ret16 FontStyleEnumProc(ptr ptr word long) FontStyleEnumProc16
-19 pascal -ret16 FontFamilyEnumProc(ptr ptr word long) FontFamilyEnumProc16
-20 pascal -ret16 PrintDlg(ptr) PrintDlg16
-21 pascal PrintDlgProc(word word word long) PrintDlgProc16
-22 pascal PrintSetupDlgProc(word word word long) PrintSetupDlgProc16
-#23 pascal EDITINTEGERONLY exported, shared data
-#25 pascal WANTARROWS exported, shared data
-26 pascal CommDlgExtendedError() CommDlgExtendedError
-27 pascal -ret16 GetFileTitle(str ptr word) GetFileTitle16
-#28 pascal WEP exported, shared data
-#29 pascal DWLBSUBCLASS exported, shared data
-#30 pascal DWUPARROWHACK exported, shared data
-#31 pascal DWOKSUBCLASS exported, shared data
Removed: trunk/reactos/dll/win32/comdlg32/filedlg16.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/filedlg16.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comdlg32/filedlg16.c (removed)
@@ -1,524 +1,0 @@
-/*
- * COMMDLG - File Dialogs
- *
- * Copyright 1994 Martin Ayotte
- * Copyright 1996 Albrecht Kleine
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-#include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wine/winbase16.h"
-#include "winuser.h"
-#include "wine/winuser16.h"
-#include "wine/debug.h"
-#include "cderr.h"
-#include "commdlg.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
-
-#include "cdlg.h"
-#include "cdlg16.h"
-#include "filedlg31.h"
-
-typedef struct tagFD16_PRIVATE
-{
- HANDLE16 hDlgTmpl16; /* handle for resource 16 */
- HANDLE16 hResource16; /* handle for allocated resource 16 */
- HANDLE16 hGlobal16; /* 16 bits mem block (resources) */
- OPENFILENAME16 *ofn16; /* original structure if 16 bits dialog */
-} FD16_PRIVATE, *PFD16_PRIVATE;
-
-/************************************************************************
- * FD16_MapOfnStruct16 [internal]
- * map a 16 bits structure to a Unicode one
- */
-static void FD16_MapOfnStruct16(const OPENFILENAME16 *ofn16, LPOPENFILENAMEW ofnW, BOOL
open)
-{
- OPENFILENAMEA ofnA;
- /* first convert to linear pointers */
- memset(&ofnA, 0, sizeof(OPENFILENAMEA));
- ofnA.lStructSize = sizeof(OPENFILENAMEA);
- ofnA.hwndOwner = HWND_32(ofn16->hwndOwner);
- ofnA.hInstance = HINSTANCE_32(ofn16->hInstance);
- if (ofn16->lpstrFilter)
- ofnA.lpstrFilter = MapSL(ofn16->lpstrFilter);
- if (ofn16->lpstrCustomFilter)
- ofnA.lpstrCustomFilter = MapSL(ofn16->lpstrCustomFilter);
- ofnA.nMaxCustFilter = ofn16->nMaxCustFilter;
- ofnA.nFilterIndex = ofn16->nFilterIndex;
- ofnA.lpstrFile = MapSL(ofn16->lpstrFile);
- ofnA.nMaxFile = ofn16->nMaxFile;
- ofnA.lpstrFileTitle = MapSL(ofn16->lpstrFileTitle);
- ofnA.nMaxFileTitle = ofn16->nMaxFileTitle;
- ofnA.lpstrInitialDir = MapSL(ofn16->lpstrInitialDir);
- ofnA.lpstrTitle = MapSL(ofn16->lpstrTitle);
- ofnA.Flags = ofn16->Flags;
- ofnA.nFileOffset = ofn16->nFileOffset;
- ofnA.nFileExtension = ofn16->nFileExtension;
- ofnA.lpstrDefExt = MapSL(ofn16->lpstrDefExt);
- if (HIWORD(ofn16->lpTemplateName))
- ofnA.lpTemplateName = MapSL(ofn16->lpTemplateName);
- else
- ofnA.lpTemplateName = (LPSTR) ofn16->lpTemplateName; /* resource number */
- /* now calls the 32 bits Ansi to Unicode version to complete the job */
- FD31_MapOfnStructA(&ofnA, ofnW, open);
-}
-
-/***********************************************************************
- * FD16_GetTemplate [internal]
- *
- * Get a template (FALSE if failure) when 16 bits dialogs are used
- * by a 16 bits application
- *
- */
-static BOOL FD16_GetTemplate(const FD31_DATA *lfs)
-{
- PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632;
- LPOPENFILENAME16 ofn16 = priv->ofn16;
- LPVOID template;
- HGLOBAL16 hGlobal16 = 0;
-
- if (ofn16->Flags & OFN_ENABLETEMPLATEHANDLE)
- priv->hDlgTmpl16 = ofn16->hInstance;
- else if (ofn16->Flags & OFN_ENABLETEMPLATE)
- {
- HANDLE16 hResInfo;
- if (!(hResInfo = FindResource16(ofn16->hInstance,
- MapSL(ofn16->lpTemplateName),
- (LPSTR)RT_DIALOG)))
- {
- COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
- return FALSE;
- }
- if (!(priv->hDlgTmpl16 = LoadResource16( ofn16->hInstance, hResInfo )))
- {
- COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
- return FALSE;
- }
- priv->hResource16 = priv->hDlgTmpl16;
- }
- else
- { /* get resource from (32 bits) own Wine resource; convert it to 16 */
- HRSRC hResInfo;
- HGLOBAL hDlgTmpl32;
- LPCVOID template32;
- DWORD size;
-
- if (!(hResInfo = FindResourceA(COMDLG32_hInstance,
- lfs->open ? "OPEN_FILE":"SAVE_FILE",
(LPSTR)RT_DIALOG)))
- {
- COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
- return FALSE;
- }
- if (!(hDlgTmpl32 = LoadResource(COMDLG32_hInstance, hResInfo )) ||
- !(template32 = LockResource( hDlgTmpl32 )))
- {
- COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
- return FALSE;
- }
- size = SizeofResource(COMDLG32_hInstance, hResInfo);
- hGlobal16 = GlobalAlloc16(0, size);
- if (!hGlobal16)
- {
- COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE);
- ERR("alloc failure for %d bytes\n", size);
- return FALSE;
- }
- template = GlobalLock16(hGlobal16);
- if (!template)
- {
- COMDLG32_SetCommDlgExtendedError(CDERR_MEMLOCKFAILURE);
- ERR("global lock failure for %x handle\n", hGlobal16);
- GlobalFree16(hGlobal16);
- return FALSE;
- }
- ConvertDialog32To16(template32, size, template);
- priv->hDlgTmpl16 = hGlobal16;
- priv->hGlobal16 = hGlobal16;
- }
- return TRUE;
-}
-
-/************************************************************************
- * FD16_Init [internal]
- * called from the common 16/32 code to initialize 16 bit data
- */
-static BOOL CALLBACK FD16_Init(LPARAM lParam, PFD31_DATA lfs, DWORD data)
-{
- PFD16_PRIVATE priv;
-
- priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FD16_PRIVATE));
- lfs->private1632 = priv;
- if (NULL == lfs->private1632) return FALSE;
-
- priv->ofn16 = MapSL(lParam);
- if (priv->ofn16->Flags & OFN_ENABLEHOOK)
- if (priv->ofn16->lpfnHook)
- lfs->hook = TRUE;
-
- lfs->ofnW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*lfs->ofnW));
- FD16_MapOfnStruct16(priv->ofn16, lfs->ofnW, lfs->open);
-
- if (! FD16_GetTemplate(lfs)) return FALSE;
-
- return TRUE;
-}
-
-/***********************************************************************
- * FD16_CallWindowProc [internal]
- *
- * called from the common 16/32 code to call the appropriate hook
- */
-static BOOL CALLBACK FD16_CallWindowProc(const FD31_DATA *lfs, UINT wMsg, WPARAM wParam,
- LPARAM lParam)
-{
- PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632;
-
- if (priv->ofn16)
- {
- return (BOOL16) CallWindowProc16(
- (WNDPROC16)priv->ofn16->lpfnHook, HWND_16(lfs->hwnd),
- (UINT16)wMsg, (WPARAM16)wParam, lParam);
- }
- return FALSE;
-}
-
-
-/***********************************************************************
- * FD31_UpdateResult [internal]
- * update the real client structures
- */
-static void CALLBACK FD16_UpdateResult(const FD31_DATA *lfs)
-{
- PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632;
- LPOPENFILENAMEW ofnW = lfs->ofnW;
-
- if (priv->ofn16)
- { /* we have to convert to short (8.3) path */
- char tmp[1024]; /* MAX_PATHNAME_LEN */
- LPOPENFILENAME16 ofn16 = priv->ofn16;
- char *dest = MapSL(ofn16->lpstrFile);
- char *bs16;
- if (!WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFile, -1,
- tmp, sizeof(tmp), NULL, NULL ))
- tmp[sizeof(tmp)-1] = 0;
- GetShortPathNameA(tmp, dest, ofn16->nMaxFile);
-
- /* the same procedure as every year... */
- if((bs16 = strrchr(dest, '\\')) != NULL)
- ofn16->nFileOffset = bs16 - dest +1;
- else
- ofn16->nFileOffset = 0;
- ofn16->nFileExtension = 0;
- while(dest[ofn16->nFileExtension] != '.' &&
dest[ofn16->nFileExtension] != '\0')
- ofn16->nFileExtension++;
- if (dest[ofn16->nFileExtension] == '\0')
- ofn16->nFileExtension = 0;
- else
- ofn16->nFileExtension++;
- }
-}
-
-
-/***********************************************************************
- * FD16_UpdateFileTitle [internal]
- * update the real client structures
- */
-static void CALLBACK FD16_UpdateFileTitle(const FD31_DATA *lfs)
-{
- PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632;
- LPOPENFILENAMEW ofnW = lfs->ofnW;
-
- if (priv->ofn16)
- {
- char *dest = MapSL(priv->ofn16->lpstrFileTitle);
- if (!WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFileTitle, -1,
- dest, ofnW->nMaxFileTitle, NULL, NULL ))
- dest[ofnW->nMaxFileTitle-1] = 0;
- }
-}
-
-
-/***********************************************************************
- * FD16_SendLbGetCurSel [internal]
- * retrieve selected listbox item
- */
-static LRESULT CALLBACK FD16_SendLbGetCurSel(const FD31_DATA *lfs)
-{
- return SendDlgItemMessageW(lfs->hwnd, lst1, LB_GETCURSEL16, 0, 0);
-}
-
-
-/************************************************************************
- * FD16_Destroy [internal]
- * called from the common 16/32 code to cleanup 32 bit data
- */
-static void CALLBACK FD16_Destroy(const FD31_DATA *lfs)
-{
- PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632;
-
- /* free resources for a 16 bits dialog */
- if (NULL != priv)
- {
- if (priv->hResource16) FreeResource16(priv->hResource16);
- if (priv->hGlobal16)
- {
- GlobalUnlock16(priv->hGlobal16);
- GlobalFree16(priv->hGlobal16);
- }
- FD31_FreeOfnW(lfs->ofnW);
- HeapFree(GetProcessHeap(), 0, lfs->ofnW);
- }
-}
-
-static void FD16_SetupCallbacks(PFD31_CALLBACKS callbacks)
-{
- callbacks->Init = FD16_Init;
- callbacks->CWP = FD16_CallWindowProc;
- callbacks->UpdateResult = FD16_UpdateResult;
- callbacks->UpdateFileTitle = FD16_UpdateFileTitle;
- callbacks->SendLbGetCurSel = FD16_SendLbGetCurSel;
- callbacks->Destroy = FD16_Destroy;
-}
-
-/***********************************************************************
- * FD16_MapDrawItemStruct [internal]
- * map a 16 bits drawitem struct to 32
- */
-static void FD16_MapDrawItemStruct(const DRAWITEMSTRUCT16 *lpdis16, LPDRAWITEMSTRUCT
lpdis)
-{
- lpdis->CtlType = lpdis16->CtlType;
- lpdis->CtlID = lpdis16->CtlID;
- lpdis->itemID = lpdis16->itemID;
- lpdis->itemAction = lpdis16->itemAction;
- lpdis->itemState = lpdis16->itemState;
- lpdis->hwndItem = HWND_32(lpdis16->hwndItem);
- lpdis->hDC = HDC_32(lpdis16->hDC);
- lpdis->rcItem.right = lpdis16->rcItem.right;
- lpdis->rcItem.left = lpdis16->rcItem.left;
- lpdis->rcItem.top = lpdis16->rcItem.top;
- lpdis->rcItem.bottom = lpdis16->rcItem.bottom;
- lpdis->itemData = lpdis16->itemData;
-}
-
-
-/***********************************************************************
- * FD16_WMMeasureItem16 [internal]
- */
-static LONG FD16_WMMeasureItem(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
-{
- LPMEASUREITEMSTRUCT16 lpmeasure;
-
- lpmeasure = MapSL(lParam);
- lpmeasure->itemHeight = FD31_GetFldrHeight();
- return TRUE;
-}
-
-/* ------------------ Dialog procedures ---------------------- */
-
-/***********************************************************************
- * FileOpenDlgProc (COMMDLG.6)
- */
-BOOL16 CALLBACK FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM
lParam)
-{
- HWND hWnd = HWND_32(hWnd16);
- PFD31_DATA lfs = (PFD31_DATA)GetPropA(hWnd,FD31_OFN_PROP);
- DRAWITEMSTRUCT dis;
-
- TRACE("msg=%x wparam=%x lParam=%lx\n", wMsg, wParam, lParam);
- if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook)
- {
- LRESULT lRet = (BOOL16)FD31_CallWindowProc(lfs, wMsg, wParam, lParam);
- if (lRet)
- return lRet; /* else continue message processing */
- }
- switch (wMsg)
- {
- case WM_INITDIALOG:
- return FD31_WMInitDialog(hWnd, wParam, lParam);
-
- case WM_MEASUREITEM:
- return FD16_WMMeasureItem(hWnd16, wParam, lParam);
-
- case WM_DRAWITEM:
- FD16_MapDrawItemStruct(MapSL(lParam), &dis);
- return FD31_WMDrawItem(hWnd, wParam, lParam, FALSE, &dis);
-
- case WM_COMMAND:
- return FD31_WMCommand(hWnd, lParam, HIWORD(lParam),wParam, lfs);
-#if 0
- case WM_CTLCOLOR:
- SetBkColor((HDC16)wParam, 0x00C0C0C0);
- switch (HIWORD(lParam))
- {
- case CTLCOLOR_BTN:
- SetTextColor((HDC16)wParam, 0x00000000);
- return hGRAYBrush;
- case CTLCOLOR_STATIC:
- SetTextColor((HDC16)wParam, 0x00000000);
- return hGRAYBrush;
- }
- break;
-#endif
- }
- return FALSE;
-}
-
-/***********************************************************************
- * FileSaveDlgProc (COMMDLG.7)
- */
-BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM
lParam)
-{
- HWND hWnd = HWND_32(hWnd16);
- PFD31_DATA lfs = (PFD31_DATA)GetPropA(hWnd,FD31_OFN_PROP);
- DRAWITEMSTRUCT dis;
-
- TRACE("msg=%x wparam=%x lParam=%lx\n", wMsg, wParam, lParam);
- if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook)
- {
- LRESULT lRet;
- lRet = (BOOL16)FD31_CallWindowProc(lfs, wMsg, wParam, lParam);
- if (lRet)
- return lRet; /* else continue message processing */
- }
- switch (wMsg) {
- case WM_INITDIALOG:
- return FD31_WMInitDialog(hWnd, wParam, lParam);
-
- case WM_MEASUREITEM:
- return FD16_WMMeasureItem(hWnd16, wParam, lParam);
-
- case WM_DRAWITEM:
- FD16_MapDrawItemStruct(MapSL(lParam), &dis);
- return FD31_WMDrawItem(hWnd, wParam, lParam, TRUE, &dis);
-
- case WM_COMMAND:
- return FD31_WMCommand(hWnd, lParam, HIWORD(lParam), wParam, lfs);
- }
-
- /*
- case WM_CTLCOLOR:
- SetBkColor((HDC16)wParam, 0x00C0C0C0);
- switch (HIWORD(lParam))
- {
- case CTLCOLOR_BTN:
- SetTextColor((HDC16)wParam, 0x00000000);
- return hGRAYBrush;
- case CTLCOLOR_STATIC:
- SetTextColor((HDC16)wParam, 0x00000000);
- return hGRAYBrush;
- }
- return FALSE;
-
- */
- return FALSE;
-}
-
-/* ------------------ APIs ---------------------- */
-
-/***********************************************************************
- * GetOpenFileName (COMMDLG.1)
- *
- * Creates a dialog box for the user to select a file to open.
- *
- * RETURNS
- * TRUE on success: user selected a valid file
- * FALSE on cancel, error, close or filename-does-not-fit-in-buffer.
- *
- * BUGS
- * unknown, there are some FIXME's left.
- */
-BOOL16 WINAPI GetOpenFileName16(
- SEGPTR ofn /* [in/out] address of structure with data*/
- )
-{
- HINSTANCE16 hInst;
- BOOL bRet = FALSE;
- LPOPENFILENAME16 lpofn = MapSL(ofn);
- PFD31_DATA lfs;
- FARPROC16 ptr;
- FD31_CALLBACKS callbacks;
- PFD16_PRIVATE priv;
-
- if (!lpofn || !FD31_Init()) return FALSE;
-
- FD16_SetupCallbacks(&callbacks);
- lfs = FD31_AllocPrivate((LPARAM) ofn, OPEN_DIALOG, &callbacks, 0);
- if (lfs)
- {
- priv = (PFD16_PRIVATE) lfs->private1632;
- hInst = GetWindowLongPtrA( HWND_32(lpofn->hwndOwner), GWLP_HINSTANCE );
- ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 6);
- bRet = DialogBoxIndirectParam16( hInst, priv->hDlgTmpl16,
lpofn->hwndOwner,
- (DLGPROC16) ptr, (LPARAM) lfs);
- FD31_DestroyPrivate(lfs);
- }
-
- TRACE("return lpstrFile='%s' !\n", (char
*)MapSL(lpofn->lpstrFile));
- return bRet;
-}
-
-/***********************************************************************
- * GetSaveFileName (COMMDLG.2)
- *
- * Creates a dialog box for the user to select a file to save.
- *
- * RETURNS
- * TRUE on success: user enters a valid file
- * FALSE on cancel, error, close or filename-does-not-fit-in-buffer.
- *
- * BUGS
- * unknown. There are some FIXME's left.
- */
-BOOL16 WINAPI GetSaveFileName16(
- SEGPTR ofn /* [in/out] address of structure with data*/
- )
-{
- HINSTANCE16 hInst;
- BOOL bRet = FALSE;
- LPOPENFILENAME16 lpofn = MapSL(ofn);
- PFD31_DATA lfs;
- FARPROC16 ptr;
- FD31_CALLBACKS callbacks;
- PFD16_PRIVATE priv;
-
- if (!lpofn || !FD31_Init()) return FALSE;
-
- FD16_SetupCallbacks(&callbacks);
- lfs = FD31_AllocPrivate((LPARAM) ofn, SAVE_DIALOG, &callbacks, 0);
- if (lfs)
- {
- priv = (PFD16_PRIVATE) lfs->private1632;
- hInst = GetWindowLongPtrA( HWND_32(lpofn->hwndOwner), GWLP_HINSTANCE );
- ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 7);
- bRet = DialogBoxIndirectParam16( hInst, priv->hDlgTmpl16,
lpofn->hwndOwner,
- (DLGPROC16) ptr, (LPARAM) lfs);
- FD31_DestroyPrivate(lfs);
- }
-
- TRACE("return lpstrFile='%s' !\n", (char
*)MapSL(lpofn->lpstrFile));
- return bRet;
-}
-
-
-/***********************************************************************
- * GetFileTitle (COMMDLG.27)
- */
-short WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf)
-{
- return GetFileTitleA(lpFile, lpTitle, cbBuf);
-}
Removed: trunk/reactos/dll/win32/comdlg32/printdlg.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/printdlg.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comdlg32/printdlg.h (removed)
@@ -1,102 +1,0 @@
-/*
- * COMMDLG - Print Dialog
- *
- * Copyright 1994 Martin Ayotte
- * Copyright 1996 Albrecht Kleine
- * Copyright 1999 Klaas van Gend
- * Copyright 2000 Huw D M Davies
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _WINE_PRINTDLG_H
-#define _WINE_PRINTDLG_H
-
-#include "cdlg.h"
-
-/* This PRINTDLGA internal structure stores
- * pointers to several throughout useful structures.
- */
-
-typedef struct
-{
- LPDEVMODEA lpDevMode;
- LPPRINTDLGA lpPrintDlg;
- LPPRINTER_INFO_2A lpPrinterInfo;
- LPDRIVER_INFO_3A lpDriverInfo;
- UINT HelpMessageID;
- HICON hCollateIcon; /* PrintDlg only */
- HICON hNoCollateIcon; /* PrintDlg only */
- HICON hPortraitIcon; /* PrintSetupDlg only */
- HICON hLandscapeIcon; /* PrintSetupDlg only */
- HWND hwndUpDown;
-} PRINT_PTRA;
-
-typedef struct
-{
- LPDEVMODEW lpDevMode;
- LPPRINTDLGW lpPrintDlg;
- LPPRINTER_INFO_2W lpPrinterInfo;
- LPDRIVER_INFO_3W lpDriverInfo;
- UINT HelpMessageID;
- HICON hCollateIcon; /* PrintDlg only */
- HICON hNoCollateIcon; /* PrintDlg only */
- HICON hPortraitIcon; /* PrintSetupDlg only */
- HICON hLandscapeIcon; /* PrintSetupDlg only */
- HWND hwndUpDown;
-} PRINT_PTRW;
-
-/* Debugging info */
-static const struct pd_flags {
- DWORD flag;
- LPCSTR name;
-} pd_flags[] = {
- {PD_SELECTION, "PD_SELECTION "},
- {PD_PAGENUMS, "PD_PAGENUMS "},
- {PD_NOSELECTION, "PD_NOSELECTION "},
- {PD_NOPAGENUMS, "PD_NOPAGENUMS "},
- {PD_COLLATE, "PD_COLLATE "},
- {PD_PRINTTOFILE, "PD_PRINTTOFILE "},
- {PD_PRINTSETUP, "PD_PRINTSETUP "},
- {PD_NOWARNING, "PD_NOWARNING "},
- {PD_RETURNDC, "PD_RETURNDC "},
- {PD_RETURNIC, "PD_RETURNIC "},
- {PD_RETURNDEFAULT, "PD_RETURNDEFAULT "},
- {PD_SHOWHELP, "PD_SHOWHELP "},
- {PD_ENABLEPRINTHOOK, "PD_ENABLEPRINTHOOK "},
- {PD_ENABLESETUPHOOK, "PD_ENABLESETUPHOOK "},
- {PD_ENABLEPRINTTEMPLATE, "PD_ENABLEPRINTTEMPLATE "},
- {PD_ENABLESETUPTEMPLATE, "PD_ENABLESETUPTEMPLATE "},
- {PD_ENABLEPRINTTEMPLATEHANDLE, "PD_ENABLEPRINTTEMPLATEHANDLE "},
- {PD_ENABLESETUPTEMPLATEHANDLE, "PD_ENABLESETUPTEMPLATEHANDLE "},
- {PD_USEDEVMODECOPIES, "PD_USEDEVMODECOPIES[ANDCOLLATE] "},
- {PD_DISABLEPRINTTOFILE, "PD_DISABLEPRINTTOFILE "},
- {PD_HIDEPRINTTOFILE, "PD_HIDEPRINTTOFILE "},
- {PD_NONETWORKBUTTON, "PD_NONETWORKBUTTON "},
- {-1, NULL}
-};
-
-/* Internal Functions
- * Do not Export to other applications or dlls
- */
-
-INT PRINTDLG_SetUpPrinterListComboA(HWND hDlg, UINT id, LPCSTR name);
-BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name,
- PRINT_PTRA *PrintStructures);
-BOOL PRINTDLG_OpenDefaultPrinter(HANDLE *hprn);
-LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam,
- LPARAM lParam, PRINT_PTRA* PrintStructures);
-
-#endif /* _WINE_PRINTDLG_H */