Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[gvg] 12934: Wine-20051011 vendor drop

by gvg＠svn.reactos.com

Wine-20051011 vendor drop Added: vendor/wine/dlls/commdlg/Wine-20050111/ Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg.h Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Cn.rc Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_De.rc Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_En.rc Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Es.rc Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Fr.rc Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_It.rc Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Nl.rc Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Pl.rc Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Pt.rc Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Ru.rc Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Si.rc Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Sk.rc Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Sv.rc Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Th.rc Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Uk.rc Modified: vendor/wine/dlls/commdlg/Wine-20050111/colordlg.c Modified: vendor/wine/dlls/commdlg/Wine-20050111/filedlg.c Modified: vendor/wine/dlls/commdlg/Wine-20050111/filedlg31.c Modified: vendor/wine/dlls/commdlg/Wine-20050111/filedlgbrowser.c Modified: vendor/wine/dlls/commdlg/Wine-20050111/filedlgbrowser.h Modified: vendor/wine/dlls/commdlg/Wine-20050111/fontdlg.c Modified: vendor/wine/dlls/commdlg/Wine-20050111/fontdlg16.c Modified: vendor/wine/dlls/commdlg/Wine-20050111/printdlg.c Modified: vendor/wine/dlls/commdlg/current/cdlg.h Modified: vendor/wine/dlls/commdlg/current/cdlg_Cn.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_De.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_En.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Es.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Fr.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_It.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Nl.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Pl.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Pt.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Ru.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Si.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Sk.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Sv.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Th.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Uk.rc Modified: vendor/wine/dlls/commdlg/current/colordlg.c Modified: vendor/wine/dlls/commdlg/current/filedlg.c Modified: vendor/wine/dlls/commdlg/current/filedlg31.c Modified: vendor/wine/dlls/commdlg/current/filedlgbrowser.c Modified: vendor/wine/dlls/commdlg/current/filedlgbrowser.h Modified: vendor/wine/dlls/commdlg/current/fontdlg.c Modified: vendor/wine/dlls/commdlg/current/fontdlg16.c Modified: vendor/wine/dlls/commdlg/current/printdlg.c _____ Copied: vendor/wine/dlls/commdlg/Wine-20050111 (from rev 12927, vendor/wine/dlls/commdlg/current) _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg.h --- vendor/wine/dlls/commdlg/current/cdlg.h 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/cdlg.h 2005-01-11 22:46:30 UTC (rev 12934) @@ -93,7 +93,7 @@ #define PD32_DEFAULT_PRINTER 1582 #define PD32_NR_OF_DOCUMENTS_IN_QUEUE 1583 -#define PD32_PRINT_ALL_X_PAGES 1584 + #define PD32_MARGINS_IN_INCHES 1585 #define PD32_MARGINS_IN_MILIMETERS 1586 #define PD32_MILIMETERS 1587 @@ -145,6 +145,13 @@ #define IDS_COLOR_AQUA 1054 #define IDS_COLOR_WHITE 1055 +#define IDS_FONT_SIZE 1200 +#define IDS_SAVE_BUTTON 1201 +#define IDS_SAVE_IN 1202 +#define IDS_SAVE 1203 +#define IDS_SAVE_AS 1204 +#define IDS_OPEN_FILE 1205 + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -199,26 +206,25 @@ { HWND hWnd1; HWND hWnd2; - LPCHOOSEFONTA lpcf32a; + LPCHOOSEFONTW lpcf32w; int added; } CFn_ENUMSTRUCT, *LPCFn_ENUMSTRUCT; -INT AddFontFamily(const ENUMLOGFONTEXA *lpElfex, const NEWTEXTMETRICEXA *lpNTM, - UINT nFontType, LPCHOOSEFONTA lpcf, HWND hwnd, +INT AddFontFamily(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *lpNTM, + UINT nFontType, LPCHOOSEFONTW lpcf, HWND hwnd, LPCFn_ENUMSTRUCT e); -INT AddFontStyle(const ENUMLOGFONTEXA *lpElfex, const NEWTEXTMETRICEXA *metrics, - UINT nFontType, LPCHOOSEFONTA lpcf, HWND hcmb2, HWND hcmb3, +INT AddFontStyle(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *metrics, + UINT nFontType, LPCHOOSEFONTW lpcf, HWND hcmb2, HWND hcmb3, HWND hDlg, BOOL iswin16); void _dump_cf_flags(DWORD cflags); LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam, - LPCHOOSEFONTA lpcf); + LPCHOOSEFONTW lpcf); LRESULT CFn_WMMeasureItem(HWND hDlg, WPARAM wParam, LPARAM lParam); LRESULT CFn_WMDrawItem(HWND hDlg, WPARAM wParam, LPARAM lParam); LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, - LPCHOOSEFONTA lpcf); + LPCHOOSEFONTW lpcf); LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, - LPCHOOSEFONTA lpcf); -LRESULT CFn_WMDestroy(HWND hwnd, WPARAM wParam, LPARAM lParam); + LPCHOOSEFONTW lpcf); #endif /* _WINE_DLL_CDLG_H */ _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Cn.rc --- vendor/wine/dlls/commdlg/current/cdlg_Cn.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Cn.rc 2005-01-11 22:46:30 UTC (rev 12934) @@ -300,9 +300,9 @@ CAPTION "Ò³ÃæÉèÖÃ" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT - CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT - CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT + 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 "Ö½ÕÅ", 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 @@ -408,7 +408,6 @@ PD32_DEFAULT_PRINTER "Default Printer; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "There are %d documents in the queue" - PD32_PRINT_ALL_X_PAGES "&All %d pages" PD32_MARGINS_IN_INCHES "Margins [inches]" PD32_MARGINS_IN_MILIMETERS "Margins [mm]" PD32_MILIMETERS "mm" _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_De.rc --- vendor/wine/dlls/commdlg/current/cdlg_De.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/cdlg_De.rc 2005-01-11 22:46:30 UTC (rev 12934) @@ -120,9 +120,9 @@ CAPTION "Seite einrichten" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT - CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT - CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT + 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 "Papier", grp2, 8, 96, 224, 56, BS_GROUPBOX LTEXT "&Größe:", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL @@ -402,7 +402,6 @@ PD32_DEFAULT_PRINTER "Standard Drucker; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Es sind %d Dokumente in der Queue" - PD32_PRINT_ALL_X_PAGES "&Alle %d Seiten" PD32_MARGINS_IN_INCHES "Ränder [inches/zoll]" PD32_MARGINS_IN_MILIMETERS "Ränder [mm]" PD32_MILIMETERS "mm" _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_En.rc --- vendor/wine/dlls/commdlg/current/cdlg_En.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/cdlg_En.rc 2005-01-11 22:46:30 UTC (rev 12934) @@ -300,9 +300,9 @@ CAPTION "Setup Page" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT - CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT - CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT + 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 "Paper", grp2, 8, 96, 224, 56, BS_GROUPBOX LTEXT "&Size:", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL @@ -408,7 +408,6 @@ PD32_DEFAULT_PRINTER "Default Printer; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "There are %d documents in the queue" - PD32_PRINT_ALL_X_PAGES "&All %d pages" PD32_MARGINS_IN_INCHES "Margins [inches]" PD32_MARGINS_IN_MILIMETERS "Margins [mm]" PD32_MILIMETERS "mm" @@ -461,6 +460,15 @@ IDS_COLOR_WHITE "White" } +STRINGTABLE DISCARDABLE +{ + IDS_FONT_SIZE "Select a font size between %d and %d points." + IDS_SAVE_BUTTON "&Save" + IDS_SAVE_IN "Save &in:" + IDS_SAVE "Save" + IDS_SAVE_AS "Save as" + IDS_OPEN_FILE "Open File" +} /****************************************************************/ /* English neutral resources _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Es.rc --- vendor/wine/dlls/commdlg/current/cdlg_Es.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Es.rc 2005-01-11 22:46:30 UTC (rev 12934) @@ -1,6 +1,6 @@ /* * Copyright 1995 Jon Tombs - * Copyright 2004 José Manuel Ferrer Ortiz + * Copyright 2004, 2005 José Manuel Ferrer Ortiz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -139,7 +139,7 @@ CHECKBOX "&Subrayado", chx2, 10,94,50,10, BS_AUTOCHECKBOX LTEXT "&Color:", stc4 ,6,110,30,9 COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Ejemplo",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZzÑñ",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Codificación:",stc7 ,98,114,80,9 @@ -155,7 +155,7 @@ { LTEXT "Colores &básicos:", 1088, 4, 4, 140, 10 LTEXT "Colores person&alizados:", 1089, 4, 106, 140, 10 - LTEXT "Color|Sól&ido", 1090, 150, 151, 48, 10 + LTEXT "Color | Sól&ido", 1090, 150, 151, 48, 10 LTEXT "&Rojo:", 726 /*1094*/,249,126,24,10 EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&Verde:",727/*1095*/,249,140,24,10 @@ -178,7 +178,7 @@ PUSHBUTTON "A&yuda", pshHelp,100,166, 44, 14 PUSHBUTTON "Añadir a &colores personalizados", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Definir colores personalizados >>", 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" */ + PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ } @@ -267,7 +267,7 @@ BEGIN DEFPUSHBUTTON "Aceptar",IDOK,180,156,48,14,WS_GROUP PUSHBUTTON "Cancelar",IDCANCEL,232,156,48,14 -/* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ +/* PUSHBUTTON "Red...", psh5, 284,156,48,14 */ GROUPBOX "Impresora", grp4, 8, 4, 272,84, WS_GROUP PUSHBUTTON "&Propiedades", psh2, 212, 17, 60,14, WS_GROUP @@ -299,9 +299,9 @@ CAPTION "Página de configuración" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT - CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT - CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT + 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 "Papel", grp2, 8, 96, 224, 56, BS_GROUPBOX LTEXT "&Tamaño:", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL @@ -409,7 +409,6 @@ PD32_DEFAULT_PRINTER "Impresora por defecto; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Hay %d documentos en la cola" - PD32_PRINT_ALL_X_PAGES "&Todas las %d páginas" PD32_MARGINS_IN_INCHES "Márgenes [pulgadas]" PD32_MARGINS_IN_MILIMETERS "Márgenes [mm]" PD32_MILIMETERS "mm" @@ -418,7 +417,7 @@ PD32_PRINTER_STATUS_PAUSED "Pausada; " PD32_PRINTER_STATUS_ERROR "Error; " PD32_PRINTER_STATUS_PENDING_DELETION "Borrado pendiente; " - PD32_PRINTER_STATUS_PAPER_JAM "Paper jam; " + PD32_PRINTER_STATUS_PAPER_JAM "Papel atascado; " PD32_PRINTER_STATUS_PAPER_OUT "Sin papel; " PD32_PRINTER_STATUS_MANUAL_FEED "Ponga papel a mano; " PD32_PRINTER_STATUS_PAPER_PROBLEM "Problema con el papel; " @@ -451,7 +450,7 @@ IDS_COLOR_OLIVE "Oliva" IDS_COLOR_NAVY "Azul marino" IDS_COLOR_PURPLE "Morado" - IDS_COLOR_TEAL "Teal" + IDS_COLOR_TEAL "Turquesa" IDS_COLOR_GRAY "Gris" IDS_COLOR_SILVER "Plateado" IDS_COLOR_RED "Rojo" @@ -462,3 +461,8 @@ IDS_COLOR_AQUA "Agua" IDS_COLOR_WHITE "Blanco" } + +STRINGTABLE DISCARDABLE +{ + IDS_FONT_SIZE "Elija un tamaño de fuente entre %d and %d puntos." +} _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Fr.rc --- vendor/wine/dlls/commdlg/current/cdlg_Fr.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Fr.rc 2005-01-11 22:46:30 UTC (rev 12934) @@ -303,9 +303,9 @@ CAPTION "Mise en page" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT - CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT - CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT + 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 "Papier", grp2, 8, 96, 224, 56, BS_GROUPBOX LTEXT "&Taille:", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL @@ -411,7 +411,6 @@ PD32_DEFAULT_PRINTER "Imprimante par défaut; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Il y a %d documents dans la file d'attente" - PD32_PRINT_ALL_X_PAGES "&Toutes les %d pages" PD32_MARGINS_IN_INCHES "Marges [pouces]" PD32_MARGINS_IN_MILIMETERS "Marges [mm]" PD32_MILIMETERS "mm" _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_It.rc --- vendor/wine/dlls/commdlg/current/cdlg_It.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/cdlg_It.rc 2005-01-11 22:46:30 UTC (rev 12934) @@ -300,9 +300,9 @@ CAPTION "Setup di Pagina" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT - CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT - CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT + 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 "Carta", grp2, 8, 96, 224, 56, BS_GROUPBOX LTEXT "&Dimensione:", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL @@ -407,7 +407,6 @@ PD32_DEFAULT_PRINTER "Stampante predefinita; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Ci sono %d documenti nella coda di stampa" - PD32_PRINT_ALL_X_PAGES "&Tutte le %d pagine" PD32_MARGINS_IN_INCHES "Margini [pollici]" PD32_MARGINS_IN_MILIMETERS "Margini [mm]" PD32_MILIMETERS "mm" _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Nl.rc --- vendor/wine/dlls/commdlg/current/cdlg_Nl.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Nl.rc 2005-01-11 22:46:30 UTC (rev 12934) @@ -251,7 +251,7 @@ EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "Afdrukbereik", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Alle xx", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 + CONTROL "&Alle", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 CONTROL "&Pagina's", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 CONTROL "Sele&ctie", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER @@ -289,7 +289,6 @@ PD32_DEFAULT_PRINTER "Default Printer, " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Er staan %d documenten in de \ wachtrij" - PD32_PRINT_ALL_X_PAGES "&Alle %d pagina's" PD32_MARGINS_IN_INCHES "Marges [inch]" PD32_MARGINS_IN_MILIMETERS "Marges [mm]" PD32_MILIMETERS "mm" _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Pl.rc --- vendor/wine/dlls/commdlg/current/cdlg_Pl.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Pl.rc 2005-01-11 22:46:30 UTC (rev 12934) @@ -302,9 +302,9 @@ CAPTION "Ustawienia Strony" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT - CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT - CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT + 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 "Papier", grp2, 8, 96, 224, 56, BS_GROUPBOX LTEXT "&Rozmiar:", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL @@ -405,7 +405,6 @@ PD32_DEFAULT_PRINTER "Domyolna Drukarka; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "W kolejce znajduj¹ siê %d dokumenty" - PD32_PRINT_ALL_X_PAGES "&Wszystkie %d strony" PD32_MARGINS_IN_INCHES "Marginesy [cale]" PD32_MARGINS_IN_MILIMETERS "Marginesy [mm]" PD32_MILIMETERS "mm" @@ -437,6 +436,16 @@ PD32_PRINTER_STATUS_POWER_SAVE "Tryb oszczêdzania energii; " } +STRINGTABLE DISCARDABLE +{ + IDS_FONT_SIZE "Wybierz czcionkê o rozmiarze pomiêdzy %d a %d punktami." + IDS_SAVE_BUTTON "&Zapisz" + IDS_SAVE_IN "Zapisz &w:" + IDS_SAVE "Zapisz" + IDS_SAVE_AS "Zapisz jako" + IDS_OPEN_FILE "Otwórz Plik" +} + STRINGTABLE DISCARDABLE /* Color names */ { IDS_COLOR_BLACK "Czarny" _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Pt.rc --- vendor/wine/dlls/commdlg/current/cdlg_Pt.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Pt.rc 2005-01-11 22:46:30 UTC (rev 12934) @@ -301,9 +301,9 @@ CAPTION "Configurações de Página" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT - CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT - CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT + 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 "Papel", grp2, 8, 96, 224, 56, BS_GROUPBOX LTEXT "&Tamanho:", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL @@ -407,7 +407,6 @@ PD32_DEFAULT_PRINTER "Impressora Padrão; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Existem %d documentos na fila" - PD32_PRINT_ALL_X_PAGES "&Todas %d páginas" PD32_MARGINS_IN_INCHES "Margens [polegadas]" PD32_MARGINS_IN_MILIMETERS "Margens [mm]" PD32_MILIMETERS "mm" _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Ru.rc --- vendor/wine/dlls/commdlg/current/cdlg_Ru.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Ru.rc 2005-01-11 22:46:30 UTC (rev 12934) @@ -376,7 +376,6 @@ PD32_DEFAULT_PRINTER "Ïðèíòåð ïî óìîë÷àíèþ; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d äîêóìåíòîâ â î÷åðåäè" - PD32_PRINT_ALL_X_PAGES "&Âñå %d ñòðàíèö" PD32_MARGINS_IN_INCHES "Ãðàíèöû [äþéìû)" PD32_MARGINS_IN_MILIMETERS "Ãðàíèöû [ìì]" PD32_MILIMETERS "ìì" _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Si.rc --- vendor/wine/dlls/commdlg/current/cdlg_Si.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Si.rc 2005-01-11 22:46:30 UTC (rev 12934) @@ -300,9 +300,9 @@ CAPTION "Priprava strani" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT - CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT - CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT + 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 "Papir", grp2, 8, 96, 224, 56, BS_GROUPBOX LTEXT "Veli&kost:", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL @@ -405,7 +405,6 @@ PD32_DEFAULT_PRINTER "Privzeti tiskalnik; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d èakajoèih dok." - PD32_PRINT_ALL_X_PAGES "&Vse strani -- %d" PD32_MARGINS_IN_INCHES "Robovi [palci]" PD32_MARGINS_IN_MILIMETERS "Robovi [mm]" PD32_MILIMETERS "mm" _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Sk.rc --- vendor/wine/dlls/commdlg/current/cdlg_Sk.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Sk.rc 2005-01-11 22:46:30 UTC (rev 12934) @@ -378,7 +378,6 @@ PD32_DEFAULT_PRINTER "Implicitná tlaèiareò; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "There are %d documents in queue" - PD32_PRINT_ALL_X_PAGES "&Vsetky %d strany" PD32_MARGINS_IN_INCHES "Okraje [palce]" PD32_MARGINS_IN_MILIMETERS "Okraje [mm]" PD32_MILIMETERS "mm" _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Sv.rc --- vendor/wine/dlls/commdlg/current/cdlg_Sv.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Sv.rc 2005-01-11 22:46:30 UTC (rev 12934) @@ -293,9 +293,9 @@ CAPTION "Utskriftsformat" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT - CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT - CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT + 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 "Papper", grp2, 8, 96, 224, 56, BS_GROUPBOX LTEXT "&Storlek:", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 160, 160,CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL @@ -398,7 +398,6 @@ PD32_DEFAULT_PRINTER "Standardskrivare; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Det är %d dokument i kön" - PD32_PRINT_ALL_X_PAGES "&Alla %d sidor" PD32_MARGINS_IN_INCHES "Marginaler [inches]" PD32_MARGINS_IN_MILIMETERS "Marginaler [millimeter]" PD32_MILIMETERS "millimeter" _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Th.rc --- vendor/wine/dlls/commdlg/current/cdlg_Th.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Th.rc 2005-01-11 22:46:30 UTC (rev 12934) @@ -297,9 +297,9 @@ CAPTION "»ÃÑºáµè§" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT - CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT - CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT + 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 "¡ÃÐ´ÒÉ", grp2, 8, 96, 224, 56, BS_GROUPBOX LTEXT "¢¹Ò´:", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL @@ -402,7 +402,6 @@ PD32_DEFAULT_PRINTER "à¤Ã×èÍ§¾ÔÁ¾ì»¡µÔ; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "ÁÕ %d á¿éÁÃÍÍÂÙè" - PD32_PRINT_ALL_X_PAGES "·Ø¡ %d Ë¹éÒ" PD32_MARGINS_IN_INCHES "¢Íº¡ÃÐ´ÒÉ [¹ÔéÇ]" PD32_MARGINS_IN_MILIMETERS "¢Íº¡ÃÐ´ÒÉ [ÁÁ.]" PD32_MILIMETERS "ÁÁ." _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Uk.rc --- vendor/wine/dlls/commdlg/current/cdlg_Uk.rc 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/cdlg_Uk.rc 2005-01-11 22:46:30 UTC (rev 12934) @@ -376,7 +376,6 @@ PD32_DEFAULT_PRINTER "Ïðèíòåð çà îáóìîâëåííÿì; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d äîêóìåíò³â ó ÷åðç³" - PD32_PRINT_ALL_X_PAGES "&Âñ³ %d ñòîð³íîê" PD32_MARGINS_IN_INCHES "Ìåæ³ [äþéìè]" PD32_MARGINS_IN_MILIMETERS "Ìåæ³ [ìì]" PD32_MILIMETERS "ìì" _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/colordlg.c --- vendor/wine/dlls/commdlg/current/colordlg.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/colordlg.c 2005-01-11 22:46:30 UTC (rev 12934) @@ -1057,11 +1057,10 @@ */ LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam ) { - HDC hdc; PAINTSTRUCT ps; LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER); - hdc = BeginPaint(hDlg, &ps); + BeginPaint(hDlg, &ps); /* we have to paint dialog children except text and buttons */ CC_PaintPredefColorArray(hDlg, 6, 8); CC_PaintUserColorArray(hDlg, 2, 8, lpp->lpcc->lpCustColors); @@ -1072,7 +1071,7 @@ CC_PaintColorGraph(hDlg); EndPaint(hDlg, &ps); - return TRUE; + return TRUE; } /*********************************************************************** @@ -1289,7 +1288,8 @@ { HRSRC hResInfo; HGLOBAL hDlgTmpl; - if (!(hResInfo = FindResourceA(COMDLG32_hInstance, "CHOOSE_COLOR", (LPSTR)RT_DIALOG))) + static const WCHAR wszCHOOSE_COLOR[] = {'C','H','O','O','S','E','_','C','O','L','O','R',0}; + if (!(hResInfo = FindResourceW(COMDLG32_hInstance, wszCHOOSE_COLOR, (LPWSTR)RT_DIALOG))) { COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); return FALSE; _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/filedlg.c --- vendor/wine/dlls/commdlg/current/filedlg.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/filedlg.c 2005-01-11 22:46:30 UTC (rev 12934) @@ -314,7 +314,7 @@ ZeroMemory(&fodInfos, sizeof(FileOpenDlgInfos)); /* Pass in the original ofn */ - fodInfos.ofnInfos = ofn; + fodInfos.ofnInfos = (LPOPENFILENAMEW)ofn; /* save current directory */ if (ofn->Flags & OFN_NOCHANGEDIR) @@ -445,13 +445,13 @@ { BOOL ret; FileOpenDlgInfos fodInfos; - LPSTR lpstrSavDir = NULL; + LPWSTR lpstrSavDir = NULL; /* Initialize FileOpenDlgInfos structure */ ZeroMemory(&fodInfos, sizeof(FileOpenDlgInfos)); /* Pass in the original ofn */ - fodInfos.ofnInfos = (LPOPENFILENAMEA) ofn; + fodInfos.ofnInfos = ofn; fodInfos.title = ofn->lpstrTitle; fodInfos.defext = ofn->lpstrDefExt; @@ -479,8 +479,8 @@ /* save current directory */ if (ofn->Flags & OFN_NOCHANGEDIR) { - lpstrSavDir = MemAlloc(MAX_PATH); - GetCurrentDirectoryA(MAX_PATH, lpstrSavDir); + lpstrSavDir = MemAlloc(MAX_PATH*sizeof(WCHAR)); + GetCurrentDirectoryW(MAX_PATH, lpstrSavDir); } fodInfos.unicode = TRUE; @@ -500,7 +500,7 @@ if (lpstrSavDir) { - SetCurrentDirectoryA(lpstrSavDir); + SetCurrentDirectoryW(lpstrSavDir); MemFree(lpstrSavDir); } @@ -729,12 +729,12 @@ hinst = fodInfos->ofnInfos->hInstance; if(fodInfos->unicode) { - LPOPENFILENAMEW ofn = (LPOPENFILENAMEW) fodInfos->ofnInfos; + LPOPENFILENAMEW ofn = fodInfos->ofnInfos; hRes = FindResourceW( hinst, ofn->lpTemplateName, (LPWSTR)RT_DIALOG); } else { - LPOPENFILENAMEA ofn = fodInfos->ofnInfos; + LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)fodInfos->ofnInfos; hRes = FindResourceA( hinst, ofn->lpTemplateName, (LPSTR)RT_DIALOG); } if (!hRes) @@ -807,7 +807,7 @@ ofnNotify.hdr.hwndFrom=hwndParentDlg; ofnNotify.hdr.idFrom=0; ofnNotify.hdr.code = uCode; - ofnNotify.lpOFN = (LPOPENFILENAMEW) fodInfos->ofnInfos; + ofnNotify.lpOFN = fodInfos->ofnInfos; ofnNotify.pszFile = NULL; ret = SendMessageW(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNo tify); } @@ -817,7 +817,7 @@ ofnNotify.hdr.hwndFrom=hwndParentDlg; ofnNotify.hdr.idFrom=0; ofnNotify.hdr.code = uCode; - ofnNotify.lpOFN = fodInfos->ofnInfos; + ofnNotify.lpOFN = (LPOPENFILENAMEA)fodInfos->ofnInfos; ofnNotify.pszFile = NULL; ret = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNo tify); } @@ -1164,7 +1164,9 @@ } else if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) { - SetWindowTextA(hwnd,"Save"); + WCHAR buf[16]; + LoadStringW(COMDLG32_hInstance, IDS_SAVE, buf, sizeof(buf)/sizeof(WCHAR)); + SetWindowTextW(hwnd, buf); } /* Initialise the file name edit control */ @@ -1388,11 +1390,14 @@ (rectDlg.bottom-rectDlg.top) - (rectHelp.bottom - rectCancel.bottom), SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOZORDER); } - /* change Open to Save FIXME: use resources */ + /* change Open to Save */ if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) { - SetDlgItemTextA(hwnd,IDOK,"&Save"); - SetDlgItemTextA(hwnd,IDC_LOOKINSTATIC,"Save &in"); + WCHAR buf[16]; + LoadStringW(COMDLG32_hInstance, IDS_SAVE_BUTTON, buf, sizeof(buf)/sizeof(WCHAR)); + SetDlgItemTextW(hwnd, IDOK, buf); + LoadStringW(COMDLG32_hInstance, IDS_SAVE_IN, buf, sizeof(buf)/sizeof(WCHAR)); + SetDlgItemTextW(hwnd, IDC_LOOKINSTATIC, buf); } return 0; } @@ -1582,12 +1587,12 @@ if(fodInfos->unicode) { - LPOPENFILENAMEW ofn = (LPOPENFILENAMEW) fodInfos->ofnInfos; + LPOPENFILENAMEW ofn = fodInfos->ofnInfos; ofn->lpstrFile[0] = '\0'; } else { - LPOPENFILENAMEA ofn = fodInfos->ofnInfos; + LPOPENFILENAMEA ofn = (LPOPENFILENAMEA) fodInfos->ofnInfos; ofn->lpstrFile[0] = '\0'; } @@ -1640,13 +1645,13 @@ } if(fodInfos->unicode) { - LPOPENFILENAMEW ofn = (LPOPENFILENAMEW) fodInfos->ofnInfos; + LPOPENFILENAMEW ofn = fodInfos->ofnInfos; strcpyW( ofn->lpstrFile, lpstrPathSpec); memcpy( ofn->lpstrFile + nSizePath, lpstrFileList, sizeUsed*sizeof(WCHAR) ); } else { - LPOPENFILENAMEA ofn = fodInfos->ofnInfos; + LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)fodInfos->ofnInfos; if (ofn->lpstrFile != NULL) { @@ -1684,14 +1689,14 @@ #define ONOPEN_SEARCH 3 static void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText) { - char strMsgTitle[MAX_PATH]; - char strMsgText [MAX_PATH]; + WCHAR strMsgTitle[MAX_PATH]; + WCHAR strMsgText [MAX_PATH]; if (idCaption) - LoadStringA(COMDLG32_hInstance, idCaption, strMsgTitle, sizeof(strMsgTitle)); + LoadStringW(COMDLG32_hInstance, idCaption, strMsgTitle, sizeof(strMsgTitle)/sizeof(WCHAR)); else strMsgTitle[0] = '\0'; - LoadStringA(COMDLG32_hInstance, idText, strMsgText, sizeof(strMsgText)); - MessageBoxA(hwnd,strMsgText, strMsgTitle, MB_OK | MB_ICONHAND); + LoadStringW(COMDLG32_hInstance, idText, strMsgText, sizeof(strMsgText)/sizeof(WCHAR)); + MessageBoxW(hwnd,strMsgText, strMsgTitle, MB_OK | MB_ICONHAND); } BOOL FILEDLG95_OnOpen(HWND hwnd) @@ -2027,7 +2032,7 @@ { if(fodInfos->unicode) { - LPOPENFILENAMEW ofn = (LPOPENFILENAMEW) fodInfos->ofnInfos; + LPOPENFILENAMEW ofn = fodInfos->ofnInfos; strncpyW(ofn->lpstrFile, lpstrPathAndFile, ofn->nMaxFile); if (ofn->Flags & OFN_ALLOWMULTISELECT) @@ -2035,7 +2040,7 @@ } else { - LPOPENFILENAMEA ofn = fodInfos->ofnInfos; + LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)fodInfos->ofnInfos; WideCharToMultiByte(CP_ACP, 0, lpstrPathAndFile, -1, ofn->lpstrFile, ofn->nMaxFile, NULL, NULL); @@ -2058,12 +2063,12 @@ LPWSTR lpstrFileTitle = PathFindFileNameW(lpstrPathAndFile); if(fodInfos->unicode) { - LPOPENFILENAMEW ofn = (LPOPENFILENAMEW) fodInfos->ofnInfos; + LPOPENFILENAMEW ofn = fodInfos->ofnInfos; strncpyW(ofn->lpstrFileTitle, lpstrFileTitle, ofn->nMaxFileTitle); } else { - LPOPENFILENAMEA ofn = fodInfos->ofnInfos; + LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)fodInfos->ofnInfos; WideCharToMultiByte(CP_ACP, 0, lpstrFileTitle, -1, ofn->lpstrFileTitle, ofn->nMaxFileTitle, NULL, NULL); } @@ -2072,7 +2077,7 @@ /* copy currently selected filter to lpstrCustomFilter */ if (fodInfos->ofnInfos->lpstrCustomFilter) { - LPOPENFILENAMEA ofn = fodInfos->ofnInfos; + LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)fodInfos->ofnInfos; int len = WideCharToMultiByte(CP_ACP, 0, fodInfos->ShellInfos.lpstrCurrentFilter, -1, NULL, 0, NULL, NULL); if (len + strlen(ofn->lpstrCustomFilter) + 1 <= ofn->nMaxCustFilter) @@ -3208,7 +3213,6 @@ if(!lpsf) { - HRESULT hRes; SHGetDesktopFolder(&lpsf); hRes = GetName(lpsf,pidl,dwFlags,lpstrFileName); IShellFolder_Release(lpsf); @@ -3358,10 +3362,7 @@ static void MemFree(void *mem) { - if(mem) - { - HeapFree(GetProcessHeap(),0,mem); - } + HeapFree(GetProcessHeap(),0,mem); } /* _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/filedlg31.c --- vendor/wine/dlls/commdlg/current/filedlg31.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/filedlg31.c 2005-01-11 22:46:30 UTC (rev 12934) @@ -586,11 +586,8 @@ static LRESULT FD31_FileTypeChange( PFD31_DATA lfs ) { LONG lRet; - WCHAR diskname[BUFFILE]; LPWSTR pstr; - diskname[0] = 0; - lRet = SendDlgItemMessageW(lfs->hwnd, cmb1, CB_GETCURSEL, 0, 0); if (lRet == LB_ERR) return TRUE; @@ -705,7 +702,6 @@ */ void FD31_MapOfnStructA(LPOPENFILENAMEA ofnA, LPOPENFILENAMEW ofnW, BOOL open) { - LPCSTR str; UNICODE_STRING usBuffer; ofnW->lStructSize = sizeof(OPENFILENAMEW); @@ -727,13 +723,18 @@ RtlCreateUnicodeStringFromAsciiz (&usBuffer,ofnA->lpstrInitialDir); ofnW->lpstrInitialDir = usBuffer.Buffer; } - if (ofnA->lpstrTitle) - str = ofnA->lpstrTitle; - else - /* Allocates default title (FIXME : get it from resource) */ - str = open ? "Open File" : "Save as"; - RtlCreateUnicodeStringFromAsciiz (&usBuffer,str); - ofnW->lpstrTitle = usBuffer.Buffer; + if (ofnA->lpstrTitle) { + RtlCreateUnicodeStringFromAsciiz (&usBuffer, ofnA->lpstrTitle); + ofnW->lpstrTitle = usBuffer.Buffer; + } else { + WCHAR buf[16]; + int len; + LoadStringW(COMDLG32_hInstance, open ? IDS_OPEN_FILE : IDS_SAVE_AS, + buf, sizeof(buf)/sizeof(WCHAR)); + len = lstrlenW(buf)+1; + ofnW->lpstrTitle = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + memcpy((void*)ofnW->lpstrTitle, buf, len*sizeof(WCHAR)); + } ofnW->Flags = ofnA->Flags; ofnW->nFileOffset = ofnA->nFileOffset; ofnW->nFileExtension = ofnA->nFileExtension; @@ -757,12 +758,12 @@ */ void FD31_FreeOfnW(LPOPENFILENAMEW ofnW) { - if (ofnW->lpstrFilter) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrFilter); - if (ofnW->lpstrCustomFilter) HeapFree(GetProcessHeap(), 0, ofnW->lpstrCustomFilter); - if (ofnW->lpstrFile) HeapFree(GetProcessHeap(), 0, ofnW->lpstrFile); - if (ofnW->lpstrFileTitle) HeapFree(GetProcessHeap(), 0, ofnW->lpstrFileTitle); - if (ofnW->lpstrInitialDir) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrInitialDir); - if (ofnW->lpstrTitle) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrTitle); + HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrFilter); + HeapFree(GetProcessHeap(), 0, ofnW->lpstrCustomFilter); + HeapFree(GetProcessHeap(), 0, ofnW->lpstrFile); + HeapFree(GetProcessHeap(), 0, ofnW->lpstrFileTitle); + HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrInitialDir); + HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrTitle); if ((ofnW->lpTemplateName) && (HIWORD(ofnW->lpTemplateName))) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpTemplateName); } _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/filedlgbrowser.c --- vendor/wine/dlls/commdlg/current/filedlgbrowser.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/filedlgbrowser.c 2005-01-11 22:46:30 UTC (rev 12934) @@ -216,10 +216,11 @@ ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface) { IShellBrowserImpl *This = (IShellBrowserImpl *)iface; + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p,%lu)\n", This, This->ref); + TRACE("(%p,%lu)\n", This, ref - 1); - return ++(This->ref); + return ref; } /*********************************************************************** *** @@ -228,16 +229,17 @@ ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface) { IShellBrowserImpl *This = (IShellBrowserImpl *)iface; + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p,%lu)\n", This, This->ref); + TRACE("(%p,%lu)\n", This, ref + 1); - if (!--(This->ref)) + if (!ref) { COMDLG32_SHFree(This); TRACE("-- destroyed\n"); return 0; } - return This->ref; + return ref; } /* _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/filedlgbrowser.h --- vendor/wine/dlls/commdlg/current/filedlgbrowser.h 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/filedlgbrowser.h 2005-01-11 22:46:30 UTC (rev 12934) @@ -56,7 +56,7 @@ typedef struct { - LPOPENFILENAMEA ofnInfos; + LPOPENFILENAMEW ofnInfos; BOOL unicode; LPWSTR initdir; LPWSTR filename; _____ Modified: vendor/wine/dlls/commdlg/Wine-20050111/fontdlg.c --- vendor/wine/dlls/commdlg/current/fontdlg.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/commdlg/Wine-20050111/fontdlg.c 2005-01-11 22:46:30 UTC (rev 12934) @@ -36,7 +36,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); -#define WINE_FONTDATA "__WINE_FONTDLGDATA" +static const WCHAR strWineFontData[] = {'_','_','W','I','N','E','_','F','O','N','T','D','L','G','D','A','T','A' ,0}; +static const WCHAR strWineFontData_a[] = + {'_','_','W','I','N','E','_','F','O','N','T','D','L','G','D','A','T','A' ,'_','A',0}; +static const WCHAR chooseFontW[] = {'C','H','O','O','S','E','_','F','O','N','T',0}; #include "cdlg.h" @@ -44,12 +47,9 @@ static HIMAGELIST himlTT = 0; #define TTBITMAP_XSIZE 20 /* x-size of the bitmaps */ +INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, - LPARAM lParam); -INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, - LPARAM lParam); - /* There is a table here of all charsets, and the sample text for each. * There is a second table that translates a charset into an index into * the first table. @@ -168,8 +168,7 @@ HINSTANCE hDlginst; HGLOBAL hDlgTmpl; - static const WCHAR chooseFontW[] = {'C','H','O','O','S','E','_', - 'F','O','N','T',0}; + TRACE("(%p)\n", lpChFont); if ( (lpChFont->Flags&CF_ENABLETEMPLATEHANDLE)!=0 ) { @@ -221,6 +220,8 @@ HINSTANCE hDlginst; HGLOBAL hDlgTmpl; + TRACE("(%p)\n", lpChFont); + if ( (lpChFont->Flags&CF_ENABLETEMPLATEHANDLE)!=0 ) { template=(LPCVOID)lpChFont->hInstance; @@ -238,7 +239,7 @@ } else { hDlginst=COMDLG32_hInstance; - if (!(hResInfo = FindResourceA(hDlginst, "CHOOSE_FONT", (LPSTR)RT_DIALOG))) + if (!(hResInfo = FindResourceW(hDlginst, chooseFontW, (LPWSTR)RT_DIALOG))) { COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); return FALSE; @@ -253,7 +254,6 @@ } if (TRACE_ON(commdlg)) _dump_cf_flags(lpChFont->Flags); - if (lpChFont->Flags & (CF_SELECTSCRIPT | CF_NOVERTFONTS )) FIXME(": unimplemented flag (ignored)\n"); @@ -261,7 +261,6 @@ lpChFont->hwndOwner, FormatCharDlgProcA, (LPARAM)lpChFont ); } - #define TEXT_EXTRAS 4 #define TEXT_COLORS 16 @@ -276,7 +275,7 @@ /*********************************************************************** * CFn_HookCallChk32 [internal] */ -static BOOL CFn_HookCallChk32(LPCHOOSEFONTA lpcf) +static BOOL CFn_HookCallChk32(LPCHOOSEFONTW lpcf) { if (lpcf) if(lpcf->Flags & CF_ENABLEHOOK) @@ -288,14 +287,14 @@ /*********************************************************************** ** * AddFontFamily [internal] */ -INT AddFontFamily(const ENUMLOGFONTEXA *lpElfex, const NEWTEXTMETRICEXA *lpNTM, - UINT nFontType, LPCHOOSEFONTA lpcf, HWND hwnd, LPCFn_ENUMSTRUCT e) +INT AddFontFamily(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *lpNTM, + UINT nFontType, LPCHOOSEFONTW lpcf, HWND hwnd, LPCFn_ENUMSTRUCT e) { int i; WORD w; - const LOGFONTA *lplf = &(lpElfex->elfLogFont); + const LOGFONTW *lplf = &(lpElfex->elfLogFont); - TRACE("font=%s (nFontType=%d)\n", lplf->lfFaceName,nFontType); + TRACE("font=%s (nFontType=%d)\n", debugstr_w(lplf->lfFaceName), nFontType); if (lpcf->Flags & CF_FIXEDPITCHONLY) if (!(lplf->lfPitchAndFamily & FIXED_PITCH)) @@ -309,14 +308,14 @@ if (e) e->added++; - i=SendMessageA(hwnd, CB_FINDSTRINGEXACT, 0, (LPARAM)lplf->lfFaceName); + i=SendMessageW(hwnd, CB_FINDSTRINGEXACT, 0, (LPARAM)lplf->lfFaceName); if (i == CB_ERR) { - i = SendMessageA(hwnd, CB_ADDSTRING, 0, (LPARAM)lplf->lfFaceName); + i = SendMessageW(hwnd, CB_ADDSTRING, 0, (LPARAM)lplf->lfFaceName); if( i != CB_ERR) { /* store some important font information */ w = (lplf->lfPitchAndFamily) << 8 | (HIWORD(lpNTM->ntmTm.ntmFlags) & 0xff); - SendMessageA(hwnd, CB_SETITEMDATA, i, MAKELONG(nFontType,w)); + SendMessageW(hwnd, CB_SETITEMDATA, i, MAKELONG(nFontType,w)); } } [truncated at 1000 lines; 3411 more skipped]

