Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[royce] 17328: check for failure of vfatAttachFCBToFileObject() during file creation
by royce＠svn.reactos.com 12 Aug '05

12 Aug '05

check for failure of vfatAttachFCBToFileObject() during file creation Modified: trunk/reactos/drivers/fs/vfat/create.c _____ Modified: trunk/reactos/drivers/fs/vfat/create.c --- trunk/reactos/drivers/fs/vfat/create.c 2005-08-12 16:47:29 UTC (rev 17327) +++ trunk/reactos/drivers/fs/vfat/create.c 2005-08-12 16:49:04 UTC (rev 17328) @@ -564,7 +564,12 @@ vfatReleaseFCB (DeviceExt, ParentFcb); if (NT_SUCCESS (Status)) { - vfatAttachFCBToFileObject (DeviceExt, pFcb, FileObject); + Status = vfatAttachFCBToFileObject (DeviceExt, pFcb, FileObject); + if ( !NT_SUCCESS(Status) ) + { + vfatReleaseFCB (DeviceExt, pFcb); + return Status; + } Irp->IoStatus.Information = FILE_CREATED;

1 0

[gvg] 17327: Sync to Wine-20050725:
by gvg＠svn.reactos.com 12 Aug '05

12 Aug '05

Sync to Wine-20050725: Huw Davies <huw(a)codeweavers.com> - Add English neutral version of IDS_COLOR_GRAY. Eugeny Gorelov <tft(a)etersoft.ru> - Implement most functionality of PageSetupDlg function. Michael Jung <mjung(a)iss.tu-darmstadt.de> - Don't expand MyComputer in the file dialogs without user interaction, if unixfs is rooted at desktop. Henning Gerhardt <henning.gerhardt(a)web.de> - Update German resource files. Vincent Beron <vberon(a)mecano.gme.usherb.ca> - Remove multiple declarations of the same function, keeping the public one as reference. Mike McCormack <mike(a)codeweavers.com> - gcc 4.0 -Wpointer-sign fixes. - Fix declarations. Modified: trunk/reactos/lib/comdlg32/Makefile.in Modified: trunk/reactos/lib/comdlg32/cdlg16.h Modified: trunk/reactos/lib/comdlg32/cdlg_Ca.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Cn.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Cs.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Da.rc Modified: trunk/reactos/lib/comdlg32/cdlg_De.rc Modified: trunk/reactos/lib/comdlg32/cdlg_En.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Eo.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Es.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Fi.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Fr.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Hu.rc Modified: trunk/reactos/lib/comdlg32/cdlg_It.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Ja.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Ko.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Nl.rc Modified: trunk/reactos/lib/comdlg32/cdlg_No.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Pl.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Pt.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Ru.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Si.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Sk.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Sv.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Th.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Uk.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Wa.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Zh.rc Modified: trunk/reactos/lib/comdlg32/cdlg_xx.rc Modified: trunk/reactos/lib/comdlg32/colordlg.c Modified: trunk/reactos/lib/comdlg32/colordlg16.c Modified: trunk/reactos/lib/comdlg32/filedlg.c Modified: trunk/reactos/lib/comdlg32/filedlg16.c Modified: trunk/reactos/lib/comdlg32/filedlg31.c Modified: trunk/reactos/lib/comdlg32/filedlgbrowser.c Modified: trunk/reactos/lib/comdlg32/filetitle.c Modified: trunk/reactos/lib/comdlg32/finddlg.c Modified: trunk/reactos/lib/comdlg32/fontdlg.c Modified: trunk/reactos/lib/comdlg32/fontdlg16.c Modified: trunk/reactos/lib/comdlg32/printdlg.c Modified: trunk/reactos/lib/comdlg32/printdlg16.c Modified: trunk/reactos/lib/comdlg32/rsrc.rc _____ Modified: trunk/reactos/lib/comdlg32/Makefile.in --- trunk/reactos/lib/comdlg32/Makefile.in 2005-08-12 16:31:56 UTC (rev 17326) +++ trunk/reactos/lib/comdlg32/Makefile.in 2005-08-12 16:47:29 UTC (rev 17327) @@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = comdlg32.dll IMPORTLIB = libcomdlg32.$(IMPLIBEXT) -IMPORTS = shell32 shlwapi comctl32 winspool user32 gdi32 kernel32 ntdll +IMPORTS = shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 kernel32 ntdll EXTRALIBS = -luuid C_SRCS = \ _____ Modified: trunk/reactos/lib/comdlg32/cdlg16.h --- trunk/reactos/lib/comdlg32/cdlg16.h 2005-08-12 16:31:56 UTC (rev 17326) +++ trunk/reactos/lib/comdlg32/cdlg16.h 2005-08-12 16:47:29 UTC (rev 17327) @@ -143,12 +143,20 @@ BOOL16 WINAPI ChooseColor16(LPCHOOSECOLOR16 lpChCol); HWND16 WINAPI FindText16( SEGPTR find); -INT16 WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf); 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" _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Ca.rc --- trunk/reactos/lib/comdlg32/cdlg_Ca.rc 2005-08-12 16:31:56 UTC (rev 17326) +++ trunk/reactos/lib/comdlg32/cdlg_Ca.rc 2005-08-12 16:47:29 UTC (rev 17327) @@ -1,218 +1,218 @@ -/* - * Copyright 1998 Marc Huguet Puig - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES. - */ - -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Obrir" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Nom:", 1090, 6, 6, 76, 9 - EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP - LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&Directoris:", -1, 110, 6, 92, 9 - LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP - LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&Tipus de fitxers:", 1089, 6, 104, 90, 9 - COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "&Unitats:", 1091, 110, 104, 92, 9 - COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "D'acord", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "AnulÀlaci¾", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "A&juda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "NomÚs &lectura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Anomenar i desar..." -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Nom:", 1090, 6, 6, 76, 9 - EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP - LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&Directoris:", -1, 110, 6, 92, 9 - LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP - LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "Desar fitxer en f&ormat:", 1089, 6, 104, 90, 9 - COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "&Unitats:", 1091, 110, 104, 92, 9 - COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "D'acord", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "AnulÀlaci¾", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "A&juda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "&Fer-ne c?pia", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Impressi¾" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Impressora:", 1088, 6, 6, 40, 9 - LTEXT "Impressi¾ del document", 1089, 60, 6, 150, 9 - GROUPBOX "", 1072, 6, 30, 160, 65, BS_GROUPBOX - RADIOBUTTON "&Sencer", 1056, 16, 45, 60, 12 - RADIOBUTTON "&Part seleccionada", 1057, 16, 60, 60, 12 - RADIOBUTTON "PÓ&gines", 1058, 16, 75, 60, 12 - DEFPUSHBUTTON "D'acord", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "AnulÀlaci¾", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Configuraci¾", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - LTEXT "P&rimera:", 1090, 60, 80, 30, 9 - LTEXT "?&ltima:", 1091, 120, 80, 30, 9 - LTEXT "&Qualitat:", 1092, 6, 100, 76, 9 - COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CHECKBOX "Imprimir en un &fitxer", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "S&eparar les c?pies", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configuraci¾ de la impressi¾" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Impressora:", 1072, 6, 10, 180, 65, BS_GROUPBOX - RADIOBUTTON "Impressora per &defecte", 1056, 16, 20, 80, 12 - LTEXT "[none]", 1088, 35, 35, 120, 9 - RADIOBUTTON "Impressora &especificada:", 1057, 16, 50, 80, 12 - COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "D'acord", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "AnulÀlaci¾", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Opcions", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "Orientaci¾", 1073, 6, 85, 100, 50, BS_GROUPBOX - RADIOBUTTON "&Vertical", 1058, 50, 100, 40, 12 - RADIOBUTTON "&Horitzontal", 1059, 50, 115, 40, 12 - ICON "LANDSCAP", 1097, 10, 95, 32, 32 - ICON "PORTRAIT", 1098, 10, 95, 32, 32 - GROUPBOX "Paper", 1074, 120, 85, 180, 50, BS_GROUPBOX - LTEXT "&Mida", 1089, 130, 95, 30, 9 - LTEXT "A&limentaci¾:", 1090, 130, 110, 30, 9 - COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP -} - - -CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Tipus de lletra" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Tipus de lletra:",1088 ,6,3,40,9 - COMBOBOX 1136 ,6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "&Estil del tipus de lletra:",1089 ,108,3,44,9 - COMBOBOX 1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "&GrandÓria:",1090,179,3,30,9 - COMBOBOX 1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "D'acord",IDOK,218,6,40,14,WS_GROUP - PUSHBUTTON "AnulÀlaci¾",IDCANCEL,218,23,40,14,WS_GROUP - PUSHBUTTON "A&plicar", 1026,218,40,40,14,WS_GROUP - PUSHBUTTON "A&juda" , 1038,218,57,40,14,WS_GROUP - GROUPBOX "Efectes",1072,6,72,84,34,WS_GROUP - CHECKBOX "&Barrar-lo", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Subratllar-lo", 1041, 10,94,50,10, BS_AUTOCHECKBOX - LTEXT "&Color:", 1091 ,6,110,30,9 - COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Exemple",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP -} - - -CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Color" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Colors &bßsics:", 1088, 4, 4, 140, 10 - LTEXT "Colors person&alitzats:", 1089, 4, 106, 140, 10 - LTEXT "Color S?l&id", 1090, 150, 151, 48, 10 - LTEXT "&Roig:", 726 /*1094*/,249,126,24,10 - EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Verd:",727/*1095*/,249,140,24,10 - EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Bla&u:",728 /*1096*/,249,154,24,10 - EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Tint:" ,723 /*1091*/,202,126,22,10 - EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Sat.:" ,724 /*1092*/,202,140,22,10 - EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Llum.:" ,725 /*1093*/,202,154,22,10 - EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 - CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 - CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 - CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 - CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 - DEFPUSHBUTTON "D'acord", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "AnulÀlaci¾", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "A&juda", 1038,100,166, 44, 14 - PUSHBUTTON "Afegir als &colors personalitzats", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Definir colors personalitzats >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ -} - - -FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Cerca" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Cercar:", -1, 4, 8, 42, 8 - EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "C&ercar mots sencers", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Distingir maj·scules de min·scules", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Direcci¾", 1072, 107, 26, 68, 28 - CONTROL "&Amunt", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 - CONTROL "A&vall", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - DEFPUSHBUTTON "&Continuaci¾", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "AnulÀlaci¾", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "A&juda", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP -} - - -REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Substituci¾" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Cercar:", -1, 4, 9, 48, 8 - EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Substituir per:", 1090, -1, 4, 26, 48, 8 - EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Cercar &mots sencers", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Distingir maj·scules de min·scules", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP - DEFPUSHBUTTON "C&ontinucaci¾", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "S&ubstituci¾", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Substituci¾ &automÓtica", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Tancar", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "A&juda", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP -} +/* + * Copyright 1998 Marc Huguet Puig + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES. + */ + +LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT + +OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Obrir" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Nom:", 1090, 6, 6, 76, 9 + EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "&Directoris:", -1, 110, 6, 92, 9 + LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP + LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "&Tipus de fitxers:", 1089, 6, 104, 90, 9 + COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "&Unitats:", 1091, 110, 104, 92, 9 + COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "D'acord", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "AnulÀlaci¾", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "A&juda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "NomÚs &lectura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +} + + +SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Anomenar i desar..." +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Nom:", 1090, 6, 6, 76, 9 + EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "&Directoris:", -1, 110, 6, 92, 9 + LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP + LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "Desar fitxer en f&ormat:", 1089, 6, 104, 90, 9 + COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "&Unitats:", 1091, 110, 104, 92, 9 + COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "D'acord", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "AnulÀlaci¾", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "A&juda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "&Fer-ne c?pia", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +} + + +PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Impressi¾" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Impressora:", 1088, 6, 6, 40, 9 + LTEXT "Impressi¾ del document", 1089, 60, 6, 150, 9 + GROUPBOX "", 1072, 6, 30, 160, 65, BS_GROUPBOX + RADIOBUTTON "&Sencer", 1056, 16, 45, 60, 12 + RADIOBUTTON "&Part seleccionada", 1057, 16, 60, 60, 12 + RADIOBUTTON "PÓ&gines", 1058, 16, 75, 60, 12 + DEFPUSHBUTTON "D'acord", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "AnulÀlaci¾", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Configuraci¾", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "P&rimera:", 1090, 60, 80, 30, 9 + LTEXT "?&ltima:", 1091, 120, 80, 30, 9 + LTEXT "&Qualitat:", 1092, 6, 100, 76, 9 + COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + CHECKBOX "Imprimir en un &fitxer", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "S&eparar les c?pies", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +} + + +PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Configuraci¾ de la impressi¾" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Impressora:", 1072, 6, 10, 180, 65, BS_GROUPBOX + RADIOBUTTON "Impressora per &defecte", 1056, 16, 20, 80, 12 + LTEXT "[none]", 1088, 35, 35, 120, 9 + RADIOBUTTON "Impressora &especificada:", 1057, 16, 50, 80, 12 + COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "D'acord", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "AnulÀlaci¾", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Opcions", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + GROUPBOX "Orientaci¾", 1073, 6, 85, 100, 50, BS_GROUPBOX + RADIOBUTTON "&Vertical", 1058, 50, 100, 40, 12 + RADIOBUTTON "&Horitzontal", 1059, 50, 115, 40, 12 + ICON "LANDSCAP", 1097, 10, 95, 32, 32 + ICON "PORTRAIT", 1098, 10, 95, 32, 32 + GROUPBOX "Paper", 1074, 120, 85, 180, 50, BS_GROUPBOX + LTEXT "&Mida", 1089, 130, 95, 30, 9 + LTEXT "A&limentaci¾:", 1090, 130, 110, 30, 9 + COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP +} + + +CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Tipus de lletra" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Tipus de lletra:",1088 ,6,3,40,9 + COMBOBOX 1136 ,6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE + LTEXT "&Estil del tipus de lletra:",1089 ,108,3,44,9 + COMBOBOX 1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE + LTEXT "&GrandÓria:",1090,179,3,30,9 + COMBOBOX 1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT + DEFPUSHBUTTON "D'acord",IDOK,218,6,40,14,WS_GROUP + PUSHBUTTON "AnulÀlaci¾",IDCANCEL,218,23,40,14,WS_GROUP + PUSHBUTTON "A&plicar", 1026,218,40,40,14,WS_GROUP + PUSHBUTTON "A&juda" , 1038,218,57,40,14,WS_GROUP + GROUPBOX "Efectes",1072,6,72,84,34,WS_GROUP + CHECKBOX "&Barrar-lo", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Subratllar-lo", 1041, 10,94,50,10, BS_AUTOCHECKBOX + LTEXT "&Color:", 1091 ,6,110,30,9 + COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Exemple",grp2,98,72,120,36,WS_GROUP + CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 + COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP +} + + +CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Color" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Colors &bßsics:", 1088, 4, 4, 140, 10 + LTEXT "Colors person&alitzats:", 1089, 4, 106, 140, 10 + LTEXT "Color S?l&id", 1090, 150, 151, 48, 10 + LTEXT "&Roig:", 726 /*1094*/,249,126,24,10 + EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Verd:",727/*1095*/,249,140,24,10 + EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Bla&u:",728 /*1096*/,249,154,24,10 + EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Tint:" ,723 /*1091*/,202,126,22,10 + EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Sat.:" ,724 /*1092*/,202,140,22,10 + EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Llum.:" ,725 /*1093*/,202,154,22,10 + EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + DEFPUSHBUTTON "D'acord", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "AnulÀlaci¾", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "A&juda", 1038,100,166, 44, 14 + PUSHBUTTON "Afegir als &colors personalitzats", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Definir colors personalitzats >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ +} + + +FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Cerca" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Cercar:", -1, 4, 8, 42, 8 + EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "C&ercar mots sencers", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Distingir maj·scules de min·scules", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Direcci¾", 1072, 107, 26, 68, 28 + CONTROL "&Amunt", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 + CONTROL "A&vall", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 + DEFPUSHBUTTON "&Continuaci¾", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "AnulÀlaci¾", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "A&juda", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP +} + + +REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Substituci¾" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Cercar:", -1, 4, 9, 48, 8 + EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Substituir per:", 1090, -1, 4, 26, 48, 8 + EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "Cercar &mots sencers", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Distingir maj·scules de min·scules", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP + DEFPUSHBUTTON "C&ontinucaci¾", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "S&ubstituci¾", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Substituci¾ &automÓtica", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Tancar", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "A&juda", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP +} Property changes on: trunk/reactos/lib/comdlg32/cdlg_Ca.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Cn.rc --- trunk/reactos/lib/comdlg32/cdlg_Cn.rc 2005-08-12 16:31:56 UTC (rev 17326) +++ trunk/reactos/lib/comdlg32/cdlg_Cn.rc 2005-08-12 16:47:29 UTC (rev 17327) @@ -1,443 +1,443 @@ -/* - * Copyright 2002 Tisheng Chen - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES. - */ - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED - -OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "???¬" -FONT 8, "MS Shell Dlg" -{ - LTEXT "?????¹(&N):", 1090, 6, 6, 76, 9 - EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP - LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "?????ð(&D):", -1, 110, 6, 92, 9 - LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP - LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "?????Óð?(&T):", 1089, 6, 104, 90, 9 - COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Ã²Â»ã¸(&v):", 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 - DEFPUSHBUTTON "???¬", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "?í¤¹", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?´Í·(&H)", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "Í?Â?(&R)", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "?Ý?µ?¬ ..." -FONT 8, "MS Shell Dlg" -{ - LTEXT "?????¹(&N):", 1090, 6, 6, 76, 9 - EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP - LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "????(&D):", -1, 110, 6, 92, 9 - LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP - LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "?????Óð?(&T):", 1089, 6, 104, 90, 9 - COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Ã²Â»ã¸(&v):", 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 - DEFPUSHBUTTON "?ú?µ", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "?í¤¹", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?´Í·(&H)", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "Í?Â?(&R)", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "??Ëí" -FONT 8, "MS Shell Dlg" -{ - LTEXT "??Ëí?·:", 1088, 6, 6, 40, 9 - LTEXT "", 1089, 60, 6, 150, 9 - GROUPBOX "??ËíÀÂ?º", grp1, 6, 30, 160, 65, BS_GROUPBOX - RADIOBUTTON "?½??(&A)", rad1, 16, 45, 60, 12 - RADIOBUTTON "ÐíÈ±Á?ÀÂ?º(&e)", rad2, 16, 60, 60, 12 - RADIOBUTTON "Ê??²(&G)", rad3, 16, 75, 60, 12 - DEFPUSHBUTTON "?ÀÂ¿", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "?í¤¹", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?ÞÍ?(&S)", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - LTEXT "?Ë(&F):", 1090, 60, 80, 30, 9 - LTEXT "Á¢(&T):", 1091, 120, 80, 30, 9 - LTEXT "??ËíÍ???(&Q):", 1092, 6, 100, 76, 9 - COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CHECKBOX "??ËíÁ¢????(&l):", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Condensed", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "??Ëí?ÞÍ?" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "??Ëí?·", grp1, 6, 10, 180, 65, BS_GROUPBOX - RADIOBUTTON "?¼?¤??Ëí?·(&D)", rad1, 16, 20, 80, 12 - LTEXT "[none]", 1088, 35, 35, 120, 9 - RADIOBUTTON "Í©Â¿Á???Ëí?·(&P)", rad2, 16, 50, 80, 12 - COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "?ÀÂ¿", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "?í¤¹", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?ÞÍ?(&S)", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "À¢¤?(&O)", grp2, 6, 85, 100, 50, BS_GROUPBOX - RADIOBUTTON "Î¦¤?(&P)", rad3, 50, 100, 40, 12 - RADIOBUTTON "?ß¤?(&L)", rad4, 50, 115, 40, 12 - ICON "LANDSCAP", stc10, 10, 95, 32, 32 - ICON "PORTRAIT", stc11, 10, 95, 32, 32 - GROUPBOX "Í¢i?", grp3, 120, 85, 180, 50, BS_GROUPBOX - LTEXT "Í¢i??¾ðí(&Z)", 1089, 130, 95, 30, 9 - LTEXT "Í¢i???È?(&S)", 1090, 130, 110, 30, 9 - COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP -} - - -CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÎÍ?Õ" -FONT 8, "MS Shell Dlg" -{ - LTEXT "ÎÍ?Õ(&F):",1088 ,6,3,40,9 - COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "ÎÍ?ÕÐ¨?¢(&y):",1089 ,108,3,44,9 - COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "?¾ðí(&S):",1090,179,3,30,9 - COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "?ÀÂ¿",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "?í¤¹",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP - PUSHBUTTON "ËªË?(&A)", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP - PUSHBUTTON "?´Í·(&H)" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP - GROUPBOX "ðº?¹",1072,6,72,84,34,WS_GROUP - CHECKBOX "?¥?²¤?(&k)", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "¤??«¤?(&U)", chx2, 10,94,50,10, BS_AUTOCHECKBOX - LTEXT "Ði?½(&C):", 1091 ,6,110,30,9 - COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "?¥?²",grp2,98,72,120,36,WS_GROUP - CTEXT "Íð??ÎÍ?ÕAaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt (translate):",stc7,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP -} - - -CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ði?½" -FONT 8, "MS Shell Dlg" -{ - LTEXT "?¨?¥Ði?½(&B):", 1088, 4, 4, 140, 10 - LTEXT "ÎÈÂ¿ÍãÐi?½(&C):", 1089, 4, 106, 140, 10 - LTEXT "Ði?½|???½(&O)", 1090, 150, 151, 48, 10 - LTEXT "?ý(&R):", 726 /*1094*/,249,126,24,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "??(&G):",727/*1095*/,249,140,24,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "?Â(&B):",728 /*1096*/,249,154,24,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "?½Á¸(&E):" ,723 /*1091*/,202,126,22,10 - EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "?Ñ??Â?(&S):" ,724 /*1092*/,202,140,22,10 - EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "??Â?(&L)" ,725 /*1093*/,202,154,22,10 - EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 - CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 - CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 - CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 - CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 - DEFPUSHBUTTON "?ÀÂ¿", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "?í¤¹", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?´Í·", pshHelp,100,166, 44, 14 - PUSHBUTTON "?Ý?ËÁ¢ÎÈÂ¿ÍãÐi?½(&A)", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?µÂ¿ÎÈÂ¿ÊÕÐi?½(&D)>>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ -} - - -FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "?ÚiÊ" -FONT 8, "MS Shell Dlg" -{ - LTEXT "?ÚiÊ(&n):", -1, 4, 8, 42, 8 - EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "?½ÎÍãÑ?õ(&W)", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Ã°ÀÍ?¾ðíð?(&C)", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "À¢¤?", grp1, 107, 26, 68, 28 - CONTROL "¤??¤(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 - CONTROL "¤?¤?(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - - DEFPUSHBUTTON "?ÚiÊ¤?Ê?©÷(&F)", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "?í¤¹", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?´Í·(&H)", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP -} - - -REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "?µ??" -FONT 8, "MS Shell Dlg" -{ - LTEXT "?ÚiÊ???¦(&n):", -1, 4, 9, 48, 8 - EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "?µ???¬(&p):", -1, 4, 26, 48, 8 - EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "?½ÎÍãÑ?õ(&W)", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Ã°ÀÍ?¾ðíð?(&C)", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP - - DEFPUSHBUTTON "?ÚiÊ¤?Ê?©÷(&F)", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "?µ??(&R)", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?½???µ??(&A)", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?í¤¹", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?´Í·(&H)", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP -} - - -PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | - DS_CONTEXTHELP | DS_3DLOOK -CAPTION "??Ëí" -FONT 8, "MS Shell Dlg" -{ - DEFPUSHBUTTON "?ÀÂ¿", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "?í¤¹", IDCANCEL, 232,164, 48,14, WS_GROUP - PUSHBUTTON "?´Í·(&H)", pshHelp, 50, 161, 48,14, WS_GROUP - - GROUPBOX "??Ëí?·", grp4, 8, 4, 272,84, WS_GROUP - CONTROL "??ËíÁ¢????(&l)", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 - PUSHBUTTON "?¶ðÈ(&P)", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "?¹?ã(&N):", stc6, 16, 20, 36,8 - COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Î??¼:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "ð???:", stc7, 16, 48, 36,10, SS_NOPREFIX - LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "??Í?:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "?©Îó:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "Dummy Remark", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - - GROUPBOX "À¦?²", grp2, 160, 92, 120,64, WS_GROUP - LTEXT "À¦?²(&C):",stc5,168,108,68,8 - ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12 - EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER - - GROUPBOX "??ËíÀÂ?º", grp1, 8,92, 144,64, WS_GROUP - CONTROL "?½??(&A)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "Ê??²(&G)", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "ÐíÈ±Á?ÀÂ?º(&S)", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 - EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER - EDITTEXT edt2, 118,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "?Ë(&f):", stc2, 52,124, 20,8 - RTEXT "Á¢(&t):", stc3, 100,124, 16,8 -} - -PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | - DS_CONTEXTHELP | DS_3DLOOK -CAPTION "??Ëí?ÞÍ?" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "?ÀÂ¿",IDOK,180,156,48,14,WS_GROUP - PUSHBUTTON "?í¤¹",IDCANCEL,232,156,48,14 -/* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - - GROUPBOX "??Ëí?·", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "?¶ðÈ(&P)", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "?¹?ã(&N):", stc6, 16, 20, 36,8 - COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Î??¼:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "ð???:", stc7, 16, 48, 36,10, SS_NOPREFIX - LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "??Í?:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "?©Îó:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "Dummy Remark", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - - GROUPBOX "Í¢i?", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "Í¢i??¾ðí(&z):", stc2, 16,108, 36, 8 - COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Í¢i???È?(&S):", stc3, 16,128, 36, 8 - COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - - GROUPBOX "À¢¤?", grp1, 180, 92, 100,56, WS_GROUP - ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "Î¦¤?(&P)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "?ß¤?(&L)", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 -END - -PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ê??µ?ÞÍ?" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 - CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 - CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 - GROUPBOX "Í¢i?", grp2, 8, 96, 224, 56, BS_GROUPBOX - LTEXT "?¾ðí(&S):", stc2, 16, 112, 36, 8 - COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - LTEXT "??È?(&S):", stc3, 16, 132, 36, 8 - COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - GROUPBOX "À¢¤?(&O)", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "Î¦¤?(&P)", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "?ß¤?(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "??¥Ó", grp4, 80, 156, 152, 56, BS_GROUPBOX - LTEXT "Î¾(&e):", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "ËÊ(&R):", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "?¤(&o):", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "¤?(&B):", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - DEFPUSHBUTTON "?ÀÂ¿", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON - PUSHBUTTON "?í¤¹", IDCANCEL, 126, 220, 50, 14 - PUSHBUTTON "??Ëí?·(&P)...", psh3, 184, 220, 48, 14 -END - -NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN -CAPTION "???¬" -FONT 8, "MS Shell Dlg" -{ - LTEXT "?ÐÐ?(&I)",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY - COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - - LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - - LTEXT "?????¹(&N):",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY - EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL - - LTEXT "?????Óð?(&t)",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY - COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - CONTROL "Í?Â?(&r)",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 - - DEFPUSHBUTTON "???¬(&O)", IDOK,222,110,50,14 - PUSHBUTTON "?í¤¹", IDCANCEL,222,128,50,14 - PUSHBUTTON "?´Í·(&H)", pshHelp,222,145,50,14 -} - -STRINGTABLE DISCARDABLE -{ - IDS_ABOUTBOX "&About FolderPicker Test" - IDS_DOCUMENTFOLDERS "??ÁÁ????" - IDS_PERSONAL "?ÊÁ???ÁÁ" - IDS_FAVORITES "?i?Ï?ð" - IDS_PATH "¤Á???À¥Â" - IDS_DESKTOP "Î??µ" - IDS_FONTS "ÎÍ?Õ" - IDS_MYCOMPUTER "?ÊÁ?Áþ?È" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SYSTEMFOLDERS "¤Á???????ð" - IDS_LOCALHARDRIVES "?¥ÁÏË???Ã²Â»ã¸" - IDS_FILENOTFOUND "iÊ??Á¢????" - IDS_VERIFYFILE "ÃÙ?ýÐÚ?ÃÀ±©°ËÞi²?ÀÁ??????¹?ãíú" - IDS_CREATEFILE "iÊ??Á¢????\n?ÃÀ±??¢¿ð??????" - IDS_OVERWRITEFILE "????ÊÐ¥¡?µÈ?íú\nÊ¬?µ????" - IDS_INVALID_FILENAME_TITLE "?????¹Íð?µÈ??ÌðºÁ?ÎÍÀ¹" - IDS_INVALID_FILENAME "?????¹Íð?????³?¼????Ê?¤?ÎÍÀ¹:: \n / : < > |" - IDS_PATHNOTEXISTING "?????ð???µÈ?" - IDS_FILENOTEXISTING "???????µÈ?" -} - -STRINGTABLE DISCARDABLE -{ - IDS_UPFOLDER "¤??¤ÊãÊ??Ò" - IDS_NEWFOLDER "ð?¢¿?????ð" - IDS_LISTVIEW "?ð?Ý" - IDS_REPORTVIEW "¤Û¤©Î??¤" - IDS_TODESKTOP "?Ú??Î??µ" -} - -STRINGTABLE DISCARDABLE -{ - PD32_PRINT_TITLE "??Ëí" - - PD32_VALUE_UREADABLE "Unreadable Entry" - PD32_INVALID_PAGE_RANGE "This value does not lie within the page range.\n\ -Please enter a value between %d and %d." - PD32_FROM_NOT_ABOVE_TO "The 'from' entry cannot exceed the \ -'to' entry." - PD32_MARGINS_OVERLAP "Margins overlap or fall outside \ -Paper boundaries.\nPlease reenter margins." - PD32_NR_OF_COPIES_EMPTY "The number of 'Number of copies' \ -value cannot be empty." - PD32_TOO_LARGE_COPIES "This large nmuber of copies is not \ -supported by your printer.\nPlease enter a value between 1 and %d." - PD32_PRINT_ERROR "A printer error occurred." - PD32_NO_DEFAULT_PRINTER "There is not default printer." - PD32_CANT_FIND_PRINTER "Cannot find the printer." - PD32_OUT_OF_MEMORY "Out of memory." - PD32_GENERIC_ERROR "Some error occurred." - PD32_DRIVER_UNKNOWN "Unknown printer driver." - - PD32_DEFAULT_PRINTER "Default Printer; " - PD32_NR_OF_DOCUMENTS_IN_QUEUE "There are %d documents in the queue" - PD32_MARGINS_IN_INCHES "Margins [inches]" - PD32_MARGINS_IN_MILIMETERS "Margins [mm]" - PD32_MILIMETERS "mm" - - PD32_PRINTER_STATUS_READY "Ready" - PD32_PRINTER_STATUS_PAUSED "Paused; " - PD32_PRINTER_STATUS_ERROR "Error; " - PD32_PRINTER_STATUS_PENDING_DELETION "Pending deletion; " - PD32_PRINTER_STATUS_PAPER_JAM "Paper jam; " - PD32_PRINTER_STATUS_PAPER_OUT "Out of paper; " - PD32_PRINTER_STATUS_MANUAL_FEED "Feed paper manual; " - PD32_PRINTER_STATUS_PAPER_PROBLEM "Paper problem; " - PD32_PRINTER_STATUS_OFFLINE "Printer offline; " - PD32_PRINTER_STATUS_IO_ACTIVE "I/O Active; " - PD32_PRINTER_STATUS_BUSY "Busy; " - PD32_PRINTER_STATUS_PRINTING "Printing; " - PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Output tray is full; " - PD32_PRINTER_STATUS_NOT_AVAILABLE "Not available; " - PD32_PRINTER_STATUS_WAITING "Waiting; " - PD32_PRINTER_STATUS_PROCESSING "Processing; " - PD32_PRINTER_STATUS_INITIALIZING "Initialising; " - PD32_PRINTER_STATUS_WARMING_UP "Warming up; " - PD32_PRINTER_STATUS_TONER_LOW "Toner low; " - PD32_PRINTER_STATUS_NO_TONER "No toner; " - PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " - PD32_PRINTER_STATUS_USER_INTERVENTION "Interrupted by user; " - PD32_PRINTER_STATUS_OUT_OF_MEMORY "Out of memory; " - PD32_PRINTER_STATUS_DOOR_OPEN "The printer door is open; " - PD32_PRINTER_STATUS_SERVER_UNKNOWN "Print server unknown; " - PD32_PRINTER_STATUS_POWER_SAVE "Power safe mode; " -} - -#pragma code_page(default) +/* + * Copyright 2002 Tisheng Chen + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES. + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "???¬" +FONT 8, "MS Shell Dlg" +{ + LTEXT "?????¹(&N):", 1090, 6, 6, 76, 9 + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "?????ð(&D):", -1, 110, 6, 92, 9 + LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP + LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "?????Óð?(&T):", 1089, 6, 104, 90, 9 + COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Ã²Â»ã¸(&v):", 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 + DEFPUSHBUTTON "???¬", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "?í¤¹", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "?´Í·(&H)", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "Í?Â?(&R)", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +} + + +SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "?Ý?µ?¬ ..." +FONT 8, "MS Shell Dlg" +{ + LTEXT "?????¹(&N):", 1090, 6, 6, 76, 9 + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "????(&D):", -1, 110, 6, 92, 9 + LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP + LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "?????Óð?(&T):", 1089, 6, 104, 90, 9 + COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Ã²Â»ã¸(&v):", 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 + DEFPUSHBUTTON "?ú?µ", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "?í¤¹", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "?´Í·(&H)", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "Í?Â?(&R)", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +} + + [truncated at 1000 lines; 20730 more skipped]

1 0

[gvg] 17326: Sync to Wine-20050725:
by gvg＠svn.reactos.com 12 Aug '05

12 Aug '05

Sync to Wine-20050725: Vitaliy Margolen <wine-patch(a)kievinfo.com> - Send CDDS_ITEMPOSTERASE | CDDS_PREPAINT notify. Felix Nawothnig <felix.nawothnig(a)t-online.de> - Move DPA and DSA functions out of comctl32undoc.c as they are documented by now. - Fix some DPA functions so they pass the new tests. - Don't invalidate the whole propsheet when the page is switched. Dimi Paun <dimi(a)lattica.com> - Silence uninitialized warnings. Robert Shearman <rob(a)codeweavers.com> - Call SetBkMode with the correct value from the NMTBCUSTOMDRAW structure. - Don't fill the NMTBCUSTOMDRAW structure in again for CDDS_POSTPAINT. - Remove redundant bBtnTransprnt value. - Height is now calculated based on the number of rows, not on the bounding rect. - Only call CalcToolbar in AutoSize if it has TBSTYLE_WRAPABLE or TBSTYLE_EX_UNDOC1 set. - Remove a bad test in SetButtonWidth that fixes a regression from the above change in IE. - Remove unnecessary nHeight data. - Remove duplicated code in Size by calling AutoSize. - Remove unnecessary bAutoSize value because SetWindowPos doesn't generate WM_SIZE when there is nothing to do on both Windows and Wine. - TBSTATE_INDETERMINATE only takes effect if the button is enabled, otherwise it should just appear like any other disabled button. - Native autosizes on inserting/adding buttons, so we should too. - The IsValidImageList test is not needed because if it isn't a valid image list we will have set the bitmap width and height to 1 and it does the wrong thing when no buttons are present. - The calculated button height should include the text height when no buttons are present. - Handle CopyImage and other functions failing by not adding the icon and notifying the caller. Thomas Weidenmueller <wine-patches(a)reactsoft.com> - Support PSH_WIZARDHASFINISH in wizards. - Correct tab order of the wizard buttons. - Support PSM_IDTOINDEX. Aric Stewart <aric(a)codeweavers.com> - When adding an image copy the full previous buffer. - Implement replacing an icon with one from a resource. Kevin Koltzau <kevin(a)plop.org> - Forward some header notifications to parent of listview. Frank Richter <frank.richter(a)gmail.com> - Enabled "tab" dialog texture for property sheet pages. - Add theming support for header controls. - Use theming for the ListView non-client area. - Let property sheets update the cached system colors upon receiving WM_SYSCOLORCHANGE. - Add theming for the up/down control. Modified: trunk/reactos/lib/comctl32/comctl32.xml Modified: trunk/reactos/lib/comctl32/comctl32undoc.c Modified: trunk/reactos/lib/comctl32/comctl_Cn.rc Modified: trunk/reactos/lib/comctl32/comctl_Cs.rc Modified: trunk/reactos/lib/comctl32/comctl_De.rc Modified: trunk/reactos/lib/comctl32/comctl_En.rc Modified: trunk/reactos/lib/comctl32/comctl_Es.rc Modified: trunk/reactos/lib/comctl32/comctl_Fr.rc Modified: trunk/reactos/lib/comctl32/comctl_It.rc Modified: trunk/reactos/lib/comctl32/comctl_Ja.rc Modified: trunk/reactos/lib/comctl32/comctl_Ko.rc Modified: trunk/reactos/lib/comctl32/comctl_Nl.rc Modified: trunk/reactos/lib/comctl32/comctl_Pl.rc Modified: trunk/reactos/lib/comctl32/comctl_Pt.rc Modified: trunk/reactos/lib/comctl32/comctl_Ru.rc Modified: trunk/reactos/lib/comctl32/comctl_Si.rc Modified: trunk/reactos/lib/comctl32/comctl_Sv.rc Modified: trunk/reactos/lib/comctl32/comctl_Th.rc Modified: trunk/reactos/lib/comctl32/comctl_Uk.rc Added: trunk/reactos/lib/comctl32/dpa.c Added: trunk/reactos/lib/comctl32/dsa.c Modified: trunk/reactos/lib/comctl32/header.c Modified: trunk/reactos/lib/comctl32/imagelist.c Modified: trunk/reactos/lib/comctl32/listview.c Modified: trunk/reactos/lib/comctl32/propsheet.c Modified: trunk/reactos/lib/comctl32/toolbar.c Modified: trunk/reactos/lib/comctl32/updown.c _____ Modified: trunk/reactos/lib/comctl32/comctl32.xml --- trunk/reactos/lib/comctl32/comctl32.xml 2005-08-12 13:46:36 UTC (rev 17325) +++ trunk/reactos/lib/comctl32/comctl32.xml 2005-08-12 16:31:56 UTC (rev 17326) @@ -13,13 +13,16 @@ <library>advapi32</library> <library>gdi32</library> <library>user32</library> + <library>uxtheme</library> <library>winmm</library> <file>animate.c</file> <file>comboex.c</file> <file>comctl32undoc.c</file> <file>commctrl.c</file> <file>datetime.c</file> + <file>dpa.c</file> <file>draglist.c</file> + <file>dsa.c</file> <file>flatsb.c</file> <file>header.c</file> <file>hotkey.c</file> _____ Modified: trunk/reactos/lib/comctl32/comctl32undoc.c --- trunk/reactos/lib/comctl32/comctl32undoc.c 2005-08-12 13:46:36 UTC (rev 17325) +++ trunk/reactos/lib/comctl32/comctl32undoc.c 2005-08-12 16:31:56 UTC (rev 17326) @@ -55,314 +55,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(commctrl); -struct _DSA -{ - INT nItemCount; - LPVOID pData; - INT nMaxCount; - INT nItemSize; - INT nGrow; -}; - -struct _DPA -{ - INT nItemCount; - LPVOID *ptrs; - HANDLE hHeap; - INT nGrow; - INT nMaxCount; -}; - -typedef struct _STREAMDATA -{ - DWORD dwSize; - DWORD dwData2; - DWORD dwItems; -} STREAMDATA, *PSTREAMDATA; - -typedef struct _LOADDATA -{ - INT nCount; - PVOID ptr; -} LOADDATA, *LPLOADDATA; - -typedef HRESULT (CALLBACK *DPALOADPROC)(LPLOADDATA,IStream*,LPARAM); - static const WCHAR strMRUList[] = { 'M','R','U','L','i','s','t',0 }; /*********************************************************************** *** - * DPA_LoadStream [COMCTL32.9] - * - * Loads a dynamic pointer array from a stream - * - * PARAMS - * phDpa [O] pointer to a handle to a dynamic pointer array - * loadProc [I] pointer to a callback function - * pStream [I] pointer to a stream - * lParam [I] application specific value - * - * RETURNS - * Success: TRUE - * Failure: FALSE - * - * NOTES - * No more information available yet! - */ -HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, DPALOADPROC loadProc, - IStream *pStream, LPARAM lParam) -{ - HRESULT errCode; - LARGE_INTEGER position; - ULARGE_INTEGER newPosition; - STREAMDATA streamData; - LOADDATA loadData; - ULONG ulRead; - HDPA hDpa; - PVOID *ptr; - - FIXME ("phDpa=%p loadProc=%p pStream=%p lParam=%lx\n", - phDpa, loadProc, pStream, lParam); - - if (!phDpa || !loadProc || !pStream) - return E_INVALIDARG; - - *phDpa = (HDPA)NULL; - - position.QuadPart = 0; - - /* - * Zero out our streamData - */ - memset(&streamData,0,sizeof(STREAMDATA)); - - errCode = IStream_Seek (pStream, position, STREAM_SEEK_CUR, &newPosition); - if (errCode != S_OK) - return errCode; - - errCode = IStream_Read (pStream, &streamData, sizeof(STREAMDATA), &ulRead); - if (errCode != S_OK) - return errCode; - - FIXME ("dwSize=%lu dwData2=%lu dwItems=%lu\n", - streamData.dwSize, streamData.dwData2, streamData.dwItems); - - if ( ulRead < sizeof(STREAMDATA) || - lParam < sizeof(STREAMDATA) || - streamData.dwSize < sizeof(STREAMDATA) || - streamData.dwData2 < 1) { - errCode = E_FAIL; - } - - if (streamData.dwItems > (UINT_MAX / 2 / sizeof(VOID*))) /* 536870911 */ - return E_OUTOFMEMORY; - - /* create the dpa */ - hDpa = DPA_Create (streamData.dwItems); - if (!hDpa) - return E_OUTOFMEMORY; - - if (!DPA_Grow (hDpa, streamData.dwItems)) - return E_OUTOFMEMORY; - - /* load data from the stream into the dpa */ - ptr = hDpa->ptrs; - for (loadData.nCount = 0; loadData.nCount < streamData.dwItems; loadData.nCount++) { - errCode = (loadProc)(&loadData, pStream, lParam); - if (errCode != S_OK) { - errCode = S_FALSE; - break; - } - - *ptr = loadData.ptr; - ptr++; - } - - /* set the number of items */ - hDpa->nItemCount = loadData.nCount; - - /* store the handle to the dpa */ - *phDpa = hDpa; - FIXME ("new hDpa=%p, errorcode=%lx\n", hDpa, errCode); - - return errCode; -} - - -/********************************************************************** **** - * DPA_SaveStream [COMCTL32.10] - * - * Saves a dynamic pointer array to a stream - * - * PARAMS - * hDpa [I] handle to a dynamic pointer array - * loadProc [I] pointer to a callback function - * pStream [I] pointer to a stream - * lParam [I] application specific value - * - * RETURNS - * Success: TRUE - * Failure: FALSE - * - * NOTES - * No more information available yet! - */ -HRESULT WINAPI DPA_SaveStream (const HDPA hDpa, DPALOADPROC loadProc, - IStream *pStream, LPARAM lParam) -{ - - FIXME ("hDpa=%p loadProc=%p pStream=%p lParam=%lx\n", - hDpa, loadProc, pStream, lParam); - - return E_FAIL; -} - - -/********************************************************************** **** - * DPA_Merge [COMCTL32.11] - * - * Merge two dynamic pointers arrays. - * - * PARAMS - * hdpa1 [I] handle to a dynamic pointer array - * hdpa2 [I] handle to a dynamic pointer array - * dwFlags [I] flags - * pfnCompare [I] pointer to sort function - * pfnMerge [I] pointer to merge function - * lParam [I] application specific value - * - * RETURNS - * Success: TRUE - * Failure: FALSE - * - * NOTES - * No more information available yet! - */ -BOOL WINAPI DPA_Merge (const HDPA hdpa1, const HDPA hdpa2, DWORD dwFlags, - PFNDPACOMPARE pfnCompare, PFNDPAMERGE pfnMerge, - LPARAM lParam) -{ - INT nCount; - LPVOID *pWork1, *pWork2; - INT nResult, i; - INT nIndex; - - TRACE("%p %p %08lx %p %p %08lx)\n", - hdpa1, hdpa2, dwFlags, pfnCompare, pfnMerge, lParam); - - if (IsBadWritePtr (hdpa1, sizeof(*hdpa1))) - return FALSE; - - if (IsBadWritePtr (hdpa2, sizeof(*hdpa2))) - return FALSE; - - if (IsBadCodePtr ((FARPROC)pfnCompare)) - return FALSE; - - if (IsBadCodePtr ((FARPROC)pfnMerge)) - return FALSE; - - if (!(dwFlags & DPAM_NOSORT)) { - TRACE("sorting dpa's!\n"); - if (hdpa1->nItemCount > 0) - DPA_Sort (hdpa1, pfnCompare, lParam); - TRACE ("dpa 1 sorted!\n"); - if (hdpa2->nItemCount > 0) - DPA_Sort (hdpa2, pfnCompare, lParam); - TRACE ("dpa 2 sorted!\n"); - } - - if (hdpa2->nItemCount < 1) - return TRUE; - - TRACE("hdpa1->nItemCount=%d hdpa2->nItemCount=%d\n", - hdpa1->nItemCount, hdpa2->nItemCount); - - - /* working but untrusted implementation */ - - pWork1 = &(hdpa1->ptrs[hdpa1->nItemCount - 1]); - pWork2 = &(hdpa2->ptrs[hdpa2->nItemCount - 1]); - - nIndex = hdpa1->nItemCount - 1; - nCount = hdpa2->nItemCount - 1; - - do - { - if (nIndex < 0) { - if ((nCount >= 0) && (dwFlags & DPAM_INSERT)) { - /* Now insert the remaining new items into DPA 1 */ - TRACE("%d items to be inserted at start of DPA 1\n", - nCount+1); - for (i=nCount; i>=0; i--) { - PVOID ptr; - - ptr = (pfnMerge)(3, *pWork2, NULL, lParam); - if (!ptr) - return FALSE; - DPA_InsertPtr (hdpa1, 0, ptr); - pWork2--; - } - } - break; - } - nResult = (pfnCompare)(*pWork1, *pWork2, lParam); - TRACE("compare result=%d, dpa1.cnt=%d, dpa2.cnt=%d\n", - nResult, nIndex, nCount); - - if (nResult == 0) - { - PVOID ptr; - - ptr = (pfnMerge)(1, *pWork1, *pWork2, lParam); - if (!ptr) - return FALSE; - - nCount--; - pWork2--; - *pWork1 = ptr; - nIndex--; - pWork1--; - } - else if (nResult > 0) - { - /* item in DPA 1 missing from DPA 2 */ - if (dwFlags & DPAM_DELETE) - { - /* Now delete the extra item in DPA1 */ - PVOID ptr; - - ptr = DPA_DeletePtr (hdpa1, hdpa1->nItemCount - 1); - - (pfnMerge)(2, ptr, NULL, lParam); - } - nIndex--; - pWork1--; - } - else - { - /* new item in DPA 2 */ - if (dwFlags & DPAM_INSERT) - { - /* Now insert the new item in DPA 1 */ - PVOID ptr; - - ptr = (pfnMerge)(3, *pWork2, NULL, lParam); - if (!ptr) - return FALSE; - DPA_InsertPtr (hdpa1, nIndex+1, ptr); - } - nCount--; - pWork2--; - } - - } - while (nCount >= 0); - - return TRUE; -} - - -/********************************************************************** **** * Alloc [COMCTL32.71] * * Allocates memory block from the dll's private heap @@ -1416,912 +1111,6 @@ /*********************************************************************** *** - * DSA_Create [COMCTL32.320] - * - * Creates a dynamic storage array - * - * PARAMS - * nSize [I] size of the array elements - * nGrow [I] number of elements by which the array grows when it is filled - * - * RETURNS - * Success: pointer to an array control structure. Use this like a handle. - * Failure: NULL - * - * NOTES - * The DSA_ functions can be used to create and manipulate arrays of - * fixed-size memory blocks. These arrays can store any kind of data - * (e.g. strings and icons). - */ -HDSA WINAPI DSA_Create (INT nSize, INT nGrow) -{ - HDSA hdsa; - - TRACE("(size=%d grow=%d)\n", nSize, nGrow); - - hdsa = Alloc (sizeof(*hdsa)); - if (hdsa) - { - hdsa->nItemCount = 0; - hdsa->pData = NULL; - hdsa->nMaxCount = 0; - hdsa->nItemSize = nSize; - hdsa->nGrow = max(1, nGrow); - } - - return hdsa; -} - - -/********************************************************************** **** - * DSA_Destroy [COMCTL32.321] - * - * Destroys a dynamic storage array - * - * PARAMS - * hdsa [I] pointer to the array control structure - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI DSA_Destroy (const HDSA hdsa) -{ - TRACE("(%p)\n", hdsa); - - if (!hdsa) - return FALSE; - - if (hdsa->pData && (!Free (hdsa->pData))) - return FALSE; - - return Free (hdsa); -} - - -/********************************************************************** **** - * DSA_GetItem [COMCTL32.322] - * - * Copies the specified item into a caller-supplied buffer. - * - * PARAMS - * hdsa [I] pointer to the array control structure - * nIndex [I] number of the Item to get - * pDest [O] destination buffer. Has to be >= dwElementSize. - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI DSA_GetItem (const HDSA hdsa, INT nIndex, LPVOID pDest) -{ - LPVOID pSrc; - - TRACE("(%p %d %p)\n", hdsa, nIndex, pDest); - - if (!hdsa) - return FALSE; - if ((nIndex < 0) || (nIndex >= hdsa->nItemCount)) - return FALSE; - - pSrc = (char *) hdsa->pData + (hdsa->nItemSize * nIndex); - memmove (pDest, pSrc, hdsa->nItemSize); - - return TRUE; -} - - -/********************************************************************** **** - * DSA_GetItemPtr [COMCTL32.323] - * - * Retrieves a pointer to the specified item. - * - * PARAMS - * hdsa [I] pointer to the array control structure - * nIndex [I] index of the desired item - * - * RETURNS - * Success: pointer to an item - * Failure: NULL - */ -LPVOID WINAPI DSA_GetItemPtr (const HDSA hdsa, INT nIndex) -{ - LPVOID pSrc; - - TRACE("(%p %d)\n", hdsa, nIndex); - - if (!hdsa) - return NULL; - if ((nIndex < 0) || (nIndex >= hdsa->nItemCount)) - return NULL; - - pSrc = (char *) hdsa->pData + (hdsa->nItemSize * nIndex); - - TRACE("-- ret=%p\n", pSrc); - - return pSrc; -} - - -/********************************************************************** **** - * DSA_SetItem [COMCTL32.325] - * - * Sets the contents of an item in the array. - * - * PARAMS - * hdsa [I] pointer to the array control structure - * nIndex [I] index for the item - * pSrc [I] pointer to the new item data - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI DSA_SetItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) -{ - INT nSize, nNewItems; - LPVOID pDest, lpTemp; - - TRACE("(%p %d %p)\n", hdsa, nIndex, pSrc); - - if ((!hdsa) || nIndex < 0) - return FALSE; - - if (hdsa->nItemCount <= nIndex) { - /* within the old array */ - if (hdsa->nMaxCount > nIndex) { - /* within the allocated space, set a new boundary */ - hdsa->nItemCount = nIndex + 1; - } - else { - /* resize the block of memory */ - nNewItems = - hdsa->nGrow * ((INT)(((nIndex + 1) - 1) / hdsa->nGrow) + 1); - nSize = hdsa->nItemSize * nNewItems; - - lpTemp = ReAlloc (hdsa->pData, nSize); - if (!lpTemp) - return FALSE; - - hdsa->nMaxCount = nNewItems; - hdsa->nItemCount = nIndex + 1; - hdsa->pData = lpTemp; - } - } - - /* put the new entry in */ - pDest = (char *) hdsa->pData + (hdsa->nItemSize * nIndex); - TRACE("-- move dest=%p src=%p size=%d\n", - pDest, pSrc, hdsa->nItemSize); - memmove (pDest, pSrc, hdsa->nItemSize); - - return TRUE; -} - - -/********************************************************************** **** - * DSA_InsertItem [COMCTL32.324] - * - * Inserts an item into the array at the specified index. - * - * PARAMS - * hdsa [I] pointer to the array control structure - * nIndex [I] index for the new item - * pSrc [I] pointer to the element - * - * RETURNS - * Success: position of the new item - * Failure: -1 - */ -INT WINAPI DSA_InsertItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) -{ - INT nNewItems, nSize; - LPVOID lpTemp, lpDest; - - TRACE("(%p %d %p)\n", hdsa, nIndex, pSrc); - - if ((!hdsa) || nIndex < 0) - return -1; - - /* when nIndex >= nItemCount then append */ - if (nIndex >= hdsa->nItemCount) - nIndex = hdsa->nItemCount; - - /* do we need to resize ? */ - if (hdsa->nItemCount >= hdsa->nMaxCount) { - nNewItems = hdsa->nMaxCount + hdsa->nGrow; - nSize = hdsa->nItemSize * nNewItems; - - lpTemp = ReAlloc (hdsa->pData, nSize); - if (!lpTemp) - return -1; - - hdsa->nMaxCount = nNewItems; - hdsa->pData = lpTemp; - } - - /* do we need to move elements ? */ - if (nIndex < hdsa->nItemCount) { - lpTemp = (char *) hdsa->pData + (hdsa->nItemSize * nIndex); - lpDest = (char *) lpTemp + hdsa->nItemSize; - nSize = (hdsa->nItemCount - nIndex) * hdsa->nItemSize; - TRACE("-- move dest=%p src=%p size=%d\n", - lpDest, lpTemp, nSize); - memmove (lpDest, lpTemp, nSize); - } - - /* ok, we can put the new Item in */ - hdsa->nItemCount++; - lpDest = (char *) hdsa->pData + (hdsa->nItemSize * nIndex); - TRACE("-- move dest=%p src=%p size=%d\n", - lpDest, pSrc, hdsa->nItemSize); - memmove (lpDest, pSrc, hdsa->nItemSize); - - return nIndex; -} - - -/********************************************************************** **** - * DSA_DeleteItem [COMCTL32.326] - * - * Deletes the specified item from the array. - * - * PARAMS - * hdsa [I] pointer to the array control structure - * nIndex [I] index for the element to delete - * - * RETURNS - * Success: number of the deleted element - * Failure: -1 - */ -INT WINAPI DSA_DeleteItem (const HDSA hdsa, INT nIndex) -{ - LPVOID lpDest,lpSrc; - INT nSize; - - TRACE("(%p %d)\n", hdsa, nIndex); - - if (!hdsa) - return -1; - if (nIndex < 0 || nIndex >= hdsa->nItemCount) - return -1; - - /* do we need to move ? */ - if (nIndex < hdsa->nItemCount - 1) { - lpDest = (char *) hdsa->pData + (hdsa->nItemSize * nIndex); - lpSrc = (char *) lpDest + hdsa->nItemSize; - nSize = hdsa->nItemSize * (hdsa->nItemCount - nIndex - 1); - TRACE("-- move dest=%p src=%p size=%d\n", - lpDest, lpSrc, nSize); - memmove (lpDest, lpSrc, nSize); - } - - hdsa->nItemCount--; - - /* free memory ? */ - if ((hdsa->nMaxCount - hdsa->nItemCount) >= hdsa->nGrow) { - nSize = hdsa->nItemSize * hdsa->nItemCount; - - lpDest = ReAlloc (hdsa->pData, nSize); - if (!lpDest) - return -1; - - hdsa->nMaxCount = hdsa->nItemCount; - hdsa->pData = lpDest; - } - - return nIndex; -} - - -/********************************************************************** **** - * DSA_DeleteAllItems [COMCTL32.327] - * - * Removes all items and reinitializes the array. - * - * PARAMS - * hdsa [I] pointer to the array control structure - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI DSA_DeleteAllItems (const HDSA hdsa) -{ - TRACE("(%p)\n", hdsa); - - if (!hdsa) - return FALSE; - if (hdsa->pData && (!Free (hdsa->pData))) - return FALSE; - - hdsa->nItemCount = 0; - hdsa->pData = NULL; - hdsa->nMaxCount = 0; - - return TRUE; -} - - -/********************************************************************** **** - * DPA_Destroy [COMCTL32.329] - * - * Destroys a dynamic pointer array - * - * PARAMS - * hdpa [I] handle (pointer) to the pointer array - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI DPA_Destroy (const HDPA hdpa) -{ - TRACE("(%p)\n", hdpa); - - if (!hdpa) - return FALSE; - - if (hdpa->ptrs && (!HeapFree (hdpa->hHeap, 0, hdpa->ptrs))) - return FALSE; - - return HeapFree (hdpa->hHeap, 0, hdpa); -} - - -/********************************************************************** **** - * DPA_Grow [COMCTL32.330] - * - * Sets the growth amount. - * - * PARAMS - * hdpa [I] handle (pointer) to the existing (source) pointer array - * nGrow [I] number of items by which the array grows when it's too small - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI DPA_Grow (const HDPA hdpa, INT nGrow) -{ - TRACE("(%p %d)\n", hdpa, nGrow); - - if (!hdpa) - return FALSE; - - hdpa->nGrow = max(8, nGrow); - - return TRUE; -} - - -/********************************************************************** **** - * DPA_Clone [COMCTL32.331] - * - * Copies a pointer array to an other one or creates a copy - * - * PARAMS - * hdpa [I] handle (pointer) to the existing (source) pointer array - * hdpaNew [O] handle (pointer) to the destination pointer array - * - * RETURNS - * Success: pointer to the destination pointer array. - * Failure: NULL - * - * NOTES - * - If the 'hdpaNew' is a NULL-Pointer, a copy of the source pointer - * array will be created and it's handle (pointer) is returned. - * - If 'hdpa' is a NULL-Pointer, the original implementation crashes, - * this implementation just returns NULL. - */ -HDPA WINAPI DPA_Clone (const HDPA hdpa, const HDPA hdpaNew) -{ - INT nNewItems, nSize; - HDPA hdpaTemp; - - if (!hdpa) - return NULL; - - TRACE("(%p %p)\n", hdpa, hdpaNew); - - if (!hdpaNew) { - /* create a new DPA */ - hdpaTemp = HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY, - sizeof(*hdpaTemp)); - hdpaTemp->hHeap = hdpa->hHeap; - hdpaTemp->nGrow = hdpa->nGrow; - } - else - hdpaTemp = hdpaNew; - - if (hdpaTemp->ptrs) { - /* remove old pointer array */ - HeapFree (hdpaTemp->hHeap, 0, hdpaTemp->ptrs); - hdpaTemp->ptrs = NULL; - hdpaTemp->nItemCount = 0; - hdpaTemp->nMaxCount = 0; - } - - /* create a new pointer array */ - nNewItems = hdpaTemp->nGrow * - ((INT)((hdpa->nItemCount - 1) / hdpaTemp->nGrow) + 1); - nSize = nNewItems * sizeof(LPVOID); - hdpaTemp->ptrs = HeapAlloc (hdpaTemp->hHeap, HEAP_ZERO_MEMORY, nSize); - hdpaTemp->nMaxCount = nNewItems; - - /* clone the pointer array */ - hdpaTemp->nItemCount = hdpa->nItemCount; - memmove (hdpaTemp->ptrs, hdpa->ptrs, - hdpaTemp->nItemCount * sizeof(LPVOID)); - - return hdpaTemp; -} - - -/********************************************************************** **** - * DPA_GetPtr [COMCTL32.332] - * - * Retrieves a pointer from a dynamic pointer array - * - * PARAMS - * hdpa [I] handle (pointer) to the pointer array - * nIndex [I] array index of the desired pointer - * - * RETURNS - * Success: pointer - * Failure: NULL - */ -LPVOID WINAPI DPA_GetPtr (const HDPA hdpa, INT nIndex) -{ - TRACE("(%p %d)\n", hdpa, nIndex); - - if (!hdpa) - return NULL; - if (!hdpa->ptrs) { - WARN("no pointer array.\n"); - return NULL; - } - if ((nIndex < 0) || (nIndex >= hdpa->nItemCount)) { - WARN("not enough pointers in array (%d vs %d).\n",nIndex,hdpa->nItemCount); - return NULL; - } - - TRACE("-- %p\n", hdpa->ptrs[nIndex]); - - return hdpa->ptrs[nIndex]; -} - - -/********************************************************************** **** - * DPA_GetPtrIndex [COMCTL32.333] - * - * Retrieves the index of the specified pointer - * - * PARAMS - * hdpa [I] handle (pointer) to the pointer array - * p [I] pointer - * - * RETURNS - * Success: index of the specified pointer - * Failure: -1 - */ -INT WINAPI DPA_GetPtrIndex (const HDPA hdpa, LPVOID p) -{ - INT i; - - if (!hdpa || !hdpa->ptrs) - return -1; - - for (i = 0; i < hdpa->nItemCount; i++) { - if (hdpa->ptrs[i] == p) - return i; - } - - return -1; -} - - -/********************************************************************** **** - * DPA_InsertPtr [COMCTL32.334] - * - * Inserts a pointer into a dynamic pointer array - * - * PARAMS - * hdpa [I] handle (pointer) to the array - * i [I] array index - * p [I] pointer to insert - * - * RETURNS - * Success: index of the inserted pointer - * Failure: -1 - */ -INT WINAPI DPA_InsertPtr (const HDPA hdpa, INT i, LPVOID p) -{ - TRACE("(%p %d %p)\n", hdpa, i, p); - - if (!hdpa || i < 0) return -1; - - if (i >= 0x7fff) - i = hdpa->nItemCount; - - if (i >= hdpa->nItemCount) - return DPA_SetPtr(hdpa, i, p) ? i : -1; - - /* create empty spot at the end */ - if (!DPA_SetPtr(hdpa, hdpa->nItemCount, 0)) return -1; - memmove (hdpa->ptrs + i + 1, hdpa->ptrs + i, (hdpa->nItemCount - i - 1) * sizeof(LPVOID)); - hdpa->ptrs[i] = p; - return i; -} - -/********************************************************************** **** - * DPA_SetPtr [COMCTL32.335] - * - * Sets a pointer in the pointer array - * - * PARAMS - * hdpa [I] handle (pointer) to the pointer array - * i [I] index of the pointer that will be set - * p [I] pointer to be set - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI DPA_SetPtr (const HDPA hdpa, INT i, LPVOID p) -{ - LPVOID *lpTemp; - - TRACE("(%p %d %p)\n", hdpa, i, p); - - if (!hdpa || i < 0 || i > 0x7fff) - return FALSE; - - if (hdpa->nItemCount <= i) { - /* within the old array */ - if (hdpa->nMaxCount <= i) { - /* resize the block of memory */ - INT nNewItems = - hdpa->nGrow * ((INT)(((i+1) - 1) / hdpa->nGrow) + 1); - INT nSize = nNewItems * sizeof(LPVOID); - - if (hdpa->ptrs) - lpTemp = HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY, hdpa->ptrs, nSize); - else - lpTemp = HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY, nSize); - - if (!lpTemp) - return FALSE; - - hdpa->nMaxCount = nNewItems; - hdpa->ptrs = lpTemp; - } - hdpa->nItemCount = i+1; - } - - /* put the new entry in */ - hdpa->ptrs[i] = p; - - return TRUE; -} - - -/********************************************************************** **** - * DPA_DeletePtr [COMCTL32.336] - * - * Removes a pointer from the pointer array. - * - * PARAMS - * hdpa [I] handle (pointer) to the pointer array - * i [I] index of the pointer that will be deleted - * - * RETURNS - * Success: deleted pointer - * Failure: NULL - */ -LPVOID WINAPI DPA_DeletePtr (const HDPA hdpa, INT i) -{ - LPVOID *lpDest, *lpSrc, lpTemp = NULL; - INT nSize; - - TRACE("(%p %d)\n", hdpa, i); - - if ((!hdpa) || i < 0 || i >= hdpa->nItemCount) - return NULL; - - lpTemp = hdpa->ptrs[i]; - - /* do we need to move ?*/ - if (i < hdpa->nItemCount - 1) { - lpDest = hdpa->ptrs + i; - lpSrc = lpDest + 1; - nSize = (hdpa->nItemCount - i - 1) * sizeof(LPVOID); - TRACE("-- move dest=%p src=%p size=%x\n", - lpDest, lpSrc, nSize); - memmove (lpDest, lpSrc, nSize); - } - - hdpa->nItemCount --; - - /* free memory ?*/ - if ((hdpa->nMaxCount - hdpa->nItemCount) >= hdpa->nGrow) { - INT nNewItems = max(hdpa->nGrow * 2, hdpa->nItemCount); - nSize = nNewItems * sizeof(LPVOID); - lpDest = HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY, - hdpa->ptrs, nSize); - if (!lpDest) - return NULL; - - hdpa->nMaxCount = nNewItems; - hdpa->ptrs = (LPVOID*)lpDest; - } - - return lpTemp; -} - - -/********************************************************************** **** - * DPA_DeleteAllPtrs [COMCTL32.337] - * - * Removes all pointers and reinitializes the array. - * - * PARAMS - * hdpa [I] handle (pointer) to the pointer array - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ [truncated at 1000 lines; 2397 more skipped]

1 0

[ea] 17325: Make the 'rosky' optional module compile.
by ea＠svn.reactos.com 12 Aug '05

12 Aug '05

Make the 'rosky' optional module compile. Added: trunk/rosky/directory.xml Modified: trunk/rosky/include/rosky.h Added: trunk/rosky/lib/directory.xml Modified: trunk/rosky/lib/libsky/libsky.h Added: trunk/rosky/lib/libsky/libsky.xml Modified: trunk/rosky/lib/libsky/stubs.c Modified: trunk/rosky/lib/libskygi/libskygi.c Modified: trunk/rosky/lib/libskygi/libskygi.h Added: trunk/rosky/lib/libskygi/libskygi.xml Modified: trunk/rosky/lib/libskygi/stubs.c Added: trunk/rosky/makefile _____ Added: trunk/rosky/directory.xml --- trunk/rosky/directory.xml 2005-08-12 12:31:33 UTC (rev 17324) +++ trunk/rosky/directory.xml 2005-08-12 13:46:36 UTC (rev 17325) @@ -0,0 +1,4 @@ +<directory name="lib"> + <xi:include href="lib/directory.xml" /> +</directory> + Property changes on: trunk/rosky/directory.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosky/include/rosky.h --- trunk/rosky/include/rosky.h 2005-08-12 12:31:33 UTC (rev 17324) +++ trunk/rosky/include/rosky.h 2005-08-12 13:46:36 UTC (rev 17325) @@ -2,6 +2,6 @@ * ReactOS SkyOS headers */ -#include <rosky/structs.h> -#include <rosky/defines.h> +#include <structs.h> +#include <defines.h> _____ Added: trunk/rosky/lib/directory.xml --- trunk/rosky/lib/directory.xml 2005-08-12 12:31:33 UTC (rev 17324) +++ trunk/rosky/lib/directory.xml 2005-08-12 13:46:36 UTC (rev 17325) @@ -0,0 +1,8 @@ +<group> + <directory name="libsky"> + <xi:include href="libsky/libsky.xml" /> + </directory> + <directory name="libskygi"> + <xi:include href="libskygi/libskygi.xml" /> + </directory> +</group> Property changes on: trunk/rosky/lib/directory.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosky/lib/libsky/libsky.h --- trunk/rosky/lib/libsky/libsky.h 2005-08-12 12:31:33 UTC (rev 17324) +++ trunk/rosky/lib/libsky/libsky.h 2005-08-12 13:46:36 UTC (rev 17325) @@ -3,6 +3,10 @@ void __cdecl DbgPrint(char *, ...); +#if defined(DBG) +#undef DBG +#endif + #ifdef DEBUG # ifdef NDEBUG # define DBG(...) _____ Added: trunk/rosky/lib/libsky/libsky.xml --- trunk/rosky/lib/libsky/libsky.xml 2005-08-12 12:31:33 UTC (rev 17324) +++ trunk/rosky/lib/libsky/libsky.xml 2005-08-12 13:46:36 UTC (rev 17325) @@ -0,0 +1,12 @@ +<module name="libsky" type="win32dll" installbase="system32" installname="libsky.dll"> + <importlibrary definition="libsky.def" /> + <include base="libsky">.</include> + <include base="libskygi">../../include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <library>ntdll</library> + <library>kernel32</library> + <file>libsky.c</file> + <file>stubs.c</file> + <file>libsky.rc</file> +</module> Property changes on: trunk/rosky/lib/libsky/libsky.xml ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/rosky/lib/libsky/stubs.c --- trunk/rosky/lib/libsky/stubs.c 2005-08-12 12:31:33 UTC (rev 17324) +++ trunk/rosky/lib/libsky/stubs.c 2005-08-12 13:46:36 UTC (rev 17325) @@ -11,6 +11,7 @@ */ #include <windows.h> /* #define NDEBUG */ +#include <debug.h> #include "libsky.h" _____ Modified: trunk/rosky/lib/libskygi/libskygi.c --- trunk/rosky/lib/libskygi/libskygi.c 2005-08-12 12:31:33 UTC (rev 17324) +++ trunk/rosky/lib/libskygi/libskygi.c 2005-08-12 13:46:36 UTC (rev 17325) @@ -27,10 +27,13 @@ */ #include <windows.h> #include <stdio.h> -#include <rosky/rosky.h> +#include <rosky.h> #include "libskygi.h" #include "resource.h" +#define NDEBUG +#include <debug.h> + typedef struct { s_window Window; _____ Modified: trunk/rosky/lib/libskygi/libskygi.h --- trunk/rosky/lib/libskygi/libskygi.h 2005-08-12 12:31:33 UTC (rev 17324) +++ trunk/rosky/lib/libskygi/libskygi.h 2005-08-12 13:46:36 UTC (rev 17325) @@ -3,7 +3,11 @@ ULONG DbgPrint(PCH Format,...); -#define DBG DbgPrint +#if defined(DBG) +#undef DBG +#endif + +#define DBG DPRINT #define STUB DbgPrint("Stub in %s:%i: ", __FILE__, __LINE__); DbgPrint #endif /* __LIBSKY_H */ _____ Added: trunk/rosky/lib/libskygi/libskygi.xml --- trunk/rosky/lib/libskygi/libskygi.xml 2005-08-12 12:31:33 UTC (rev 17324) +++ trunk/rosky/lib/libskygi/libskygi.xml 2005-08-12 13:46:36 UTC (rev 17325) @@ -0,0 +1,14 @@ +<module name="libskygi" type="win32dll" installbase="system32" installname="libskygi.dll"> + <importlibrary definition="libskygi.def" /> + <include base="libskygi">.</include> + <include base="libskygi">../../include</include> + <define name="_WIN32_WINNT">0x0501</define> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <library>ntdll</library> + <library>kernel32</library> + <library>gdi32</library> + <file>libskygi.c</file> + <file>stubs.c</file> + <file>libskygi.rc</file> +</module> Property changes on: trunk/rosky/lib/libskygi/libskygi.xml ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/rosky/lib/libskygi/stubs.c --- trunk/rosky/lib/libskygi/stubs.c 2005-08-12 12:31:33 UTC (rev 17324) +++ trunk/rosky/lib/libskygi/stubs.c 2005-08-12 13:46:36 UTC (rev 17325) @@ -10,10 +10,13 @@ * 08/12/2004 Created */ #include <windows.h> -#include <rosky/rosky.h> +#include <rosky.h> #include "libskygi.h" +#define NDEBUG +#include <debug.h> + /* * @unimplemented */ _____ Added: trunk/rosky/makefile --- trunk/rosky/makefile 2005-08-12 12:31:33 UTC (rev 17324) +++ trunk/rosky/makefile 2005-08-12 13:46:36 UTC (rev 17325) @@ -0,0 +1,14 @@ +all: + @echo To build "rosky" there are two paths: + @echo --- + @echo 1. copy the rosky folder into the reactos\modules folder + @echo 2. link reactos/modules/rosky to rosky + @echo UNIX + @echo cd $${ROS_SRC_ROOT}/reactos/modules + @echo ln -s $${ROS_SRC_ROOT}/rosky rosky + @echo WINDOWS + @echo cd %%ROS_SRC_ROOT%%\reactos\modules + @echo junction rosky %%ROS_SRC_ROOT%%\rosky + @echo --- + @echo Eventually you can run "make depends" in the %%ROS_SRC_ROOT%%\reactos + @echo directory to compile it. Property changes on: trunk/rosky/makefile ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native

1 0

[ea] 17324: Add 'rosky' module.
by ea＠svn.reactos.com 12 Aug '05

12 Aug '05

Add 'rosky' module. Modified: trunk/reactos/modules/directory.xml _____ Modified: trunk/reactos/modules/directory.xml --- trunk/reactos/modules/directory.xml 2005-08-12 12:22:02 UTC (rev 17323) +++ trunk/reactos/modules/directory.xml 2005-08-12 12:31:33 UTC (rev 17324) @@ -20,6 +20,13 @@ </xi:fallback> </xi:include> </directory> +<directory name="rosky"> + <xi:include href="rosky/directory.xml"> + <xi:fallback> + <xi:include href="empty.xml" /> + </xi:fallback> + </xi:include> +</directory> <directory name="vms"> <xi:include href="vms/directory.xml"> <xi:fallback>

1 0

[ea] 17323: CSR Reloaded... well, split.
by ea＠svn.reactos.com 12 Aug '05

12 Aug '05

CSR Reloaded... well, split. - almost do-nothing base source code for new CSR server DLLs host - base source code for the core CSR server DLL 'csrsrv.dll' (server 0) - base source code for the base WIN server DLL 'basesrv.dll' (server 1) - base source code for the console+user WIN server DLL 'winsrv.dll' (servers 3 and 2) NOTES - At present, nothing works, but compilation is OK, sorry. - The program is temporarily named 'csr.exe' to coexist with current monolithic 'csrss.exe'. - Code, hints, suggestions, and migration plans welcome! (post 0.3) Added: trunk/reactos/subsys/csr/ Added: trunk/reactos/subsys/csr/args.c Added: trunk/reactos/subsys/csr/csr.h Added: trunk/reactos/subsys/csr/csr.rc Added: trunk/reactos/subsys/csr/csr.xml Added: trunk/reactos/subsys/csr/csrsrv/ Added: trunk/reactos/subsys/csr/csrsrv/csrsrv.def Added: trunk/reactos/subsys/csr/csrsrv/csrsrv.rc Added: trunk/reactos/subsys/csr/csrsrv/csrsrv.xml Added: trunk/reactos/subsys/csr/csrsrv/debug.c Added: trunk/reactos/subsys/csr/csrsrv/dllmain.c Added: trunk/reactos/subsys/csr/csrsrv/init.c Added: trunk/reactos/subsys/csr/csrsrv/process.c Added: trunk/reactos/subsys/csr/csrsrv/server.c Added: trunk/reactos/subsys/csr/csrsrv/session.c Added: trunk/reactos/subsys/csr/csrsrv/srv.h Added: trunk/reactos/subsys/csr/csrsrv/thread.c Added: trunk/reactos/subsys/csr/csrsrv/wait.c Added: trunk/reactos/subsys/csr/main.c Added: trunk/reactos/subsys/win/ Added: trunk/reactos/subsys/win/basesrv/ Added: trunk/reactos/subsys/win/basesrv/basesrv.def Added: trunk/reactos/subsys/win/basesrv/basesrv.h Added: trunk/reactos/subsys/win/basesrv/basesrv.rc Added: trunk/reactos/subsys/win/basesrv/basesrv.xml Added: trunk/reactos/subsys/win/basesrv/init.c Added: trunk/reactos/subsys/win/basesrv/main.c Added: trunk/reactos/subsys/win/basesrv/server.c Added: trunk/reactos/subsys/win/directory.xml Added: trunk/reactos/subsys/win/winsrv/ Added: trunk/reactos/subsys/win/winsrv/dllmain.c Added: trunk/reactos/subsys/win/winsrv/init.c Added: trunk/reactos/subsys/win/winsrv/server.c Added: trunk/reactos/subsys/win/winsrv/winsrv.def Added: trunk/reactos/subsys/win/winsrv/winsrv.h Added: trunk/reactos/subsys/win/winsrv/winsrv.rc Added: trunk/reactos/subsys/win/winsrv/winsrv.xml _____ Added: trunk/reactos/subsys/csr/args.c --- trunk/reactos/subsys/csr/args.c 2005-08-12 12:10:33 UTC (rev 17322) +++ trunk/reactos/subsys/csr/args.c 2005-08-12 12:22:02 UTC (rev 17323) @@ -0,0 +1,126 @@ +/* $Id$ + * + * args.c - Client/Server Runtime - command line parsing + * + * ReactOS Operating System + * + * -------------------------------------------------------------------- + * + * This software is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This software 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING.LIB. If not, write + * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, + * MA 02139, USA. + * + * -------------------------------------------------------------------- + */ +#include "csr.h" + +#define NDEBUG +#include <debug.h> + +/********************************************************************** + * NAME PRIVATE + * CsrParseCommandLine/2 + */ +NTSTATUS FASTCALL CsrParseCommandLine (PPEB Peb, + PCOMMAND_LINE_ARGUMENT Argument) +{ + HANDLE ProcessHeap = Peb->ProcessHeap; + PRTL_USER_PROCESS_PARAMETERS RtlProcessParameters = RtlNormalizeProcessParams (Peb->ProcessParameters); + INT i = 0; + INT afterlastspace = 0; + + + DPRINT("CSR: %s called\n", __FUNCTION__); + + RtlZeroMemory (Argument, sizeof (COMMAND_LINE_ARGUMENT)); + + Argument->Vector = (PWSTR *) RtlAllocateHeap (ProcessHeap, + 0, + (CSRP_MAX_ARGUMENT_COUNT * sizeof Argument->Vector[0])); + if(NULL == Argument->Vector) + { + DPRINT("CSR: %s: no memory for Argument->Vector\n", __FUNCTION__); + return STATUS_NO_MEMORY; + } + + Argument->Buffer.Length = + Argument->Buffer.MaximumLength = + RtlProcessParameters->CommandLine.Length + + sizeof Argument->Buffer.Buffer [0]; /* zero terminated */ + Argument->Buffer.Buffer = + (PWSTR) RtlAllocateHeap (ProcessHeap, + 0, + Argument->Buffer.MaximumLength); + if(NULL == Argument->Buffer.Buffer) + { + DPRINT("CSR: %s: no memory for Argument->Buffer.Buffer\n", __FUNCTION__); + return STATUS_NO_MEMORY; + } + + RtlCopyMemory (Argument->Buffer.Buffer, + RtlProcessParameters->CommandLine.Buffer, + RtlProcessParameters->CommandLine.Length); + + while (Argument->Buffer.Buffer [i]) + { + if (Argument->Buffer.Buffer[i] == L' ') + { + Argument->Count ++; + Argument->Buffer.Buffer [i] = L'\0'; + Argument->Vector [Argument->Count - 1] = & (Argument->Buffer.Buffer [afterlastspace]); + i++; + while (Argument->Buffer.Buffer [i] == L' ') + { + i++; + } + afterlastspace = i; + } + else + { + i++; + } + } + + if (Argument->Buffer.Buffer [afterlastspace] != L'\0') + { + Argument->Count ++; + Argument->Buffer.Buffer [i] = L'\0'; + Argument->Vector [Argument->Count - 1] = & (Argument->Buffer.Buffer [afterlastspace]); + } +#if !defined(NDEBUG) + for (i=0; i<Argument->Count; i++) + { + DPRINT("CSR: Argument[%d] = '%S'\n", i, Argument->Vector [i]); + } +#endif + return STATUS_SUCCESS; +} +/********************************************************************** + * NAME PRIVATE + * CsrFreeCommandLine/2 + */ + +VOID FASTCALL CsrFreeCommandLine (PPEB Peb, + PCOMMAND_LINE_ARGUMENT Argument) +{ + DPRINT("CSR: %s called\n", __FUNCTION__); + + RtlFreeHeap (Peb->ProcessHeap, + 0, + Argument->Vector); + RtlFreeHeap (Peb->ProcessHeap, + 0, + Argument->Buffer.Buffer); +} +/* EOF */ Property changes on: trunk/reactos/subsys/csr/args.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/csr/csr.h --- trunk/reactos/subsys/csr/csr.h 2005-08-12 12:10:33 UTC (rev 17322) +++ trunk/reactos/subsys/csr/csr.h 2005-08-12 12:22:02 UTC (rev 17323) @@ -0,0 +1,34 @@ +#if !defined(_INCLUDE_CSR_H) +#define _INCLUDE_CSR_H + +/* PSDK/NDK Headers */ +#include <stdio.h> +#include <windows.h> + +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + +#include <csr/server.h> + + +#define CSRSS_ARGUMENT_SIZE 16 + +/* args.c */ +#define CSRP_MAX_ARGUMENT_COUNT 512 + +typedef struct _COMMAND_LINE_ARGUMENT +{ + ULONG Count; + UNICODE_STRING Buffer; + PWSTR * Vector; + +} COMMAND_LINE_ARGUMENT, *PCOMMAND_LINE_ARGUMENT; + +NTSTATUS FASTCALL CsrParseCommandLine (PPEB,PCOMMAND_LINE_ARGUMENT); +VOID FASTCALL CsrFreeCommandLine (PPEB,PCOMMAND_LINE_ARGUMENT); + +/* csrsrv.dll */ +NTSTATUS STDCALL CsrServerInitialization (ULONG,LPWSTR*); + +#endif /* !def _INCLUDE_CSR_H */ + Property changes on: trunk/reactos/subsys/csr/csr.h ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/csr/csr.rc --- trunk/reactos/subsys/csr/csr.rc 2005-08-12 12:10:33 UTC (rev 17322) +++ trunk/reactos/subsys/csr/csr.rc 2005-08-12 12:22:02 UTC (rev 17323) @@ -0,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "Client/Server Runtime Process\0" +#define REACTOS_STR_INTERNAL_NAME "csrss\0" +#define REACTOS_STR_ORIGINAL_FILENAME "csrss.exe\0" +#include <reactos/version.rc> Property changes on: trunk/reactos/subsys/csr/csr.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/csr/csr.xml --- trunk/reactos/subsys/csr/csr.xml 2005-08-12 12:10:33 UTC (rev 17322) +++ trunk/reactos/subsys/csr/csr.xml 2005-08-12 12:22:02 UTC (rev 17323) @@ -0,0 +1,14 @@ +<module name="csr" type="nativecui" installbase="system32" installname="csr.exe"> + <include base="csr">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0600</define> + <define name="WINVER">0x0501</define> + <library>ntdll</library> + <library>csrsrv</library> + <file>main.c</file> + <file>args.c</file> + <file>csr.rc</file> +</module> +<directory name="csrsrv"> + <xi:include href="csrsrv/csrsrv.xml" /> +</directory> Property changes on: trunk/reactos/subsys/csr/csr.xml ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/csr/csrsrv/csrsrv.def --- trunk/reactos/subsys/csr/csrsrv/csrsrv.def 2005-08-12 12:10:33 UTC (rev 17322) +++ trunk/reactos/subsys/csr/csrsrv/csrsrv.def 2005-08-12 12:22:02 UTC (rev 17323) @@ -0,0 +1,37 @@ +; $Id$ +LIBRARY csrsrv.dll +EXPORTS +CsrAddStaticServerThread@4 +CsrCallServerFromServer@0 +CsrCreateProcess@8 +CsrCreateRemoteThread@0 +CsrCreateThread@8 +CsrCreateWait@8 +CsrDebugProcess@4 +CsrDebugProcessStop@4 +CsrDereferenceProcess@4 +CsrDereferenceThread@4 +CsrDereferenceWait@4 +CsrDestroyProcess@4 +CsrDestroyThread@4 +CsrExecServerThread@0 +CsrGetProcessLuid@8 +CsrImpersonateClient@0 +CsrLockProcessByClientId@0 +CsrLockThreadByClientId@0 +CsrMoveSatisfiedWait@4 +CsrNotifyWait@4 +CsrQueryApiPort@0 +CsrReferenceThread@4 +CsrRevertToSelf@0 +CsrServerInitialization@8 +CsrSetBackgroundPriority@0 +CsrSetCallingSpooler@0 +CsrSetForegroundPriority@0 +CsrShutdownProcesses@4 +CsrUnhandledExceptionFilter@0 +CsrUnlockProcess@4 +CsrUnlockThread@4 +CsrValidateMessageBuffer@0 +CsrValidateMessageString@0 +; EOF Property changes on: trunk/reactos/subsys/csr/csrsrv/csrsrv.def ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/csr/csrsrv/csrsrv.rc --- trunk/reactos/subsys/csr/csrsrv/csrsrv.rc 2005-08-12 12:10:33 UTC (rev 17322) +++ trunk/reactos/subsys/csr/csrsrv/csrsrv.rc 2005-08-12 12:22:02 UTC (rev 17323) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS CSR Core Server\0" +#define REACTOS_STR_INTERNAL_NAME "csrsrv\0" +#define REACTOS_STR_ORIGINAL_FILENAME "csrsrv.dll\0" +#include <reactos/version.rc> Property changes on: trunk/reactos/subsys/csr/csrsrv/csrsrv.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/csr/csrsrv/csrsrv.xml --- trunk/reactos/subsys/csr/csrsrv/csrsrv.xml 2005-08-12 12:10:33 UTC (rev 17322) +++ trunk/reactos/subsys/csr/csrsrv/csrsrv.xml 2005-08-12 12:22:02 UTC (rev 17323) @@ -0,0 +1,17 @@ +<module name="csrsrv" type="nativedll"> + <importlibrary definition="csrsrv.def" /> + <include base="csrsrv">.</include> + <include base="csr">.</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <library>ntdll</library> + <file>debug.c</file> + <file>dllmain.c</file> + <file>init.c</file> + <file>process.c</file> + <file>server.c</file> + <file>session.c</file> + <file>thread.c</file> + <file>wait.c</file> + <file>csrsrv.rc</file> +</module> Property changes on: trunk/reactos/subsys/csr/csrsrv/csrsrv.xml ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/csr/csrsrv/debug.c --- trunk/reactos/subsys/csr/csrsrv/debug.c 2005-08-12 12:10:33 UTC (rev 17322) +++ trunk/reactos/subsys/csr/csrsrv/debug.c 2005-08-12 12:22:02 UTC (rev 17323) @@ -0,0 +1,53 @@ +/* $Id$ + * + * subsys/csr/csrsrv/debug.c - CSR server - debugging management + * + * ReactOS Operating System + * + * -------------------------------------------------------------------- + * + * This software is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This software 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING.LIB. If not, write + * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, + * MA 02139, USA. + * + * -------------------------------------------------------------------- + */ +#include "srv.h" + +//#define NDEBUG +#include <debug.h> + +/*===================================================================== + * PUBLIC API + *===================================================================*/ + +NTSTATUS STDCALL CsrDebugProcess (PCSR_PROCESS pCsrProcess) +{ + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + + DPRINT("CSRSRV: %s(%08lx) called\n", __FUNCTION__, pCsrProcess); + + return Status; +} + +NTSTATUS STDCALL CsrDebugProcessStop (PCSR_PROCESS pCsrProcess) +{ + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + + DPRINT("CSRSRV: %s(%08lx) called\n", __FUNCTION__, pCsrProcess); + + return Status; +} + +/* EOF */ Property changes on: trunk/reactos/subsys/csr/csrsrv/debug.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/csr/csrsrv/dllmain.c --- trunk/reactos/subsys/csr/csrsrv/dllmain.c 2005-08-12 12:10:33 UTC (rev 17322) +++ trunk/reactos/subsys/csr/csrsrv/dllmain.c 2005-08-12 12:22:02 UTC (rev 17323) @@ -0,0 +1,33 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: subsys/csr/csrsrv/dllmain.c + * PURPOSE: DLL entry point + */ + +/* INCLUDES ******************************************************************/ + +#include "srv.h" + +#define NDEBUG +#include <debug.h> + +HANDLE CsrSrvDllHandle = 0; + +/* FUNCTIONS *****************************************************************/ + +BOOL STDCALL +DllMain(HANDLE hDll, + DWORD dwReason, + LPVOID lpReserved) +{ + if (DLL_PROCESS_ATTACH == dwReason) + { + CsrSrvDllHandle = hDll; + } + + return TRUE; +} + +/* EOF */ Property changes on: trunk/reactos/subsys/csr/csrsrv/dllmain.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/csr/csrsrv/init.c --- trunk/reactos/subsys/csr/csrsrv/init.c 2005-08-12 12:10:33 UTC (rev 17322) +++ trunk/reactos/subsys/csr/csrsrv/init.c 2005-08-12 12:22:02 UTC (rev 17323) @@ -0,0 +1,427 @@ +/* $Id$ + * + * subsys/csr/csrsrv/init.c - CSR server - initialization + * + * ReactOS Operating System + * + * -------------------------------------------------------------------- + * + * This software is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This software 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING.LIB. If not, write + * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, + * MA 02139, USA. + * + * -------------------------------------------------------------------- + */ + +#include "srv.h" + +//#define NDEBUG +#include <debug.h> + + +typedef enum { + CSRAT_UNKNOWN=0, + CSRAT_OBJECT_DIRECTORY, + CSRAT_SUBSYSTEM_TYPE, + CSRAT_REQUEST_THREADS, /* ReactOS extension */ + CSRAT_REQUEST_THREADS_MAX, + CSRAT_PROFILE_CONTROL, + CSRAT_SHARED_SECTION, + CSRAT_SERVER_DLL, + CSRAT_WINDOWS, + CSRAT_SESSIONS, /* ReactOS extension */ + CSRAT_MAX +} CSR_ARGUMENT_TYPE, *PCSR_ARGUMENT_TYPE; + +typedef struct _CSR_ARGUMENT_ITEM +{ + CSR_ARGUMENT_TYPE Type; + UNICODE_STRING Data; + union { + UNICODE_STRING ObjectDirectory; + CSR_SUBSYSTEM_TYPE SubSystemType; + USHORT RequestThreads; + USHORT MaxRequestThreads; + BOOL ProfileControl; + BOOL Windows; + BOOL Sessions; + CSR_SERVER_DLL ServerDll; + struct { + USHORT PortSectionSize; // 1024k; 128k..? + USHORT InteractiveDesktopHeapSize; // 3072k; 128k.. + USHORT NonInteractiveDesktopHeapSize; // (InteractiveDesktopHeapSize); 128k.. + USHORT Reserved; /* unused */ + } SharedSection; + } Item; + +} CSR_ARGUMENT_ITEM, * PCSR_ARGUMENT_ITEM; + +/********************************************************************** + * CsrpStringToBool/3 PRIVATE + */ +static BOOL STDCALL CsrpStringToBool (LPWSTR TestString, LPWSTR TrueString, LPWSTR FalseString) +{ + if((0 == wcscmp(TestString, TrueString))) + { + return TRUE; + } + if((0 == wcscmp(TestString, FalseString))) + { + return FALSE; + } + DPRINT1("CSRSRV:%s: replacing invalid value '%S' with '%S'!\n", + __FUNCTION__, TestString, FalseString); + return FALSE; +} +/********************************************************************** + * CsrpSplitServerDll/2 PRIVATE + * + * RETURN VALUE + * 0: syntax error + * 2: ServerDll=="basesrv,1" + * 3: ServerDll=="winsrv:UserServerDllInitialization,3" + */ +static INT STDCALL CsrpSplitServerDll (LPWSTR ServerDll, PCSR_ARGUMENT_ITEM pItem) +{ + LPWSTR DllName = NULL; + LPWSTR DllEntryPoint = NULL; + LPWSTR DllId = NULL; + static LPWSTR DefaultDllEntryPoint = L"ServerDllInitialization"; + LPWSTR tmp = NULL; + INT rc = 0; + PCSR_SERVER_DLL pCsrServerDll = & pItem->Item.ServerDll; + + if (L'\0' == *ServerDll) + { + return 0; + } + /* + * DllName (required) + */ + DllName = ServerDll; + if (NULL == DllName) + { + return 0; + } + /* + * DllEntryPoint (optional) + */ + DllEntryPoint = wcschr (ServerDll, L':'); + if (NULL == DllEntryPoint) + { + DllEntryPoint = DefaultDllEntryPoint; + tmp = ServerDll; + rc = 2; + } else { + tmp = ++DllEntryPoint; + rc = 3; + } + /* + * DllId (required) + */ + DllId = wcschr (tmp, L','); + if (NULL == DllId) + { + return 0; + } + *DllId++ = L'\0'; + // OK + pCsrServerDll->ServerIndex = wcstoul (DllId, NULL, 10); + pCsrServerDll->Unused = 0; + RtlInitUnicodeString (& pCsrServerDll->DllName, DllName); + RtlInitUnicodeString (& pCsrServerDll->DllEntryPoint, DllEntryPoint); + return rc; +} +/********************************************************************** + * CsrpSplitSharedSection/2 PRIVATE + * + * RETURN VALUE + * 0: syntax error + * 1: PortSectionSize (required) + * 2: PortSection,InteractiveDesktopHeap + * 3: PortSection,InteractiveDesktopHeap,NonInteractiveDesktopHeap + */ +static INT STDCALL CsrpSplitSharedSection (LPWSTR SharedSection, PCSR_ARGUMENT_ITEM pItem) +{ + LPWSTR PortSectionSize = NULL; + LPWSTR InteractiveDesktopHeapSize = NULL; + LPWSTR NonInteractiveDesktopHeapSize = NULL; + INT rc = 1; + + DPRINT("CSRSRV:%s(%S) called\n", __FUNCTION__, SharedSection); + + if(L'\0' == *SharedSection) + { + DPRINT("CSRSRV:%s(%S): *SharedSection == L'\\0'\n", __FUNCTION__, SharedSection); + return 0; + } + + // PortSectionSize (required) + PortSectionSize = SharedSection; + // InteractiveDesktopHeapSize (optional) + InteractiveDesktopHeapSize = wcschr (PortSectionSize, L','); + if (NULL == InteractiveDesktopHeapSize) + { + // Default value is 128k + InteractiveDesktopHeapSize = L"128"; + } else { + rc = 2; + } + // NonInteractiveDesktopHeapSize (optional) + NonInteractiveDesktopHeapSize = wcschr (InteractiveDesktopHeapSize, L','); + if (NULL == NonInteractiveDesktopHeapSize) + { + // Default value equals interactive one + NonInteractiveDesktopHeapSize = InteractiveDesktopHeapSize; + } else { + rc = 3; + } + // OK - normalization + pItem->Item.SharedSection.PortSectionSize = wcstoul (PortSectionSize, NULL, 10); + if (pItem->Item.SharedSection.PortSectionSize < 64) + { + pItem->Item.SharedSection.PortSectionSize = 64; + } + pItem->Item.SharedSection.InteractiveDesktopHeapSize = wcstoul (InteractiveDesktopHeapSize, NULL, 10); + if (pItem->Item.SharedSection.InteractiveDesktopHeapSize < 128) + { + pItem->Item.SharedSection.InteractiveDesktopHeapSize = 128; + } + pItem->Item.SharedSection.NonInteractiveDesktopHeapSize = wcstoul (NonInteractiveDesktopHeapSize, NULL, 10); + if (pItem->Item.SharedSection.NonInteractiveDesktopHeapSize < 128) + { + pItem->Item.SharedSection.NonInteractiveDesktopHeapSize = 128; + } + // done + return rc; +} +/********************************************************************** + * CsrpParseArgumentItem/1 PRIVATE + * + * DESCRIPTION + * + * ARGUMENTS + * Argument: argument to decode; + * + * RETURN VALUE + * STATUS_SUCCESS; otherwise, STATUS_UNSUCCESSFUL and + * pItem->Type = CSRAT_UNKNOWN. + * + * NOTE + * The command line could be as complex as the following one, + * which is the original command line for the Win32 subsystem + * in NT 5.1: + * + * %SystemRoot%\system32\csrss.exe + * ObjectDirectory=\Windows + * SharedSection=1024,3072,512 + * Windows=On + * SubSystemType=Windows + * ServerDll=basesrv,1 + * ServerDll=winsrv:UserServerDllInitialization,3 + * ServerDll=winsrv:ConServerDllInitialization,2 + * ProfileControl=Off + * MaxRequestThreads=16 + */ +static NTSTATUS FASTCALL CsrpParseArgumentItem (IN OUT PCSR_ARGUMENT_ITEM pItem) +{ + NTSTATUS Status = STATUS_SUCCESS; + LPWSTR ParameterName = NULL; + LPWSTR ParameterValue = NULL; + + pItem->Type = CSRAT_UNKNOWN; + + if(0 == pItem->Data.Length) + { + DPRINT1("CSRSRV:%s: (0 == Data.Length)!\n", __FUNCTION__); + return STATUS_INVALID_PARAMETER; + } + //--- Seek '=' to split name and value + ParameterName = pItem->Data.Buffer; + ParameterValue = wcschr (ParameterName, L'='); + if (NULL == ParameterValue) + { + DPRINT1("CSRSRV:%s: (NULL == ParameterValue)!\n", __FUNCTION__); + return STATUS_INVALID_PARAMETER; + } + *ParameterValue++ = L'\0'; + DPRINT("Name=%S, Value=%S\n", ParameterName, ParameterValue); + //--- + if(0 == wcscmp(ParameterName, L"ObjectDirectory")) + { + RtlInitUnicodeString (& pItem->Item.ObjectDirectory, ParameterValue); + pItem->Type = CSRAT_OBJECT_DIRECTORY; + } + else if(0 == wcscmp(ParameterName, L"SubSystemType")) + { + pItem->Type = CSRAT_SUBSYSTEM_TYPE; + pItem->Item.Windows = CsrpStringToBool (ParameterValue, L"Windows", L"Text"); + } + else if(0 == wcscmp(ParameterName, L"MaxRequestThreads")) + { + pItem->Item.MaxRequestThreads = (USHORT) wcstoul (ParameterValue, NULL, 10); + pItem->Type = CSRAT_REQUEST_THREADS_MAX; + } + else if(0 == wcscmp(ParameterName, L"RequestThreads")) + { + // ROS Extension + pItem->Item.RequestThreads = (USHORT) wcstoul (ParameterValue, NULL, 10); + pItem->Type = CSRAT_REQUEST_THREADS; + } + else if(0 == wcscmp(ParameterName, L"ProfileControl")) + { + pItem->Item.ProfileControl = CsrpStringToBool (ParameterValue, L"On", L"Off"); + pItem->Type = CSRAT_PROFILE_CONTROL; + } + else if(0 == wcscmp(ParameterName, L"SharedSection")) + { + if (0 != CsrpSplitSharedSection(ParameterValue, pItem)) + { + pItem->Type = CSRAT_SHARED_SECTION; + } else { + pItem->Type = CSRAT_UNKNOWN; + return STATUS_INVALID_PARAMETER; + } + } + else if(0 == wcscmp(ParameterName, L"ServerDll")) + { + if (0 != CsrpSplitServerDll(ParameterValue, pItem)) + { + pItem->Type = CSRAT_SERVER_DLL; + } else { + pItem->Type = CSRAT_UNKNOWN; + return STATUS_INVALID_PARAMETER; + } + } + else if(0 == wcscmp(ParameterName, L"Windows")) + { + pItem->Item.Windows = CsrpStringToBool (ParameterValue, L"On", L"Off"); + pItem->Type = CSRAT_WINDOWS; + } + else if(0 == wcscmp(ParameterName, L"Sessions")) + { + // ROS Extension + pItem->Item.Sessions = CsrpStringToBool (ParameterValue, L"On", L"Off"); + pItem->Type = CSRAT_SESSIONS; + } + else + { + DPRINT1("CSRSRV:%s: unknown parameter '%S'!\n", __FUNCTION__, ParameterName); + pItem->Type = CSRAT_UNKNOWN; + Status = STATUS_INVALID_PARAMETER; + } + return Status; +} +/********************************************************************** + * CsrServerInitialization/2 + * + * DESCRIPTION + * Every environment subsystem implicitly starts where this + * routines stops. This routine is called by CSR on startup + * and then it calls the entry points in the following server + * DLLs, as per command line. + * + * ARGUMENTS + * ArgumentCount: + * Argument: + * + * RETURN VALUE + * STATUS_SUCCESS if it succeeds. Otherwise a status code. + * + * NOTE + * This is the only function explicitly called by csr.exe. + */ +NTSTATUS STDCALL CsrServerInitialization (ULONG ArgumentCount, + LPWSTR *Argument) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONG ArgumentIndex = 0; + CSR_ARGUMENT_ITEM ArgumentItem = {CSRAT_UNKNOWN,}; + + // get registry bootstrap options + for (ArgumentIndex = 0; ArgumentIndex < ArgumentCount; ArgumentIndex++) + { + RtlInitUnicodeString (& ArgumentItem.Data, Argument[ArgumentIndex]); + Status = CsrpParseArgumentItem (& ArgumentItem); + if (NT_SUCCESS(Status)) + { + switch (ArgumentItem.Type) + { + case CSRAT_UNKNOWN: + // ignore unknown parameters + DPRINT1("CSRSRV: ignoring param '%s'\n", Argument[ArgumentIndex]); + break; + case CSRAT_OBJECT_DIRECTORY: + RtlDuplicateUnicodeString (1, & ArgumentItem.Item.ObjectDirectory, & CsrSrvOption.NameSpace.Root); + DPRINT("ObjectDirectory: '%S'\n", CsrSrvOption.NameSpace.Root.Buffer); + break; + case CSRAT_SUBSYSTEM_TYPE: + CsrSrvOption.SubSystemType = ArgumentItem.Item.SubSystemType; + DPRINT("SubSystemType: %u\n", CsrSrvOption.SubSystemType); + break; + case CSRAT_REQUEST_THREADS: + CsrSrvOption.Threads.RequestCount = ArgumentItem.Item.RequestThreads; + DPRINT("RequestThreads: %u\n", CsrSrvOption.Threads.RequestCount); + break; + case CSRAT_REQUEST_THREADS_MAX: + CsrSrvOption.Threads.MaxRequestCount = ArgumentItem.Item.MaxRequestThreads; + DPRINT("MaxRequestThreads: %u\n", CsrSrvOption.Threads.MaxRequestCount); + break; + case CSRAT_PROFILE_CONTROL: + CsrSrvOption.Flag.ProfileControl = ArgumentItem.Item.ProfileControl; + DPRINT("ProfileControl: %u \n", CsrSrvOption.Flag.ProfileControl); + break; + case CSRAT_SHARED_SECTION: + CsrSrvOption.PortSharedSectionSize = ArgumentItem.Item.SharedSection.PortSectionSize; + CsrSrvOption.Heap.InteractiveDesktopHeapSize = ArgumentItem.Item.SharedSection.InteractiveDesktopHeapSize; + CsrSrvOption.Heap.NonInteractiveDesktopHeapSize = ArgumentItem.Item.SharedSection.NonInteractiveDesktopHeapSize; + DPRINT("SharedSection: %u-%u-%u\n", + CsrSrvOption.PortSharedSectionSize, + CsrSrvOption.Heap.InteractiveDesktopHeapSize, + CsrSrvOption.Heap.NonInteractiveDesktopHeapSize); + break; + case CSRAT_SERVER_DLL: + Status = CsrSrvRegisterServerDll (& ArgumentItem.Item.ServerDll); + if(!NT_SUCCESS(Status)) + { + DPRINT1("CSRSRV: CsrSrvRegisterServerDll(%S) failed!\n", + Argument[ArgumentIndex]); + } else { + DPRINT("ServerDll: DLL='%S' Entrypoint='%S' ID=%u\n", + ArgumentItem.Item.ServerDll.DllName.Buffer, + ArgumentItem.Item.ServerDll.DllEntryPoint.Buffer, + ArgumentItem.Item.ServerDll.ServerIndex); + } + break; + case CSRAT_WINDOWS: + CsrSrvOption.Flag.Windows = ArgumentItem.Item.Windows; + DPRINT("Windows: %d\n", CsrSrvOption.Flag.Windows); + break; + case CSRAT_SESSIONS: + CsrSrvOption.Flag.Sessions = ArgumentItem.Item.Sessions; + DPRINT("Sessions: %d\n", CsrSrvOption.Flag.Sessions); + break; + default: + DPRINT("CSRSRV: unknown ArgumentItem->Type=%ld!\n", ArgumentItem.Type); + } + } else { + DPRINT1("CSRSRV:%s: CsrpParseArgumentItem(%S) failed with Status = %08lx\n", + __FUNCTION__, Argument[ArgumentIndex], Status); + } + } + // TODO: verify required + Status = CsrSrvBootstrap (); + return Status; +} +/* EOF */ Property changes on: trunk/reactos/subsys/csr/csrsrv/init.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/csr/csrsrv/process.c --- trunk/reactos/subsys/csr/csrsrv/process.c 2005-08-12 12:10:33 UTC (rev 17322) +++ trunk/reactos/subsys/csr/csrsrv/process.c 2005-08-12 12:22:02 UTC (rev 17323) @@ -0,0 +1,135 @@ +/* $Id$ + * + * subsys/csr/csrsrv/process.c - CSR server - process management + * + * ReactOS Operating System + * + * -------------------------------------------------------------------- + * + * This software is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This software 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING.LIB. If not, write + * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, + * MA 02139, USA. + * + * -------------------------------------------------------------------- + */ +#include "srv.h" + +//#define NDEBUG +#include <debug.h> + +/* LOCALS */ + +struct { + RTL_CRITICAL_SECTION Lock; +} Process; + + + +NTSTATUS STDCALL CsrSrvInitializeProcess (VOID) +{ + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + + DPRINT("CSRSRV: %s called\n", __FUNCTION__); + + Status = RtlInitializeCriticalSection (& Process.Lock); + if(NT_SUCCESS(Status)) + { + // more process management initialization + } + return Status; +} + +/*===================================================================== + * PUBLIC API + *===================================================================*/ + +NTSTATUS STDCALL CsrCreateProcess (PCSR_SESSION pCsrSession, PCSR_PROCESS * ppCsrProcess) +{ + NTSTATUS Status = STATUS_SUCCESS; + PCSR_PROCESS pCsrProcess = NULL; + + DPRINT("CSRSRV: %s called\n", __FUNCTION__); + + pCsrProcess = RtlAllocateHeap (pCsrSession->Heap, + HEAP_ZERO_MEMORY, + sizeof (CSR_PROCESS)); + if (NULL == pCsrProcess) + { + Status = STATUS_NO_MEMORY; + } else { + pCsrProcess->CsrSession = pCsrSession; + if (NULL != ppCsrProcess) + { + *ppCsrProcess = pCsrProcess; + } + } + return Status; +} + +NTSTATUS STDCALL CsrDereferenceProcess (PCSR_PROCESS pCsrProcess) +{ + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + + DPRINT("CSRSRV: %s called\n", __FUNCTION__); + return Status; +} + +NTSTATUS STDCALL CsrDestroyProcess (PCSR_PROCESS pCsrProcess) +{ + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + + DPRINT("CSRSRV: %s called\n", __FUNCTION__); + return Status; +} + +NTSTATUS STDCALL CsrGetProcessLuid (PCSR_PROCESS pCsrProcess, PLUID pLuid) +{ + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + + DPRINT("CSRSRV: %s called\n", __FUNCTION__); + return Status; +} + +NTSTATUS STDCALL CsrLockProcessByClientId () +{ + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + + DPRINT("CSRSRV: %s called\n", __FUNCTION__); + return Status; +} + +NTSTATUS STDCALL CsrShutdownProcesses (PCSR_SESSION pCsrSession OPTIONAL) +{ + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + + DPRINT("CSRSRV: %s called\n", __FUNCTION__); + + if (NULL == pCsrSession) + { + // TODO: shutdown every session + } else { + // TODO: shutdown every process in pCsrSession + } + return Status; +} + +NTSTATUS STDCALL CsrUnlockProcess (PCSR_PROCESS pCsrProcess) +{ + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + + DPRINT("CSRSRV: %s called\n", __FUNCTION__); + return Status; +} + +/* EOF */ [truncated at 1000 lines; 1596 more skipped]