19 years, 10 months

[gvg] 12933: Sync to Wine-20050111:

by gvg＠svn.reactos.com

Sync to Wine-20050111: Eric Pouech <pouech-eric(a)wanadoo.fr> - Removed excessive statement (break after return or goto, not useful break, not needed vars...) Michael Stefaniuc <mstefani(a)redhat.de> - Do not check for non NULL pointer before HeapFree'ing it. It's redundant. Ulrich Czekalla <ulrich(a)codeweavers.com> - Add partial handler for WM_PRINTCLIENT. - WM_GETTEXTLENGTH should return zero for owner drawn status bars. Jon Griffiths <jon_p_griffiths(a)yahoo.com> - Remove unneeded headers to reduce unneeded rebuilds. - Implement the remaining MRU functions, fix a couple of differences from native comctl32, add tests of MRU behaviour and documentation. Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Eric Kohl <eric.kohl(a)t-online.de> - DrawStatusText() must not process prefix characters. Filip Navara <xnavara(a)volny.cz> - Don't use DrawEdge with NULL device context, it's invalid call and sets last error. - Tooltip icons must be destroyed with DestroyIcon and not with DeleteObject. - Rebar cursors must be destroyed with DestroyCursor and not with DeleteObject. Robert Shearman <rob(a)codeweavers.com> - Use the DrawFocusRect function to draw the focus rect, instead of a broken home-brewed solution. - Don't highlight text in non-TVS_TRACKSELECT mode. - Add code for hot tracking. - Draw hot items with underline and with highlight colour with TVS_TRACKSELECT style. - Set cursor to hand cursor with TVS_TRACKSELECT style. - Make sure uInternalStatus is consistent with actual scrollbar state by forcing scrollbars off in WM_CREATE handler. - Make the month calendar child window auto-size instead of using a hard coded 200px. - Use SetFocus when the control is clicked on to get the correct behaviour when another control clicked on. - Force the WS_EX_CLIENTEDGE style, instead of emulating it. - Implement WM_ENABLE handler to update cached control style when the control is disabled. - Move background drawing into WM_ERASEBKGND handler and draw the background differently when disabled. - Change WM_PAINT handler to draw text with transparent background and with the correct colour for the style. - Initialize selected field to -1 instead of 0 so that the control notices when field 0 is selected. Vitaly Lipatov <lav(a)etersoft.ru> - Add comments, fix negative value from GetCurFocus. Alexandre Julliard <julliard(a)winehq.org>: - Janitorial: C booleans must not be compared against TRUE. Mike McCormack <mike(a)codeweavers.com> - Fix image list mask and blending. Evan Deaubl <wine(a)warpedview.com> - GetItemA/W on header controls should handle message even if index is invalid. Crestez Leonard <cleonard(a)go.ro> - Fix bug with Treeview_SelectItem reselecting the same item. Thomas Weidenmnller <w3seek(a)gmail.com> - Free allocated font handles when control is destroyed. Modified: trunk/reactos/lib/comctl32/animate.c Modified: trunk/reactos/lib/comctl32/comboex.c Modified: trunk/reactos/lib/comctl32/comctl32undoc.c Modified: trunk/reactos/lib/comctl32/commctrl.c Modified: trunk/reactos/lib/comctl32/datetime.c Modified: trunk/reactos/lib/comctl32/flatsb.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/monthcal.c Modified: trunk/reactos/lib/comctl32/nativefont.c Modified: trunk/reactos/lib/comctl32/pager.c Modified: trunk/reactos/lib/comctl32/propsheet.c Modified: trunk/reactos/lib/comctl32/rebar.c Modified: trunk/reactos/lib/comctl32/smoothscroll.c Modified: trunk/reactos/lib/comctl32/status.c Modified: trunk/reactos/lib/comctl32/syslink.c Modified: trunk/reactos/lib/comctl32/tab.c Modified: trunk/reactos/lib/comctl32/toolbar.c Modified: trunk/reactos/lib/comctl32/tooltips.c Modified: trunk/reactos/lib/comctl32/trackbar.c Modified: trunk/reactos/lib/comctl32/treeview.c _____ Modified: trunk/reactos/lib/comctl32/animate.c --- trunk/reactos/lib/comctl32/animate.c 2005-01-11 22:15:41 UTC (rev 12932) +++ trunk/reactos/lib/comctl32/animate.c 2005-01-11 22:44:10 UTC (rev 12933) @@ -187,32 +187,20 @@ FreeResource(infoPtr->hRes); infoPtr->hRes = 0; } - if (infoPtr->lpIndex) { - HeapFree(GetProcessHeap(), 0, infoPtr->lpIndex); - infoPtr->lpIndex = NULL; - } + HeapFree(GetProcessHeap(), 0, infoPtr->lpIndex); + infoPtr->lpIndex = NULL; if (infoPtr->hic) { fnIC.fnICClose(infoPtr->hic); infoPtr->hic = 0; } - if (infoPtr->inbih) { - HeapFree(GetProcessHeap(), 0, infoPtr->inbih); - infoPtr->inbih = NULL; - } - if (infoPtr->outbih) { - HeapFree(GetProcessHeap(), 0, infoPtr->outbih); - infoPtr->outbih = NULL; - } - if( infoPtr->indata ) - { + HeapFree(GetProcessHeap(), 0, infoPtr->inbih); + infoPtr->inbih = NULL; + HeapFree(GetProcessHeap(), 0, infoPtr->outbih); + infoPtr->outbih = NULL; HeapFree(GetProcessHeap(), 0, infoPtr->indata); - infoPtr->indata = NULL; - } - if( infoPtr->outdata ) - { + infoPtr->indata = NULL; HeapFree(GetProcessHeap(), 0, infoPtr->outdata); - infoPtr->outdata = NULL; - } + infoPtr->outdata = NULL; if( infoPtr->hbmPrevFrame ) { DeleteObject(infoPtr->hbmPrevFrame); _____ Modified: trunk/reactos/lib/comctl32/comboex.c --- trunk/reactos/lib/comctl32/comboex.c 2005-01-11 22:15:41 UTC (rev 12932) +++ trunk/reactos/lib/comctl32/comboex.c 2005-01-11 22:44:10 UTC (rev 12933) @@ -1840,7 +1840,6 @@ return CallWindowProcW (infoPtr->prevEditWndProc, hwnd, uMsg, wParam, lParam); } - return 0; } @@ -2243,7 +2242,6 @@ ERR("unknown msg %04x wp=%08x lp=%08lx\n",uMsg,wParam,lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } - return 0; } _____ Modified: trunk/reactos/lib/comctl32/comctl32undoc.c --- trunk/reactos/lib/comctl32/comctl32undoc.c 2005-01-11 22:15:41 UTC (rev 12932) +++ trunk/reactos/lib/comctl32/comctl32undoc.c 2005-01-11 22:44:10 UTC (rev 12933) @@ -106,9 +106,8 @@ * NOTES * No more information available yet! */ - -HRESULT WINAPI -DPA_LoadStream (HDPA *phDpa, DPALOADPROC loadProc, IStream *pStream, LPARAM lParam) +HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, DPALOADPROC loadProc, + IStream *pStream, LPARAM lParam) { HRESULT errCode; LARGE_INTEGER position; @@ -205,9 +204,8 @@ * NOTES * No more information available yet! */ - -HRESULT WINAPI -DPA_SaveStream (const HDPA hDpa, DPALOADPROC loadProc, IStream *pStream, LPARAM lParam) +HRESULT WINAPI DPA_SaveStream (const HDPA hDpa, DPALOADPROC loadProc, + IStream *pStream, LPARAM lParam) { FIXME ("hDpa=%p loadProc=%p pStream=%p lParam=%lx\n", @@ -220,6 +218,8 @@ /*********************************************************************** *** * 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 @@ -235,10 +235,9 @@ * NOTES * No more information available yet! */ - -BOOL WINAPI -DPA_Merge (const HDPA hdpa1, const HDPA hdpa2, DWORD dwFlags, - PFNDPACOMPARE pfnCompare, PFNDPAMERGE pfnMerge, LPARAM lParam) +BOOL WINAPI DPA_Merge (const HDPA hdpa1, const HDPA hdpa2, DWORD dwFlags, + PFNDPACOMPARE pfnCompare, PFNDPAMERGE pfnMerge, + LPARAM lParam) { INT nCount; LPVOID *pWork1, *pWork2; @@ -373,7 +372,6 @@ * Success: pointer to allocated memory block * Failure: NULL */ - LPVOID WINAPI Alloc (DWORD dwSize) { return LocalAlloc( LMEM_ZEROINIT, dwSize ); @@ -398,7 +396,6 @@ * If lpSrc is a NULL-pointer, then ReAlloc allocates a memory * block like Alloc. */ - LPVOID WINAPI ReAlloc (LPVOID lpSrc, DWORD dwSize) { if (lpSrc) @@ -420,7 +417,6 @@ * Success: TRUE * Failure: FALSE */ - BOOL WINAPI Free (LPVOID lpMem) { return !LocalFree( lpMem ); @@ -440,7 +436,6 @@ * Success: size of the specified memory block * Failure: 0 */ - DWORD WINAPI GetSize (LPVOID lpMem) { return LocalSize( lpMem ); @@ -448,33 +443,90 @@ /*********************************************************************** *** - * The MRU-API is a set of functions to manipulate MRU(Most Recently Used) - * lists. + * MRU-Functions {COMCTL32} * - * Stored in the reg. as a set of values under a single key. Each item in the - * list has a value name that is a single char. 'a' - 'z', '{', '|' or '}'. - * The order of the list is stored with value name 'MRUList' which is a string - * containing the value names (i.e. 'a', 'b', etc.) in the relevant order. + * NOTES + * The MRU-Api is a set of functions to manipulate lists of M.R.U. (Most Recently + * Used) items. It is an undocumented Api that is used (at least) by the shell + * and explorer to implement their recent documents feature. + * + * Since these functions are undocumented, they are unsupported by MS and + * may change at any time. + * + * Internally, the list is implemented as a last in, last out list of items + * persisted into the system registry under a caller chosen key. Each list + * item is given a one character identifier in the Ascii range from 'a' to + * '}'. A list of the identifiers in order from newest to oldest is stored + * under the same key in a value named "MRUList". + * + * Items are re-ordered by changing the order of the values in the MRUList + * value. When a new item is added, it becomes the new value of the oldest + * identifier, and that identifier is moved to the front of the MRUList value. + * + * Wine stores MRU-lists in the same registry format as Windows, so when + * switching between the builtin and native comctl32.dll no problems or + * incompatibilities should occur. + * + * The following undocumented structure is used to create an MRU-list: + *|typedef INT (CALLBACK *MRUStringCmpFn)(LPCTSTR lhs, LPCTSTR rhs); + *|typedef INT (CALLBACK *MRUBinaryCmpFn)(LPCVOID lhs, LPCVOID rhs, DWORD length); + *| + *|typedef struct tagCREATEMRULIST + *|{ + *| DWORD cbSize; + *| DWORD nMaxItems; + *| DWORD dwFlags; + *| HKEY hKey; + *| LPCTSTR lpszSubKey; + *| PROC lpfnCompare; + *|} CREATEMRULIST, *LPCREATEMRULIST; + * + * MEMBERS + * cbSize [I] The size of the CREATEMRULIST structure. This must be set + * to sizeof(CREATEMRULIST) by the caller. + * nMaxItems [I] The maximum number of items allowed in the list. Because + * of the limited number of identifiers, this should be set to + * a value from 1 to 30 by the caller. + * dwFlags [I] If bit 0 is set, the list will be used to store binary + * data, otherwise it is assumed to store strings. If bit 1 + * is set, every change made to the list will be reflected in + * the registry immediately, otherwise changes will only be + * written when the list is closed. + * hKey [I] The registry key that the list should be written under. + * This must be supplied by the caller. + * lpszSubKey [I] A caller supplied name of a subkey under hKey to write + * the list to. This may not be blank. + * lpfnCompare [I] A caller supplied comparison function, which may be either + * an MRUStringCmpFn if dwFlags does not have bit 0 set, or a + * MRUBinaryCmpFn otherwise. + * + * FUNCTIONS + * - Create an MRU-list with CreateMRUList() or CreateMRUListLazy(). + * - Add items to an MRU-list with AddMRUString() or AddMRUData(). + * - Remove items from an MRU-list with DelMRUString(). + * - Find data in an MRU-list with FindMRUString() or FindMRUData(). + * - Iterate through an MRU-list with EnumMRUList(). + * - Free an MRU-list with FreeMRUList(). */ typedef struct tagCREATEMRULISTA { - DWORD cbSize; /* size of struct */ - DWORD nMaxItems; /* max no. of items in list */ - DWORD dwFlags; /* see below */ - HKEY hKey; /* root reg. key under which list is saved */ - LPCSTR lpszSubKey; /* reg. subkey */ - PROC lpfnCompare; /* item compare proc */ + DWORD cbSize; + DWORD nMaxItems; + DWORD dwFlags; + HKEY hKey; + LPCSTR lpszSubKey; + PROC lpfnCompare; } CREATEMRULISTA, *LPCREATEMRULISTA; typedef struct tagCREATEMRULISTW { - DWORD cbSize; /* size of struct */ - DWORD nMaxItems; /* max no. of items in list */ - DWORD dwFlags; /* see below */ - HKEY hKey; /* root reg. key under which list is saved */ - LPCWSTR lpszSubKey; /* reg. subkey */ - PROC lpfnCompare; /* item compare proc */ + DWORD cbSize; + DWORD nMaxItems; + DWORD dwFlags; + HKEY hKey; + LPCWSTR lpszSubKey; + PROC lpfnCompare; } CREATEMRULISTW, *LPCREATEMRULISTW; /* dwFlags */ @@ -517,9 +569,9 @@ /*********************************************************************** *** * MRU_SaveChanged (internal) * - * Localize MRU saving code + * Local MRU saving code */ -VOID MRU_SaveChanged( LPWINEMRULIST mp ) +static void MRU_SaveChanged ( LPWINEMRULIST mp ) { UINT i, err; HKEY newkey; @@ -587,16 +639,17 @@ * hMRUList [I] Handle to list. * * RETURNS - * Success: TRUE - * Failure: FALSE + * Nothing. */ -BOOL WINAPI -FreeMRUList (HANDLE hMRUList) +void WINAPI FreeMRUList (HANDLE hMRUList) { LPWINEMRULIST mp = (LPWINEMRULIST)hMRUList; UINT i; - TRACE("\n"); + TRACE("(%p)\n", hMRUList); + if (!hMRUList) + return; + if (mp->wineFlags & WMRUF_CHANGED) { /* need to open key and then save the info */ MRU_SaveChanged( mp ); @@ -609,7 +662,7 @@ Free(mp->realMRU); Free(mp->array); Free((LPWSTR)mp->extview.lpszSubKey); - return Free(mp); + Free(mp); } @@ -629,8 +682,8 @@ * RETURNS * Position in list 0 -> MRU. -1 if item not found. */ -INT WINAPI -FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData, LPINT lpRegNum) +INT WINAPI FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData, + LPINT lpRegNum) { LPWINEMRULIST mp = (LPWINEMRULIST)hList; INT ret; @@ -707,14 +760,22 @@ * No. corresponding to registry name where value is stored 'a' -> 0 etc. * -1 on error. */ -INT WINAPI -AddMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData) +INT WINAPI AddMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData) { LPWINEMRULIST mp = (LPWINEMRULIST)hList; LPWINEMRUITEM witem; - INT i, replace, ret; + INT i, replace; - if ((replace = FindMRUData (hList, lpData, cbData, NULL)) < 0) { + if ((replace = FindMRUData (hList, lpData, cbData, NULL)) >= 0) { + /* Item exists, just move it to the front */ + LPSTR pos = strchr(mp->realMRU, replace + 'a'); + while (pos > mp->realMRU) + { + pos[0] = pos[-1]; + pos--; + } + } + else { /* either add a new entry or replace oldest */ if (mp->cursize < mp->extview.nMaxItems) { /* Add in a new item */ @@ -726,57 +787,73 @@ replace = mp->realMRU[mp->cursize - 1] - 'a'; Free(mp->array[replace]); } + + /* Allocate space for new item and move in the data */ + mp->array[replace] = witem = Alloc(cbData + sizeof(WINEMRUITEM)); + witem->itemFlag |= WMRUIF_CHANGED; + witem->size = cbData; + memcpy( &witem->datastart, lpData, cbData); + + /* now rotate MRU list */ + for(i=mp->cursize-1; i>=1; i--) + mp->realMRU[i] = mp->realMRU[i-1]; } - else { - /* free up the old data */ - Free(mp->array[replace]); - } - /* Allocate space for new item and move in the data */ - mp->array[replace] = witem = Alloc(cbData + sizeof(WINEMRUITEM)); - witem->itemFlag |= WMRUIF_CHANGED; - witem->size = cbData; - memcpy( &witem->datastart, lpData, cbData); - - /* now rotate MRU list */ + /* The new item gets the front spot */ mp->wineFlags |= WMRUF_CHANGED; - for(i=mp->cursize-1; i>=1; i--) { - mp->realMRU[i] = mp->realMRU[i-1]; - } mp->realMRU[0] = replace + 'a'; + TRACE("(%p, %p, %ld) adding data, /%c/ now most current\n", - hList, lpData, cbData, replace+'a'); - ret = replace; + hList, lpData, cbData, replace+'a'); if (!(mp->extview.dwFlags & MRUF_DELAYED_SAVE)) { /* save changed stuff right now */ MRU_SaveChanged( mp ); } - return ret; + return replace; } /*********************************************************************** *** * AddMRUStringW [COMCTL32.401] * - * Add item to MRU string list. If item already exists in list them it is - * simply moved up to the top of the list and not added again. If list is - * full then the least recently used item is removed to make room. + * Add an item to an MRU string list. * * PARAMS - * hList [I] Handle to list. - * lpszString [I] ptr to string to add. + * hList [I] Handle to list. + * lpszString [I] The string to add. * * RETURNS - * No. corresponding to registry name where value is stored 'a' -> 0 etc. - * -1 on error. + * Success: The number corresponding to the registry name where the string + * has been stored (0 maps to 'a', 1 to 'b' and so on). + * Failure: -1, if hList is NULL or memory allocation fails. If lpszString + * is invalid, the function returns 0, and GetLastError() returns + * ERROR_INVALID_PARAMETER. The last error value is set only in + * this case. + * + * NOTES + * -If lpszString exists in the list already, it is moved to the top of the + * MRU list (it is not duplicated). + * -If the list is full the least recently used list entry is replaced with + * lpszString. + * -If this function returns 0 you should check the last error value to + * ensure the call really succeeded. */ -INT WINAPI -AddMRUStringW(HANDLE hList, LPCWSTR lpszString) +INT WINAPI AddMRUStringW(HANDLE hList, LPCWSTR lpszString) { - FIXME("(%p, %s) empty stub!\n", hList, debugstr_w(lpszString)); + TRACE("(%p,%s)\n", hList, debugstr_w(lpszString)); - return 0; + if (!hList) + return -1; + + if (!lpszString || IsBadStringPtrW(lpszString, -1)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + return AddMRUData(hList, lpszString, + (strlenW(lpszString) + 1) * sizeof(WCHAR)); } /*********************************************************************** *** @@ -784,12 +861,32 @@ * * See AddMRUStringW. */ -INT WINAPI -AddMRUStringA(HANDLE hList, LPCSTR lpszString) +INT WINAPI AddMRUStringA(HANDLE hList, LPCSTR lpszString) { - FIXME("(%p, %s) empty stub!\n", hList, debugstr_a(lpszString)); + DWORD len; + LPWSTR stringW; + INT ret; - return 0; + TRACE("(%p,%s)\n", hList, debugstr_a(lpszString)); + + if (!hList) + return -1; + + if (IsBadStringPtrA(lpszString, -1)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + len = MultiByteToWideChar(CP_ACP, 0, lpszString, -1, NULL, 0) * sizeof(WCHAR); + stringW = Alloc(len); + if (!stringW) + return -1; + + MultiByteToWideChar(CP_ACP, 0, lpszString, -1, stringW, len); + ret = AddMRUData(hList, stringW, len); + Free(stringW); + return ret; } /*********************************************************************** *** @@ -804,8 +901,7 @@ * RETURNS * TRUE if successful, FALSE if nItemPos is out of range. */ -BOOL WINAPI -DelMRUString(HANDLE hList, INT nItemPos) +BOOL WINAPI DelMRUString(HANDLE hList, INT nItemPos) { FIXME("(%p, %d): stub\n", hList, nItemPos); return TRUE; @@ -816,11 +912,10 @@ * * See FindMRUStringA. */ -INT WINAPI -FindMRUStringW (HANDLE hList, LPCWSTR lpszString, LPINT lpRegNum) +INT WINAPI FindMRUStringW (HANDLE hList, LPCWSTR lpszString, LPINT lpRegNum) { - FIXME("stub\n"); - return -1; + return FindMRUData(hList, lpszString, + (lstrlenW(lpszString) + 1) * sizeof(WCHAR), lpRegNum); } /*********************************************************************** *** @@ -838,8 +933,7 @@ * RETURNS * Position in list 0 -> MRU. -1 if item not found. */ -INT WINAPI -FindMRUStringA (HANDLE hList, LPCSTR lpszString, LPINT lpRegNum) +INT WINAPI FindMRUStringA (HANDLE hList, LPCSTR lpszString, LPINT lpRegNum) { DWORD len = MultiByteToWideChar(CP_ACP, 0, lpszString, -1, NULL, 0); LPWSTR stringW = Alloc(len * sizeof(WCHAR)); @@ -854,7 +948,7 @@ /*********************************************************************** ** * CreateMRUListLazy_common (internal) */ -HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp) +static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp) { UINT i, err; HKEY newkey; @@ -901,7 +995,7 @@ *mp->realMRU = 0; } - TRACE("MRU list = %s\n", mp->realMRU); + TRACE("MRU list = %s, datasize = %ld\n", mp->realMRU, datasize); mp->cursize = datasize - 1; /* datasize now has number of items in the MRUList */ @@ -939,16 +1033,16 @@ * * See CreateMRUListLazyA. */ -HANDLE WINAPI -CreateMRUListLazyW (LPCREATEMRULISTW lpcml, DWORD dwParam2, DWORD dwParam3, DWORD dwParam4) +HANDLE WINAPI CreateMRUListLazyW (LPCREATEMRULISTW lpcml, DWORD dwParam2, + DWORD dwParam3, DWORD dwParam4) { LPWINEMRULIST mp; - if (lpcml == NULL) - return 0; + /* Native does not check for a NULL lpcml */ - if (lpcml->cbSize < sizeof(CREATEMRULISTW)) - return 0; + if (lpcml->cbSize != sizeof(CREATEMRULISTW) || !lpcml->hKey || + IsBadStringPtrW(lpcml->lpszSubKey, -1)) + return NULL; mp = Alloc(sizeof(WINEMRULIST)); memcpy(&mp->extview, lpcml, sizeof(CREATEMRULISTW)); @@ -973,16 +1067,16 @@ * RETURNS * Handle to MRU list. */ -HANDLE WINAPI -CreateMRUListLazyA (LPCREATEMRULISTA lpcml, DWORD dwParam2, DWORD dwParam3, DWORD dwParam4) +HANDLE WINAPI CreateMRUListLazyA (LPCREATEMRULISTA lpcml, DWORD dwParam2, + DWORD dwParam3, DWORD dwParam4) { LPWINEMRULIST mp; DWORD len; - if (lpcml == NULL) - return 0; + /* Native does not check for a NULL lpcml */ - if (lpcml->cbSize < sizeof(CREATEMRULISTA)) + if (lpcml->cbSize != sizeof(CREATEMRULISTA) || !lpcml->hKey || + IsBadStringPtrA(lpcml->lpszSubKey, -1)) return 0; mp = Alloc(sizeof(WINEMRULIST)); @@ -1000,8 +1094,7 @@ * * See CreateMRUListA. */ -HANDLE WINAPI -CreateMRUListW (LPCREATEMRULISTW lpcml) +HANDLE WINAPI CreateMRUListW (LPCREATEMRULISTW lpcml) { return CreateMRUListLazyW(lpcml, 0, 0, 0); } @@ -1017,8 +1110,7 @@ * RETURNS * Handle to MRU list. */ -HANDLE WINAPI -CreateMRUListA (LPCREATEMRULISTA lpcml) +HANDLE WINAPI CreateMRUListA (LPCREATEMRULISTA lpcml) { return CreateMRUListLazyA (lpcml, 0, 0, 0); } @@ -1042,8 +1134,8 @@ * If lpBuffer == NULL or nItemPos is -ve return value is no. of items in * the list. */ -INT WINAPI EnumMRUListW(HANDLE hList, INT nItemPos, LPVOID lpBuffer, -DWORD nBufferSize) +INT WINAPI EnumMRUListW (HANDLE hList, INT nItemPos, LPVOID lpBuffer, + DWORD nBufferSize) { LPWINEMRULIST mp = (LPWINEMRULIST) hList; LPWINEMRUITEM witem; @@ -1067,8 +1159,8 @@ * * See EnumMRUListW. */ -INT WINAPI EnumMRUListA(HANDLE hList, INT nItemPos, LPVOID lpBuffer, -DWORD nBufferSize) +INT WINAPI EnumMRUListA (HANDLE hList, INT nItemPos, LPVOID lpBuffer, + DWORD nBufferSize) { LPWINEMRULIST mp = (LPWINEMRULIST) hList; LPWINEMRUITEM witem; @@ -1110,9 +1202,7 @@ * RETURNS * The number of characters copied. */ - -INT WINAPI -Str_GetPtrA (LPCSTR lpSrc, LPSTR lpDest, INT nMaxLen) +INT WINAPI Str_GetPtrA (LPCSTR lpSrc, LPSTR lpDest, INT nMaxLen) { INT len; @@ -1157,9 +1247,7 @@ * Set lpSrc to NULL to free the memory allocated by a previous call * to this function. */ - -BOOL WINAPI -Str_SetPtrA (LPSTR *lppDest, LPCSTR lpSrc) +BOOL WINAPI Str_SetPtrA (LPSTR *lppDest, LPCSTR lpSrc) { TRACE("(%p %p)\n", lppDest, lpSrc); @@ -1186,9 +1274,7 @@ * * See Str_GetPtrA. */ - -INT WINAPI -Str_GetPtrW (LPCWSTR lpSrc, LPWSTR lpDest, INT nMaxLen) +INT WINAPI Str_GetPtrW (LPCWSTR lpSrc, LPWSTR lpDest, INT nMaxLen) { INT len; @@ -1221,9 +1307,7 @@ * * See Str_SetPtrA. */ - -BOOL WINAPI -Str_SetPtrW (LPWSTR *lppDest, LPCWSTR lpSrc) +BOOL WINAPI Str_SetPtrW (LPWSTR *lppDest, LPCWSTR lpSrc) { TRACE("(%p %p)\n", lppDest, lpSrc); @@ -1260,8 +1344,7 @@ * Length, in bytes, of the converted string. */ -INT -Str_GetPtrWtoA (LPCWSTR lpSrc, LPSTR lpDest, INT nMaxLen) +INT Str_GetPtrWtoA (LPCWSTR lpSrc, LPSTR lpDest, INT nMaxLen) { INT len; @@ -1306,9 +1389,7 @@ * TRUE: conversion successful * FALSE: error */ - -BOOL -Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) +BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) { TRACE("(%p %s)\n", lppDest, lpSrc); @@ -1350,9 +1431,7 @@ * 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 WINAPI DSA_Create (INT nSize, INT nGrow) { HDSA hdsa; @@ -1384,9 +1463,7 @@ * Success: TRUE * Failure: FALSE */ - -BOOL WINAPI -DSA_Destroy (const HDSA hdsa) +BOOL WINAPI DSA_Destroy (const HDSA hdsa) { TRACE("(%p)\n", hdsa); @@ -1414,9 +1491,7 @@ * Success: TRUE * Failure: FALSE */ - -BOOL WINAPI -DSA_GetItem (const HDSA hdsa, INT nIndex, LPVOID pDest) +BOOL WINAPI DSA_GetItem (const HDSA hdsa, INT nIndex, LPVOID pDest) { LPVOID pSrc; @@ -1447,9 +1522,7 @@ * Success: pointer to an item * Failure: NULL */ - -LPVOID WINAPI -DSA_GetItemPtr (const HDSA hdsa, INT nIndex) +LPVOID WINAPI DSA_GetItemPtr (const HDSA hdsa, INT nIndex) { LPVOID pSrc; @@ -1482,9 +1555,7 @@ * Success: TRUE * Failure: FALSE */ - -BOOL WINAPI -DSA_SetItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) +BOOL WINAPI DSA_SetItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) { INT nSize, nNewItems; LPVOID pDest, lpTemp; @@ -1540,9 +1611,7 @@ * Success: position of the new item * Failure: -1 */ - -INT WINAPI -DSA_InsertItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) +INT WINAPI DSA_InsertItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) { INT nNewItems, nSize; LPVOID lpTemp, lpDest; @@ -1603,9 +1672,7 @@ * Success: number of the deleted element * Failure: -1 */ - -INT WINAPI -DSA_DeleteItem (const HDSA hdsa, INT nIndex) +INT WINAPI DSA_DeleteItem (const HDSA hdsa, INT nIndex) { LPVOID lpDest,lpSrc; INT nSize; @@ -1657,9 +1724,7 @@ * Success: TRUE * Failure: FALSE */ - -BOOL WINAPI -DSA_DeleteAllItems (const HDSA hdsa) +BOOL WINAPI DSA_DeleteAllItems (const HDSA hdsa) { TRACE("(%p)\n", hdsa); @@ -1688,9 +1753,7 @@ * Success: TRUE * Failure: FALSE */ - -BOOL WINAPI -DPA_Destroy (const HDPA hdpa) +BOOL WINAPI DPA_Destroy (const HDPA hdpa) { TRACE("(%p)\n", hdpa); @@ -1717,9 +1780,7 @@ * Success: TRUE * Failure: FALSE */ - -BOOL WINAPI -DPA_Grow (const HDPA hdpa, INT nGrow) +BOOL WINAPI DPA_Grow (const HDPA hdpa, INT nGrow) { TRACE("(%p %d)\n", hdpa, nGrow); @@ -1751,9 +1812,7 @@ * - 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) +HDPA WINAPI DPA_Clone (const HDPA hdpa, const HDPA hdpaNew) { INT nNewItems, nSize; HDPA hdpaTemp; @@ -1811,9 +1870,7 @@ * Success: pointer * Failure: NULL */ - -LPVOID WINAPI -DPA_GetPtr (const HDPA hdpa, INT nIndex) +LPVOID WINAPI DPA_GetPtr (const HDPA hdpa, INT nIndex) { TRACE("(%p %d)\n", hdpa, nIndex); @@ -1847,9 +1904,7 @@ * Success: index of the specified pointer * Failure: -1 */ - -INT WINAPI -DPA_GetPtrIndex (const HDPA hdpa, LPVOID p) +INT WINAPI DPA_GetPtrIndex (const HDPA hdpa, LPVOID p) { INT i; @@ -1879,9 +1934,7 @@ * Success: index of the inserted pointer * Failure: -1 */ - -INT WINAPI -DPA_InsertPtr (const HDPA hdpa, INT i, LPVOID p) +INT WINAPI DPA_InsertPtr (const HDPA hdpa, INT i, LPVOID p) { TRACE("(%p %d %p)\n", hdpa, i, p); @@ -1914,9 +1967,7 @@ * Success: TRUE * Failure: FALSE */ - -BOOL WINAPI -DPA_SetPtr (const HDPA hdpa, INT i, LPVOID p) +BOOL WINAPI DPA_SetPtr (const HDPA hdpa, INT i, LPVOID p) { LPVOID *lpTemp; @@ -1967,9 +2018,7 @@ * Success: deleted pointer * Failure: NULL */ - -LPVOID WINAPI -DPA_DeletePtr (const HDPA hdpa, INT i) +LPVOID WINAPI DPA_DeletePtr (const HDPA hdpa, INT i) { LPVOID *lpDest, *lpSrc, lpTemp = NULL; INT nSize; @@ -2022,9 +2071,7 @@ * Success: TRUE * Failure: FALSE */ - -BOOL WINAPI -DPA_DeleteAllPtrs (const HDPA hdpa) +BOOL WINAPI DPA_DeleteAllPtrs (const HDPA hdpa) { TRACE("(%p)\n", hdpa); @@ -2058,10 +2105,8 @@ * RETURNS * NONE */ - -static VOID -DPA_QuickSort (LPVOID *lpPtrs, INT l, INT r, - PFNDPACOMPARE pfnCompare, LPARAM lParam) +static VOID DPA_QuickSort (LPVOID *lpPtrs, INT l, INT r, + PFNDPACOMPARE pfnCompare, LPARAM lParam) { INT m; LPVOID t; @@ -2109,9 +2154,7 @@ * Success: TRUE * Failure: FALSE */ - -BOOL WINAPI -DPA_Sort (const HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam) +BOOL WINAPI DPA_Sort (const HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam) { if (!hdpa || !pfnCompare) return FALSE; @@ -2148,10 +2191,8 @@ * Function is NOT tested! * If something goes wrong, blame HIM not ME! (Eric Kohl) */ - -INT WINAPI -DPA_Search (const HDPA hdpa, LPVOID pFind, INT nStart, - PFNDPACOMPARE pfnCompare, LPARAM lParam, UINT uOptions) +INT WINAPI DPA_Search (const HDPA hdpa, LPVOID pFind, INT nStart, + PFNDPACOMPARE pfnCompare, LPARAM lParam, UINT uOptions) { if (!hdpa || !pfnCompare || !pFind) return -1; @@ -2232,9 +2273,7 @@ * The DPA_ functions can be used to create and manipulate arrays of * pointers. */ - -HDPA WINAPI -DPA_CreateEx (INT nGrow, HANDLE hHeap) +HDPA WINAPI DPA_CreateEx (INT nGrow, HANDLE hHeap) { HDPA hdpa; @@ -2275,9 +2314,7 @@ * The DPA_ functions can be used to create and manipulate arrays of * pointers. */ - -HDPA WINAPI -DPA_Create (INT nGrow) +HDPA WINAPI DPA_Create (INT nGrow) { return DPA_CreateEx( nGrow, 0 ); } @@ -2302,8 +2339,7 @@ * DoNotify [Internal] */ -static LRESULT -DoNotify (LPNOTIFYDATA lpNotify, UINT uCode, LPNMHDR lpHdr) +static LRESULT DoNotify (LPNOTIFYDATA lpNotify, UINT uCode, LPNMHDR lpHdr) { NMHDR nmhdr; LPNMHDR lpNmh = NULL; @@ -2355,7 +2391,6 @@ * message is taken from the NMHDR structure. * If hwndFrom is not -1 then lpHdr can be NULL. */ - LRESULT WINAPI SendNotify (HWND hwndTo, HWND hwndFrom, UINT uCode, LPNMHDR lpHdr) { NOTIFYDATA notify; @@ -2393,7 +2428,6 @@ * message is taken from the NMHDR structure. * If hwndFrom is not -1 then lpHdr can be NULL. */ - LRESULT WINAPI SendNotifyEx (HWND hwndTo, HWND hwndFrom, UINT uCode, LPNMHDR lpHdr, DWORD dwParam5) { @@ -2436,9 +2470,8 @@ * RETURNS * none */ - -VOID WINAPI -DPA_EnumCallback (HDPA hdpa, PFNDPAENUMCALLBACK enumProc, LPVOID lParam) +VOID WINAPI DPA_EnumCallback (HDPA hdpa, PFNDPAENUMCALLBACK enumProc, + LPVOID lParam) { INT i; @@ -2471,9 +2504,8 @@ * RETURNS * none */ - -void WINAPI -DPA_DestroyCallback (HDPA hdpa, PFNDPAENUMCALLBACK enumProc, LPVOID lParam) +void WINAPI DPA_DestroyCallback (HDPA hdpa, PFNDPAENUMCALLBACK enumProc, + LPVOID lParam) { TRACE("(%p %p %p)\n", hdpa, enumProc, lParam); @@ -2495,9 +2527,8 @@ * RETURNS * none */ - -VOID WINAPI -DSA_EnumCallback (HDSA hdsa, PFNDSAENUMCALLBACK enumProc, LPVOID lParam) +VOID WINAPI DSA_EnumCallback (HDSA hdsa, PFNDSAENUMCALLBACK enumProc, + LPVOID lParam) { INT i; @@ -2531,9 +2562,8 @@ * RETURNS * none */ - -void WINAPI -DSA_DestroyCallback (HDSA hdsa, PFNDSAENUMCALLBACK enumProc, LPVOID lParam) +void WINAPI DSA_DestroyCallback (HDSA hdsa, PFNDSAENUMCALLBACK enumProc, + LPVOID lParam) [truncated at 1000 lines; 1209 more skipped]

19 years, 10 months

[navaraf] 12932: Fix comments to be recognized by Doxygen.

by navaraf＠svn.reactos.com

Fix comments to be recognized by Doxygen. Modified: trunk/reactos/ntoskrnl/mm/marea.c _____ Modified: trunk/reactos/ntoskrnl/mm/marea.c --- trunk/reactos/ntoskrnl/mm/marea.c 2005-01-11 21:42:04 UTC (rev 12931) +++ trunk/reactos/ntoskrnl/mm/marea.c 2005-01-11 22:15:41 UTC (rev 12932) @@ -281,7 +281,7 @@ return NULL; } -/* +/** * @name MmCompressHelper * * This is helper of MmRebalanceTree. Performs a compression transformation @@ -319,7 +319,7 @@ } } -/* +/** * @name MmRebalanceTree * * Rebalance a memory area tree using the Tree->Vine->Balanced Tree @@ -699,7 +699,7 @@ } -/* +/** * @name MmFreeMemoryArea * * Free an existing memory area. @@ -832,7 +832,7 @@ return STATUS_SUCCESS; } -/* +/** * @name MmFreeMemoryAreaByPtr * * Free an existing memory area given a pointer inside it. @@ -883,7 +883,7 @@ return MmFreeMemoryArea(AddressSpace, MemoryArea, FreePage, FreePageContext); } -/* +/** * @name MmCreateMemoryArea * * Create a memory area.

19 years, 10 months

[gvg] 12931: Wine-20050111 vendor drop

by gvg＠svn.reactos.com

Wine-20050111 vendor drop Added: vendor/wine/dlls/comctl32/Wine-20050111/ Modified: vendor/wine/dlls/comctl32/Wine-20050111/animate.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/comboex.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/comctl32undoc.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/commctrl.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/datetime.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/flatsb.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/header.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/imagelist.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/listview.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/monthcal.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/nativefont.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/pager.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/propsheet.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/rebar.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/smoothscroll.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/status.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/syslink.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/tab.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/toolbar.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/tooltips.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/trackbar.c Modified: vendor/wine/dlls/comctl32/Wine-20050111/treeview.c Modified: vendor/wine/dlls/comctl32/current/animate.c Modified: vendor/wine/dlls/comctl32/current/comboex.c Modified: vendor/wine/dlls/comctl32/current/comctl32undoc.c Modified: vendor/wine/dlls/comctl32/current/commctrl.c Modified: vendor/wine/dlls/comctl32/current/datetime.c Modified: vendor/wine/dlls/comctl32/current/flatsb.c Modified: vendor/wine/dlls/comctl32/current/header.c Modified: vendor/wine/dlls/comctl32/current/imagelist.c Modified: vendor/wine/dlls/comctl32/current/listview.c Modified: vendor/wine/dlls/comctl32/current/monthcal.c Modified: vendor/wine/dlls/comctl32/current/nativefont.c Modified: vendor/wine/dlls/comctl32/current/pager.c Modified: vendor/wine/dlls/comctl32/current/propsheet.c Modified: vendor/wine/dlls/comctl32/current/rebar.c Modified: vendor/wine/dlls/comctl32/current/smoothscroll.c Modified: vendor/wine/dlls/comctl32/current/status.c Modified: vendor/wine/dlls/comctl32/current/syslink.c Modified: vendor/wine/dlls/comctl32/current/tab.c Modified: vendor/wine/dlls/comctl32/current/toolbar.c Modified: vendor/wine/dlls/comctl32/current/tooltips.c Modified: vendor/wine/dlls/comctl32/current/trackbar.c Modified: vendor/wine/dlls/comctl32/current/treeview.c _____ Copied: vendor/wine/dlls/comctl32/Wine-20050111 (from rev 12927, vendor/wine/dlls/comctl32/current) _____ Modified: vendor/wine/dlls/comctl32/Wine-20050111/animate.c --- vendor/wine/dlls/comctl32/current/animate.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/comctl32/Wine-20050111/animate.c 2005-01-11 21:42:04 UTC (rev 12931) @@ -187,32 +187,20 @@ FreeResource(infoPtr->hRes); infoPtr->hRes = 0; } - if (infoPtr->lpIndex) { - HeapFree(GetProcessHeap(), 0, infoPtr->lpIndex); - infoPtr->lpIndex = NULL; - } + HeapFree(GetProcessHeap(), 0, infoPtr->lpIndex); + infoPtr->lpIndex = NULL; if (infoPtr->hic) { fnIC.fnICClose(infoPtr->hic); infoPtr->hic = 0; } - if (infoPtr->inbih) { - HeapFree(GetProcessHeap(), 0, infoPtr->inbih); - infoPtr->inbih = NULL; - } - if (infoPtr->outbih) { - HeapFree(GetProcessHeap(), 0, infoPtr->outbih); - infoPtr->outbih = NULL; - } - if( infoPtr->indata ) - { + HeapFree(GetProcessHeap(), 0, infoPtr->inbih); + infoPtr->inbih = NULL; + HeapFree(GetProcessHeap(), 0, infoPtr->outbih); + infoPtr->outbih = NULL; HeapFree(GetProcessHeap(), 0, infoPtr->indata); - infoPtr->indata = NULL; - } - if( infoPtr->outdata ) - { + infoPtr->indata = NULL; HeapFree(GetProcessHeap(), 0, infoPtr->outdata); - infoPtr->outdata = NULL; - } + infoPtr->outdata = NULL; if( infoPtr->hbmPrevFrame ) { DeleteObject(infoPtr->hbmPrevFrame); _____ Modified: vendor/wine/dlls/comctl32/Wine-20050111/comboex.c --- vendor/wine/dlls/comctl32/current/comboex.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/comctl32/Wine-20050111/comboex.c 2005-01-11 21:42:04 UTC (rev 12931) @@ -1840,7 +1840,6 @@ return CallWindowProcW (infoPtr->prevEditWndProc, hwnd, uMsg, wParam, lParam); } - return 0; } @@ -2243,7 +2242,6 @@ ERR("unknown msg %04x wp=%08x lp=%08lx\n",uMsg,wParam,lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } - return 0; } _____ Modified: vendor/wine/dlls/comctl32/Wine-20050111/comctl32undoc.c --- vendor/wine/dlls/comctl32/current/comctl32undoc.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/comctl32/Wine-20050111/comctl32undoc.c 2005-01-11 21:42:04 UTC (rev 12931) @@ -106,9 +106,8 @@ * NOTES * No more information available yet! */ - -HRESULT WINAPI -DPA_LoadStream (HDPA *phDpa, DPALOADPROC loadProc, IStream *pStream, LPARAM lParam) +HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, DPALOADPROC loadProc, + IStream *pStream, LPARAM lParam) { HRESULT errCode; LARGE_INTEGER position; @@ -205,9 +204,8 @@ * NOTES * No more information available yet! */ - -HRESULT WINAPI -DPA_SaveStream (const HDPA hDpa, DPALOADPROC loadProc, IStream *pStream, LPARAM lParam) +HRESULT WINAPI DPA_SaveStream (const HDPA hDpa, DPALOADPROC loadProc, + IStream *pStream, LPARAM lParam) { FIXME ("hDpa=%p loadProc=%p pStream=%p lParam=%lx\n", @@ -220,6 +218,8 @@ /*********************************************************************** *** * 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 @@ -235,10 +235,9 @@ * NOTES * No more information available yet! */ - -BOOL WINAPI -DPA_Merge (const HDPA hdpa1, const HDPA hdpa2, DWORD dwFlags, - PFNDPACOMPARE pfnCompare, PFNDPAMERGE pfnMerge, LPARAM lParam) +BOOL WINAPI DPA_Merge (const HDPA hdpa1, const HDPA hdpa2, DWORD dwFlags, + PFNDPACOMPARE pfnCompare, PFNDPAMERGE pfnMerge, + LPARAM lParam) { INT nCount; LPVOID *pWork1, *pWork2; @@ -373,7 +372,6 @@ * Success: pointer to allocated memory block * Failure: NULL */ - LPVOID WINAPI Alloc (DWORD dwSize) { return LocalAlloc( LMEM_ZEROINIT, dwSize ); @@ -398,7 +396,6 @@ * If lpSrc is a NULL-pointer, then ReAlloc allocates a memory * block like Alloc. */ - LPVOID WINAPI ReAlloc (LPVOID lpSrc, DWORD dwSize) { if (lpSrc) @@ -420,7 +417,6 @@ * Success: TRUE * Failure: FALSE */ - BOOL WINAPI Free (LPVOID lpMem) { return !LocalFree( lpMem ); @@ -440,7 +436,6 @@ * Success: size of the specified memory block * Failure: 0 */ - DWORD WINAPI GetSize (LPVOID lpMem) { return LocalSize( lpMem ); @@ -448,33 +443,90 @@ /*********************************************************************** *** - * The MRU-API is a set of functions to manipulate MRU(Most Recently Used) - * lists. + * MRU-Functions {COMCTL32} * - * Stored in the reg. as a set of values under a single key. Each item in the - * list has a value name that is a single char. 'a' - 'z', '{', '|' or '}'. - * The order of the list is stored with value name 'MRUList' which is a string - * containing the value names (i.e. 'a', 'b', etc.) in the relevant order. + * NOTES + * The MRU-Api is a set of functions to manipulate lists of M.R.U. (Most Recently + * Used) items. It is an undocumented Api that is used (at least) by the shell + * and explorer to implement their recent documents feature. + * + * Since these functions are undocumented, they are unsupported by MS and + * may change at any time. + * + * Internally, the list is implemented as a last in, last out list of items + * persisted into the system registry under a caller chosen key. Each list + * item is given a one character identifier in the Ascii range from 'a' to + * '}'. A list of the identifiers in order from newest to oldest is stored + * under the same key in a value named "MRUList". + * + * Items are re-ordered by changing the order of the values in the MRUList + * value. When a new item is added, it becomes the new value of the oldest + * identifier, and that identifier is moved to the front of the MRUList value. + * + * Wine stores MRU-lists in the same registry format as Windows, so when + * switching between the builtin and native comctl32.dll no problems or + * incompatibilities should occur. + * + * The following undocumented structure is used to create an MRU-list: + *|typedef INT (CALLBACK *MRUStringCmpFn)(LPCTSTR lhs, LPCTSTR rhs); + *|typedef INT (CALLBACK *MRUBinaryCmpFn)(LPCVOID lhs, LPCVOID rhs, DWORD length); + *| + *|typedef struct tagCREATEMRULIST + *|{ + *| DWORD cbSize; + *| DWORD nMaxItems; + *| DWORD dwFlags; + *| HKEY hKey; + *| LPCTSTR lpszSubKey; + *| PROC lpfnCompare; + *|} CREATEMRULIST, *LPCREATEMRULIST; + * + * MEMBERS + * cbSize [I] The size of the CREATEMRULIST structure. This must be set + * to sizeof(CREATEMRULIST) by the caller. + * nMaxItems [I] The maximum number of items allowed in the list. Because + * of the limited number of identifiers, this should be set to + * a value from 1 to 30 by the caller. + * dwFlags [I] If bit 0 is set, the list will be used to store binary + * data, otherwise it is assumed to store strings. If bit 1 + * is set, every change made to the list will be reflected in + * the registry immediately, otherwise changes will only be + * written when the list is closed. + * hKey [I] The registry key that the list should be written under. + * This must be supplied by the caller. + * lpszSubKey [I] A caller supplied name of a subkey under hKey to write + * the list to. This may not be blank. + * lpfnCompare [I] A caller supplied comparison function, which may be either + * an MRUStringCmpFn if dwFlags does not have bit 0 set, or a + * MRUBinaryCmpFn otherwise. + * + * FUNCTIONS + * - Create an MRU-list with CreateMRUList() or CreateMRUListLazy(). + * - Add items to an MRU-list with AddMRUString() or AddMRUData(). + * - Remove items from an MRU-list with DelMRUString(). + * - Find data in an MRU-list with FindMRUString() or FindMRUData(). + * - Iterate through an MRU-list with EnumMRUList(). + * - Free an MRU-list with FreeMRUList(). */ typedef struct tagCREATEMRULISTA { - DWORD cbSize; /* size of struct */ - DWORD nMaxItems; /* max no. of items in list */ - DWORD dwFlags; /* see below */ - HKEY hKey; /* root reg. key under which list is saved */ - LPCSTR lpszSubKey; /* reg. subkey */ - PROC lpfnCompare; /* item compare proc */ + DWORD cbSize; + DWORD nMaxItems; + DWORD dwFlags; + HKEY hKey; + LPCSTR lpszSubKey; + PROC lpfnCompare; } CREATEMRULISTA, *LPCREATEMRULISTA; typedef struct tagCREATEMRULISTW { - DWORD cbSize; /* size of struct */ - DWORD nMaxItems; /* max no. of items in list */ - DWORD dwFlags; /* see below */ - HKEY hKey; /* root reg. key under which list is saved */ - LPCWSTR lpszSubKey; /* reg. subkey */ - PROC lpfnCompare; /* item compare proc */ + DWORD cbSize; + DWORD nMaxItems; + DWORD dwFlags; + HKEY hKey; + LPCWSTR lpszSubKey; + PROC lpfnCompare; } CREATEMRULISTW, *LPCREATEMRULISTW; /* dwFlags */ @@ -517,9 +569,9 @@ /*********************************************************************** *** * MRU_SaveChanged (internal) * - * Localize MRU saving code + * Local MRU saving code */ -VOID MRU_SaveChanged( LPWINEMRULIST mp ) +static void MRU_SaveChanged ( LPWINEMRULIST mp ) { UINT i, err; HKEY newkey; @@ -587,16 +639,17 @@ * hMRUList [I] Handle to list. * * RETURNS - * Success: TRUE - * Failure: FALSE + * Nothing. */ -BOOL WINAPI -FreeMRUList (HANDLE hMRUList) +void WINAPI FreeMRUList (HANDLE hMRUList) { LPWINEMRULIST mp = (LPWINEMRULIST)hMRUList; UINT i; - TRACE("\n"); + TRACE("(%p)\n", hMRUList); + if (!hMRUList) + return; + if (mp->wineFlags & WMRUF_CHANGED) { /* need to open key and then save the info */ MRU_SaveChanged( mp ); @@ -609,7 +662,7 @@ Free(mp->realMRU); Free(mp->array); Free((LPWSTR)mp->extview.lpszSubKey); - return Free(mp); + Free(mp); } @@ -629,8 +682,8 @@ * RETURNS * Position in list 0 -> MRU. -1 if item not found. */ -INT WINAPI -FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData, LPINT lpRegNum) +INT WINAPI FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData, + LPINT lpRegNum) { LPWINEMRULIST mp = (LPWINEMRULIST)hList; INT ret; @@ -707,14 +760,22 @@ * No. corresponding to registry name where value is stored 'a' -> 0 etc. * -1 on error. */ -INT WINAPI -AddMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData) +INT WINAPI AddMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData) { LPWINEMRULIST mp = (LPWINEMRULIST)hList; LPWINEMRUITEM witem; - INT i, replace, ret; + INT i, replace; - if ((replace = FindMRUData (hList, lpData, cbData, NULL)) < 0) { + if ((replace = FindMRUData (hList, lpData, cbData, NULL)) >= 0) { + /* Item exists, just move it to the front */ + LPSTR pos = strchr(mp->realMRU, replace + 'a'); + while (pos > mp->realMRU) + { + pos[0] = pos[-1]; + pos--; + } + } + else { /* either add a new entry or replace oldest */ if (mp->cursize < mp->extview.nMaxItems) { /* Add in a new item */ @@ -726,57 +787,73 @@ replace = mp->realMRU[mp->cursize - 1] - 'a'; Free(mp->array[replace]); } + + /* Allocate space for new item and move in the data */ + mp->array[replace] = witem = Alloc(cbData + sizeof(WINEMRUITEM)); + witem->itemFlag |= WMRUIF_CHANGED; + witem->size = cbData; + memcpy( &witem->datastart, lpData, cbData); + + /* now rotate MRU list */ + for(i=mp->cursize-1; i>=1; i--) + mp->realMRU[i] = mp->realMRU[i-1]; } - else { - /* free up the old data */ - Free(mp->array[replace]); - } - /* Allocate space for new item and move in the data */ - mp->array[replace] = witem = Alloc(cbData + sizeof(WINEMRUITEM)); - witem->itemFlag |= WMRUIF_CHANGED; - witem->size = cbData; - memcpy( &witem->datastart, lpData, cbData); - - /* now rotate MRU list */ + /* The new item gets the front spot */ mp->wineFlags |= WMRUF_CHANGED; - for(i=mp->cursize-1; i>=1; i--) { - mp->realMRU[i] = mp->realMRU[i-1]; - } mp->realMRU[0] = replace + 'a'; + TRACE("(%p, %p, %ld) adding data, /%c/ now most current\n", - hList, lpData, cbData, replace+'a'); - ret = replace; + hList, lpData, cbData, replace+'a'); if (!(mp->extview.dwFlags & MRUF_DELAYED_SAVE)) { /* save changed stuff right now */ MRU_SaveChanged( mp ); } - return ret; + return replace; } /*********************************************************************** *** * AddMRUStringW [COMCTL32.401] * - * Add item to MRU string list. If item already exists in list them it is - * simply moved up to the top of the list and not added again. If list is - * full then the least recently used item is removed to make room. + * Add an item to an MRU string list. * * PARAMS - * hList [I] Handle to list. - * lpszString [I] ptr to string to add. + * hList [I] Handle to list. + * lpszString [I] The string to add. * * RETURNS - * No. corresponding to registry name where value is stored 'a' -> 0 etc. - * -1 on error. + * Success: The number corresponding to the registry name where the string + * has been stored (0 maps to 'a', 1 to 'b' and so on). + * Failure: -1, if hList is NULL or memory allocation fails. If lpszString + * is invalid, the function returns 0, and GetLastError() returns + * ERROR_INVALID_PARAMETER. The last error value is set only in + * this case. + * + * NOTES + * -If lpszString exists in the list already, it is moved to the top of the + * MRU list (it is not duplicated). + * -If the list is full the least recently used list entry is replaced with + * lpszString. + * -If this function returns 0 you should check the last error value to + * ensure the call really succeeded. */ -INT WINAPI -AddMRUStringW(HANDLE hList, LPCWSTR lpszString) +INT WINAPI AddMRUStringW(HANDLE hList, LPCWSTR lpszString) { - FIXME("(%p, %s) empty stub!\n", hList, debugstr_w(lpszString)); + TRACE("(%p,%s)\n", hList, debugstr_w(lpszString)); - return 0; + if (!hList) + return -1; + + if (!lpszString || IsBadStringPtrW(lpszString, -1)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + return AddMRUData(hList, lpszString, + (strlenW(lpszString) + 1) * sizeof(WCHAR)); } /*********************************************************************** *** @@ -784,12 +861,32 @@ * * See AddMRUStringW. */ -INT WINAPI -AddMRUStringA(HANDLE hList, LPCSTR lpszString) +INT WINAPI AddMRUStringA(HANDLE hList, LPCSTR lpszString) { - FIXME("(%p, %s) empty stub!\n", hList, debugstr_a(lpszString)); + DWORD len; + LPWSTR stringW; + INT ret; - return 0; + TRACE("(%p,%s)\n", hList, debugstr_a(lpszString)); + + if (!hList) + return -1; + + if (IsBadStringPtrA(lpszString, -1)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + len = MultiByteToWideChar(CP_ACP, 0, lpszString, -1, NULL, 0) * sizeof(WCHAR); + stringW = Alloc(len); + if (!stringW) + return -1; + + MultiByteToWideChar(CP_ACP, 0, lpszString, -1, stringW, len); + ret = AddMRUData(hList, stringW, len); + Free(stringW); + return ret; } /*********************************************************************** *** @@ -804,8 +901,7 @@ * RETURNS * TRUE if successful, FALSE if nItemPos is out of range. */ -BOOL WINAPI -DelMRUString(HANDLE hList, INT nItemPos) +BOOL WINAPI DelMRUString(HANDLE hList, INT nItemPos) { FIXME("(%p, %d): stub\n", hList, nItemPos); return TRUE; @@ -816,11 +912,10 @@ * * See FindMRUStringA. */ -INT WINAPI -FindMRUStringW (HANDLE hList, LPCWSTR lpszString, LPINT lpRegNum) +INT WINAPI FindMRUStringW (HANDLE hList, LPCWSTR lpszString, LPINT lpRegNum) { - FIXME("stub\n"); - return -1; + return FindMRUData(hList, lpszString, + (lstrlenW(lpszString) + 1) * sizeof(WCHAR), lpRegNum); } /*********************************************************************** *** @@ -838,8 +933,7 @@ * RETURNS * Position in list 0 -> MRU. -1 if item not found. */ -INT WINAPI -FindMRUStringA (HANDLE hList, LPCSTR lpszString, LPINT lpRegNum) +INT WINAPI FindMRUStringA (HANDLE hList, LPCSTR lpszString, LPINT lpRegNum) { DWORD len = MultiByteToWideChar(CP_ACP, 0, lpszString, -1, NULL, 0); LPWSTR stringW = Alloc(len * sizeof(WCHAR)); @@ -854,7 +948,7 @@ /*********************************************************************** ** * CreateMRUListLazy_common (internal) */ -HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp) +static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp) { UINT i, err; HKEY newkey; @@ -901,7 +995,7 @@ *mp->realMRU = 0; } - TRACE("MRU list = %s\n", mp->realMRU); + TRACE("MRU list = %s, datasize = %ld\n", mp->realMRU, datasize); mp->cursize = datasize - 1; /* datasize now has number of items in the MRUList */ @@ -939,16 +1033,16 @@ * * See CreateMRUListLazyA. */ -HANDLE WINAPI -CreateMRUListLazyW (LPCREATEMRULISTW lpcml, DWORD dwParam2, DWORD dwParam3, DWORD dwParam4) +HANDLE WINAPI CreateMRUListLazyW (LPCREATEMRULISTW lpcml, DWORD dwParam2, + DWORD dwParam3, DWORD dwParam4) { LPWINEMRULIST mp; - if (lpcml == NULL) - return 0; + /* Native does not check for a NULL lpcml */ - if (lpcml->cbSize < sizeof(CREATEMRULISTW)) - return 0; + if (lpcml->cbSize != sizeof(CREATEMRULISTW) || !lpcml->hKey || + IsBadStringPtrW(lpcml->lpszSubKey, -1)) + return NULL; mp = Alloc(sizeof(WINEMRULIST)); memcpy(&mp->extview, lpcml, sizeof(CREATEMRULISTW)); @@ -973,16 +1067,16 @@ * RETURNS * Handle to MRU list. */ -HANDLE WINAPI -CreateMRUListLazyA (LPCREATEMRULISTA lpcml, DWORD dwParam2, DWORD dwParam3, DWORD dwParam4) +HANDLE WINAPI CreateMRUListLazyA (LPCREATEMRULISTA lpcml, DWORD dwParam2, + DWORD dwParam3, DWORD dwParam4) { LPWINEMRULIST mp; DWORD len; - if (lpcml == NULL) - return 0; + /* Native does not check for a NULL lpcml */ - if (lpcml->cbSize < sizeof(CREATEMRULISTA)) + if (lpcml->cbSize != sizeof(CREATEMRULISTA) || !lpcml->hKey || + IsBadStringPtrA(lpcml->lpszSubKey, -1)) return 0; mp = Alloc(sizeof(WINEMRULIST)); @@ -1000,8 +1094,7 @@ * * See CreateMRUListA. */ -HANDLE WINAPI -CreateMRUListW (LPCREATEMRULISTW lpcml) +HANDLE WINAPI CreateMRUListW (LPCREATEMRULISTW lpcml) { return CreateMRUListLazyW(lpcml, 0, 0, 0); } @@ -1017,8 +1110,7 @@ * RETURNS * Handle to MRU list. */ -HANDLE WINAPI -CreateMRUListA (LPCREATEMRULISTA lpcml) +HANDLE WINAPI CreateMRUListA (LPCREATEMRULISTA lpcml) { return CreateMRUListLazyA (lpcml, 0, 0, 0); } @@ -1042,8 +1134,8 @@ * If lpBuffer == NULL or nItemPos is -ve return value is no. of items in * the list. */ -INT WINAPI EnumMRUListW(HANDLE hList, INT nItemPos, LPVOID lpBuffer, -DWORD nBufferSize) +INT WINAPI EnumMRUListW (HANDLE hList, INT nItemPos, LPVOID lpBuffer, + DWORD nBufferSize) { LPWINEMRULIST mp = (LPWINEMRULIST) hList; LPWINEMRUITEM witem; @@ -1067,8 +1159,8 @@ * * See EnumMRUListW. */ -INT WINAPI EnumMRUListA(HANDLE hList, INT nItemPos, LPVOID lpBuffer, -DWORD nBufferSize) +INT WINAPI EnumMRUListA (HANDLE hList, INT nItemPos, LPVOID lpBuffer, + DWORD nBufferSize) { LPWINEMRULIST mp = (LPWINEMRULIST) hList; LPWINEMRUITEM witem; @@ -1110,9 +1202,7 @@ * RETURNS * The number of characters copied. */ - -INT WINAPI -Str_GetPtrA (LPCSTR lpSrc, LPSTR lpDest, INT nMaxLen) +INT WINAPI Str_GetPtrA (LPCSTR lpSrc, LPSTR lpDest, INT nMaxLen) { INT len; @@ -1157,9 +1247,7 @@ * Set lpSrc to NULL to free the memory allocated by a previous call * to this function. */ - -BOOL WINAPI -Str_SetPtrA (LPSTR *lppDest, LPCSTR lpSrc) +BOOL WINAPI Str_SetPtrA (LPSTR *lppDest, LPCSTR lpSrc) { TRACE("(%p %p)\n", lppDest, lpSrc); @@ -1186,9 +1274,7 @@ * * See Str_GetPtrA. */ - -INT WINAPI -Str_GetPtrW (LPCWSTR lpSrc, LPWSTR lpDest, INT nMaxLen) +INT WINAPI Str_GetPtrW (LPCWSTR lpSrc, LPWSTR lpDest, INT nMaxLen) { INT len; @@ -1221,9 +1307,7 @@ * * See Str_SetPtrA. */ - -BOOL WINAPI -Str_SetPtrW (LPWSTR *lppDest, LPCWSTR lpSrc) +BOOL WINAPI Str_SetPtrW (LPWSTR *lppDest, LPCWSTR lpSrc) { TRACE("(%p %p)\n", lppDest, lpSrc); @@ -1260,8 +1344,7 @@ * Length, in bytes, of the converted string. */ -INT -Str_GetPtrWtoA (LPCWSTR lpSrc, LPSTR lpDest, INT nMaxLen) +INT Str_GetPtrWtoA (LPCWSTR lpSrc, LPSTR lpDest, INT nMaxLen) { INT len; @@ -1306,9 +1389,7 @@ * TRUE: conversion successful * FALSE: error */ - -BOOL -Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) +BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) { TRACE("(%p %s)\n", lppDest, lpSrc); @@ -1350,9 +1431,7 @@ * 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 WINAPI DSA_Create (INT nSize, INT nGrow) { HDSA hdsa; @@ -1384,9 +1463,7 @@ * Success: TRUE * Failure: FALSE */ - -BOOL WINAPI -DSA_Destroy (const HDSA hdsa) +BOOL WINAPI DSA_Destroy (const HDSA hdsa) { TRACE("(%p)\n", hdsa); @@ -1414,9 +1491,7 @@ * Success: TRUE * Failure: FALSE */ - -BOOL WINAPI -DSA_GetItem (const HDSA hdsa, INT nIndex, LPVOID pDest) +BOOL WINAPI DSA_GetItem (const HDSA hdsa, INT nIndex, LPVOID pDest) { LPVOID pSrc; @@ -1447,9 +1522,7 @@ * Success: pointer to an item * Failure: NULL */ - -LPVOID WINAPI -DSA_GetItemPtr (const HDSA hdsa, INT nIndex) +LPVOID WINAPI DSA_GetItemPtr (const HDSA hdsa, INT nIndex) { LPVOID pSrc; @@ -1482,9 +1555,7 @@ * Success: TRUE * Failure: FALSE */ - -BOOL WINAPI -DSA_SetItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) +BOOL WINAPI DSA_SetItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) { INT nSize, nNewItems; LPVOID pDest, lpTemp; @@ -1540,9 +1611,7 @@ * Success: position of the new item * Failure: -1 */ - -INT WINAPI -DSA_InsertItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) +INT WINAPI DSA_InsertItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) { INT nNewItems, nSize; LPVOID lpTemp, lpDest; @@ -1603,9 +1672,7 @@ * Success: number of the deleted element * Failure: -1 */ - -INT WINAPI -DSA_DeleteItem (const HDSA hdsa, INT nIndex) +INT WINAPI DSA_DeleteItem (const HDSA hdsa, INT nIndex) { LPVOID lpDest,lpSrc; INT nSize; @@ -1657,9 +1724,7 @@ * Success: TRUE * Failure: FALSE */ - -BOOL WINAPI -DSA_DeleteAllItems (const HDSA hdsa) +BOOL WINAPI DSA_DeleteAllItems (const HDSA hdsa) { TRACE("(%p)\n", hdsa); @@ -1688,9 +1753,7 @@ * Success: TRUE * Failure: FALSE */ - -BOOL WINAPI -DPA_Destroy (const HDPA hdpa) +BOOL WINAPI DPA_Destroy (const HDPA hdpa) { TRACE("(%p)\n", hdpa); @@ -1717,9 +1780,7 @@ * Success: TRUE * Failure: FALSE */ - -BOOL WINAPI -DPA_Grow (const HDPA hdpa, INT nGrow) +BOOL WINAPI DPA_Grow (const HDPA hdpa, INT nGrow) { TRACE("(%p %d)\n", hdpa, nGrow); @@ -1751,9 +1812,7 @@ * - 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) +HDPA WINAPI DPA_Clone (const HDPA hdpa, const HDPA hdpaNew) { INT nNewItems, nSize; HDPA hdpaTemp; @@ -1811,9 +1870,7 @@ * Success: pointer * Failure: NULL */ - -LPVOID WINAPI -DPA_GetPtr (const HDPA hdpa, INT nIndex) +LPVOID WINAPI DPA_GetPtr (const HDPA hdpa, INT nIndex) { TRACE("(%p %d)\n", hdpa, nIndex); @@ -1847,9 +1904,7 @@ * Success: index of the specified pointer * Failure: -1 */ - -INT WINAPI -DPA_GetPtrIndex (const HDPA hdpa, LPVOID p) +INT WINAPI DPA_GetPtrIndex (const HDPA hdpa, LPVOID p) { INT i; @@ -1879,9 +1934,7 @@ * Success: index of the inserted pointer * Failure: -1 */ - -INT WINAPI -DPA_InsertPtr (const HDPA hdpa, INT i, LPVOID p) +INT WINAPI DPA_InsertPtr (const HDPA hdpa, INT i, LPVOID p) { TRACE("(%p %d %p)\n", hdpa, i, p); @@ -1914,9 +1967,7 @@ * Success: TRUE * Failure: FALSE */ - -BOOL WINAPI -DPA_SetPtr (const HDPA hdpa, INT i, LPVOID p) +BOOL WINAPI DPA_SetPtr (const HDPA hdpa, INT i, LPVOID p) { LPVOID *lpTemp; @@ -1967,9 +2018,7 @@ * Success: deleted pointer * Failure: NULL */ - -LPVOID WINAPI -DPA_DeletePtr (const HDPA hdpa, INT i) +LPVOID WINAPI DPA_DeletePtr (const HDPA hdpa, INT i) { LPVOID *lpDest, *lpSrc, lpTemp = NULL; INT nSize; @@ -2022,9 +2071,7 @@ * Success: TRUE * Failure: FALSE */ - -BOOL WINAPI -DPA_DeleteAllPtrs (const HDPA hdpa) +BOOL WINAPI DPA_DeleteAllPtrs (const HDPA hdpa) { TRACE("(%p)\n", hdpa); @@ -2058,10 +2105,8 @@ * RETURNS * NONE */ - -static VOID -DPA_QuickSort (LPVOID *lpPtrs, INT l, INT r, - PFNDPACOMPARE pfnCompare, LPARAM lParam) +static VOID DPA_QuickSort (LPVOID *lpPtrs, INT l, INT r, + PFNDPACOMPARE pfnCompare, LPARAM lParam) { INT m; LPVOID t; @@ -2109,9 +2154,7 @@ * Success: TRUE * Failure: FALSE */ - -BOOL WINAPI -DPA_Sort (const HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam) +BOOL WINAPI DPA_Sort (const HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam) { if (!hdpa || !pfnCompare) return FALSE; @@ -2148,10 +2191,8 @@ * Function is NOT tested! * If something goes wrong, blame HIM not ME! (Eric Kohl) */ - -INT WINAPI -DPA_Search (const HDPA hdpa, LPVOID pFind, INT nStart, - PFNDPACOMPARE pfnCompare, LPARAM lParam, UINT uOptions) +INT WINAPI DPA_Search (const HDPA hdpa, LPVOID pFind, INT nStart, + PFNDPACOMPARE pfnCompare, LPARAM lParam, UINT uOptions) { if (!hdpa || !pfnCompare || !pFind) return -1; @@ -2232,9 +2273,7 @@ * The DPA_ functions can be used to create and manipulate arrays of * pointers. */ - -HDPA WINAPI -DPA_CreateEx (INT nGrow, HANDLE hHeap) +HDPA WINAPI DPA_CreateEx (INT nGrow, HANDLE hHeap) { HDPA hdpa; @@ -2275,9 +2314,7 @@ * The DPA_ functions can be used to create and manipulate arrays of * pointers. */ - -HDPA WINAPI -DPA_Create (INT nGrow) +HDPA WINAPI DPA_Create (INT nGrow) { return DPA_CreateEx( nGrow, 0 ); } @@ -2302,8 +2339,7 @@ * DoNotify [Internal] */ -static LRESULT -DoNotify (LPNOTIFYDATA lpNotify, UINT uCode, LPNMHDR lpHdr) +static LRESULT DoNotify (LPNOTIFYDATA lpNotify, UINT uCode, LPNMHDR lpHdr) { NMHDR nmhdr; LPNMHDR lpNmh = NULL; @@ -2355,7 +2391,6 @@ * message is taken from the NMHDR structure. * If hwndFrom is not -1 then lpHdr can be NULL. */ - LRESULT WINAPI SendNotify (HWND hwndTo, HWND hwndFrom, UINT uCode, LPNMHDR lpHdr) { NOTIFYDATA notify; @@ -2393,7 +2428,6 @@ * message is taken from the NMHDR structure. * If hwndFrom is not -1 then lpHdr can be NULL. */ - LRESULT WINAPI SendNotifyEx (HWND hwndTo, HWND hwndFrom, UINT uCode, LPNMHDR lpHdr, DWORD dwParam5) { @@ -2436,9 +2470,8 @@ * RETURNS * none */ - -VOID WINAPI -DPA_EnumCallback (HDPA hdpa, PFNDPAENUMCALLBACK enumProc, LPVOID lParam) +VOID WINAPI DPA_EnumCallback (HDPA hdpa, PFNDPAENUMCALLBACK enumProc, + LPVOID lParam) { INT i; @@ -2471,9 +2504,8 @@ * RETURNS * none */ - -void WINAPI -DPA_DestroyCallback (HDPA hdpa, PFNDPAENUMCALLBACK enumProc, LPVOID lParam) +void WINAPI DPA_DestroyCallback (HDPA hdpa, PFNDPAENUMCALLBACK enumProc, + LPVOID lParam) { TRACE("(%p %p %p)\n", hdpa, enumProc, lParam); @@ -2495,9 +2527,8 @@ * RETURNS * none */ - -VOID WINAPI -DSA_EnumCallback (HDSA hdsa, PFNDSAENUMCALLBACK enumProc, LPVOID lParam) +VOID WINAPI DSA_EnumCallback (HDSA hdsa, PFNDSAENUMCALLBACK enumProc, + LPVOID lParam) { INT i; @@ -2531,9 +2562,8 @@ * RETURNS * none */ - -void WINAPI -DSA_DestroyCallback (HDSA hdsa, PFNDSAENUMCALLBACK enumProc, LPVOID lParam) +void WINAPI DSA_DestroyCallback (HDSA hdsa, PFNDSAENUMCALLBACK enumProc, [truncated at 1000 lines; 3487 more skipped]

19 years, 10 months

[gvg] 12930: Sync to Wine-20050111:

by gvg＠svn.reactos.com

Sync to Wine-20050111: Michael Stefaniuc <mstefani(a)redhat.de> Missing HeapFree's + 1 LocalFree (found by smatch). Modified: trunk/reactos/lib/cabinet/cabinet_main.c _____ Modified: trunk/reactos/lib/cabinet/cabinet_main.c --- trunk/reactos/lib/cabinet/cabinet_main.c 2005-01-11 21:36:04 UTC (rev 12929) +++ trunk/reactos/lib/cabinet/cabinet_main.c 2005-01-11 21:37:29 UTC (rev 12930) @@ -121,8 +121,10 @@ TRACE("extracting to dir: %s\n", debugstr_a(dir)); /* FIXME: what to do on failure? */ - if (!process_cabinet(what, dir, FALSE, FALSE, dest)) + if (!process_cabinet(what, dir, FALSE, FALSE, dest)) { + LocalFree(dir); return E_OUTOFMEMORY; + } LocalFree(dir);

19 years, 10 months

[gvg] 12929: Fix wrong tag name

by gvg＠svn.reactos.com

Fix wrong tag name Deleted: vendor/wine/dlls/cabinet/Wine-20040511/ Added: vendor/wine/dlls/cabinet/Wine-20050111/ _____ Copied: vendor/wine/dlls/cabinet/Wine-20050111 (from rev 12928, vendor/wine/dlls/cabinet/current)

19 years, 10 months

[gvg] 12928: Wine-20050111 vendor drop

by gvg＠svn.reactos.com

Wine-20050111 vendor drop Added: vendor/wine/dlls/cabinet/Wine-20040511/ Modified: vendor/wine/dlls/cabinet/Wine-20040511/cabinet_main.c Modified: vendor/wine/dlls/cabinet/Wine-20040511/fdi.c Modified: vendor/wine/dlls/cabinet/current/cabinet_main.c Modified: vendor/wine/dlls/cabinet/current/fdi.c _____ Copied: vendor/wine/dlls/cabinet/Wine-20040511 (from rev 12927, vendor/wine/dlls/cabinet/current) _____ Modified: vendor/wine/dlls/cabinet/Wine-20040511/cabinet_main.c --- vendor/wine/dlls/cabinet/current/cabinet_main.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/cabinet/Wine-20040511/cabinet_main.c 2005-01-11 21:26:55 UTC (rev 12928) @@ -121,8 +121,10 @@ TRACE("extracting to dir: %s\n", debugstr_a(dir)); /* FIXME: what to do on failure? */ - if (!process_cabinet(what, dir, FALSE, FALSE, dest)) + if (!process_cabinet(what, dir, FALSE, FALSE, dest)) { + LocalFree(dir); return E_OUTOFMEMORY; + } LocalFree(dir); _____ Modified: vendor/wine/dlls/cabinet/Wine-20040511/fdi.c --- vendor/wine/dlls/cabinet/current/fdi.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/cabinet/Wine-20040511/fdi.c 2005-01-11 21:26:55 UTC (rev 12928) @@ -2696,14 +2696,20 @@ } /* free decompression temps */ - if (LZX(window)) { - PFDI_FREE(hfdi, LZX(window)); - LZX(window) = NULL; + switch (fol->comp_type & cffoldCOMPTYPE_MASK) { + case cffoldCOMPTYPE_LZX: + if (LZX(window)) { + PFDI_FREE(hfdi, LZX(window)); + LZX(window) = NULL; + } + break; + case cffoldCOMPTYPE_QUANTUM: + if (QTM(window)) { + PFDI_FREE(hfdi, QTM(window)); + QTM(window) = NULL; + } + break; } - if (QTM(window)) { - PFDI_FREE(hfdi, QTM(window)); - QTM(window) = NULL; - } while (decomp_state) { fdi_decomp_state *prev_fds; @@ -2738,14 +2744,20 @@ bail_and_fail: /* here we free ram before error returns */ /* free decompression temps */ - if (LZX(window)) { - PFDI_FREE(hfdi, LZX(window)); - LZX(window) = NULL; + switch (fol->comp_type & cffoldCOMPTYPE_MASK) { + case cffoldCOMPTYPE_LZX: + if (LZX(window)) { + PFDI_FREE(hfdi, LZX(window)); + LZX(window) = NULL; + } + break; + case cffoldCOMPTYPE_QUANTUM: + if (QTM(window)) { + PFDI_FREE(hfdi, QTM(window)); + QTM(window) = NULL; + } + break; } - if (QTM(window)) { - PFDI_FREE(hfdi, QTM(window)); - QTM(window) = NULL; - } while (decomp_state) { fdi_decomp_state *prev_fds; _____ Modified: vendor/wine/dlls/cabinet/current/cabinet_main.c --- vendor/wine/dlls/cabinet/current/cabinet_main.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/cabinet/current/cabinet_main.c 2005-01-11 21:26:55 UTC (rev 12928) @@ -121,8 +121,10 @@ TRACE("extracting to dir: %s\n", debugstr_a(dir)); /* FIXME: what to do on failure? */ - if (!process_cabinet(what, dir, FALSE, FALSE, dest)) + if (!process_cabinet(what, dir, FALSE, FALSE, dest)) { + LocalFree(dir); return E_OUTOFMEMORY; + } LocalFree(dir); _____ Modified: vendor/wine/dlls/cabinet/current/fdi.c --- vendor/wine/dlls/cabinet/current/fdi.c 2005-01-11 20:23:48 UTC (rev 12927) +++ vendor/wine/dlls/cabinet/current/fdi.c 2005-01-11 21:26:55 UTC (rev 12928) @@ -2696,14 +2696,20 @@ } /* free decompression temps */ - if (LZX(window)) { - PFDI_FREE(hfdi, LZX(window)); - LZX(window) = NULL; + switch (fol->comp_type & cffoldCOMPTYPE_MASK) { + case cffoldCOMPTYPE_LZX: + if (LZX(window)) { + PFDI_FREE(hfdi, LZX(window)); + LZX(window) = NULL; + } + break; + case cffoldCOMPTYPE_QUANTUM: + if (QTM(window)) { + PFDI_FREE(hfdi, QTM(window)); + QTM(window) = NULL; + } + break; } - if (QTM(window)) { - PFDI_FREE(hfdi, QTM(window)); - QTM(window) = NULL; - } while (decomp_state) { fdi_decomp_state *prev_fds; @@ -2738,14 +2744,20 @@ bail_and_fail: /* here we free ram before error returns */ /* free decompression temps */ - if (LZX(window)) { - PFDI_FREE(hfdi, LZX(window)); - LZX(window) = NULL; + switch (fol->comp_type & cffoldCOMPTYPE_MASK) { + case cffoldCOMPTYPE_LZX: + if (LZX(window)) { + PFDI_FREE(hfdi, LZX(window)); + LZX(window) = NULL; + } + break; + case cffoldCOMPTYPE_QUANTUM: + if (QTM(window)) { + PFDI_FREE(hfdi, QTM(window)); + QTM(window) = NULL; + } + break; } - if (QTM(window)) { - PFDI_FREE(hfdi, QTM(window)); - QTM(window) = NULL; - } while (decomp_state) { fdi_decomp_state *prev_fds;

19 years, 10 months

[hbirr] 12927: - Changed a forgotten MP to CONFIG_SMP.

by hbirr＠svn.reactos.com

- Changed a forgotten MP to CONFIG_SMP. Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-01-11 20:02:58 UTC (rev 12926) +++ trunk/reactos/Makefile 2005-01-11 20:23:48 UTC (rev 12927) @@ -1,3 +1,4 @@ +# $Id$ # # Global makefile # @@ -773,7 +774,7 @@ # # Hardware Abstraction Layers # -ifeq ($(MP),1) +ifeq ($(CONFIG_SMP),1) halx86: halx86/mp else halx86: halx86/up

19 years, 10 months

[chorns] 12926: Build ntdll.dll.

by chorns＠svn.reactos.com

Build ntdll.dll. Modified: branches/xmlbuildsystem/reactos/config.template.xml Modified: branches/xmlbuildsystem/reactos/lib/directory.xml Added: branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/config.template.xml --- branches/xmlbuildsystem/reactos/config.template.xml 2005-01-11 18:20:30 UTC (rev 12925) +++ branches/xmlbuildsystem/reactos/config.template.xml 2005-01-11 20:02:58 UTC (rev 12926) @@ -1,66 +0,0 @@ - - -<define name="ARCH" value="i386" /> - - - - -<define name="OARCH" value="i486" /> - - - -<define name="KDBG" value="0" /> - - - - -<define name="DBG" value="0" /> - - - - -<define name="OPTIMIZED" value="0" /> - - - - -<define name="MP" value="0" /> - - - -<define name="ACPI" value="0" /> - - - - -<define name="3GB" value="1" /> - - - _____ Modified: branches/xmlbuildsystem/reactos/lib/directory.xml --- branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-11 18:20:30 UTC (rev 12925) +++ branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-11 20:02:58 UTC (rev 12926) @@ -1,6 +1,9 @@ <directory name="kjs"> <xi:include href="kjs/kjs.xml" /> </directory> +<directory name="ntdll"> + <xi:include href="ntdll/ntdll.xml" /> +</directory> <directory name="pseh"> <xi:include href="pseh/pseh.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml --- branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml 2005-01-11 18:20:30 UTC (rev 12925) +++ branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml 2005-01-11 20:02:58 UTC (rev 12926) @@ -0,0 +1,108 @@ +<module name="ntdll" type="nativedll"> + <dependency>genntdll</dependency> + <importlibrary definition="def/ntdll.def" /> + <define name="__NTDLL__" /> + <define name="_DISABLE_TIDENTS" /> + <library>rosrtl</library> + <library>rtl</library> + <library>string</library> + <directory name="csr"> + <file>capture.c</file> + <file>lpc.c</file> + <file>probe.c</file> + <file>thread.c</file> + </directory> + <directory name="dbg"> + <file>brkpoint.c</file> + <file>debug.c</file> + <file>print.c</file> + </directory> + <directory name="ldr"> + <file>entry.S</file> + <file>res.c</file> + <file>startup.c</file> + <file>utils.c</file> + </directory> + <directory name="main"> + <file>dllmain.c</file> + </directory> + <directory name="rtl"> + <directory name="i386"> + <file>alldiv.s</file> + <file>allmul.s</file> + <file>allrem.s</file> + <file>allshl.s</file> + <file>allshr.s</file> + <file>aulldiv.s</file> + <file>aullrem.s</file> + <file>aullshr.s</file> + <file>chkstk.s</file> + <file>except.s</file> + <file>exception.c</file> + <file>float.c</file> + <file>ftol.c</file> + </directory> + <file>access.c</file> + <file>apc.c</file> + <file>atom.c</file> + <file>callback.c</file> + <file>crc32.c</file> + <file>critical.c</file> + <file>dbgbuffer.c</file> + <file>exception.c</file> + <file>handle.c</file> + <file>intrlck.c</file> + <file>libsupp.c</file> + <file>math.c</file> + <file>message.c</file> + <file>misc.c</file> + <file>path.c</file> + <file>ppb.c</file> + <file>process.c</file> + <file>propvar.c</file> + <file>rangelist.c</file> + <file>registry.c</file> + <file>resource.c</file> + <file>teb.c</file> + <file>thread.c</file> + <file>timerqueue.c</file> + </directory> + <directory name="stdio"> + <file>sprintf.c</file> + <file>sscanf.c</file> + <file>swprintf.c</file> + </directory> + <directory name="stdlib"> + <file>abs.c</file> + <file>atoi64.c</file> + <file>atoi.c</file> + <file>atol.c</file> + <file>bsearch.c</file> + <file>itoa.c</file> + <file>itow.c</file> + <file>labs.c</file> + <file>lfind.c</file> + <file>mbstowcs.c</file> + <file>splitp.c</file> + <file>strtol.c</file> + <file>strtoul.c</file> + <file>wcstol.c</file> + <file>wcstombs.c</file> + <file>wcstoul.c</file> + <file>wtoi64.c</file> + <file>wtoi.c</file> + <file>wtol.c</file> + </directory> + <directory name="string"> + <file>ctype.c</file> + <file>memicmp.c</file> + <file>stricmp.c</file> + <file>strlwr.c</file> + <file>strnicmp.c</file> + <file>strpbrk.c</file> + <file>strstr.c</file> + <file>strupr.c</file> + <file>wstring.c</file> + </directory> + <file>napi.c</file> +</module> Property changes on: branches/xmlbuildsystem/reactos/lib/pseh ___________________________________________________________________ Name: svn:ignore - *.o *.d + *.o *.a *.d Property changes on: branches/xmlbuildsystem/reactos/lib/rosrtl ___________________________________________________________________ Name: svn:ignore + *.a Property changes on: branches/xmlbuildsystem/reactos/lib/rtl ___________________________________________________________________ Name: svn:ignore - *.o *.d *.sym *.map + *.o *.a *.d *.sym *.map Property changes on: branches/xmlbuildsystem/reactos/lib/string ___________________________________________________________________ Name: svn:ignore - *.o *.d *.sym *.map + *.o *.a *.d *.sym *.map _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-11 18:20:30 UTC (rev 12925) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-11 20:02:58 UTC (rev 12926) @@ -719,3 +719,65 @@ target.c_str ()); } } + + +static MingwNativeDLLModuleHandler nativedll_handler; + +MingwNativeDLLModuleHandler::MingwNativeDLLModuleHandler () + : MingwModuleHandler ( NativeDLL ) +{ +} + +void +MingwNativeDLLModuleHandler::Process ( const Module& module ) +{ + GeneratePreconditionDependencies ( module ); + GenerateNativeDLLModuleTarget ( module ); + GenerateInvocations ( module ); +} + +void +MingwNativeDLLModuleHandler::GenerateNativeDLLModuleTarget ( const Module& module ) +{ + static string ros_junk ( "$(ROS_TEMPORARY)" ); + string target ( FixupTargetFilename ( module.GetPath () ) ); + string workingDirectory = GetWorkingDirectory ( ); + string archiveFilename = GetModuleArchiveFilename ( module ); + string importLibraryDependencies = GetImportLibraryDependencies ( module ); + + if (module.importLibrary != NULL) + { + fprintf ( fMakefile, "%s:\n", + module.GetDependencyPath ().c_str () ); + + fprintf ( fMakefile, + "\t${dlltool} --dllname %s --def %s --output-lib %s --kill-at\n\n", + module.GetTargetName ().c_str (), + FixupTargetFilename ( module.GetBasePath () + SSEP + module.importLibrary->definition ).c_str (), + FixupTargetFilename ( module.GetDependencyPath () ).c_str () ); + } + + if (module.files.size () > 0) + { + fprintf ( fMakefile, "%s: %s %s\n", + target.c_str (), + archiveFilename.c_str (), + importLibraryDependencies.c_str () ); + + fprintf ( fMakefile, + "\t${gcc} -Wl,--subsystem,native -Wl,--entry,_DllMainCRTStartup@12 -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll -o %s %s %s\n", + target.c_str (), + archiveFilename.c_str (), + importLibraryDependencies.c_str () ); + + GenerateArchiveTargetTarget ( module ); + GenerateObjectFileTargetsTarget ( module ); + } + else + { + fprintf ( fMakefile, "%s:\n\n", + target.c_str ()); + fprintf ( fMakefile, ".PHONY: %s\n\n", + target.c_str ()); + } +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-11 18:20:30 UTC (rev 12925) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-11 20:02:58 UTC (rev 12926) @@ -108,4 +108,14 @@ void GenerateKernelModeDLLModuleTarget ( const Module& module ); }; + +class MingwNativeDLLModuleHandler : public MingwModuleHandler +{ +public: + MingwNativeDLLModuleHandler (); + virtual void Process ( const Module& module ); +private: + void GenerateNativeDLLModuleTarget ( const Module& module ); +}; + #endif /* MINGW_MODULEHANDLER_H */ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-11 18:20:30 UTC (rev 12925) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-11 20:02:58 UTC (rev 12926) @@ -152,6 +152,8 @@ return Kernel; if ( attribute.value == "kernelmodedll" ) return KernelModeDLL; + if ( attribute.value == "nativedll" ) + return NativeDLL; throw InvalidAttributeValueException ( location, attribute.name, attribute.value ); @@ -170,6 +172,8 @@ return ".exe"; case KernelModeDLL: return ".dll"; + case NativeDLL: + return ".dll"; } throw InvalidOperationException (__FILE__, __LINE__); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-11 18:20:30 UTC (rev 12925) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-11 20:02:58 UTC (rev 12926) @@ -65,7 +65,8 @@ BuildTool, StaticLibrary, Kernel, - KernelModeDLL + KernelModeDLL, + NativeDLL }; Property changes on: branches/xmlbuildsystem/reactos/tools/wmc ___________________________________________________________________ Name: svn:ignore - wmc *.coff *.d *.exe *.o *.sym *.dsp *.dsw *.ncb *.opt + wmc *.coff *.d *.exe *.o *.a *.sym *.dsp *.dsw *.ncb *.opt

19 years, 10 months

[royce] 12925: create a couple more variables to reduce makefile size

by royce＠svn.reactos.com

create a couple more variables to reduce makefile size preparations for <if> support Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-11 01:47:35 UTC (rev 12924) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-11 18:20:30 UTC (rev 12925) @@ -237,10 +237,11 @@ void MingwModuleHandler::GenerateGccModuleIncludeVariable ( const Module& module ) const { - string name ( module.name + "_INCLUDES" ); + string name ( module.name + "_CFLAGS" ); fprintf ( fMakefile, - "%s := %s\n", + "%s := %s %s\n", name.c_str(), + GenerateGccDefineParameters(module).c_str(), GenerateGccIncludeParameters(module).c_str() ); } @@ -260,9 +261,7 @@ string MingwModuleHandler::GenerateGccParameters ( const Module& module ) const { - string parameters = GenerateGccDefineParameters ( module ); - parameters += ssprintf(" $(%s_INCLUDES)", module.name.c_str()); - return parameters; + return ssprintf(" $(%s_CFLAGS)", module.name.c_str()); } string @@ -381,18 +380,18 @@ { string archiveFilename = GetModuleArchiveFilename ( module ); string sourceFilenames = GetSourceFilenames ( module ); - string objectFilenames = GetObjectFilenames ( module ); + string objectsMacro = GenerateObjectList ( module ); fprintf ( fMakefile, "%s: %s\n", archiveFilename.c_str (), - objectFilenames.c_str ()); + objectsMacro.c_str ()); fprintf ( fMakefile, "\t%s -rc %s %s\n\n", ar.c_str (), archiveFilename.c_str (), - objectFilenames.c_str ()); + objectsMacro.c_str ()); } void @@ -527,7 +526,18 @@ preconditionDependenciesName.c_str () ); } +string MingwModuleHandler::GenerateObjectList ( const Module& module ) const +{ + string macro ( ssprintf("%s_OBJS",module.name.c_str()) ); + fprintf ( + fMakefile, + "%s = %s\n", + macro.c_str(), + GetObjectFilenames(module).c_str() ); + return ssprintf("$(%s)",macro.c_str()); +} + static MingwBuildToolModuleHandler buildtool_handler; MingwBuildToolModuleHandler::MingwBuildToolModuleHandler() _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-11 01:47:35 UTC (rev 12924) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-11 18:20:30 UTC (rev 12925) @@ -38,6 +38,7 @@ std::string GetInvocationParameters ( const Invoke& invoke ) const; void GenerateInvocations ( const Module& module ) const; void GeneratePreconditionDependencies ( const Module& module ) const; + std::string GenerateObjectList ( const Module& module ) const; static FILE* fMakefile; private: std::string ConcatenatePaths ( const std::string& path1,

19 years, 10 months

← Newer
1
...
42
43
44
45
46
47
48
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2005