1 0

[hbirr] 17322: Set the process exit status.
by hbirr＠svn.reactos.com 12 Aug '05

12 Aug '05

Set the process exit status. Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-08-11 21:56:28 UTC (rev 17321) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-08-12 12:10:33 UTC (rev 17322) @@ -261,6 +261,7 @@ happens when the last thread just terminates without explicitly terminating the process. */ CurrentProcess->ExitTime = CurrentThread->ExitTime; + CurrentProcess->ExitStatus = ExitStatus; } /* Check if the process has a debug port */ @@ -573,6 +574,7 @@ we kill ourselves to prevent threads outside of our process trying to kill us */ KeQuerySystemTime(&Process->ExitTime); + Process->ExitStatus = ExitStatus; /* Only master thread remains... kill it off */ if (CurrentThread->ThreadsProcess == Process) {

1 0

[hbirr] 17321: Fixed compilation.
by hbirr＠svn.reactos.com 11 Aug '05

11 Aug '05

Fixed compilation. Modified: trunk/reactos/ntoskrnl/mm/npool.c _____ Modified: trunk/reactos/ntoskrnl/mm/npool.c --- trunk/reactos/ntoskrnl/mm/npool.c 2005-08-11 21:46:37 UTC (rev 17320) +++ trunk/reactos/ntoskrnl/mm/npool.c 2005-08-11 21:56:28 UTC (rev 17321) @@ -1258,7 +1258,7 @@ HDR_FREE *blk, *current, *previous = NULL, *next = NULL, *best = NULL; ULONG previous_size = 0, current_size, next_size = 0, new_size; PVOID end; - PVOID addr, aligned_addr, best_aligned_addr; + PVOID addr, aligned_addr, best_aligned_addr=NULL; PNODE p; DPRINT("get_block %d\n", size); @@ -1516,7 +1516,7 @@ VALIDATE_POOL; -#if 1 +#if 0 /* after some allocations print the npaged pool stats */ #ifdef TAG_STATISTICS_TRACKING

1 0

[ea] 17320: Minor changes to some API signatures.
by ea＠svn.reactos.com 11 Aug '05

11 Aug '05

Minor changes to some API signatures. Modified: trunk/reactos/include/subsys/csr/server.h Modified: trunk/reactos/include/subsys/win/base.h Modified: trunk/reactos/include/subsys/win/windows.h _____ Modified: trunk/reactos/include/subsys/csr/server.h --- trunk/reactos/include/subsys/csr/server.h 2005-08-11 21:29:37 UTC (rev 17319) +++ trunk/reactos/include/subsys/csr/server.h 2005-08-11 21:46:37 UTC (rev 17320) @@ -37,7 +37,7 @@ } CSR_WAIT, * PCSR_WAIT; -typedef VOID (STDCALL * CSR_SERVER_THREAD)(PVOID); +typedef VOID (CALLBACK * CSR_SERVER_THREAD)(PVOID); /* symbols exported by native DLL csrsrv.dll */ _____ Modified: trunk/reactos/include/subsys/win/base.h --- trunk/reactos/include/subsys/win/base.h 2005-08-11 21:29:37 UTC (rev 17319) +++ trunk/reactos/include/subsys/win/base.h 2005-08-11 21:46:37 UTC (rev 17320) @@ -7,8 +7,10 @@ #define WIN_SRV_BASE 1 -NTSTATUS STDCALL BaseSetProcessCreateNotify (); -NTSTATUS STDCALL ServerDllInitialization (); +typedef VOID (CALLBACK * BASE_PROCESS_CREATE_NOTIFY_ROUTINE)(PVOID); +NTSTATUS STDCALL BaseSetProcessCreateNotify (BASE_PROCESS_CREATE_NOTIFY_ROUTINE); +NTSTATUS STDCALL ServerDllInitialization (ULONG,LPWSTR*); + #endif /* ndef __INCLUDE_WIN_BASE_H */ _____ Modified: trunk/reactos/include/subsys/win/windows.h --- trunk/reactos/include/subsys/win/windows.h 2005-08-11 21:29:37 UTC (rev 17319) +++ trunk/reactos/include/subsys/win/windows.h 2005-08-11 21:46:37 UTC (rev 17320) @@ -5,11 +5,11 @@ /* w32 console server */ #define WIN_SRV_WIN_CONSOLE 2 -NTSTATUS STDCALL ConServerDllInitialization (); +NTSTATUS STDCALL ConServerDllInitialization (ULONG,LPWSTR*); /* w32 user server */ #define WIN_SRV_WIN_USER 3 -NTSTATUS STDCALL UserServerDllInitialization (); +NTSTATUS STDCALL UserServerDllInitialization (ULONG,LPWSTR*); #endif /* ndef __INCLUDE_WIN_WINDOWS_H */

1 0

[hpoussin] 17319: Input parameter in FSCTL_GET_RETRIEVAL_POINTERS is really a STARTING_VCN_INPUT_BUFFER structure (even if it contains only a LARGE_INTEGER)
by hpoussin＠svn.reactos.com 11 Aug '05

11 Aug '05

Input parameter in FSCTL_GET_RETRIEVAL_POINTERS is really a STARTING_VCN_INPUT_BUFFER structure (even if it contains only a LARGE_INTEGER) Modified: trunk/reactos/drivers/fs/vfat/fsctl.c _____ Modified: trunk/reactos/drivers/fs/vfat/fsctl.c --- trunk/reactos/drivers/fs/vfat/fsctl.c 2005-08-11 21:25:28 UTC (rev 17318) +++ trunk/reactos/drivers/fs/vfat/fsctl.c 2005-08-11 21:29:37 UTC (rev 17319) @@ -704,7 +704,7 @@ DeviceExt = IrpContext->DeviceExt; FileObject = IrpContext->FileObject; Stack = IrpContext->Stack; - if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(LARGE_INTEGER) || + if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(STARTING_VCN_INPUT_BUFFER) || Stack->Parameters.DeviceIoControl.Type3InputBuffer == NULL) { return STATUS_INVALID_PARAMETER; @@ -719,7 +719,7 @@ ExAcquireResourceSharedLite(&Fcb->MainResource, TRUE); - Vcn = *(PLARGE_INTEGER)Stack->Parameters.DeviceIoControl.Type3InputBuffer; + Vcn = ((PSTARTING_VCN_INPUT_BUFFER)Stack->Parameters.DeviceIoControl.Type3Inpu tBuffer)->StartingVcn; RetrievalPointers = IrpContext->Irp->UserBuffer; MaxExtentCount = ((Stack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(RetrievalPointers->ExtentCount) - sizeof(RetrievalPointers->StartingVcn)) / sizeof(RetrievalPointers->Extents[0]));

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005