Ros-diffs April 2007

ros-diffs@reactos.org

19 participants
380 discussions

[hpoussin] 26503: Do not try to copy winver.exe on the bootcd, it was deleted in r26486

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Apr 25 12:38:23 2007 New Revision: 26503 URL: http://svn.reactos.org/svn/reactos?rev=26503&view=rev Log: Do not try to copy winver.exe on the bootcd, it was deleted in r26486 Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/crypt32/crypt32_ros.diff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Wed Apr 25 12:38:23 2007 @@ -60,7 +60,6 @@ base\applications\shutdown\shutdown.exe 1 base\applications\sndvol32\sndvol32.exe 1 base\applications\taskmgr\taskmgr.exe 1 -base\applications\winver\winver.exe 1 base\applications\wordpad\wordpad.exe 1 base\services\dhcp\dhcp.exe 1 Modified: trunk/reactos/dll/win32/crypt32/crypt32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_ros.diff (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_ros.diff Wed Apr 25 12:38:23 2007 @@ -4,7 +4,7 @@ +++ crypt32.rc (working copy) @@ -17,12 +17,18 @@ * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#define REACTOS_VERSION_DLL

17 years, 4 months

[winesync] 26502: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Wed Apr 25 12:22:35 2007 New Revision: 26502 URL: http://svn.reactos.org/svn/reactos?rev=26502&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/uxtheme/msstyles.h Modified: trunk/reactos/dll/win32/uxtheme/msstyles.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.h (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.h Wed Apr 25 12:22:35 2007 @@ -82,7 +82,7 @@ PTHEME_IMAGE images; } THEME_FILE, *PTHEME_FILE; -typedef void* PUXINI_FILE; +typedef struct _UXINI_FILE *PUXINI_FILE; HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWSTR pszSizeName, PTHEME_FILE *tf); void MSSTYLES_CloseThemeFile(PTHEME_FILE tf);

17 years, 4 months

[winesync] 26501: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Wed Apr 25 12:22:24 2007 New Revision: 26501 URL: http://svn.reactos.org/svn/reactos?rev=26501&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc (with props) trunk/reactos/dll/win32/oledlg/oledlg_private.h (with props) trunk/reactos/dll/win32/oledlg/pastespl.c (with props) Modified: trunk/reactos/dll/win32/oledlg/insobjdlg.c trunk/reactos/dll/win32/oledlg/oledlg.rbuild trunk/reactos/dll/win32/oledlg/oledlg_De.rc trunk/reactos/dll/win32/oledlg/oledlg_En.rc trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc trunk/reactos/dll/win32/oledlg/oledlg_It.rc trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc trunk/reactos/dll/win32/oledlg/oledlg_No.rc trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc trunk/reactos/dll/win32/oledlg/oledlg_main.c trunk/reactos/dll/win32/oledlg/oledlg_ros.diff trunk/reactos/dll/win32/oledlg/resource.h trunk/reactos/dll/win32/oledlg/rsrc.rc Modified: trunk/reactos/dll/win32/oledlg/insobjdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/insobjdlg… ============================================================================== --- trunk/reactos/dll/win32/oledlg/insobjdlg.c (original) +++ trunk/reactos/dll/win32/oledlg/insobjdlg.c Wed Apr 25 12:22:24 2007 @@ -57,7 +57,7 @@ } InsertObjectDlgInfo; -INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +static INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static LRESULT UIINSOBJDLG_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam); static void UIINSERTOBJECTDLG_InitDialog(InsertObjectDlgInfo* pdlgInfo); static void UIINSERTOBJECTDLG_SelectCreateCtrl(InsertObjectDlgInfo* pdlgInfo); Modified: trunk/reactos/dll/win32/oledlg/oledlg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg.rb… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg.rbuild (original) +++ trunk/reactos/dll/win32/oledlg/oledlg.rbuild Wed Apr 25 12:22:24 2007 @@ -17,6 +17,7 @@ <library>ntdll</library> <file>insobjdlg.c</file> <file>oledlg_main.c</file> + <file>pastespl.c</file> <file>rsrc.rc</file> <file>oledlg.spec</file> </module> Modified: trunk/reactos/dll/win32/oledlg/oledlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_De… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_De.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_De.rc Wed Apr 25 12:22:24 2007 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -53,3 +53,43 @@ IDS_NOTOLEMOD "Die Datei ist offenbar kein gültiges OLE - Steuermodul. Die OLE - Steuerung konnte nicht registiert werden." IDS_NOTOLEMODCAPTION "Steuerung hinzufügen" } + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Inhalte einfügen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Quelle:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "&Einfügen", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "&Verknüpfung einfügen", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&Als:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "Abbrechen", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "&Hilfe", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "Als Symbol &darstellen", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "&Symbol ändern...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< result text goes here >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "Ergebnis", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Fügt den Inhalt der Zwischenablage in Ihr Dokument als %s ein." + IDS_PS_PASTE_OBJECT "Fügt den Inhalt der Zwischenablage so in Ihr Dokument ein dass Sie es mit %s aktivieren können." + IDS_PS_PASTE_OBJECT_AS_ICON "Fügt den Inhalt der Zwischenablage so in Ihr Dokument ein dass Sie es mit %s aktivieren können. Wird als Symbol dargestellt." + IDS_PS_PASTE_LINK_DATA "Fügt den Inhalt der Zwischenablage in Ihr Dokument als %s ein. Die Daten sind mit der Ursprungsdatei verknüpft so dass Änderungen an dieser in Ihrem Dokument erscheinen." + IDS_PS_PASTE_LINK_OBJECT "Fügt ein Bild des Zwischenablagen-Inhalts in Ihr Dokument ein. Das Bild ist mit der Ursprungsdatei verknüpft so dass Änderungen an dieser in Ihrem Dokument erscheinen." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Fügt eine Verknüpfung ein die auf den Ort des Zwischenablagen-Inhalts zeigt. Die Verknüpfung ist mit der Ursprungsdatei verknüpft so dass Änderungen an dieser in Ihrem Dokument erscheinen." + IDS_PS_NON_OLE "Fügt den Inhalt der Zwischenablage in Ihr Dokument als ein." + IDS_PS_UNKNOWN_TYPE "Unbekannter Typ" + IDS_PS_UNKNOWN_SRC "Unbekannte Quelle" + IDS_PS_UNKNOWN_APP "dem Erzeugerprogramm" +} Modified: trunk/reactos/dll/win32/oledlg/oledlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_En… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_En.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_En.rc Wed Apr 25 12:22:24 2007 @@ -53,3 +53,43 @@ IDS_NOTOLEMOD "File does not appear to be a valid OLE module. Unable to register OLE control." IDS_NOTOLEMODCAPTION "Add Control" } + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Paste Special" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Source:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "&Paste", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "Paste &Link", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&As:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "Cancel", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "&Help", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "&Display As Icon", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "Change &Icon...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< result text goes here >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "Result", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Inserts the contents of the clipboard into your document as %s." + IDS_PS_PASTE_OBJECT "Inserts the contents of the clipboard into your document so that you can activate it using %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Inserts the contents of the clipboard into your document so that you can activate it using %s. It will be displayed as an icon." + IDS_PS_PASTE_LINK_DATA "Inserts the contents of the clipboard into your document as %s. The data is linked to the source file so that changes to the file will be reflected in your document." + IDS_PS_PASTE_LINK_OBJECT "Inserts a picture of the clipboard contents into your document. The picture is linked to the source file so that changes to the file will be reflected in your document." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Inserts a shortcut which points to the location of the clipboard contents. The shortcut is linked to the source file so that changes to the file will be reflected in your document." + IDS_PS_NON_OLE "Inserts the contents of the clipboard into your document." + IDS_PS_UNKNOWN_TYPE "Unknown Type" + IDS_PS_UNKNOWN_SRC "Unknown Source" + IDS_PS_UNKNOWN_APP "the program which created it" +} Modified: trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Fr… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Fr.rc Wed Apr 25 12:22:24 2007 @@ -2,7 +2,7 @@ * oledlg dll resources * French language support * - * Copyright (C) 2005 Jonathan Ernst + * Copyright (C) 2005-2006 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,30 +30,70 @@ LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "Type d'objet:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + LTEXT "Type d'objet :",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE DEFPUSHBUTTON "OK",IDOK,221,7,66,14 PUSHBUTTON "Annuler",IDCANCEL,221,24,66,14 GROUPBOX "Résultat",IDC_RESULT,7,103,208,41 - CONTROL "Créer Nouveau",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + CONTROL "Créer nouveau",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 - CONTROL "Créer Contrôle",IDC_CREATECONTROL,"Button", + CONTROL "Créer le contrôle",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "Créer Depuis Fichier",IDC_CREATEFROMFILE,"Button", + CONTROL "Créer depuis le fichier",IDC_CREATEFROMFILE,"Button", BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "&Ajoute Contrôle...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Afficher Comme Icône",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Afficher comme icône",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Parcourir...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE - LTEXT "Fichier:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + LTEXT "Fichier :",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE END STRINGTABLE DISCARDABLE { IDS_RESULTOBJDESC "Insérer un nouvel object %s dans votre document" - IDS_RESULTFILEOBJDESC "Insère le contenu du fichier comme un objet dans votre document afin que vous puissiez l'activer en utilisant le programme avec lequel vous l'avez créé." + IDS_RESULTFILEOBJDESC "Insère le contenu du fichier comme un objet dans votre document afin que vous puissiez l'activer en utilisant le programme avec lequel il a été créé." IDS_BROWSE "Parcourir" IDS_NOTOLEMOD "Le fichier ne semble pas être un module OLE valide. Impossible d'enregistrer le contrôle OLE." - IDS_NOTOLEMODCAPTION "Ajouter Contrôle" + IDS_NOTOLEMODCAPTION "Ajouter un contrôle" } + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Collage spécial" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Source :", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "C&oller", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "Coller le &lien", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&Comme :", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "Annuler", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "Aid&e", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "&Afficher comme icône", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "Changer l'&icône...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< le résultat vient ici >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "Résultat", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Insère le contenu du presse-papiers dans votre document comme %s." + IDS_PS_PASTE_OBJECT "Insère le contenu du presse-papiers dans votre document de sorte que vous puissiez l'activer en utilisant %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Insère le contenu du presse-papiers dans votre document de sorte que vous puissiez l'activer en utilisant %s. Il sera affiché comme une icône." + IDS_PS_PASTE_LINK_DATA "Insère le contenu du presse-papiers dans votre document comme %s. Les données sont liées au fichier source de sorte que les modifications de celles-ci seront répercutées dans votre document." + IDS_PS_PASTE_LINK_OBJECT "Insère le contenu du presse-papiers dans votre document. L'image est liée au fichier source de sorte que les modifications de celle-ci seront répercutées dans votre document." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Insère un raccourci qui pointe vers l'emplacement du contenu du presse-papiers. Le raccourci est lié au fichier source de sorte que les modifications de celui-ci seront répercutées dans votre document." + IDS_PS_NON_OLE "Insère le contenu du presse-papiers dans votre document." + IDS_PS_UNKNOWN_TYPE "Type inconnu" + IDS_PS_UNKNOWN_SRC "Source inconnue" + IDS_PS_UNKNOWN_APP "le programme avec lequel il a été créé" +} Modified: trunk/reactos/dll/win32/oledlg/oledlg_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_It… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_It.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_It.rc Wed Apr 25 12:22:24 2007 @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Ko… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Ko.rc Wed Apr 25 12:22:24 2007 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -53,3 +53,43 @@ IDS_NOTOLEMOD "ÀÌ ÆÄÀÏÀº ¿Ã¹Ù¸¥ OLE¸ðµâÀÌ ¾Æ´Ñ°Å·Î º¸ÀÔ´Ï´Ù. OLEÄÁÆ®·ÑÀ» µî·ÏÇÒ¼ö ¾ø½À´Ï´Ù." IDS_NOTOLEMODCAPTION "ÄÁÆ®·Ñ ´õÇÏ±â" } + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Æ¯º°ÇÏ°Ô ºÙ¿©³Ö±â" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "¿øº»:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "ºÙ¿©³Ö±â(&P)", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "¸µÅ©·Î ºÙ¿©³Ö±â(&L)", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&As:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "È®ÀÎ", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "Ãë¼Ò", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "µµ¿ò¸»(&H)", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "¾ÆÀÌÄÜÀ¸·Î º¸±â(&D)", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "¾ÆÀÌÄÜ ¹Ù²Ù±â(&I)...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< °á°ú ÅØ½ºÆ®´Â ¿©±â´Ù°¡ >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "°á°ú", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "´ç½ÅÀÇ ¹®¼ %s¿¡ Å¬¸³º¸µåÀÇ ³»¿ë »ðÀÔÇÏ±â." + IDS_PS_PASTE_OBJECT "´ç½ÅÀÇ ¹®¼¿¡ Å¬¸³º¸µåÀÇ ³»¿ëµéÀ» Ã·ºÎÇÏ¸é %s¸¦ »ç¿ëÇØ¼ ÀÌ°ÍÀ» ½ÇÇàÇÒ ¼ö ÀÖ½À´Ï´Ù." + IDS_PS_PASTE_OBJECT_AS_ICON "´ç½ÅÀÇ ¹®¼¿¡ Å¬¸³º¸µåÀÇ ³»¿ëµéÀ» Ã·ºÎÇÏ¸é %s¸¦ »ç¿ëÇØ¼ ÀÌ°ÍÀ» ½ÇÇàÇÒ ¼ö ÀÖ½À´Ï´Ù. ÀÌ°ÍÀº ¾ÆÀÌÄÜÀ¸·Î ³ªÅ¸³»Áú °Ì´Ï´Ù." + IDS_PS_PASTE_LINK_DATA "´ç½ÅÀÇ ¹®¼ %s¿¡ Å¬¸³º¸µåÀÇ ³»¿ë »ðÀÔÇÏ±â. ÀÌ µ¥ÀÌÅÍ´Â ¿øº» ÆÄÀÏ¿¡ ¿¬°áµÇ¾î ÀÖ¾î¼ ÆÄÀÏÀÌ ¹Ù²î¸é ´ç½ÅÀÇ ¹®¼µµ ¹Ù²ð°Ì´Ï´Ù." + IDS_PS_PASTE_LINK_OBJECT "´ç½ÅÀÇ ¹®¼¿¡ Å¬¸³º¸µå¿¡ ÀÖ´Â ±×¸²À» Áý¾î³Ö½À´Ï´Ù. ÀÌ ±×¸²Àº ¿øº» ÆÄÀÏ¿¡ ¿¬°áµÇ¾î ÀÖ¾î¼ ÆÄÀÏÀÌ ¹Ù²î¸é ´ç½ÅÀÇ ¹®¼µµ ¹Ù²ð°Ì´Ï´Ù." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "´ç½ÅÀÇ ¹®¼¿¡ Å¬¸³º¸µå¿¡ ÀÖ´Â ´ÜÃà¾ÆÀÌÄÜÀ» Áý¾î³Ö½À´Ï´Ù. ÀÌ ´ÜÃà¾ÆÀÌÄÜÀº ¿øº» ÆÄÀÏ¿¡ ¿¬°áµÇ¾î ÀÖ¾î¼ ÆÄÀÏÀÌ ¹Ù²î¸é ´ç½ÅÀÇ ¹®¼µµ ¹Ù²ð°Ì´Ï´Ùt." + IDS_PS_NON_OLE "´ç½ÅÀÇ ¹®¼¿¡ Å¬¸³º¸µåÀÇ ³»¿ë »ðÀÔÇÏ±â." + IDS_PS_UNKNOWN_TYPE "¾Ë¼ö ¾ø´Â Çü½Ä" + IDS_PS_UNKNOWN_SRC "¾Ë¼ö ¾ø´Â ¿øº»" + IDS_PS_UNKNOWN_APP "ÀÌ ÇÁ·Î±×·¥Àº ¾Ë ¼ö ¾ø´Â ÇÁ·Î±×·¥À¸·Î ¸¸µé¾îÁ³½À´Ï´Ù" +} Modified: trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Nl… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Nl.rc Wed Apr 25 12:22:24 2007 @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -33,7 +33,7 @@ GROUPBOX "Resultaat",IDC_RESULT,7,103,208,41 CONTROL "Nieuw",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 - CONTROL "CreÃ«ren",IDC_CREATECONTROL,"Button", + CONTROL "Creëren",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 CONTROL "Bestand gebruiken",IDC_CREATEFROMFILE,"Button", BS_AUTORADIOBUTTON,7,37,67,10 Modified: trunk/reactos/dll/win32/oledlg/oledlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_No… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_No.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_No.rc Wed Apr 25 12:22:24 2007 @@ -1,5 +1,5 @@ /* - * Copyright 2005 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2005-2006 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -53,3 +53,43 @@ IDS_NOTOLEMOD "Filen ser ikke ut til å være en gyldig OLE-modul. Kunne ikke registrere OLE-kontroller." IDS_NOTOLEMODCAPTION "Legg til kontroller" } + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Lim inn spesiell" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Kilde:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "Lim in&n", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "Lim inn kob&ling", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&Som:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "Avbryt", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "&Hjelp", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "&Vis som ikon", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "Endre &ikon . . .", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< resultatet kommer her >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "Resultat", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Rediger", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Setter innholdet fra utklippstavlen inn i dokumentet som %s." + IDS_PS_PASTE_OBJECT "Setter innholdet fra utklippstavlen inn i dokumentet så du kan aktivere det med %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Setter innholdet fra utklippstavlen inn i dokumentet så du kan aktivere det med %s. Det vises som et ikon." + IDS_PS_PASTE_LINK_DATA "Setter innholdet fra utklippstavlen inn i dokumentet som %s. Det kobles til kildefilen så endrer i denne også skjer i dokumentet." + IDS_PS_PASTE_LINK_OBJECT "Setter inn et bilde av utklippstavleinnholdet i dokumentet. Bildet kobles til kildefilen så endringer i denne også skjer i dokumentet ." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Setter inn en snarvei som peker til plasseringen av innholdet på utklippstavlen. Snarveien kobles til kildefilen så endringer i denne også skjer i dokumentet." + IDS_PS_NON_OLE "Setter innholdet fra utklippstavlen inn i dokumentet." + IDS_PS_UNKNOWN_TYPE "Ukjent type" + IDS_PS_UNKNOWN_SRC "Ukjent kilde" + IDS_PS_UNKNOWN_APP "programmet som laget det" +} Added: trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Pl… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc (added) +++ trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc Wed Apr 25 12:22:24 2007 @@ -1,0 +1,96 @@ +/* + * Copyright 2003 Ulrich Czekalla for CodeWeavers + * Copyright 2006 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 310, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Wstaw objekt" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Typ obiektu:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,229,7,66,14 + PUSHBUTTON "Anuluj",IDCANCEL,229,24,66,14 + GROUPBOX "Wynik",IDC_RESULT,7,103,208,41 + CONTROL "Utwórz nowy",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "Utwórz kontrolkê",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,72,10 + CONTROL "Utwórz z pliku",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "&Dodaj kontrolkê...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "Wywietlaj jako ikonê",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,84,10 + PUSHBUTTON "Przegl¹daj...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "Plik:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "Wstaw nowy objekt %s do dokumentu" + IDS_RESULTFILEOBJDESC "Wstaw zawartoæ pliku jako obiekt do dokumentu. Bêdzie mo¿na go aktywowaæ u¿ywaj¹c programu, który go stworzy³." + IDS_BROWSE "Przegl¹daj" + IDS_NOTOLEMOD "Plik nie wydaje siê byæ poprawnym modu³em OLE. Nie uda³o siê zarejestrowaæ kontrolki OLE." + IDS_NOTOLEMODCAPTION "Dodaj kontrolkê" +} + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 309, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Wklej specjalnie" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ród³o:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "&Wklej", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "Wklej &³¹czê", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&Jako:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 232, 6, 66, 14 + CONTROL "Anuluj", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 232, 23, 66, 14 + CONTROL "&Pomoc", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 232, 42, 66, 14 + CONTROL "W&ywietlaj jako ikonê", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 84, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 232, 75, 66, 44 + CONTROL "Zmieñ &ikonê...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 232, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< result text goes here >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "Wynik", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Wstawia zawartoæ schowka do documentu jako %s." + IDS_PS_PASTE_OBJECT "Wstawia zawartoæ schowka do dokumentu, tak aby móg³ byæ aktywowany za pomoc¹ %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Wstawia zawartoæ schowka do dokumentu, tak aby móg³ byæ aktywowany za pomoc¹ %s. Bêdzie wywietlany jako ikona." + IDS_PS_PASTE_LINK_DATA "Wstawia zawartoæ schowka do documentu jako %s. Dane bêd¹ po³¹czone z plikiem ród³owym, dziêki czemu zmiany w pliku bêd¹ odzwierciedlone w dokumencie." + IDS_PS_PASTE_LINK_OBJECT "Wstawia zawartoæ schowka do documentu jako obraz. Obraz bêdzie po³¹czony z plikiem ród³owym, dziêki czemu zmiany w pliku bêd¹ odzwierciedlone w dokumencie." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Wstawia do documentu skrót do zawartoci schowka. Skrót bêdzie po³¹czony z plikiem ród³owym, dziêki czemu zmiany w pliku bêd¹ odzwierciedlone w dokumencie." + IDS_PS_NON_OLE "Wstawia zawartoæ schowka do dokumentu" + IDS_PS_UNKNOWN_TYPE "Nieznany typ" + IDS_PS_UNKNOWN_SRC "Nieznane ród³o" + IDS_PS_UNKNOWN_APP "program który go stworzy³" +} Propchange: trunk/reactos/dll/win32/oledlg/oledlg_Pl.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_Pt… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_Pt.rc Wed Apr 25 12:22:24 2007 @@ -1,5 +1,6 @@ /* * Copyright 2004 Marcelo Duarte + * Copyright 2006 Américo José Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -45,6 +46,38 @@ EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE END +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Inserir objecto" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Tipo de objecto:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,221,7,66,14 + PUSHBUTTON "Cancelar",IDCANCEL,221,24,66,14 + GROUPBOX "Resultado",IDC_RESULT,7,103,208,41 + CONTROL "Criar novo",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "Criar controlo",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "Criar do ficheiro",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "&Adicionar Controlo...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "Mostrar como ícone",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "Procurar...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "Ficheiro:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + STRINGTABLE DISCARDABLE { IDS_RESULTOBJDESC "Inserir um novo objeto %s no documento" @@ -53,3 +86,14 @@ IDS_NOTOLEMOD "O arquivo não parece ser um módulo OLE válido. Impossível registrar o controle OLE." IDS_NOTOLEMODCAPTION "Adicionar Controle" } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "Inserir novo objecto %s no documento" + IDS_RESULTFILEOBJDESC "Inserir conteúdo do ficheiro como um objecto no documento de modo que opossa activar usando o programa que o criou." + IDS_BROWSE "Procurar" + IDS_NOTOLEMOD "O ficheiro não parece ser um módulo OLE válido. Impossível registrar o controlo OLE." + IDS_NOTOLEMODCAPTION "Adicionar Controlo" +} Modified: trunk/reactos/dll/win32/oledlg/oledlg_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_ma… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_main.c (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_main.c Wed Apr 25 12:22:24 2007 @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <stdarg.h> #include "windef.h" @@ -27,24 +26,69 @@ #include "wingdi.h" #include "winuser.h" #include "oledlg.h" +#include "ole2.h" +#include "oledlg_private.h" + #include "wine/debug.h" -#include "ole2.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); HINSTANCE OLEDLG_hInstance = 0; +UINT cf_embed_source; +UINT cf_embedded_object; +UINT cf_link_source; +UINT cf_object_descriptor; +UINT cf_link_src_descriptor; +UINT cf_ownerlink; +UINT cf_filename; +UINT cf_filenamew; + +UINT oleui_msg_help; +UINT oleui_msg_enddialog; + +static void register_clipboard_formats(void) +{ + /* These used to be declared in olestd.h, but that seems to have been removed from the api */ + static const WCHAR CF_EMBEDSOURCEW[] = { 'E','m','b','e','d',' ','S','o','u','r','c','e',0 }; + static const WCHAR CF_EMBEDDEDOBJECTW[] = { 'E','m','b','e','d','d','e','d',' ','O','b','j','e','c','t',0 }; + static const WCHAR CF_LINKSOURCEW[] = { 'L','i','n','k',' ','S','o','u','r','c','e',0 }; + static const WCHAR CF_OBJECTDESCRIPTORW[] = { 'O','b','j','e','c','t',' ','D','e','s','c','r','i','p','t','o','r',0 }; + static const WCHAR CF_LINKSRCDESCRIPTORW[] = { 'L','i','n','k',' ','S','o','u','r','c','e',' ','D','e','s','c','r','i','p','t','o','r',0 }; + static const WCHAR CF_OWNERLINKW[] = { 'O','w','n','e','r','L','i','n','k',0 }; + static const WCHAR CF_FILENAMEW[] = { 'F','i','l','e','N','a','m','e',0 }; + static const WCHAR CF_FILENAMEWW[] = { 'F','i','l','e','N','a','m','e','W',0 }; + + /* Load in the same order as native to make debugging easier */ + cf_object_descriptor = RegisterClipboardFormatW(CF_OBJECTDESCRIPTORW); + cf_link_src_descriptor = RegisterClipboardFormatW(CF_LINKSRCDESCRIPTORW); + cf_embed_source = RegisterClipboardFormatW(CF_EMBEDSOURCEW); + cf_embedded_object = RegisterClipboardFormatW(CF_EMBEDDEDOBJECTW); + cf_link_source = RegisterClipboardFormatW(CF_LINKSOURCEW); + cf_ownerlink = RegisterClipboardFormatW(CF_OWNERLINKW); + cf_filename = RegisterClipboardFormatW(CF_FILENAMEW); + cf_filenamew = RegisterClipboardFormatW(CF_FILENAMEWW); +} + +static void register_messages(void) +{ + oleui_msg_help = RegisterWindowMessageW(SZOLEUI_MSG_HELPW); + oleui_msg_enddialog = RegisterWindowMessageW(SZOLEUI_MSG_ENDDIALOGW); +} + /*********************************************************************** * DllMain */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad); + TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad); switch(fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); OLEDLG_hInstance = hinstDLL; + register_clipboard_formats(); + register_messages(); break; case DLL_PROCESS_DETACH: @@ -113,26 +157,6 @@ } /*********************************************************************** - * OleUIPasteSpecialA (OLEDLG.4) - */ -UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA lpOleUIPasteSpecial) -{ - FIXME("(%p): stub\n", lpOleUIPasteSpecial); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return OLEUI_FALSE; -} - -/*********************************************************************** - * OleUIPasteSpecialW (OLEDLG.22) - */ -UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW lpOleUIPasteSpecial) -{ - FIXME("(%p): stub\n", lpOleUIPasteSpecial); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return OLEUI_FALSE; -} - -/*********************************************************************** * OleUIEditLinksA (OLEDLG.5) */ UINT WINAPI OleUIEditLinksA(LPOLEUIEDITLINKSA lpOleUIEditLinks) Added: trunk/reactos/dll/win32/oledlg/oledlg_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_pr… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_private.h (added) +++ trunk/reactos/dll/win32/oledlg/oledlg_private.h Wed Apr 25 12:22:24 2007 @@ -1,0 +1,38 @@ +/* + * oledlg internal header file + * + * Copyright (C) 2006 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __OLEDLG_PRIVATE_H__ +#define __OLEDLG_PRIVATE_H__ + +extern HINSTANCE OLEDLG_hInstance; + +extern UINT cf_embed_source; +extern UINT cf_embedded_object; +extern UINT cf_link_source; +extern UINT cf_object_descriptor; +extern UINT cf_link_src_descriptor; +extern UINT cf_ownerlink; +extern UINT cf_filename; +extern UINT cf_filenamew; + +extern UINT oleui_msg_help; +extern UINT oleui_msg_enddialog; + +#endif /* __OLEDLG_PRIVATE_H__ */ Propchange: trunk/reactos/dll/win32/oledlg/oledlg_private.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/oledlg/oledlg_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_ro… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_ros.diff (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_ros.diff Wed Apr 25 12:22:24 2007 @@ -58,8 +58,8 @@ =================================================================== --- rsrc.rc (revision 25690) +++ rsrc.rc (revision working copy) -@@ -44,3 +44,4 @@ - #include "oledlg_No.rc" +@@ -47,3 +47,4 @@ + #include "oledlg_Pl.rc" #include "oledlg_Pt.rc" #include "oledlg_Tr.rc" +#include "oledlg_Uk.rc" Added: trunk/reactos/dll/win32/oledlg/pastespl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/pastespl.… ============================================================================== --- trunk/reactos/dll/win32/oledlg/pastespl.c (added) +++ trunk/reactos/dll/win32/oledlg/pastespl.c Wed Apr 25 12:22:24 2007 @@ -1,0 +1,722 @@ +/* + * OleUIPasteSpecial implementation + * + * Copyright 2006 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#define NONAMELESSSTRUCT +#define NONAMELESSUNION + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wingdi.h" +#include "winuser.h" +#include "winnls.h" +#include "oledlg.h" + +#include "oledlg_private.h" +#include "resource.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +typedef struct +{ + OLEUIPASTESPECIALW *ps; + DWORD flags; + WCHAR *source_name; + WCHAR *link_source_name; + WCHAR *type_name; + WCHAR *link_type_name; + LPOLESTR app_name; +} ps_struct_t; + +static const struct ps_flag +{ + DWORD flag; + const char *name; +} ps_flags[] = { +#define PS_FLAG_ENTRY(p) {p, #p} + PS_FLAG_ENTRY(PSF_SHOWHELP), + PS_FLAG_ENTRY(PSF_SELECTPASTE), + PS_FLAG_ENTRY(PSF_SELECTPASTELINK), + PS_FLAG_ENTRY(PSF_CHECKDISPLAYASICON), + PS_FLAG_ENTRY(PSF_DISABLEDISPLAYASICON), + PS_FLAG_ENTRY(PSF_HIDECHANGEICON), + PS_FLAG_ENTRY(PSF_STAYONCLIPBOARDCHANGE), + PS_FLAG_ENTRY(PSF_NOREFRESHDATAOBJECT), + {-1, NULL} +#undef PS_FLAG_ENTRY +}; + +static void dump_ps_flags(DWORD flags) +{ + char flagstr[1000] = ""; + + const struct ps_flag *flag = ps_flags; + for( ; flag->name; flag++) { + if(flags & flag->flag) { + strcat(flagstr, flag->name); + strcat(flagstr, "|"); + } + } + TRACE("flags %08x %s\n", flags, flagstr); +} + +static void dump_pastespecial(LPOLEUIPASTESPECIALW ps) +{ + UINT i; + dump_ps_flags(ps->dwFlags); + TRACE("hwnd %p caption %s hook %p custdata %lx\n", + ps->hWndOwner, debugstr_w(ps->lpszCaption), ps->lpfnHook, ps->lCustData); + if(IS_INTRESOURCE(ps->lpszTemplate)) + TRACE("hinst %p template %04x hresource %p\n", ps->hInstance, (WORD)(ULONG_PTR)ps->lpszTemplate, ps->hResource); + else + TRACE("hinst %p template %s hresource %p\n", ps->hInstance, debugstr_w(ps->lpszTemplate), ps->hResource); + TRACE("dataobj %p arrpasteent %p cpasteent %d arrlinktype %p clinktype %d\n", + ps->lpSrcDataObj, ps->arrPasteEntries, ps->cPasteEntries, + ps->arrLinkTypes, ps->cLinkTypes); + TRACE("cclsidex %d lpclsidex %p nselect %d flink %d hmetapict %p size(%d,%d)\n", + ps->cClsidExclude, ps->lpClsidExclude, ps->nSelectedIndex, ps->fLink, + ps->hMetaPict, ps->sizel.cx, ps->sizel.cy); + for(i = 0; i < ps->cPasteEntries; i++) + { + TRACE("arrPasteEntries[%d]: cFormat %08x pTargetDevice %p dwAspect %d lindex %d tymed %d\n", + i, ps->arrPasteEntries[i].fmtetc.cfFormat, ps->arrPasteEntries[i].fmtetc.ptd, + ps->arrPasteEntries[i].fmtetc.dwAspect, ps->arrPasteEntries[i].fmtetc.lindex, + ps->arrPasteEntries[i].fmtetc.tymed); + TRACE("\tformat name %s result text %s flags %04x\n", debugstr_w(ps->arrPasteEntries[i].lpstrFormatName), + debugstr_w(ps->arrPasteEntries[i].lpstrResultText), ps->arrPasteEntries[i].dwFlags); + } + for(i = 0; i < ps->cLinkTypes; i++) + TRACE("arrLinkTypes[%d] %08x\n", i, ps->arrLinkTypes[i]); + for(i = 0; i < ps->cClsidExclude; i++) + TRACE("lpClsidExclude[%d] %s\n", i, debugstr_guid(&ps->lpClsidExclude[i])); + +} + +static inline WCHAR *strdupAtoW(const char *str) +{ + DWORD len; + WCHAR *ret; + if(!str) return NULL; + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + +static inline WCHAR *strdupW(const WCHAR *str) +{ + DWORD len; + WCHAR *ret; + if(!str) return NULL; + len = lstrlenW(str) + 1; + ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + memcpy(ret, str, len * sizeof(WCHAR)); + return ret; +} + +static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct) +{ + FORMATETC fmtetc; + STGMEDIUM stg; + + fmtetc.tymed = TYMED_HGLOBAL; + fmtetc.dwAspect = DVASPECT_CONTENT; + fmtetc.ptd = NULL; + fmtetc.lindex = -1; + + fmtetc.cfFormat = cf_object_descriptor; + if(IDataObject_GetData(ps_struct->ps->lpSrcDataObj, &fmtetc, &stg) == S_OK) + { + OBJECTDESCRIPTOR *obj_desc = GlobalLock(stg.u.hGlobal); + if(obj_desc->dwSrcOfCopy) + ps_struct->source_name = strdupW((WCHAR*)((char*)obj_desc + obj_desc->dwSrcOfCopy)); + if(obj_desc->dwFullUserTypeName) + ps_struct->type_name = strdupW((WCHAR*)((char*)obj_desc + obj_desc->dwFullUserTypeName)); + OleRegGetUserType(&obj_desc->clsid, USERCLASSTYPE_APPNAME, &ps_struct->app_name); + /* Get the icon here. If dwDrawAspect & DVASCPECT_ICON call GetData(CF_METAFILEPICT), otherwise + native calls OleGetIconFromClass(obj_desc->clsid) */ + GlobalUnlock(stg.u.hGlobal); + GlobalFree(stg.u.hGlobal); + } + else + { + /* Try to get some data using some of the other clipboard formats */ + } + + fmtetc.cfFormat = cf_link_src_descriptor; + if(IDataObject_GetData(ps_struct->ps->lpSrcDataObj, &fmtetc, &stg) == S_OK) + { + OBJECTDESCRIPTOR *obj_desc = GlobalLock(stg.u.hGlobal); + if(obj_desc->dwSrcOfCopy) + ps_struct->link_source_name = strdupW((WCHAR*)((char*)obj_desc + obj_desc->dwSrcOfCopy)); + if(obj_desc->dwFullUserTypeName) + ps_struct->link_type_name = strdupW((WCHAR*)((char*)obj_desc + obj_desc->dwFullUserTypeName)); + GlobalUnlock(stg.u.hGlobal); + GlobalFree(stg.u.hGlobal); + } + + if(ps_struct->source_name == NULL && ps_struct->link_source_name == NULL) + { + WCHAR buf[200]; + LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_SRC, buf, sizeof(buf)/sizeof(WCHAR)); + ps_struct->source_name = strdupW(buf); + } + + if(ps_struct->type_name == NULL && ps_struct->link_type_name == NULL) + { + WCHAR buf[200]; + LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_TYPE, buf, sizeof(buf)/sizeof(WCHAR)); + ps_struct->type_name = strdupW(buf); + } +} + +static BOOL add_entry_to_lb(HWND hdlg, UINT id, OLEUIPASTEENTRYW *pe) +{ + HWND hwnd = GetDlgItem(hdlg, id); + BOOL ret = FALSE; + + /* FIXME %s handling */ + + /* Note that this suffers from the same bug as native, in that if a new string + is a substring of an already added string, then the FINDSTRING will succeed + this is probably not what we want */ + if(SendMessageW(hwnd, LB_FINDSTRING, 0, (LPARAM)pe->lpstrFormatName) == -1) + { + LRESULT pos = SendMessageW(hwnd, LB_ADDSTRING, 0, (LPARAM)pe->lpstrFormatName); + SendMessageW(hwnd, LB_SETITEMDATA, pos, (LPARAM)pe); + ret = TRUE; + } + return ret; +} + +static DWORD init_pastelist(HWND hdlg, OLEUIPASTESPECIALW *ps) +{ + IEnumFORMATETC *penum; + HRESULT hr; + FORMATETC fmts[20]; + DWORD fetched, items_added = 0; + + hr = IDataObject_EnumFormatEtc(ps->lpSrcDataObj, DATADIR_GET, &penum); + if(FAILED(hr)) + { + WARN("Unable to create IEnumFORMATETC\n"); + return 0; + } + + /* The native version grabs only the first 20 fmts and we do the same */ + hr = IEnumFORMATETC_Next(penum, sizeof(fmts)/sizeof(fmts[0]), fmts, &fetched); + TRACE("got %d formats hr %08x\n", fetched, hr); + + if(SUCCEEDED(hr)) + { + DWORD src_fmt, req_fmt; + for(req_fmt = 0; req_fmt < ps->cPasteEntries; req_fmt++) + { + /* This is used by update_structure() to set nSelectedIndex on exit */ + ps->arrPasteEntries[req_fmt].dwScratchSpace = req_fmt; + TRACE("req_fmt %x\n", ps->arrPasteEntries[req_fmt].fmtetc.cfFormat); + for(src_fmt = 0; src_fmt < fetched; src_fmt++) + { + TRACE("\tenum'ed fmt %x\n", fmts[src_fmt].cfFormat); + if(ps->arrPasteEntries[req_fmt].fmtetc.cfFormat == fmts[src_fmt].cfFormat) + { + add_entry_to_lb(hdlg, IDC_PS_PASTELIST, ps->arrPasteEntries + req_fmt); + items_added++; + break; + } + } + } + } + + IEnumFORMATETC_Release(penum); + EnableWindow(GetDlgItem(hdlg, IDC_PS_PASTE), items_added ? TRUE : FALSE); + return items_added; +} + +static DWORD init_linklist(HWND hdlg, OLEUIPASTESPECIALW *ps) +{ + HRESULT hr; + DWORD supported_mask = 0; + DWORD items_added = 0; + int link, req_fmt; + FORMATETC fmt = {0, NULL, DVASPECT_CONTENT, -1, -1}; + + for(link = 0; link < ps->cLinkTypes && link < PS_MAXLINKTYPES; link++) + { + fmt.cfFormat = ps->arrLinkTypes[link]; + hr = IDataObject_QueryGetData(ps->lpSrcDataObj, &fmt); + if(hr == S_OK) + supported_mask |= 1 << link; + } + TRACE("supported_mask %02x\n", supported_mask); + for(req_fmt = 0; req_fmt < ps->cPasteEntries; req_fmt++) + { + DWORD linktypes; + if(ps->arrPasteEntries[req_fmt].dwFlags & OLEUIPASTE_LINKANYTYPE) + linktypes = 0xff; + else + linktypes = ps->arrPasteEntries[req_fmt].dwFlags & 0xff; + + if(linktypes & supported_mask) + { + add_entry_to_lb(hdlg, IDC_PS_PASTELINKLIST, ps->arrPasteEntries + req_fmt); + items_added++; + } + } + + EnableWindow(GetDlgItem(hdlg, IDC_PS_PASTELINK), items_added ? TRUE : FALSE); + return items_added; +} + +/* copies src_list_id into the display list */ +static void update_display_list(HWND hdlg, UINT src_list_id) +{ + LONG count, i, old_pos; + WCHAR txt[256]; + LONG item_data; + HWND display_list = GetDlgItem(hdlg, IDC_PS_DISPLAYLIST); + HWND list = GetDlgItem(hdlg, src_list_id); + + old_pos = SendMessageW(display_list, LB_GETCURSEL, 0, 0); + if(old_pos == -1) old_pos = 0; + + SendMessageW(display_list, WM_SETREDRAW, 0, 0); + SendMessageW(display_list, LB_RESETCONTENT, 0, 0); + count = SendMessageW(list, LB_GETCOUNT, 0, 0); + for(i = 0; i < count; i++) + { + SendMessageW(list, LB_GETTEXT, i, (LPARAM)txt); + item_data = SendMessageW(list, LB_GETITEMDATA, i, 0); + SendMessageW(display_list, LB_INSERTSTRING, i, (LPARAM)txt); + SendMessageW(display_list, LB_SETITEMDATA, i, item_data); + } + old_pos = max(old_pos, count); + SendMessageW(display_list, LB_SETCURSEL, 0, 0); + SendMessageW(display_list, WM_SETREDRAW, 1, 0); + if(GetForegroundWindow() == hdlg) + SetFocus(display_list); +} + +static void init_lists(HWND hdlg, ps_struct_t *ps_struct) +{ + DWORD pastes_added = init_pastelist(hdlg, ps_struct->ps); + DWORD links_added = init_linklist(hdlg, ps_struct->ps); + UINT check_id, list_id; + + if((ps_struct->flags & (PSF_SELECTPASTE | PSF_SELECTPASTELINK)) == 0) + ps_struct->flags |= PSF_SELECTPASTE; + + if(!pastes_added && !links_added) + ps_struct->flags &= ~(PSF_SELECTPASTE | PSF_SELECTPASTELINK); + else if(!pastes_added && (ps_struct->flags & PSF_SELECTPASTE)) + { + ps_struct->flags &= ~PSF_SELECTPASTE; + ps_struct->flags |= PSF_SELECTPASTELINK; + } + else if(!links_added && (ps_struct->flags & PSF_SELECTPASTELINK)) + { + ps_struct->flags &= ~PSF_SELECTPASTELINK; + ps_struct->flags |= PSF_SELECTPASTE; + } + + check_id = 0; + list_id = 0; + if(ps_struct->flags & PSF_SELECTPASTE) + { + check_id = IDC_PS_PASTE; + list_id = IDC_PS_PASTELIST; + } + else if(ps_struct->flags & PSF_SELECTPASTELINK) + { + check_id = IDC_PS_PASTELINK; + list_id = IDC_PS_PASTELINKLIST; + } + + CheckRadioButton(hdlg, IDC_PS_PASTE, IDC_PS_PASTELINK, check_id); + + if(list_id) + update_display_list(hdlg, list_id); + else + EnableWindow(GetDlgItem(hdlg, IDOK), 0); +} + +static void update_src_text(HWND hdlg, ps_struct_t *ps_struct) +{ + WCHAR *str; + + if(ps_struct->flags & PSF_SELECTPASTE) + { + if(ps_struct->source_name) + str = ps_struct->source_name; + else + str = ps_struct->link_source_name; + + } + else + { + if(ps_struct->link_source_name) + str = ps_struct->link_source_name; + else + str = ps_struct->source_name; + + } + SetDlgItemTextW(hdlg, IDC_PS_SOURCETEXT, str); +} + +static void update_as_icon(HWND hdlg, ps_struct_t *ps_struct) +{ + HWND icon_display = GetDlgItem(hdlg, IDC_PS_ICONDISPLAY); + HWND display_as_icon = GetDlgItem(hdlg, IDC_PS_DISPLAYASICON); + HWND change_icon = GetDlgItem(hdlg, IDC_PS_CHANGEICON); + + /* FIXME. No as icon handling */ + ps_struct->flags &= ~PSF_CHECKDISPLAYASICON; + + CheckDlgButton(hdlg, IDC_PS_DISPLAYASICON, ps_struct->flags & PSF_CHECKDISPLAYASICON); + EnableWindow(display_as_icon, 0); + ShowWindow(icon_display, SW_HIDE); + EnableWindow(icon_display, 0); + ShowWindow(change_icon, SW_HIDE); + EnableWindow(change_icon, 0); +} + +static void update_result_text(HWND hdlg, ps_struct_t *ps_struct) +{ + WCHAR resource_txt[200]; + UINT res_id; + OLEUIPASTEENTRYW *pent; + LONG cur_sel; + static const WCHAR percent_s[] = {'%','s',0}; + WCHAR *result_txt, *ptr; + + cur_sel = SendMessageW(GetDlgItem(hdlg, IDC_PS_DISPLAYLIST), LB_GETCURSEL, 0, 0); + if(cur_sel == -1) return; + pent = (OLEUIPASTEENTRYW*)SendMessageW(GetDlgItem(hdlg, IDC_PS_DISPLAYLIST), LB_GETITEMDATA, cur_sel, 0); + + if(ps_struct->flags & PSF_SELECTPASTE) + { + if(ps_struct->flags & PSF_CHECKDISPLAYASICON) + res_id = IDS_PS_PASTE_OBJECT_AS_ICON; + else + res_id = IDS_PS_PASTE_DATA; + } + else + { + if(ps_struct->flags & PSF_CHECKDISPLAYASICON) + res_id = IDS_PS_PASTE_LINK_OBJECT_AS_ICON; + else + res_id = IDS_PS_PASTE_LINK_DATA; + } + + LoadStringW(OLEDLG_hInstance, res_id, resource_txt, sizeof(resource_txt)/sizeof(WCHAR)); + if((ptr = strstrW(resource_txt, percent_s))) + { + /* FIXME handle %s in ResultText. Sub appname if IDS_PS_PASTE_OBJECT{_AS_ICON}. Else sub appropiate type name */ + size_t result_txt_len = strlenW(pent->lpstrResultText); + ptrdiff_t offs = (char*)ptr - (char*)resource_txt; + result_txt = HeapAlloc(GetProcessHeap(), 0, (strlenW(resource_txt) + result_txt_len - 1) * sizeof(WCHAR)); + memcpy(result_txt, resource_txt, offs); + memcpy((char*)result_txt + offs, pent->lpstrResultText, result_txt_len * sizeof(WCHAR)); + memcpy((char*)result_txt + offs + result_txt_len * sizeof(WCHAR), ptr + 2, (strlenW(ptr + 2) + 1) * sizeof(WCHAR)); + } + else + result_txt = resource_txt; + + SetDlgItemTextW(hdlg, IDC_PS_RESULTTEXT, result_txt); + + if(result_txt != resource_txt) + HeapFree(GetProcessHeap(), 0, result_txt); + +} + +static void selection_change(HWND hdlg, ps_struct_t *ps_struct) +{ + update_as_icon(hdlg, ps_struct); + update_result_text(hdlg, ps_struct); +} + +static void mode_change(HWND hdlg, ps_struct_t *ps_struct, UINT id) +{ + if(id == IDC_PS_PASTE) + { + ps_struct->flags &= ~PSF_SELECTPASTELINK; + ps_struct->flags |= PSF_SELECTPASTE; + } + else + { + ps_struct->flags &= ~PSF_SELECTPASTE; + ps_struct->flags |= PSF_SELECTPASTELINK; + } + + update_src_text(hdlg, ps_struct); + update_display_list(hdlg, id == IDC_PS_PASTE ? IDC_PS_PASTELIST : IDC_PS_PASTELINKLIST); + selection_change(hdlg, ps_struct); +} + +static void post_help_msg(HWND hdlg, ps_struct_t *ps_struct) +{ + PostMessageW(ps_struct->ps->hWndOwner, oleui_msg_help, (WPARAM)hdlg, IDD_PASTESPECIAL); +} + +static void send_end_dialog_msg(HWND hdlg, ps_struct_t *ps_struct, UINT id) +{ + SendMessageW(hdlg, oleui_msg_enddialog, id, 0); +} + +static void update_structure(HWND hdlg, ps_struct_t *ps_struct) +{ + LONG cur_sel = SendMessageW(GetDlgItem(hdlg, IDC_PS_DISPLAYLIST), LB_GETCURSEL, 0, 0); + if(cur_sel != -1) + { + OLEUIPASTEENTRYW *pent; + pent = (OLEUIPASTEENTRYW *)SendMessageW(GetDlgItem(hdlg, IDC_PS_DISPLAYLIST), LB_GETITEMDATA, cur_sel, 0); + ps_struct->ps->nSelectedIndex = pent->dwScratchSpace; + } + ps_struct->ps->dwFlags = ps_struct->flags; + ps_struct->ps->fLink = (ps_struct->flags & PSF_SELECTPASTELINK) ? TRUE : FALSE; +} + +static void free_structure(ps_struct_t *ps_struct) +{ + HeapFree(GetProcessHeap(), 0, ps_struct->type_name); + HeapFree(GetProcessHeap(), 0, ps_struct->source_name); + HeapFree(GetProcessHeap(), 0, ps_struct->link_type_name); + HeapFree(GetProcessHeap(), 0, ps_struct->link_source_name); + CoTaskMemFree(ps_struct->app_name); + HeapFree(GetProcessHeap(), 0, ps_struct); +} + +static INT_PTR CALLBACK ps_dlg_proc(HWND hdlg, UINT msg, WPARAM wp, LPARAM lp) +{ + /* native uses prop name "Structure", but we're not compatible + with that so we'll prepend "Wine_". */ + static const WCHAR prop_name[] = {'W','i','n','e','_','S','t','r','u','c','t','u','r','e',0}; + ps_struct_t *ps_struct; + + TRACE("(%p, %04x, %08x, %08lx)\n", hdlg, msg, wp, lp); + + ps_struct = GetPropW(hdlg, prop_name); + + if(msg != WM_INITDIALOG) + { + if(!ps_struct) + return 0; + + if(ps_struct->ps->lpfnHook) + { + INT_PTR ret = ps_struct->ps->lpfnHook(hdlg, msg, wp, lp); + if(ret) return ret; + } + } + + switch(msg) + { + case WM_INITDIALOG: + { + ps_struct = HeapAlloc(GetProcessHeap(), 0, sizeof(*ps_struct)); + ps_struct->ps = (OLEUIPASTESPECIALW*)lp; + ps_struct->type_name = NULL; + ps_struct->source_name = NULL; + ps_struct->link_type_name = NULL; + ps_struct->link_source_name = NULL; + ps_struct->app_name = NULL; + ps_struct->flags = ps_struct->ps->dwFlags; + + SetPropW(hdlg, prop_name, ps_struct); + + if(!(ps_struct->ps->dwFlags & PSF_SHOWHELP)) + { + ShowWindow(GetDlgItem(hdlg, IDC_OLEUIHELP), SW_HIDE); + EnableWindow(GetDlgItem(hdlg, IDC_OLEUIHELP), 0); + } + + if(ps_struct->ps->lpszCaption) + SetWindowTextW(hdlg, ps_struct->ps->lpszCaption); + + get_descriptors(hdlg, ps_struct); + + init_lists(hdlg, ps_struct); + + update_src_text(hdlg, ps_struct); + + selection_change(hdlg, ps_struct); + + SetFocus(GetDlgItem(hdlg, IDC_PS_DISPLAYLIST)); + + if(ps_struct->ps->lpfnHook) + ps_struct->ps->lpfnHook(hdlg, msg, 0, 0); + return FALSE; /* use new focus */ + } + case WM_COMMAND: + switch(LOWORD(wp)) + { + case IDC_PS_DISPLAYLIST: + switch(HIWORD(wp)) + { + case LBN_SELCHANGE: + selection_change(hdlg, ps_struct); + return FALSE; + default: + return FALSE; + } + case IDC_PS_PASTE: + case IDC_PS_PASTELINK: + switch(HIWORD(wp)) + { + case BN_CLICKED: + mode_change(hdlg, ps_struct, LOWORD(wp)); + return FALSE; + + default: + return FALSE; + } + case IDC_OLEUIHELP: + switch(HIWORD(wp)) + { + case BN_CLICKED: + post_help_msg(hdlg, ps_struct); + return FALSE; + default: + return FALSE; + } + case IDOK: + case IDCANCEL: + switch(HIWORD(wp)) + { + case BN_CLICKED: + send_end_dialog_msg(hdlg, ps_struct, LOWORD(wp)); + return FALSE; + default: + return FALSE; + } + } + return FALSE; + default: + if(msg == oleui_msg_enddialog) + { + if(wp == IDOK) + update_structure(hdlg, ps_struct); + EndDialog(hdlg, wp); + /* native does its cleanup in WM_DESTROY */ + RemovePropW(hdlg, prop_name); + free_structure(ps_struct); + return TRUE; + } + return FALSE; + } + +} + +/*********************************************************************** + * OleUIPasteSpecialA (OLEDLG.4) + */ +UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA psA) +{ + OLEUIPASTESPECIALW ps; + UINT ret; + TRACE("(%p)\n", psA); + + memcpy(&ps, psA, psA->cbStruct); + + ps.lpszCaption = strdupAtoW(psA->lpszCaption); + if(!IS_INTRESOURCE(ps.lpszTemplate)) + ps.lpszTemplate = strdupAtoW(psA->lpszTemplate); + + if(psA->cPasteEntries > 0) + { + DWORD size = psA->cPasteEntries * sizeof(ps.arrPasteEntries[0]); + UINT i; + + ps.arrPasteEntries = HeapAlloc(GetProcessHeap(), 0, size); + memcpy(ps.arrPasteEntries, psA->arrPasteEntries, size); + for(i = 0; i < psA->cPasteEntries; i++) + { + ps.arrPasteEntries[i].lpstrFormatName = + strdupAtoW(psA->arrPasteEntries[i].lpstrFormatName); + ps.arrPasteEntries[i].lpstrResultText = + strdupAtoW(psA->arrPasteEntries[i].lpstrResultText); + } + } + + ret = OleUIPasteSpecialW(&ps); + + if(psA->cPasteEntries > 0) + { + UINT i; + for(i = 0; i < psA->cPasteEntries; i++) + { + HeapFree(GetProcessHeap(), 0, (WCHAR*)ps.arrPasteEntries[i].lpstrFormatName); + HeapFree(GetProcessHeap(), 0, (WCHAR*)ps.arrPasteEntries[i].lpstrResultText); + } + HeapFree(GetProcessHeap(), 0, ps.arrPasteEntries); + } + if(!IS_INTRESOURCE(ps.lpszTemplate)) + HeapFree(GetProcessHeap(), 0, (WCHAR*)ps.lpszTemplate); + HeapFree(GetProcessHeap(), 0, (WCHAR*)ps.lpszCaption); + + /* Copy back the output fields */ + psA->dwFlags = ps.dwFlags; + psA->lpSrcDataObj = ps.lpSrcDataObj; + psA->nSelectedIndex = ps.nSelectedIndex; + psA->fLink = ps.fLink; + psA->hMetaPict = ps.hMetaPict; + psA->sizel = ps.sizel; + + return ret; +} + +/*********************************************************************** + * OleUIPasteSpecialW (OLEDLG.22) + */ +UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW ps) +{ + LPCDLGTEMPLATEW dlg_templ = (LPCDLGTEMPLATEW)ps->hResource; + UINT ret; + + TRACE("(%p)\n", ps); + + if(TRACE_ON(ole)) dump_pastespecial(ps); + + if(!ps->lpSrcDataObj) + OleGetClipboard(&ps->lpSrcDataObj); + + if(ps->hInstance || !ps->hResource) + { + HINSTANCE hInst = ps->hInstance ? ps->hInstance : OLEDLG_hInstance; + const WCHAR *name = ps->hInstance ? ps->lpszTemplate : MAKEINTRESOURCEW(IDD_PASTESPECIAL4); + HRSRC hrsrc; + + if(name == NULL) return OLEUI_ERR_LPSZTEMPLATEINVALID; + hrsrc = FindResourceW(hInst, name, MAKEINTRESOURCEW(RT_DIALOG)); + if(!hrsrc) return OLEUI_ERR_FINDTEMPLATEFAILURE; + dlg_templ = LoadResource(hInst, hrsrc); + if(!dlg_templ) return OLEUI_ERR_LOADTEMPLATEFAILURE; + } + + ret = DialogBoxIndirectParamW(OLEDLG_hInstance, dlg_templ, ps->hWndOwner, ps_dlg_proc, (LPARAM)ps); + + return ret; +} Propchange: trunk/reactos/dll/win32/oledlg/pastespl.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/oledlg/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/resource.… ============================================================================== --- trunk/reactos/dll/win32/oledlg/resource.h (original) +++ trunk/reactos/dll/win32/oledlg/resource.h Wed Apr 25 12:22:24 2007 @@ -38,3 +38,15 @@ #define IDC_BROWSE 1009 #define IDC_FILELBL 1010 #define IDC_FILE 1011 + +/* String ids for Paste Special */ +#define IDS_PS_PASTE_DATA 0x190 +#define IDS_PS_PASTE_OBJECT 0x191 +#define IDS_PS_PASTE_OBJECT_AS_ICON 0x192 +#define IDS_PS_PASTE_LINK_DATA 0x193 +#define IDS_PS_PASTE_LINK_OBJECT 0x194 +#define IDS_PS_PASTE_LINK_OBJECT_AS_ICON 0x195 +#define IDS_PS_NON_OLE 0x196 +#define IDS_PS_UNKNOWN_TYPE 0x197 +#define IDS_PS_UNKNOWN_SRC 0x198 +#define IDS_PS_UNKNOWN_APP 0x199 Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/oledlg/rsrc.rc (original) +++ trunk/reactos/dll/win32/oledlg/rsrc.rc Wed Apr 25 12:22:24 2007 @@ -22,6 +22,8 @@ #include "winbase.h" #include "winuser.h" #include "winnls.h" +#include "oledlg.h" + #include "resource.h" /* @@ -42,6 +44,7 @@ #include "oledlg_Ko.rc" #include "oledlg_Nl.rc" #include "oledlg_No.rc" +#include "oledlg_Pl.rc" #include "oledlg_Pt.rc" #include "oledlg_Tr.rc" #include "oledlg_Uk.rc"

17 years, 4 months

[winesync] 26500: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Wed Apr 25 12:22:13 2007 New Revision: 26500 URL: http://svn.reactos.org/svn/reactos?rev=26500&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.c Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp3… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/odbccp32.c (original) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.c Wed Apr 25 12:22:13 2007 @@ -523,7 +523,7 @@ WCHAR path[MAX_PATH]; clear_errors(); - TRACE("(%p %d %d)\n", lpszPath, cbPathMax, *pcbPathOut); + TRACE("(%p %d %p)\n", lpszPath, cbPathMax, pcbPathOut); len = GetSystemDirectoryW(path, MAX_PATH); @@ -546,7 +546,7 @@ WCHAR path[MAX_PATH]; clear_errors(); - TRACE("(%p %d %d)\n", lpszPath, cbPathMax, *pcbPathOut); + TRACE("(%p %d %p)\n", lpszPath, cbPathMax, pcbPathOut); ret = SQLInstallDriverManagerW(path, MAX_PATH, &cbOut); if (ret)

17 years, 4 months

[winesync] 26499: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Wed Apr 25 12:21:59 2007 New Revision: 26499 URL: http://svn.reactos.org/svn/reactos?rev=26499&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/msvfw32/msvfw32_De.rc (with props) trunk/reactos/dll/win32/msvfw32/msvfw32_En.rc (with props) trunk/reactos/dll/win32/msvfw32/msvfw32_Fr.rc (with props) trunk/reactos/dll/win32/msvfw32/msvfw32_Hu.rc (with props) trunk/reactos/dll/win32/msvfw32/msvfw32_Ko.rc (with props) trunk/reactos/dll/win32/msvfw32/msvfw32_No.rc (with props) trunk/reactos/dll/win32/msvfw32/msvfw32_Pl.rc (with props) trunk/reactos/dll/win32/msvfw32/msvfw32_Tr.rc (with props) trunk/reactos/dll/win32/msvfw32/msvfw32_ros.diff (with props) trunk/reactos/dll/win32/msvfw32/rsrc.rc (with props) Removed: trunk/reactos/dll/win32/msvfw32/Makefile.in trunk/reactos/dll/win32/msvfw32/msvfw32.rc Modified: trunk/reactos/dll/win32/msvfw32/drawdib.c trunk/reactos/dll/win32/msvfw32/mciwnd.c trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild trunk/reactos/dll/win32/msvfw32/msvfw32.spec trunk/reactos/dll/win32/msvfw32/msvideo.spec trunk/reactos/dll/win32/msvfw32/msvideo16.c trunk/reactos/dll/win32/msvfw32/msvideo_main.c trunk/reactos/dll/win32/msvfw32/msvideo_private.h trunk/reactos/dll/win32/msvfw32/vfw16.h Removed: trunk/reactos/dll/win32/msvfw32/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/Makefile… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/Makefile.in (original) +++ trunk/reactos/dll/win32/msvfw32/Makefile.in (removed) @@ -1,22 +1,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = msvfw32.dll -IMPORTS = winmm comctl32 version user32 gdi32 advapi32 kernel32 ntdll -ALTNAMES = msvideo.dll -EXTRALIBS = $(LIBUNICODE) - -SPEC_SRCS16 = $(ALTNAMES:.dll=.spec) - -C_SRCS = \ - mciwnd.c \ - msvideo_main.c \ - drawdib.c - -C_SRCS16 = \ - msvideo16.c - -@MAKE_DLL_RULES@ - -### Dependencies: Modified: trunk/reactos/dll/win32/msvfw32/drawdib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/drawdib.… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/drawdib.c (original) +++ trunk/reactos/dll/win32/msvfw32/drawdib.c Wed Apr 25 12:21:59 2007 @@ -13,18 +13,22 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * FIXME: Some flags are ignored * * Handle palettes */ +#include <stdarg.h> +#include <stdio.h> #include <string.h> -#include "msvideo_private.h" - + +#include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "vfw.h" #include "wine/debug.h" @@ -49,7 +53,7 @@ struct tagWINE_HDD* next; } WINE_HDD; -int num_colours(LPBITMAPINFOHEADER lpbi) +static int num_colours(const BITMAPINFOHEADER *lpbi) { if(lpbi->biClrUsed) return lpbi->biClrUsed; @@ -131,16 +135,10 @@ whdd->hpal = 0; /* Do not free this */ whdd->hdc = 0; - if (whdd->lpbi) - { - HeapFree(GetProcessHeap(), 0, whdd->lpbi); - whdd->lpbi = NULL; - } - if (whdd->lpbiOut) - { - HeapFree(GetProcessHeap(), 0, whdd->lpbiOut); - whdd->lpbiOut = NULL; - } + HeapFree(GetProcessHeap(), 0, whdd->lpbi); + whdd->lpbi = NULL; + HeapFree(GetProcessHeap(), 0, whdd->lpbiOut); + whdd->lpbiOut = NULL; whdd->begun = FALSE; @@ -184,10 +182,10 @@ BOOL ret = TRUE; WINE_HDD *whdd; - TRACE("(%p,%p,%d,%d,%p,%d,%d,0x%08lx)\n", + TRACE("(%p,%p,%d,%d,%p,%d,%d,0x%08x)\n", hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, (DWORD)wFlags); - TRACE("lpbi: %ld,%ld/%ld,%d,%d,%ld,%ld,%ld,%ld,%ld,%ld\n", + TRACE("lpbi: %d,%d/%d,%d,%d,%d,%d,%d,%d,%d,%d\n", lpbi->biSize, lpbi->biWidth, lpbi->biHeight, lpbi->biPlanes, lpbi->biBitCount, lpbi->biCompression, lpbi->biSizeImage, lpbi->biXPelsPerMeter, lpbi->biYPelsPerMeter, lpbi->biClrUsed, @@ -208,7 +206,7 @@ whdd->hic = ICOpen(ICTYPE_VIDEO, lpbi->biCompression, ICMODE_DECOMPRESS); if (!whdd->hic) { - WARN("Could not open IC. biCompression == 0x%08lx\n", lpbi->biCompression); + WARN("Could not open IC. biCompression == 0x%08x\n", lpbi->biCompression); ret = FALSE; } @@ -236,8 +234,8 @@ if (ICDecompressBegin(whdd->hic, lpbi, whdd->lpbiOut) != ICERR_OK) ret = FALSE; - TRACE("biSizeImage == %ld\n", whdd->lpbiOut->biSizeImage); - TRACE("biCompression == %ld\n", whdd->lpbiOut->biCompression); + TRACE("biSizeImage == %d\n", whdd->lpbiOut->biSizeImage); + TRACE("biCompression == %d\n", whdd->lpbiOut->biCompression); TRACE("biBitCount == %d\n", whdd->lpbiOut->biBitCount); } } @@ -256,13 +254,17 @@ /*whdd->lpvbuf = HeapAlloc(GetProcessHeap(), 0, whdd->lpbiOut->biSizeImage);*/ whdd->hMemDC = CreateCompatibleDC(hdc); - TRACE("Creating: %ld, %p\n", whdd->lpbiOut->biSize, whdd->lpvbits); + TRACE("Creating: %d, %p\n", whdd->lpbiOut->biSize, whdd->lpvbits); whdd->hDib = CreateDIBSection(whdd->hMemDC, (BITMAPINFO *)whdd->lpbiOut, DIB_RGB_COLORS, &(whdd->lpvbits), 0, 0); - if (!whdd->hDib) - { - TRACE("Error: %ld\n", GetLastError()); - } - TRACE("Created: %p,%p\n", whdd->hDib, whdd->lpvbits); + if (whdd->hDib) + { + TRACE("Created: %p,%p\n", whdd->hDib, whdd->lpvbits); + } + else + { + ret = FALSE; + TRACE("Error: %d\n", GetLastError()); + } whdd->hOldDib = SelectObject(whdd->hMemDC, whdd->hDib); } @@ -282,11 +284,8 @@ { if (whdd->hic) ICClose(whdd->hic); - if (whdd->lpbiOut) - { - HeapFree(GetProcessHeap(), 0, whdd->lpbiOut); - whdd->lpbiOut = NULL; - } + HeapFree(GetProcessHeap(), 0, whdd->lpbiOut); + whdd->lpbiOut = NULL; } return ret; @@ -305,14 +304,16 @@ WINE_HDD *whdd; BOOL ret = TRUE; - TRACE("(%p,%p,%d,%d,%d,%d,%p,%p,%d,%d,%d,%d,0x%08lx)\n", + TRACE("(%p,%p,%d,%d,%d,%d,%p,%p,%d,%d,%d,%d,0x%08x)\n", hdd, hdc, xDst, yDst, dxDst, dyDst, lpbi, lpBits, xSrc, ySrc, dxSrc, dySrc, (DWORD)wFlags); whdd = MSVIDEO_GetHddPtr(hdd); if (!whdd) return FALSE; - if (wFlags & ~(DDF_SAME_HDC | DDF_SAME_DRAW | DDF_NOTKEYFRAME | DDF_UPDATE | DDF_DONTDRAW)) - FIXME("wFlags == 0x%08lx not handled\n", (DWORD)wFlags); + TRACE("whdd=%p\n", whdd); + + if (wFlags & ~(DDF_SAME_HDC | DDF_SAME_DRAW | DDF_NOTKEYFRAME | DDF_UPDATE | DDF_DONTDRAW | DDF_BACKGROUNDPAL)) + FIXME("wFlags == 0x%08x not handled\n", (DWORD)wFlags); if (!lpBits) { @@ -341,15 +342,17 @@ if (!(wFlags & DDF_UPDATE)) { + DWORD biSizeImage = lpbi->biSizeImage; + /* biSizeImage may be set to 0 for BI_RGB (uncompressed) bitmaps */ - if ((lpbi->biCompression == BI_RGB) && (lpbi->biSizeImage == 0)) - lpbi->biSizeImage = ((lpbi->biWidth * lpbi->biBitCount + 31) / 32) * 4 * lpbi->biHeight; + if ((lpbi->biCompression == BI_RGB) && (biSizeImage == 0)) + biSizeImage = ((lpbi->biWidth * lpbi->biBitCount + 31) / 32) * 4 * lpbi->biHeight; if (lpbi->biCompression) { DWORD flags = 0; - TRACE("Compression == 0x%08lx\n", lpbi->biCompression); + TRACE("Compression == 0x%08x\n", lpbi->biCompression); if (wFlags & DDF_NOTKEYFRAME) flags |= ICDECOMPRESS_NOTKEYFRAME; @@ -358,11 +361,16 @@ } else { - memcpy(whdd->lpvbits, lpBits, lpbi->biSizeImage); + memcpy(whdd->lpvbits, lpBits, biSizeImage); } } if (!(wFlags & DDF_DONTDRAW) && whdd->hpal) - SelectPalette(hdc, whdd->hpal, FALSE); + { + if ((wFlags & DDF_BACKGROUNDPAL) && ! (wFlags & DDF_SAME_HDC)) + SelectPalette(hdc, whdd->hpal, TRUE); + else + SelectPalette(hdc, whdd->hpal, FALSE); + } if (!(StretchBlt(whdd->hdc, xDst, yDst, dxDst, dyDst, whdd->hMemDC, xSrc, ySrc, dxSrc, dySrc, SRCCOPY))) ret = FALSE; @@ -374,7 +382,7 @@ * DrawDibStart [MSVFW32.@] */ BOOL VFWAPI DrawDibStart(HDRAWDIB hdd, DWORD rate) { - FIXME("(%p, %ld), stub\n", hdd, rate); + FIXME("(%p, %d), stub\n", hdd, rate); return TRUE; } @@ -387,6 +395,15 @@ } /*********************************************************************** + * DrawDibChangePalette [MSVFW32.@] + */ +BOOL VFWAPI DrawDibChangePalette(HDRAWDIB hdd, int iStart, int iLen, LPPALETTEENTRY lppe) +{ + FIXME("(%p, 0x%08x, 0x%08x, %p), stub\n", hdd, iStart, iLen, lppe); + return TRUE; +} + +/*********************************************************************** * DrawDibSetPalette [MSVFW32.@] */ BOOL VFWAPI DrawDibSetPalette(HDRAWDIB hdd, HPALETTE hpal) @@ -407,6 +424,15 @@ } return TRUE; +} + +/*********************************************************************** + * DrawDibGetBuffer [MSVFW32.@] + */ +LPVOID VFWAPI DrawDibGetBuffer(HDRAWDIB hdd, LPBITMAPINFOHEADER lpbi, DWORD dwSize, DWORD dwFlags) +{ + FIXME("(%p, %p, 0x%08x, 0x%08x), stub\n", hdd, lpbi, dwSize, dwFlags); + return NULL; } /*********************************************************************** @@ -455,6 +481,18 @@ return ret; } +/*********************************************************************** + * DrawDibTime [MSVFW32.@] + */ +BOOL VFWAPI DrawDibTime(HDRAWDIB hdd, LPDRAWDIBTIME lpddtime) +{ + FIXME("(%p, %p) stub\n", hdd, lpddtime); + return FALSE; +} + +/*********************************************************************** + * DrawDibProfileDisplay [MSVFW32.@] + */ DWORD VFWAPI DrawDibProfileDisplay(LPBITMAPINFOHEADER lpbi) { FIXME("(%p) stub\n", lpbi); Modified: trunk/reactos/dll/win32/msvfw32/mciwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/mciwnd.c… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/mciwnd.c (original) +++ trunk/reactos/dll/win32/msvfw32/mciwnd.c Wed Apr 25 12:21:59 2007 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * FIXME: * Add support for all remaining MCI_ commands and MCIWNDM_ messages. @@ -104,7 +104,7 @@ HWND VFWAPIV MCIWndCreateW(HWND hwndParent, HINSTANCE hInstance, DWORD dwStyle, LPCWSTR szFile) { - TRACE("%p %p %lx %s\n", hwndParent, hInstance, dwStyle, debugstr_w(szFile)); + TRACE("%p %p %x %s\n", hwndParent, hInstance, dwStyle, debugstr_w(szFile)); MCIWndRegisterClass(); @@ -244,7 +244,7 @@ strcatW(buffer, r_braceW); } - TRACE("=> '%s'\n", debugstr_w(buffer)); + TRACE("=> %s\n", debugstr_w(buffer)); SetWindowTextW(mwi->hWnd, buffer); } @@ -429,6 +429,21 @@ return mci_devcaps.dwReturn; } +static LRESULT MCIWND_KeyDown(MCIWndInfo *mwi, UINT key) +{ + TRACE("%p, key %04x\n", mwi->hWnd, key); + + switch(key) + { + case VK_ESCAPE: + SendMessageW(mwi->hWnd, MCI_STOP, 0, 0); + return 0; + + default: + return 0; + } +} + static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam) { MCIWndInfo *mwi; @@ -476,6 +491,9 @@ case WM_COMMAND: return MCIWND_Command(mwi, wParam, lParam); + + case WM_KEYDOWN: + return MCIWND_KeyDown(mwi, wParam); case WM_NCACTIVATE: if (mwi->uTimer) @@ -735,7 +753,7 @@ MCIWND_notify_error(mwi); return 0; } - TRACE("MCIWNDM_GETLENGTH: %ld\n", mci_status.dwReturn); + TRACE("MCIWNDM_GETLENGTH: %d\n", mci_status.dwReturn); return mci_status.dwReturn; } @@ -752,7 +770,7 @@ MCIWND_notify_error(mwi); return 0; } - TRACE("MCIWNDM_GETSTART: %ld\n", mci_status.dwReturn); + TRACE("MCIWNDM_GETSTART: %d\n", mci_status.dwReturn); return mci_status.dwReturn; } @@ -1010,7 +1028,7 @@ return mwi->lasterror; case MCIWNDM_RETURNSTRINGW: - strncpyW((LPWSTR)lParam, mwi->return_string, wParam); + lstrcpynW((LPWSTR)lParam, mwi->return_string, wParam); TRACE("MCIWNDM_RETURNTRINGW %s\n", debugstr_wn((LPWSTR)lParam, wParam)); return mwi->lasterror; @@ -1048,7 +1066,7 @@ return 0; case MCIWNDM_GETSTYLES: - TRACE("MCIWNDM_GETSTYLES: %08lx\n", mwi->dwStyle & 0xffff); + TRACE("MCIWNDM_GETSTYLES: %08x\n", mwi->dwStyle & 0xffff); return mwi->dwStyle & 0xffff; case MCIWNDM_GETDEVICEA: @@ -1095,7 +1113,7 @@ case MCIWNDM_GETFILENAMEW: TRACE("MCIWNDM_GETFILENAMEW: %s\n", debugstr_w(mwi->lpName)); if (mwi->lpName) - strncpyW((LPWSTR)lParam, mwi->lpName, wParam); + lstrcpynW((LPWSTR)lParam, mwi->lpName, wParam); return 0; case MCIWNDM_GETTIMEFORMATA: @@ -1328,11 +1346,8 @@ mwi->mode = MCI_MODE_NOT_READY; mwi->position = -1; - if (mwi->lpName) - { - HeapFree(GetProcessHeap(), 0, mwi->lpName); - mwi->lpName = NULL; - } + HeapFree(GetProcessHeap(), 0, mwi->lpName); + mwi->lpName = NULL; MCIWND_UpdateState(mwi); GetClientRect(hWnd, &rc); Modified: trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32.… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild (original) +++ trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild Wed Apr 25 12:21:59 2007 @@ -1,22 +1,25 @@ <module name="msvfw32" type="win32dll" baseaddress="${BASEADDRESS_MSVFW32}" installbase="system32" installname="msvfw32.dll" allowwarnings="true"> <importlibrary definition="msvfw32.spec.def" /> + <include base="msvfw32">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> <library>wine</library> <library>winmm</library> + <library>comctl32</library> + <library>version</library> + <library>user32</library> <library>gdi32</library> - <library>comctl32</library> + <library>advapi32</library> <library>kernel32</library> - <library>advapi32</library> - <library>user32</library> <library>ntdll</library> + <file>mciwnd.c</file> + <file>msvideo_main.c</file> <file>drawdib.c</file> - <file>mciwnd.c</file> - <file>msvfw32.rc</file> - <file>msvideo_main.c</file> + <file>rsrc.rc</file> <file>msvfw32.spec</file> </module> Removed: trunk/reactos/dll/win32/msvfw32/msvfw32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32.… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32.rc (original) +++ trunk/reactos/dll/win32/msvfw32/msvfw32.rc (removed) @@ -1,5 +1,0 @@ -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "MSvideo support\0" -#define REACTOS_STR_INTERNAL_NAME "msvfw32\0" -#define REACTOS_STR_ORIGINAL_FILENAME "msvfw32.dll\0" -#include <reactos/version.rc> Modified: trunk/reactos/dll/win32/msvfw32/msvfw32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32.… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32.spec (original) +++ trunk/reactos/dll/win32/msvfw32/msvfw32.spec Wed Apr 25 12:21:59 2007 @@ -4,11 +4,11 @@ 2 stdcall VideoForWindowsVersion() @ stdcall DrawDibBegin(long long long long ptr long long long) -@ stub DrawDibChangePalette +@ stdcall DrawDibChangePalette(long long long ptr) @ stdcall DrawDibClose(long) @ stdcall DrawDibDraw(long long long long long long ptr ptr long long long long long) @ stdcall DrawDibEnd(long) -@ stub DrawDibGetBuffer +@ stdcall DrawDibGetBuffer(long ptr long long) @ stdcall DrawDibGetPalette(long) @ stdcall DrawDibOpen() @ stdcall DrawDibProfileDisplay(ptr) @@ -16,8 +16,8 @@ @ stdcall DrawDibSetPalette(long long) @ stdcall DrawDibStart(long long) @ stdcall DrawDibStop(long) -@ stub DrawDibTime -@ stub GetOpenFileNamePreview +@ stdcall DrawDibTime(long ptr) +@ stdcall GetOpenFileNamePreview(ptr) GetOpenFileNamePreviewA @ stdcall GetOpenFileNamePreviewA(ptr) @ stdcall GetOpenFileNamePreviewW(ptr) @ stdcall GetSaveFileNamePreviewA(ptr) @@ -40,10 +40,10 @@ @ stdcall ICOpen(long long long) @ stdcall ICOpenFunction(long long long ptr) @ stdcall ICRemove(long long long) -@ stdcall ICSendMessage(long long long long) -@ stub ICSeqCompressFrame -@ stub ICSeqCompressFrameEnd -@ stub ICSeqCompressFrameStart +@ stdcall ICSendMessage(long long ptr ptr) +@ stdcall ICSeqCompressFrame(ptr long ptr ptr ptr) +@ stdcall ICSeqCompressFrameEnd(ptr) +@ stdcall ICSeqCompressFrameStart(ptr ptr) @ cdecl MCIWndCreate (long long long str) MCIWndCreateA @ cdecl MCIWndCreateA (long long long str) @ cdecl MCIWndCreateW (long long long wstr) Added: trunk/reactos/dll/win32/msvfw32/msvfw32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32_De.rc (added) +++ trunk/reactos/dll/win32/msvfw32/msvfw32_De.rc Wed Apr 25 12:21:59 2007 @@ -1,0 +1,52 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2005 Henning Gerhardt + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Video Compression" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK",IDOK,129,2,49,14 + PUSHBUTTON "Abbrechen",IDCANCEL,129,18,49,14 + + LTEXT "&Komprimierer:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "Kon&figurieren...",882,129,36,49,14 + PUSHBUTTON "&Über...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "Komprimierungsqualität:",886,9,34,80,8 + + CONTROL "&Key Frame aller",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "frames",889,103,62,26,10 + + CONTROL "&Datenrate",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/sec",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Vollständige Frames (Unkomprimiert)" +} Propchange: trunk/reactos/dll/win32/msvfw32/msvfw32_De.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msvfw32/msvfw32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32_En.rc (added) +++ trunk/reactos/dll/win32/msvfw32/msvfw32_En.rc Wed Apr 25 12:21:59 2007 @@ -1,0 +1,51 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Video Compression" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK",IDOK,129,2,49,14 + PUSHBUTTON "Cancel",IDCANCEL,129,18,49,14 + + LTEXT "&Compressor:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "Con&figure...",882,129,36,49,14 + PUSHBUTTON "&About...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "Compression &Quality:",886,9,34,80,8 + + CONTROL "&Key Frame Every",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "frames",889,103,62,26,10 + + CONTROL "&Data Rate",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/sec",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Full Frames (Uncompressed)" +} Propchange: trunk/reactos/dll/win32/msvfw32/msvfw32_En.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msvfw32/msvfw32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32_Fr.rc (added) +++ trunk/reactos/dll/win32/msvfw32/msvfw32_Fr.rc Wed Apr 25 12:21:59 2007 @@ -1,0 +1,51 @@ +/* + * Copyright 2006 Jonathan Ernst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Compression vidéo" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK",IDOK,129,2,49,14 + PUSHBUTTON "Annuler",IDCANCEL,129,18,49,14 + + LTEXT "&Compresseur :",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "Con&figurer...",882,129,36,49,14 + PUSHBUTTON "À &propos",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "&Qualité de compression :",886,9,34,80,8 + + CONTROL "Image &clé toutes les",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "images",889,103,62,26,10 + + CONTROL "&Débit de données",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "Kio/sec",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Images complètes (non compressées)" +} Propchange: trunk/reactos/dll/win32/msvfw32/msvfw32_Fr.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msvfw32/msvfw32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32_Hu.rc (added) +++ trunk/reactos/dll/win32/msvfw32/msvfw32_Hu.rc Wed Apr 25 12:21:59 2007 @@ -1,0 +1,51 @@ +/* + * Copyright 2006 Andras Kovacs + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Video tömörítés" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK",IDOK,129,2,49,14 + PUSHBUTTON "Mégse",IDCANCEL,129,18,49,14 + + LTEXT "&Tömörítõ:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "Beállí&tás...",882,129,36,49,14 + PUSHBUTTON "&About...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "Tömörítési minõsé&g:",886,9,34,80,8 + + CONTROL "&Kulcs képkocka minden",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "képkockánként",889,103,62,26,10 + + CONTROL "A&dat arány",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/sec",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Teljes képkockák (tömörítetlen)" +} Propchange: trunk/reactos/dll/win32/msvfw32/msvfw32_Hu.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msvfw32/msvfw32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32_Ko.rc (added) +++ trunk/reactos/dll/win32/msvfw32/msvfw32_Ko.rc Wed Apr 25 12:21:59 2007 @@ -1,0 +1,52 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2005,2006 YunSong Hwang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ºñµð¿À ¾ÐÃà" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "È®ÀÎ",IDOK,129,2,49,14 + PUSHBUTTON "Ãë¼Ò",IDCANCEL,129,18,49,14 + + LTEXT "¾ÐÃà(&C):",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "¼³Á¤(&F)...",882,129,36,49,14 + PUSHBUTTON "Á¤º¸(&A)...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "¾ÐÃà Ç°Áú(&Q):",886,9,34,80,8 + + CONTROL "¸ðµç Å° ÇÁ·¹ÀÓ(&K)",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "ÇÁ·¹ÀÓ",889,103,62,26,10 + + CONTROL "µ¥ÀÌÅ¸ Àü¼ÛÀ²(&D)",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/sec",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "ÀüÃ¤ ÇÁ·¹ÀÓ(ºñ¾ÐÃà)" +} Propchange: trunk/reactos/dll/win32/msvfw32/msvfw32_Ko.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msvfw32/msvfw32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32_No.rc (added) +++ trunk/reactos/dll/win32/msvfw32/msvfw32_No.rc Wed Apr 25 12:21:59 2007 @@ -1,0 +1,51 @@ +/* + * Copyright 2005 Alexander N. Sørnes <alex(a)thehandofagony.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Videokomprimering" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK",IDOK,129,2,49,14 + PUSHBUTTON "Avbryt",IDCANCEL,129,18,49,14 + + LTEXT "&Komprimerer:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "&Oppsett . . .",882,129,36,49,14 + PUSHBUTTON "O&m . . .",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "Komprimeringskvalite&t:",886,9,34,80,8 + + CONTROL "Nø&kkelbilde for hvert",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "bilde",889,103,62,26,10 + + CONTROL "&Datahastighet",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/s",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Fulle bilder (ukomprimert)" +} Propchange: trunk/reactos/dll/win32/msvfw32/msvfw32_No.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msvfw32/msvfw32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32_Pl.rc (added) +++ trunk/reactos/dll/win32/msvfw32/msvfw32_Pl.rc Wed Apr 25 12:21:59 2007 @@ -1,0 +1,52 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2006 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 207, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Kompresja wideo" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "&OK",IDOK,146,2,52,14 + PUSHBUTTON "&Anuluj",IDCANCEL,146,18,52,14 + + LTEXT "Typ &kompresji:",-1,9,6,128,8 + COMBOBOX 880,9,16,128,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "Kon&figuruj...",882,146,36,52,14 + PUSHBUTTON "&Informacje...",883,146,52,52,14 + + SCROLLBAR 884,9,44,128,9,WS_TABSTOP + + LTEXT "&Jakoæ kompresji:",886,9,34,97,8 + + CONTROL "&Ramka kluczowa co",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,81,12 + EDITTEXT 888,88,60,22,12 + LTEXT "ramek",889,114,62,31,10 + + CONTROL "&Strumieñ",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,81,12 + EDITTEXT 895,88,76,22,12 + LTEXT "KB/sec",896,114,78,31,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Pe³ne ramki (bez kompresji)" +} Propchange: trunk/reactos/dll/win32/msvfw32/msvfw32_Pl.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msvfw32/msvfw32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32_Tr.rc (added) +++ trunk/reactos/dll/win32/msvfw32/msvfw32_Tr.rc Wed Apr 25 12:21:59 2007 @@ -1,0 +1,53 @@ +/* + * Turkish Resources + * + * Copyright 2006 Fatih Aþýcý + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Vidyo Sýkýþtýrma" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "Tamam",IDOK,129,2,49,14 + PUSHBUTTON "Ýptal",IDCANCEL,129,18,49,14 + + LTEXT "&Sýkýþtýrýcý:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "Ya&pýlandýr...",882,129,36,49,14 + PUSHBUTTON "&Hakkýnda...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "Sýkýþtýrma &Kalitesi:",886,9,34,80,8 + + CONTROL "&Key Frame Every",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "frames",889,103,62,26,10 + + CONTROL "&Veri Oraný",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/sec",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Tüm Çerçeveler (Sýkýþtýrýlmamýþ)" +} Propchange: trunk/reactos/dll/win32/msvfw32/msvfw32_Tr.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msvfw32/msvfw32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32_ros.diff (added) +++ trunk/reactos/dll/win32/msvfw32/msvfw32_ros.diff Wed Apr 25 12:21:59 2007 @@ -1,0 +1,14 @@ +Index: msvideo_private.h +=================================================================== +--- msvideo_private.h (revision 25690) ++++ msvideo_private.h (working copy) +@@ -19,6 +19,9 @@ + #ifndef __WINE_MSVIDEO_PRIVATE_H + #define __WINE_MSVIDEO_PRIVATE_H + ++/* Installable Compressor Manager */ ++#define ICVERSION 0x0104 ++ + #define ICM_CHOOSE_COMPRESSOR 1 + #define IDC_COMP_LIST 880 + #define IDS_FULLFRAMES 901 Propchange: trunk/reactos/dll/win32/msvfw32/msvfw32_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msvfw32/msvideo.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo.… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo.spec (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo.spec Wed Apr 25 12:21:59 2007 @@ -1,4 +1,6 @@ +#1 pascal WEP(word) 2 pascal VideoForWindowsVersion() VideoForWindowsVersion +3 pascal DllEntryPoint(long word word word long word) VIDEO_LibMain 20 stub VIDEOGETNUMDEVS 21 stub VIDEOGETERRORTEXT 22 pascal VideoCapDriverDescAndVer(word ptr word ptr word) VideoCapDriverDescAndVer16 @@ -64,5 +66,3 @@ 251 stub _MCIWNDREGISTERCLASS 252 stub GETOPENFILENAMEPREVIEW 253 stub GETSAVEFILENAMEPREVIEW - -300 pascal DllEntryPoint(long word word word long word) VIDEO_LibMain Modified: trunk/reactos/dll/win32/msvfw32/msvideo16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo1… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo16.c (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo16.c Wed Apr 25 12:21:59 2007 @@ -16,18 +16,21 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#define COM_NO_WINDOWS_H + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> #include <stdio.h> #include <string.h> -#include "msvideo_private.h" +#include "windef.h" +#include "winbase.h" #include "winver.h" #include "winnls.h" #include "winreg.h" +#include "winuser.h" #include "vfw16.h" +#include "msvideo_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvideo); @@ -118,7 +121,7 @@ /************************************************************************* * DrawDibStop [MSVIDEO.119] */ -BOOL16 DrawDibStop16(HDRAWDIB16 hdd) +BOOL16 VFWAPI DrawDibStop16(HDRAWDIB16 hdd) { return DrawDibStop(HDRAWDIB_32(hdd)); } @@ -151,7 +154,7 @@ lpData = HeapAlloc(GetProcessHeap(), 0, cb); - TRACE("0x%08lx, %u, %u, ...)\n", (DWORD) hic, msg, cb); + TRACE("0x%08x, %u, %u, ...)\n", (DWORD) hic, msg, cb); for (i = 0; i < cb / sizeof(WORD); i++) { @@ -172,7 +175,7 @@ { LRESULT ret; - TRACE("(0x%08lx,%p,%ld)\n", (DWORD) hic, picinfo, cb); + TRACE("(0x%08x,%p,%d)\n", (DWORD) hic, picinfo, cb); ret = ICSendMessage16(hic, ICM_GETINFO, (DWORD) picinfo, cb); TRACE(" -> 0x%08lx\n", ret); return ret; @@ -203,7 +206,7 @@ ICCOMPRESS iccmp; SEGPTR seg_iccmp; - TRACE("(0x%08lx,%ld,%p,%p,%p,%p,...)\n", (DWORD) hic, dwFlags, + TRACE("(0x%08x,%d,%p,%p,%p,%p,...)\n", (DWORD) hic, dwFlags, lpbiOutput, lpData, lpbiInput, lpBits); iccmp.dwFlags = dwFlags; @@ -237,7 +240,7 @@ SEGPTR segptr; DWORD ret; - TRACE("(0x%08lx,%ld,%p,%p,%p,%p)\n", (DWORD) hic, dwFlags, lpbiFormat, + TRACE("(0x%08x,%d,%p,%p,%p,%p)\n", (DWORD) hic, dwFlags, lpbiFormat, lpData, lpbi, lpBits); icd.dwFlags = dwFlags; @@ -276,7 +279,7 @@ ICDRAWBEGIN16 icdb; SEGPTR seg_icdb; - TRACE ("(0x%08lx,%ld,0x%08lx,0x%08lx,0x%08lx,%u,%u,%u,%u,%p,%u,%u,%u,%u,%ld,%ld)\n", + TRACE ("(0x%08x,%d,0x%08x,0x%08x,0x%08x,%u,%u,%u,%u,%p,%u,%u,%u,%u,%d,%d)\n", (DWORD) hic, dwFlags, (DWORD) hpal, (DWORD) hwnd, (DWORD) hdc, xDst, yDst, dxDst, dyDst, lpbi, xSrc, ySrc, dxSrc, dySrc, dwRate, dwScale); @@ -315,7 +318,7 @@ ICDRAW icd; SEGPTR seg_icd; - TRACE("(0x%08lx,0x%08lx,%p,%p,%ld,%ld)\n", (DWORD) hic, dwFlags, + TRACE("(0x%08x,0x%08x,%p,%p,%d,%d)\n", (DWORD) hic, dwFlags, lpFormat, lpData, cbData, lTime); icd.dwFlags = dwFlags; icd.lpFormat = lpFormat; @@ -670,12 +673,12 @@ static LRESULT CALLBACK IC_Callback3216(HIC hic, HDRVR hdrv, UINT msg, DWORD lp1, DWORD lp2) { WINE_HIC* whic; - LRESULT ret = 0; WORD args[8]; whic = MSVIDEO_GetHicPtr(hic); if (whic) { + DWORD ret = 0; switch (msg) { case DRV_OPEN: @@ -698,9 +701,9 @@ UnMapLS(lp2); break; } - } - else ret = ICERR_BADHANDLE; - return ret; + return ret; + } + else return ICERR_BADHANDLE; } /*********************************************************************** @@ -730,6 +733,7 @@ if (whic->driverproc16) { WORD args[8]; + DWORD result; /* FIXME: original code was passing hdrv first and hic second */ /* but this doesn't match what IC_Callback3216 does */ @@ -741,7 +745,8 @@ args[2] = LOWORD(lParam1); args[1] = HIWORD(lParam2); args[0] = LOWORD(lParam2); - WOWCallback16Ex( (DWORD)whic->driverproc16, WCB16_PASCAL, sizeof(args), args, &ret ); + WOWCallback16Ex( (DWORD)whic->driverproc16, WCB16_PASCAL, sizeof(args), args, &result ); + ret = result; } else { @@ -762,6 +767,7 @@ DWORD WINAPI VideoCapDriverDescAndVer16(WORD nr, LPSTR buf1, WORD buf1len, LPSTR buf2, WORD buf2len) { + static const char version_info_spec[] = "\\StringFileInfo\\040904E4\\FileDescription"; DWORD verhandle; DWORD infosize; UINT subblocklen; @@ -787,7 +793,7 @@ if (strncasecmp(buf, "vid", 3)) continue; if (nr--) continue; fnLen = sizeof(fn); - lRet = RegQueryValueExA(hKey, buf, 0, 0, fn, &fnLen); + lRet = RegQueryValueExA(hKey, buf, 0, 0, (LPBYTE)fn, &fnLen); if (lRet == ERROR_SUCCESS) found = TRUE; break; } @@ -821,37 +827,37 @@ infobuf = HeapAlloc(GetProcessHeap(), 0, infosize); if (GetFileVersionInfoA(fn, verhandle, infosize, infobuf)) { - char vbuf[200]; /* Yes, two space behind : */ /* FIXME: test for buflen */ - sprintf(vbuf, "Version: %d.%d.%d.%d\n", + snprintf(buf2, buf2len, "Version: %d.%d.%d.%d\n", ((WORD*)infobuf)[0x0f], ((WORD*)infobuf)[0x0e], ((WORD*)infobuf)[0x11], ((WORD*)infobuf)[0x10] ); - TRACE("version of %s is %s\n", fn, vbuf); - strncpy(buf2, vbuf, buf2len); + TRACE("version of %s is %s\n", fn, buf2); } else { TRACE("GetFileVersionInfoA failed for %s.\n", fn); - strncpy(buf2, fn, buf2len); /* msvideo.dll appears to copy fn*/ + lstrcpynA(buf2, fn, buf2len); /* msvideo.dll appears to copy fn*/ } /* FIXME: language problem? */ if (VerQueryValueA( infobuf, - "\\StringFileInfo\\040904E4\\FileDescription", + version_info_spec, &subblock, &subblocklen )) { + UINT copylen = min(subblocklen,buf1len-1); + memcpy(buf1, subblock, copylen); + buf1[copylen] = '\0'; TRACE("VQA returned %s\n", (LPCSTR)subblock); - strncpy(buf1, subblock, buf1len); } else { TRACE("VQA did not return on query \\StringFileInfo\\040904E4\\FileDescription?\n"); - strncpy(buf1, fn, buf1len); /* msvideo.dll appears to copy fn*/ + lstrcpynA(buf1, fn, buf1len); /* msvideo.dll appears to copy fn*/ } HeapFree(GetProcessHeap(), 0, infobuf); return 0; @@ -884,7 +890,7 @@ } /************************************************************************** - * DllEntryPoint (MSVIDEO.300) + * DllEntryPoint (MSVIDEO.3) * * MSVIDEO DLL entry point * Modified: trunk/reactos/dll/win32/msvfw32/msvideo_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo_main.c (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo_main.c Wed Apr 25 12:21:59 2007 @@ -2,6 +2,7 @@ * Copyright 1998 Marcus Meissner * Copyright 2000 Bradley Baetz * Copyright 2003 Michael Günnewig + * Copyright 2005 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -15,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * FIXME: This all assumes 32 bit codecs * Win95 appears to prefer 32 bit codecs, even from 16 bit code. @@ -25,17 +26,19 @@ * - no thread safety */ +#include <stdarg.h> #include <stdio.h> #include <string.h> -#include "msvideo_private.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" #include "winnls.h" #include "wingdi.h" #include "winuser.h" -#include "winreg.h" - -#include "windowsx.h" - +#include "commdlg.h" +#include "vfw.h" +#include "msvideo_private.h" #include "wine/debug.h" /* Drivers32 settings */ @@ -78,7 +81,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { - TRACE("%p,%lx,%p\n", hinst, reason, reserved); + TRACE("%p,%x,%p\n", hinst, reason, reserved); switch(reason) { @@ -116,14 +119,15 @@ lRet = RegOpenKeyExA(HKEY_LOCAL_MACHINE, HKLM_DRIVERS32, 0, KEY_QUERY_VALUE, &hKey); if (lRet == ERROR_SUCCESS) { - RegQueryInfoKeyA( hKey, 0, 0, 0, &cnt, 0, 0, 0, 0, 0, 0, 0); - for (i = 0; i < cnt; i++) + DWORD numkeys; + RegQueryInfoKeyA( hKey, 0, 0, 0, &numkeys, 0, 0, 0, 0, 0, 0, 0); + for (i = 0; i < numkeys; i++) { bufLen = sizeof(buf) / sizeof(buf[0]); lRet = RegEnumKeyExA(hKey, i, buf, &bufLen, 0, 0, 0, &lastWrite); if (lRet != ERROR_SUCCESS) continue; if (strncasecmp(buf, fccTypeStr, 5) || buf[9] != '=') continue; - if ((result = handler(buf, i, param))) break; + if ((result = handler(buf, cnt++, param))) break; } RegCloseKey( hKey ); } @@ -132,10 +136,11 @@ /* if that didn't work, go through the values in system.ini */ if (GetPrivateProfileSectionA("drivers32", buf, sizeof(buf), "system.ini")) { - for (s = buf; *s; cnt++, s += strlen(s) + 1) + for (s = buf; *s; s += strlen(s) + 1) { + TRACE("got %s\n", s); if (strncasecmp(s, fccTypeStr, 5) || s[9] != '=') continue; - if ((result = handler(s, cnt, param))) break; + if ((result = handler(s, cnt++, param))) break; } } @@ -175,11 +180,10 @@ if ((lpicinfo->fccHandler != nr) && (lpicinfo->fccHandler != fccHandler)) return FALSE; - lpicinfo->fccType = mmioStringToFOURCCA(drv, 0); lpicinfo->fccHandler = fccHandler; lpicinfo->dwFlags = 0; lpicinfo->dwVersion = 0; - lpicinfo->dwVersionICM = 0x104; + lpicinfo->dwVersionICM = ICVERSION; lpicinfo->szName[0] = 0; lpicinfo->szDescription[0] = 0; MultiByteToWideChar(CP_ACP, 0, drv + 10, -1, lpicinfo->szDriver, @@ -200,9 +204,10 @@ */ BOOL VFWAPI ICInfo( DWORD fccType, DWORD fccHandler, ICINFO *lpicinfo) { - TRACE("(%s,%s/%08lx,%p)\n", + TRACE("(%s,%s/%08x,%p)\n", wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), fccHandler, lpicinfo); + lpicinfo->fccType = fccType; lpicinfo->fccHandler = fccHandler; return enum_drivers(fccType, ICInfo_enum_handler, lpicinfo); } @@ -258,8 +263,8 @@ reg_driver_list = driver; return TRUE; - oom: - if (driver) HeapFree(GetProcessHeap(), 0, driver); +oom: + HeapFree(GetProcessHeap(), 0, driver); return FALSE; } @@ -269,7 +274,8 @@ BOOL VFWAPI ICRemove(DWORD fccType, DWORD fccHandler, UINT wFlags) { reg_driver** pdriver; - + reg_driver* drv; + TRACE("(%s,%s,0x%08x)\n", wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), wFlags); /* Check if a driver is already registered */ @@ -283,10 +289,10 @@ return FALSE; /* Remove the driver from the list */ + drv = *pdriver; *pdriver = (*pdriver)->next; - if ((*pdriver)->name) - HeapFree(GetProcessHeap(), 0, (*pdriver)->name); - HeapFree(GetProcessHeap(), 0, *pdriver); + HeapFree(GetProcessHeap(), 0, drv->name); + HeapFree(GetProcessHeap(), 0, drv); return TRUE; } @@ -343,20 +349,7 @@ hdrv = OpenDriver(codecname, drv32W, (LPARAM)&icopen); if (!hdrv) - { - if (fccType == streamtypeVIDEO) - { - codecname[0] = 'v'; - codecname[1] = 'i'; - codecname[2] = 'd'; - codecname[3] = 'c'; - - fccType = ICTYPE_VIDEO; - hdrv = OpenDriver(codecname, drv32W, (LPARAM)&icopen); - } - if (!hdrv) - return 0; - } + return 0; } else { /* The driver has been registered at runtime with its name */ hdrv = OpenDriver(driver->name, NULL, (LPARAM)&icopen); @@ -400,13 +393,13 @@ ICOPEN icopen; WINE_HIC* whic; - TRACE("(%s,%s,%d,%p,%08lx)\n", + TRACE("(%s,%s,%d,%p,%08x)\n", wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), wMode, lpfnHandler, lpfnHandler16); icopen.dwSize = sizeof(ICOPEN); icopen.fccType = fccType; icopen.fccHandler = fccHandler; - icopen.dwVersion = 0x00001000; /* FIXME */ + icopen.dwVersion = ICVERSION; icopen.dwFlags = wMode; icopen.dwError = 0; icopen.pV1Reserved = NULL; @@ -436,9 +429,9 @@ /* return value is not checked */ MSVIDEO_SendMessage(whic, DRV_ENABLE, 0L, 0L); - whic->driverId = (DWORD)MSVIDEO_SendMessage(whic, DRV_OPEN, 0, (DWORD)&icopen); + whic->driverId = (DWORD)MSVIDEO_SendMessage(whic, DRV_OPEN, 0, (DWORD_PTR)&icopen); /* FIXME: What should we put here? */ - whic->hdrv = (HDRVR)0; + whic->hdrv = NULL; if (whic->driverId == 0) { @@ -468,7 +461,7 @@ LRESULT ret; WINE_HIC* whic = MSVIDEO_GetHicPtr(hic); - TRACE("(%p,%p,%ld)\n", hic, picinfo, cb); + TRACE("(%p,%p,%d)\n", hic, picinfo, cb); whic = MSVIDEO_GetHicPtr(hic); if (!whic) return ICERR_BADHANDLE; @@ -477,11 +470,11 @@ /* (WS) The field szDriver should be initialized because the driver * is not obliged and often will not do it. Some applications, like * VirtualDub, rely on this field and will occasionally crash if it - * goes unitialized. + * goes uninitialized. */ if (cb >= sizeof(ICINFO)) picinfo->szDriver[0] = '\0'; - ret = ICSendMessage(hic, ICM_GETINFO, (DWORD)picinfo, cb); + ret = ICSendMessage(hic, ICM_GETINFO, (DWORD_PTR)picinfo, cb); /* (WS) When szDriver was not supplied by the driver itself, apparently * Windows will set its value equal to the driver file name. This can @@ -517,7 +510,7 @@ if ((hic = ICOpen(info->fccType, info->fccHandler, info->wMode))) { - if (!ICSendMessage(hic, info->querymsg, (DWORD)info->lpbiIn, (DWORD)info->lpbiOut)) + if (!ICSendMessage(hic, info->querymsg, (DWORD_PTR)info->lpbiIn, (DWORD_PTR)info->lpbiOut)) return hic; ICClose(hic); } @@ -610,14 +603,14 @@ if (ICDecompressQuery(tmphic,lpbiIn,NULL) != 0) goto errout; /* no, sorry */ - ICDecompressGetFormat(tmphic,lpbiIn,lpbiOut); + ICSendMessage(tmphic, ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)lpbiIn, (DWORD_PTR)lpbiOut); if (lpbiOut->biCompression != 0) { - FIXME("Ooch, how come decompressor outputs compressed data (%ld)??\n", + FIXME("Ooch, how come decompressor outputs compressed data (%d)??\n", lpbiOut->biCompression); } if (lpbiOut->biSize < sizeof(*lpbiOut)) { - FIXME("Ooch, size of output BIH is too small (%ld)\n", + FIXME("Ooch, size of output BIH is too small (%d)\n", lpbiOut->biSize); lpbiOut->biSize = sizeof(*lpbiOut); } @@ -655,7 +648,7 @@ { ICCOMPRESS iccmp; - TRACE("(%p,%ld,%p,%p,%p,%p,...)\n",hic,dwFlags,lpbiOutput,lpData,lpbiInput,lpBits); + TRACE("(%p,%d,%p,%p,%p,%p,...)\n",hic,dwFlags,lpbiOutput,lpData,lpbiInput,lpBits); iccmp.dwFlags = dwFlags; @@ -671,7 +664,7 @@ iccmp.dwQuality = dwQuality; iccmp.lpbiPrev = lpbiPrev; iccmp.lpPrev = lpPrev; - return ICSendMessage(hic,ICM_COMPRESS,(DWORD)&iccmp,sizeof(iccmp)); + return ICSendMessage(hic,ICM_COMPRESS,(DWORD_PTR)&iccmp,sizeof(iccmp)); } /*********************************************************************** @@ -683,9 +676,9 @@ ICDECOMPRESS icd; DWORD ret; - TRACE("(%p,%ld,%p,%p,%p,%p)\n",hic,dwFlags,lpbiFormat,lpData,lpbi,lpBits); - - TRACE("lpBits[0] == %lx\n",((LPDWORD)lpBits)[0]); + TRACE("(%p,%d,%p,%p,%p,%p)\n",hic,dwFlags,lpbiFormat,lpData,lpbi,lpBits); + + TRACE("lpBits[0] == %x\n",((LPDWORD)lpBits)[0]); icd.dwFlags = dwFlags; icd.lpbiInput = lpbiFormat; @@ -694,15 +687,261 @@ icd.lpbiOutput = lpbi; icd.lpOutput = lpBits; icd.ckid = 0; - ret = ICSendMessage(hic,ICM_DECOMPRESS,(DWORD)&icd,sizeof(ICDECOMPRESS)); - - TRACE("lpBits[0] == %lx\n",((LPDWORD)lpBits)[0]); - - TRACE("-> %ld\n",ret); + ret = ICSendMessage(hic,ICM_DECOMPRESS,(DWORD_PTR)&icd,sizeof(ICDECOMPRESS)); + + TRACE("lpBits[0] == %x\n",((LPDWORD)lpBits)[0]); + + TRACE("-> %d\n",ret); return ret; } + +struct choose_compressor +{ + UINT flags; + LPCSTR title; + COMPVARS cv; +}; + +struct codec_info +{ + HIC hic; + ICINFO icinfo; +}; + +static BOOL enum_compressors(HWND list, COMPVARS *pcv, BOOL enum_all) +{ + UINT id, total = 0; + ICINFO icinfo; + + id = 0; + + while (ICInfo(pcv->fccType, id, &icinfo)) + { + struct codec_info *ic; + DWORD idx; + HIC hic; + + id++; + + hic = ICOpen(icinfo.fccType, icinfo.fccHandler, ICMODE_COMPRESS); + + if (hic) + { + /* for unknown reason fccHandler reported by the driver + * doesn't always work, use the one returned by ICInfo instead. + */ + DWORD fccHandler = icinfo.fccHandler; + + if (!enum_all && pcv->lpbiIn) + { + if (ICCompressQuery(hic, pcv->lpbiIn, NULL) != ICERR_OK) + { + TRACE("fccHandler %s doesn't support input DIB format %d\n", + wine_dbgstr_fcc(icinfo.fccHandler), pcv->lpbiIn->bmiHeader.biCompression); + ICClose(hic); + continue; + } + } + + ICGetInfo(hic, &icinfo, sizeof(icinfo)); + icinfo.fccHandler = fccHandler; + + idx = SendMessageW(list, CB_ADDSTRING, 0, (LPARAM)icinfo.szDescription); + + ic = HeapAlloc(GetProcessHeap(), 0, sizeof(struct codec_info)); + memcpy(&ic->icinfo, &icinfo, sizeof(ICINFO)); + ic->hic = hic; + SendMessageW(list, CB_SETITEMDATA, idx, (LPARAM)ic); + } + total++; + } + + return total != 0; +} + +static INT_PTR CALLBACK icm_choose_compressor_dlgproc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + struct codec_info *ic; + WCHAR buf[128]; + struct choose_compressor *choose_comp = (struct choose_compressor *)lparam; + + SetWindowLongPtrW(hdlg, DWLP_USER, lparam); + + /* FIXME */ + choose_comp->flags &= ~(ICMF_CHOOSE_DATARATE | ICMF_CHOOSE_KEYFRAME); + + if (choose_comp->title) + SetWindowTextA(hdlg, choose_comp->title); + + if (!(choose_comp->flags & ICMF_CHOOSE_DATARATE)) + { + ShowWindow(GetDlgItem(hdlg, IDC_DATARATE_CHECKBOX), SW_HIDE); + ShowWindow(GetDlgItem(hdlg, IDC_DATARATE), SW_HIDE); + ShowWindow(GetDlgItem(hdlg, IDC_DATARATE_KB), SW_HIDE); + } + + if (!(choose_comp->flags & ICMF_CHOOSE_KEYFRAME)) + { + ShowWindow(GetDlgItem(hdlg, IDC_KEYFRAME_CHECKBOX), SW_HIDE); + ShowWindow(GetDlgItem(hdlg, IDC_KEYFRAME), SW_HIDE); + ShowWindow(GetDlgItem(hdlg, IDC_KEYFRAME_FRAMES), SW_HIDE); + } + + /* FIXME */ + EnableWindow(GetDlgItem(hdlg, IDC_QUALITY_SCROLL), FALSE); + EnableWindow(GetDlgItem(hdlg, IDC_QUALITY_TXT), FALSE); + + /*if (!(choose_comp->flags & ICMF_CHOOSE_PREVIEW)) + ShowWindow(GetDlgItem(hdlg, IDC_PREVIEW), SW_HIDE);*/ + + LoadStringW(MSVFW32_hModule, IDS_FULLFRAMES, buf, 128); + SendDlgItemMessageW(hdlg, IDC_COMP_LIST, CB_ADDSTRING, 0, (LPARAM)buf); + + ic = HeapAlloc(GetProcessHeap(), 0, sizeof(struct codec_info)); + ic->icinfo.fccType = streamtypeVIDEO; + ic->icinfo.fccHandler = comptypeDIB; + ic->hic = 0; + SendDlgItemMessageW(hdlg, IDC_COMP_LIST, CB_SETITEMDATA, 0, (LPARAM)ic); + + enum_compressors(GetDlgItem(hdlg, IDC_COMP_LIST), &choose_comp->cv, choose_comp->flags & ICMF_CHOOSE_ALLCOMPRESSORS); + + SendDlgItemMessageW(hdlg, IDC_COMP_LIST, CB_SETCURSEL, 0, 0); + SetFocus(GetDlgItem(hdlg, IDC_COMP_LIST)); + + SetWindowLongPtrW(hdlg, DWLP_USER, (ULONG_PTR)choose_comp); + break; + } + + case WM_COMMAND: + switch (LOWORD(wparam)) + { + case IDC_COMP_LIST: + { + INT cur_sel; + struct codec_info *ic; + BOOL can_configure = FALSE, can_about = FALSE; + struct choose_compressor *choose_comp; + + if (HIWORD(wparam) != CBN_SELCHANGE && HIWORD(wparam) != CBN_SETFOCUS) + break; + + choose_comp = (struct choose_compressor *)GetWindowLongPtrW(hdlg, DWLP_USER); + + cur_sel = SendMessageW((HWND)lparam, CB_GETCURSEL, 0, 0); + + ic = (struct codec_info *)SendMessageW((HWND)lparam, CB_GETITEMDATA, cur_sel, 0); + if (ic && ic->hic) + { + if (ICQueryConfigure(ic->hic) == DRVCNF_OK) + can_configure = TRUE; + if (ICQueryAbout(ic->hic) == DRVCNF_OK) + can_about = TRUE; + } + EnableWindow(GetDlgItem(hdlg, IDC_CONFIGURE), can_configure); + EnableWindow(GetDlgItem(hdlg, IDC_ABOUT), can_about); + + if (choose_comp->flags & ICMF_CHOOSE_DATARATE) + { + /* FIXME */ + } + if (choose_comp->flags & ICMF_CHOOSE_KEYFRAME) + { + /* FIXME */ + } + + break; + } + + case IDC_CONFIGURE: + case IDC_ABOUT: + { + HWND list = GetDlgItem(hdlg, IDC_COMP_LIST); + INT cur_sel; + struct codec_info *ic; + + if (HIWORD(wparam) != BN_CLICKED) + break; + + cur_sel = SendMessageW(list, CB_GETCURSEL, 0, 0); + + ic = (struct codec_info *)SendMessageW(list, CB_GETITEMDATA, cur_sel, 0); + if (ic && ic->hic) + { + if (LOWORD(wparam) == IDC_CONFIGURE) + ICConfigure(ic->hic, hdlg); + else + ICAbout(ic->hic, hdlg); + } + + break; + } + + case IDOK: + { + HWND list = GetDlgItem(hdlg, IDC_COMP_LIST); + INT cur_sel; + struct codec_info *ic; + + if (HIWORD(wparam) != BN_CLICKED) + break; + + cur_sel = SendMessageW(list, CB_GETCURSEL, 0, 0); + ic = (struct codec_info *)SendMessageW(list, CB_GETITEMDATA, cur_sel, 0); + if (ic) + { + struct choose_compressor *choose_comp = (struct choose_compressor *)GetWindowLongPtrW(hdlg, DWLP_USER); + + choose_comp->cv.hic = ic->hic; + choose_comp->cv.fccType = ic->icinfo.fccType; + choose_comp->cv.fccHandler = ic->icinfo.fccHandler; + /* FIXME: fill everything else */ + + /* prevent closing the codec handle below */ + ic->hic = 0; + } + } + /* fall through */ + case IDCANCEL: + { + HWND list = GetDlgItem(hdlg, IDC_COMP_LIST); + INT idx = 0; + + if (HIWORD(wparam) != BN_CLICKED) + break; + + while (1) + { + struct codec_info *ic; + + ic = (struct codec_info *)SendMessageW(list, CB_GETITEMDATA, idx++, 0); + + if (!ic || (LONG_PTR)ic == CB_ERR) break; + + if (ic->hic) ICClose(ic->hic); + HeapFree(GetProcessHeap(), 0, ic); + } + + EndDialog(hdlg, LOWORD(wparam) == IDOK); + break; + } + + default: + break; + } + break; + + default: + break; + } + + return FALSE; +} /*********************************************************************** * ICCompressorChoose [MSVFW32.@] @@ -710,29 +949,45 @@ BOOL VFWAPI ICCompressorChoose(HWND hwnd, UINT uiFlags, LPVOID pvIn, LPVOID lpData, PCOMPVARS pc, LPSTR lpszTitle) { - FIXME("(%p,0x%X,%p,%p,%p,%s),stub!\n",hwnd,uiFlags,pvIn,lpData,pc,lpszTitle); - - if (pc == NULL || pc->cbSize != sizeof(COMPVARS)) - return FALSE; - - if ((pc->dwFlags & ICMF_COMPVARS_VALID) == 0) { - pc->dwFlags = 0; - pc->fccType = pc->fccHandler = 0; - pc->hic = NULL; - pc->lpbiOut = NULL; - pc->lpBitsOut = pc->lpBitsPrev = pc->lpState = NULL; - pc->lQ = ICQUALITY_DEFAULT; - pc->lKey = -1; - pc->lDataRate = 300; /* kB */ - pc->lpState = NULL; - pc->cbState = 0; - } - if (pc->fccType == 0) - pc->fccType = ICTYPE_VIDEO; - - /* FIXME */ - - return FALSE; + struct choose_compressor choose_comp; + BOOL ret; + + TRACE("(%p,%08x,%p,%p,%p,%s)\n", hwnd, uiFlags, pvIn, lpData, pc, lpszTitle); + + if (!pc || pc->cbSize != sizeof(COMPVARS)) + return FALSE; + + if (!(pc->dwFlags & ICMF_COMPVARS_VALID)) + { + pc->dwFlags = 0; + pc->fccType = pc->fccHandler = 0; + pc->hic = NULL; + pc->lpbiIn = NULL; + pc->lpbiOut = NULL; + pc->lpBitsOut = pc->lpBitsPrev = pc->lpState = NULL; + pc->lQ = ICQUALITY_DEFAULT; + pc->lKey = -1; + pc->lDataRate = 300; /* kB */ + pc->lpState = NULL; + pc->cbState = 0; + } + if (pc->fccType == 0) + pc->fccType = ICTYPE_VIDEO; + + choose_comp.cv = *pc; + choose_comp.flags = uiFlags; + choose_comp.title = lpszTitle; + + ret = DialogBoxParamW(MSVFW32_hModule, MAKEINTRESOURCEW(ICM_CHOOSE_COMPRESSOR), hwnd, + icm_choose_compressor_dlgproc, (LPARAM)&choose_comp); + + if (ret) + { + *pc = choose_comp.cv; + pc->dwFlags |= ICMF_COMPVARS_VALID; + } + + return ret; } @@ -748,22 +1003,14 @@ ICClose(pc->hic); pc->hic = NULL; } - if (pc->lpbiOut != NULL) { - GlobalFreePtr(pc->lpbiOut); - pc->lpbiOut = NULL; - } - if (pc->lpBitsOut != NULL) { - GlobalFreePtr(pc->lpBitsOut); - pc->lpBitsOut = NULL; - } - if (pc->lpBitsPrev != NULL) { - GlobalFreePtr(pc->lpBitsPrev); - pc->lpBitsPrev = NULL; - } - if (pc->lpState != NULL) { - GlobalFreePtr(pc->lpBitsPrev); - pc->lpState = NULL; - } + HeapFree(GetProcessHeap(), 0, pc->lpbiIn); + pc->lpbiIn = NULL; + HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); + pc->lpBitsOut = NULL; + HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); + pc->lpBitsPrev = NULL; + HeapFree(GetProcessHeap(), 0, pc->lpState); + pc->lpState = NULL; pc->dwFlags = 0; } } @@ -774,7 +1021,7 @@ * * */ -LRESULT MSVIDEO_SendMessage(WINE_HIC* whic, UINT msg, DWORD lParam1, DWORD lParam2) +LRESULT MSVIDEO_SendMessage(WINE_HIC* whic, UINT msg, DWORD_PTR lParam1, DWORD_PTR lParam2) { LRESULT ret; @@ -839,7 +1086,7 @@ XX(ICM_DECOMPRESSEX_END); XX(ICM_SET_STATUS_PROC); default: - FIXME("(%p,0x%08lx,0x%08lx,0x%08lx) unknown message\n",whic,(DWORD)msg,lParam1,lParam2); + FIXME("(%p,0x%08x,0x%08lx,0x%08lx) unknown message\n",whic,(DWORD)msg,lParam1,lParam2); } #undef XX @@ -858,7 +1105,7 @@ /*********************************************************************** * ICSendMessage [MSVFW32.@] */ -LRESULT VFWAPI ICSendMessage(HIC hic, UINT msg, DWORD lParam1, DWORD lParam2) +LRESULT VFWAPI ICSendMessage(HIC hic, UINT msg, DWORD_PTR lParam1, DWORD_PTR lParam2) { WINE_HIC* whic = MSVIDEO_GetHicPtr(hic); @@ -890,7 +1137,7 @@ ICDRAWBEGIN icdb; - TRACE("(%p,%ld,%p,%p,%p,%u,%u,%u,%u,%p,%u,%u,%u,%u,%ld,%ld)\n", + TRACE("(%p,%d,%p,%p,%p,%u,%u,%u,%u,%p,%u,%u,%u,%u,%d,%d)\n", hic, dwFlags, hpal, hwnd, hdc, xDst, yDst, dxDst, dyDst, lpbi, xSrc, ySrc, dxSrc, dySrc, dwRate, dwScale); @@ -909,7 +1156,7 @@ icdb.dySrc = dySrc; icdb.dwRate = dwRate; icdb.dwScale = dwScale; - return ICSendMessage(hic,ICM_DRAW_BEGIN,(DWORD)&icdb,sizeof(icdb)); + return ICSendMessage(hic,ICM_DRAW_BEGIN,(DWORD_PTR)&icdb,sizeof(icdb)); } /*********************************************************************** @@ -918,7 +1165,7 @@ DWORD VFWAPIV ICDraw(HIC hic, DWORD dwFlags, LPVOID lpFormat, LPVOID lpData, DWORD cbData, LONG lTime) { ICDRAW icd; - TRACE("(%p,%ld,%p,%p,%ld,%ld)\n",hic,dwFlags,lpFormat,lpData,cbData,lTime); + TRACE("(%p,%d,%p,%p,%d,%d)\n",hic,dwFlags,lpFormat,lpData,cbData,lTime); icd.dwFlags = dwFlags; icd.lpFormat = lpFormat; @@ -926,7 +1173,7 @@ icd.cbData = cbData; icd.lTime = lTime; - return ICSendMessage(hic,ICM_DRAW,(DWORD)&icd,sizeof(icd)); + return ICSendMessage(hic,ICM_DRAW,(DWORD_PTR)&icd,sizeof(icd)); } /*********************************************************************** @@ -977,7 +1224,7 @@ LPBITMAPINFO lpbiOut, LONG lQuality, LONG* plSize) { - FIXME("(%p,%08x,%p,%p,%p,%ld,%p)\n", + FIXME("(%p,%08x,%p,%p,%p,%d,%p)\n", hic, uiFlags, lpbiIn, lpBits, lpbiOut, lQuality, plSize); return NULL; @@ -995,7 +1242,7 @@ BYTE* pMem = NULL; BOOL bReleaseIC = FALSE; BYTE* pHdr = NULL; - LONG cbHdr = 0; + ULONG cbHdr = 0; BOOL bSucceeded = FALSE; BOOL bInDecompress = FALSE; DWORD biSizeImage; @@ -1047,7 +1294,7 @@ cbHdr = ICDecompressGetFormatSize(hic,lpbiIn); if ( cbHdr < sizeof(BITMAPINFOHEADER) ) goto err; - pHdr = (BYTE*)HeapAlloc(GetProcessHeap(),0,cbHdr+sizeof(RGBQUAD)*256); + pHdr = HeapAlloc(GetProcessHeap(),0,cbHdr+sizeof(RGBQUAD)*256); if ( pHdr == NULL ) goto err; ZeroMemory( pHdr, cbHdr+sizeof(RGBQUAD)*256 ); @@ -1081,7 +1328,7 @@ goto err; bInDecompress = TRUE; - TRACE( "cbHdr %ld, biSizeImage %ld\n", cbHdr, biSizeImage ); + TRACE( "cbHdr %d, biSizeImage %d\n", cbHdr, biSizeImage ); hMem = GlobalAlloc( GMEM_MOVEABLE|GMEM_ZEROINIT, cbHdr + biSizeImage ); if ( hMem == NULL ) @@ -1104,8 +1351,7 @@ ICDecompressEnd( hic ); if ( bReleaseIC ) ICClose(hic); - if ( pHdr != NULL ) - HeapFree(GetProcessHeap(),0,pHdr); + HeapFree(GetProcessHeap(),0,pHdr); if ( pMem != NULL ) GlobalUnlock( hMem ); if ( !bSucceeded && hMem != NULL ) @@ -1116,6 +1362,156 @@ return (HANDLE)hMem; } +/*********************************************************************** + * ICSeqCompressFrame [MSVFW32.@] + */ +LPVOID VFWAPI ICSeqCompressFrame(PCOMPVARS pc, UINT uiFlags, LPVOID lpBits, BOOL *pfKey, LONG *plSize) +{ + ICCOMPRESS* icComp = (ICCOMPRESS *)pc->lpState; + DWORD ret; + TRACE("(%p, 0x%08x, %p, %p, %p)\n", pc, uiFlags, lpBits, pfKey, plSize); + + if (pc->cbState != sizeof(ICCOMPRESS)) + { + ERR("Invalid cbState %i\n", pc->cbState); + return NULL; + } + + if (!pc->lKeyCount++) + icComp->dwFlags = ICCOMPRESS_KEYFRAME; + else + { + if (pc->lKey && pc->lKeyCount == (pc->lKey - 1)) + /* No key frames if pc->lKey == 0 */ + pc->lKeyCount = 0; + icComp->dwFlags = 0; + } + + icComp->lpInput = lpBits; + icComp->lFrameNum = pc->lFrame++; + icComp->lpOutput = pc->lpBitsOut; + icComp->lpPrev = pc->lpBitsPrev; + ret = ICSendMessage(pc->hic, ICM_COMPRESS, (DWORD_PTR)icComp, sizeof(icComp)); + + if (icComp->dwFlags & AVIIF_KEYFRAME) + { + pc->lKeyCount = 1; + *pfKey = TRUE; + TRACE("Key frame\n"); + } + else + *pfKey = FALSE; + + *plSize = icComp->lpbiOutput->biSizeImage; + TRACE(" -- 0x%08x\n", ret); + if (ret == ICERR_OK) + { + LPVOID oldprev, oldout; +/* We shift Prev and Out, so we don't have to allocate and release memory */ + oldprev = pc->lpBitsPrev; + oldout = pc->lpBitsOut; + pc->lpBitsPrev = oldout; + pc->lpBitsOut = oldprev; + + TRACE("returning: %p\n", icComp->lpOutput); + return icComp->lpOutput; + } + return NULL; +} + +/*********************************************************************** + * ICSeqCompressFrameEnd [MSVFW32.@] + */ +void VFWAPI ICSeqCompressFrameEnd(PCOMPVARS pc) +{ + DWORD ret; + TRACE("(%p)\n", pc); + ret = ICSendMessage(pc->hic, ICM_COMPRESS_END, 0, 0); + TRACE(" -- %x\n", ret); + HeapFree(GetProcessHeap(), 0, pc->lpbiIn); + HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); + HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); + HeapFree(GetProcessHeap(), 0, pc->lpState); + pc->lpbiIn = pc->lpBitsPrev = pc->lpBitsOut = pc->lpState = NULL; +} + +/*********************************************************************** + * ICSeqCompressFrameStart [MSVFW32.@] + */ +BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) +{ + /* I'm ignoring bmiColors as I don't know what to do with it, + * it doesn't appear to be used though + */ + DWORD ret; + pc->lpbiIn = HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFO)); + if (!pc->lpbiIn) + return FALSE; + + memcpy(pc->lpbiIn, lpbiIn, sizeof(BITMAPINFO)); + pc->lpBitsPrev = HeapAlloc(GetProcessHeap(), 0, pc->lpbiIn->bmiHeader.biSizeImage); + if (!pc->lpBitsPrev) + { + HeapFree(GetProcessHeap(), 0, pc->lpbiIn); + return FALSE; + } + + pc->lpState = HeapAlloc(GetProcessHeap(), 0, sizeof(ICCOMPRESS)); + if (!pc->lpState) + { + HeapFree(GetProcessHeap(), 0, pc->lpbiIn); + HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); + return FALSE; + } + pc->cbState = sizeof(ICCOMPRESS); + + pc->lpBitsOut = HeapAlloc(GetProcessHeap(), 0, pc->lpbiOut->bmiHeader.biSizeImage); + if (!pc->lpBitsOut) + { + HeapFree(GetProcessHeap(), 0, pc->lpbiIn); + HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); + HeapFree(GetProcessHeap(), 0, pc->lpState); + return FALSE; + } + TRACE("Compvars:\n" + "\tpc:\n" + "\tsize: %i\n" + "\tflags: %i\n" + "\thic: %p\n" + "\ttype: %x\n" + "\thandler: %x\n" + "\tin/out: %p/%p\n" + "key/data/quality: %i/%i/%i\n", + pc->cbSize, pc->dwFlags, pc->hic, pc->fccType, pc->fccHandler, + pc->lpbiIn, pc->lpbiOut, pc->lKey, pc->lDataRate, pc->lQ); + + ret = ICSendMessage(pc->hic, ICM_COMPRESS_BEGIN, (DWORD_PTR)pc->lpbiIn, (DWORD_PTR)pc->lpbiOut); + TRACE(" -- %x\n", ret); + if (ret == ICERR_OK) + { + ICCOMPRESS* icComp = (ICCOMPRESS *)pc->lpState; + /* Initialise some variables */ + pc->lFrame = 0; pc->lKeyCount = 0; + + icComp->lpbiOutput = &pc->lpbiOut->bmiHeader; + icComp->lpbiInput = &pc->lpbiIn->bmiHeader; + icComp->lpckid = NULL; + icComp->dwFrameSize = 0; + icComp->dwQuality = pc->lQ; + icComp->lpbiPrev = &pc->lpbiIn->bmiHeader; + return TRUE; + } + HeapFree(GetProcessHeap(), 0, pc->lpbiIn); + HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); + HeapFree(GetProcessHeap(), 0, pc->lpState); + HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); + pc->lpBitsPrev = pc->lpbiIn = pc->lpState = pc->lpBitsOut = NULL; + return FALSE; +} + +/*********************************************************************** + * GetFileNamePreview [MSVFW32.@] + */ static BOOL GetFileNamePreview(LPVOID lpofn,BOOL bSave,BOOL bUnicode) { CHAR szFunctionName[20]; Modified: trunk/reactos/dll/win32/msvfw32/msvideo_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo_private.h (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo_private.h Wed Apr 25 12:21:59 2007 @@ -13,20 +13,18 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_MSVIDEO_PRIVATE_H #define __WINE_MSVIDEO_PRIVATE_H -#define COM_NO_WINDOWS_H -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "commdlg.h" -#include "vfw.h" +/* Installable Compressor Manager */ +#define ICVERSION 0x0104 + +#define ICM_CHOOSE_COMPRESSOR 1 +#define IDC_COMP_LIST 880 +#define IDS_FULLFRAMES 901 /* HIC struct (same layout as Win95 one) */ typedef struct tagWINE_HIC { @@ -48,7 +46,7 @@ } WINE_HIC; HIC MSVIDEO_OpenFunction(DWORD, DWORD, UINT, DRIVERPROC, DWORD); -LRESULT MSVIDEO_SendMessage(WINE_HIC*, UINT, DWORD, DWORD); +LRESULT MSVIDEO_SendMessage(WINE_HIC*, UINT, DWORD_PTR, DWORD_PTR); WINE_HIC* MSVIDEO_GetHicPtr(HIC); extern LRESULT (CALLBACK *pFnCallTo16)(HDRVR, HIC, UINT, LPARAM, LPARAM); @@ -62,4 +60,17 @@ #define HDRAWDIB_16(h32) (LOWORD(h32)) #define HIC_16(h32) (LOWORD(h32)) +#define IDC_CONFIGURE 882 +#define IDC_ABOUT 883 + +#define IDC_QUALITY_SCROLL 884 +#define IDC_QUALITY_TXT 886 + +#define IDC_KEYFRAME_CHECKBOX 887 +#define IDC_KEYFRAME 888 +#define IDC_KEYFRAME_FRAMES 889 +#define IDC_DATARATE_CHECKBOX 894 +#define IDC_DATARATE 895 +#define IDC_DATARATE_KB 896 + #endif /* __WINE_MSVIDEO_PRIVATE_H */ Added: trunk/reactos/dll/win32/msvfw32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/rsrc.rc (added) +++ trunk/reactos/dll/win32/msvfw32/rsrc.rc Wed Apr 25 12:21:59 2007 @@ -1,0 +1,30 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "winuser.h" +#include "msvideo_private.h" + +#include "msvfw32_De.rc" +#include "msvfw32_En.rc" +#include "msvfw32_Fr.rc" +#include "msvfw32_Hu.rc" +#include "msvfw32_Ko.rc" +#include "msvfw32_No.rc" +#include "msvfw32_Pl.rc" +#include "msvfw32_Tr.rc" Propchange: trunk/reactos/dll/win32/msvfw32/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msvfw32/vfw16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/vfw16.h?… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/vfw16.h (original) +++ trunk/reactos/dll/win32/msvfw32/vfw16.h Wed Apr 25 12:21:59 2007 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_VFW16_H

17 years, 4 months

[winesync] 26498: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Wed Apr 25 12:21:43 2007 New Revision: 26498 URL: http://svn.reactos.org/svn/reactos?rev=26498&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=2… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c (original) +++ trunk/reactos/dll/win32/mpr/wnet.c Wed Apr 25 12:21:43 2007 @@ -1489,7 +1489,7 @@ /***************************************************************** * WNetRestoreConnectionA [MPR.@] */ -DWORD WINAPI WNetRestoreConnectionA( HWND hwndOwner, LPSTR lpszDevice ) +DWORD WINAPI WNetRestoreConnectionA( HWND hwndOwner, LPCSTR lpszDevice ) { FIXME( "(%p, %s), stub\n", hwndOwner, debugstr_a(lpszDevice) ); @@ -1500,7 +1500,7 @@ /***************************************************************** * WNetRestoreConnectionW [MPR.@] */ -DWORD WINAPI WNetRestoreConnectionW( HWND hwndOwner, LPWSTR lpszDevice ) +DWORD WINAPI WNetRestoreConnectionW( HWND hwndOwner, LPCWSTR lpszDevice ) { FIXME( "(%p, %s), stub\n", hwndOwner, debugstr_w(lpszDevice) ); @@ -1700,45 +1700,78 @@ DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel, LPVOID lpBuffer, LPDWORD lpBufferSize ) { + DWORD err, size; + FIXME( "(%s, 0x%08X, %p, %p): stub\n", debugstr_a(lpLocalPath), dwInfoLevel, lpBuffer, lpBufferSize); - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; -} - -/***************************************************************** - * WNetGetUniversalNameW [MPR.@] - */ -DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel, - LPVOID lpBuffer, LPDWORD lpBufferSize ) -{ - LPUNIVERSAL_NAME_INFOW uniw; - DWORD err, len; - - FIXME( "(%s, 0x%08X, %p, %p): stub\n", - debugstr_w(lpLocalPath), dwInfoLevel, lpBuffer, lpBufferSize); - switch (dwInfoLevel) { case UNIVERSAL_NAME_INFO_LEVEL: - err = WN_MORE_DATA; - len = sizeof (*uniw) + lstrlenW(lpLocalPath); - if (*lpBufferSize <= len) + { + LPUNIVERSAL_NAME_INFOA info = (LPUNIVERSAL_NAME_INFOA)lpBuffer; + + size = sizeof(*info) + lstrlenA(lpLocalPath) + 1; + if (*lpBufferSize < size) + { + err = WN_MORE_DATA; break; - uniw = lpBuffer; - uniw->lpUniversalName = (LPWSTR) &uniw[1]; - lstrcpyW(uniw->lpUniversalName, lpLocalPath); - *lpBufferSize = len; + } + info->lpUniversalName = (char *)info + sizeof(*info); + lstrcpyA(info->lpUniversalName, lpLocalPath); + *lpBufferSize = size; err = WN_NO_ERROR; break; - + } case REMOTE_NAME_INFO_LEVEL: err = WN_NO_NETWORK; break; default: err = WN_BAD_VALUE; + break; + } + + SetLastError(err); + return err; +} + +/***************************************************************** + * WNetGetUniversalNameW [MPR.@] + */ +DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel, + LPVOID lpBuffer, LPDWORD lpBufferSize ) +{ + DWORD err, size; + + FIXME( "(%s, 0x%08X, %p, %p): stub\n", + debugstr_w(lpLocalPath), dwInfoLevel, lpBuffer, lpBufferSize); + + switch (dwInfoLevel) + { + case UNIVERSAL_NAME_INFO_LEVEL: + { + LPUNIVERSAL_NAME_INFOW info = (LPUNIVERSAL_NAME_INFOW)lpBuffer; + + size = sizeof(*info) + (lstrlenW(lpLocalPath) + 1) * sizeof(WCHAR); + if (*lpBufferSize < size) + { + err = WN_MORE_DATA; + break; + } + info->lpUniversalName = (LPWSTR)((char *)info + sizeof(*info)); + lstrcpyW(info->lpUniversalName, lpLocalPath); + *lpBufferSize = size; + err = WN_NO_ERROR; + break; + } + case REMOTE_NAME_INFO_LEVEL: + err = WN_NO_NETWORK; + break; + + default: + err = WN_BAD_VALUE; + break; } SetLastError(err);

17 years, 4 months

[winesync] 26497: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Wed Apr 25 12:21:30 2007 New Revision: 26497 URL: http://svn.reactos.org/svn/reactos?rev=26497&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/mapi32/mapi32.spec trunk/reactos/dll/win32/mapi32/mapi32_main.c trunk/reactos/dll/win32/mapi32/prop.c Modified: trunk/reactos/dll/win32/mapi32/mapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.sp… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32.spec (original) +++ trunk/reactos/dll/win32/mapi32/mapi32.spec Wed Apr 25 12:21:30 2007 @@ -7,8 +7,8 @@ 15 stdcall MAPIAllocateMore@12(long ptr ptr) MAPIAllocateMore 16 stdcall MAPIFreeBuffer(ptr) 17 stdcall MAPIFreeBuffer@4(ptr) MAPIFreeBuffer - 18 stub MAPIAdminProfiles - 19 stub MAPIAdminProfiles@8 + 18 stdcall MAPIAdminProfiles(long ptr) + 19 stdcall MAPIAdminProfiles@8(long ptr) MAPIAdminProfiles 20 stdcall MAPIInitialize(ptr) 21 stdcall MAPIInitialize@4(ptr) MAPIInitialize 22 stdcall MAPIUninitialize() Modified: trunk/reactos/dll/win32/mapi32/mapi32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32_ma… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32_main.c (original) +++ trunk/reactos/dll/win32/mapi32/mapi32_main.c Wed Apr 25 12:21:30 2007 @@ -110,3 +110,10 @@ { FIXME("Stub\n"); } + +HRESULT WINAPI MAPIAdminProfiles(ULONG ulFlags, LPPROFADMIN *lppProfAdmin) +{ + FIXME("(%u, %p): stub\n", ulFlags, lppProfAdmin); + *lppProfAdmin = NULL; + return E_FAIL; +} Modified: trunk/reactos/dll/win32/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/prop.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/prop.c (original) +++ trunk/reactos/dll/win32/mapi32/prop.c Wed Apr 25 12:21:30 2007 @@ -665,7 +665,7 @@ TRACE("(%p)\n", lpAddrs); /* Structures are binary compatible; use the same implementation */ - return FreeProws((LPSRowSet)lpAddrs); + FreeProws((LPSRowSet)lpAddrs); } /*************************************************************************

17 years, 4 months

[winesync] 26496: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Wed Apr 25 12:21:11 2007 New Revision: 26496 URL: http://svn.reactos.org/svn/reactos?rev=26496&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/imm32/imm.c trunk/reactos/dll/win32/imm32/imm32.spec Modified: trunk/reactos/dll/win32/imm32/imm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/imm32/imm.c (original) +++ trunk/reactos/dll/win32/imm32/imm.c Wed Apr 25 12:21:11 2007 @@ -763,8 +763,8 @@ static const WCHAR the_name[] = {'I','M','E','\0'}; IMM_Register(); - hwndDefault = CreateWindowExW( WS_EX_CLIENTEDGE, WC_IMECLASSNAME, - the_name, WS_POPUPWINDOW|WS_CAPTION, 0, 0, 120, 55, 0, 0, + hwndDefault = CreateWindowExW( WS_EX_TOOLWINDOW, WC_IMECLASSNAME, + the_name, WS_POPUP, 0, 0, 1, 1, 0, 0, hImeInst, 0); TRACE("Default created (%p)\n",hwndDefault); @@ -1556,6 +1556,7 @@ RECT rect; HDC hdc = BeginPaint(hwnd,&ps); GetClientRect(hwnd,&rect); + FillRect(hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1)); if (root_context->dwCompStringLength && root_context->CompositionString) { @@ -1566,8 +1567,6 @@ if (root_context->textfont) oldfont = SelectObject(hdc,root_context->textfont); - TextOutW(hdc, 0,0,(LPWSTR)root_context->CompositionString, - root_context->dwCompStringLength / sizeof(WCHAR)); GetTextExtentPoint32W(hdc, (LPWSTR)root_context->CompositionString, root_context->dwCompStringLength / sizeof(WCHAR), @@ -1575,12 +1574,44 @@ pt.x = size.cx; pt.y = size.cy; LPtoDP(hdc,&pt,1); - rect.left = pt.x; + + if (root_context->CompForm.dwStyle == CFS_POINT || + root_context->CompForm.dwStyle == CFS_FORCE_POSITION) + { + POINT cpt = root_context->CompForm.ptCurrentPos; + ClientToScreen(root_context->hwnd,&cpt); + rect.left = cpt.x; + rect.top = cpt.y; + rect.right = rect.left + pt.x + 20; + rect.bottom = rect.top + pt.y + 20; + } + else if (root_context->CompForm.dwStyle == CFS_RECT) + { + POINT cpt; + cpt.x = root_context->CompForm.rcArea.left; + cpt.y = root_context->CompForm.rcArea.top; + ClientToScreen(root_context->hwnd,&cpt); + rect.left = cpt.x; + rect.top = cpt.y; + cpt.x = root_context->CompForm.rcArea.right; + cpt.y = root_context->CompForm.rcArea.bottom; + ClientToScreen(root_context->hwnd,&cpt); + rect.right = cpt.x; + rect.bottom = cpt.y; + } + else + { + rect.right = rect.left + pt.x + 20; + rect.bottom = rect.top + pt.y + 20; + } + MoveWindow(hwnd, rect.left, rect.top, rect.right - rect.left , + rect.bottom - rect.top, FALSE); + TextOutW(hdc, 10,10,(LPWSTR)root_context->CompositionString, + root_context->dwCompStringLength / sizeof(WCHAR)); if (oldfont) SelectObject(hdc,oldfont); } - FillRect(hdc,&rect, (HBRUSH) (COLOR_WINDOW+1)); EndPaint(hwnd,&ps); } Modified: trunk/reactos/dll/win32/imm32/imm32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm32.spec… ============================================================================== --- trunk/reactos/dll/win32/imm32/imm32.spec (original) +++ trunk/reactos/dll/win32/imm32/imm32.spec Wed Apr 25 12:21:11 2007 @@ -93,7 +93,7 @@ @ stdcall ImmSetCompositionStringW(long long ptr long ptr long) @ stdcall ImmSetCompositionWindow(long ptr) @ stdcall ImmSetConversionStatus(long long long) -@ stdcall ImmSetHotKey(long long long ptr) user32.CliImmSetHotKey +#@ stdcall ImmSetHotKey(long long long ptr) user32.CliImmSetHotKey @ stdcall ImmSetOpenStatus(long long) @ stdcall ImmSetStatusWindowPos(long ptr) @ stub ImmShowSoftKeyboard

17 years, 4 months

[winesync] 26495: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Wed Apr 25 12:20:45 2007 New Revision: 26495 URL: http://svn.reactos.org/svn/reactos?rev=26495&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/cabinet/cabinet.h trunk/reactos/dll/win32/cabinet/cabinet_main.c trunk/reactos/dll/win32/cabinet/fci.c trunk/reactos/dll/win32/cabinet/fdi.c Modified: trunk/reactos/dll/win32/cabinet/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet.h (original) +++ trunk/reactos/dll/win32/cabinet/cabinet.h Wed Apr 25 12:20:45 2007 @@ -640,7 +640,7 @@ /* from fdi.c */ void QTMupdatemodel(struct QTMmodel *model, int sym); -int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, cab_UBYTE *length, cab_UWORD *table); -cab_ULONG checksum(cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum); +int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length, cab_UWORD *table); +cab_ULONG checksum(const cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum); #endif /* __WINE_CABINET_H */ Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet_… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet_main.c (original) +++ trunk/reactos/dll/win32/cabinet/cabinet_main.c Wed Apr 25 12:20:45 2007 @@ -154,7 +154,7 @@ return SetFilePointer(handle, dist, NULL, seektype); } -static void fill_file_node(struct ExtractFileList *pNode, LPSTR szFilename) +static void fill_file_node(struct ExtractFileList *pNode, LPCSTR szFilename) { pNode->next = NULL; pNode->flag = FALSE; @@ -163,7 +163,7 @@ lstrcpyA(pNode->filename, szFilename); } -static BOOL file_in_list(struct ExtractFileList *pNode, LPSTR szFilename) +static BOOL file_in_list(const struct ExtractFileList *pNode, LPCSTR szFilename) { while (pNode) { Modified: trunk/reactos/dll/win32/cabinet/fci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fci.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fci.c (original) +++ trunk/reactos/dll/win32/cabinet/fci.c Wed Apr 25 12:20:45 2007 @@ -430,12 +430,12 @@ -static cab_ULONG fci_get_checksum(void *pv, UINT cb, CHECKSUM seed) +static cab_ULONG fci_get_checksum(const void *pv, UINT cb, CHECKSUM seed) { - cab_ULONG csum; - cab_ULONG ul; - int cUlong; - BYTE *pb; + cab_ULONG csum; + cab_ULONG ul; + int cUlong; + const BYTE *pb; csum = seed; cUlong = cb / 4; Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c Wed Apr 25 12:20:45 2007 @@ -220,7 +220,7 @@ * OK: 0 * error: 1 */ -int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, cab_UBYTE *length, cab_UWORD *table) { +int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length, cab_UWORD *table) { register cab_UWORD sym; register cab_ULONG leaf; register cab_UBYTE bit_num = 1; @@ -293,7 +293,7 @@ /************************************************************************* * checksum (internal) */ -cab_ULONG checksum(cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum) { +cab_ULONG checksum(const cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum) { int len; cab_ULONG ul = 0; @@ -1132,16 +1132,16 @@ /********************************************************* * fdi_Zipinflate_codes (internal) */ -static cab_LONG fdi_Zipinflate_codes(struct Ziphuft *tl, struct Ziphuft *td, +static cab_LONG fdi_Zipinflate_codes(const struct Ziphuft *tl, const struct Ziphuft *td, cab_LONG bl, cab_LONG bd, fdi_decomp_state *decomp_state) { - register cab_ULONG e; /* table entry flag/number of extra bits */ - cab_ULONG n, d; /* length and index for copy */ - cab_ULONG w; /* current window position */ - struct Ziphuft *t; /* pointer to table entry */ - cab_ULONG ml, md; /* masks for bl and bd bits */ - register cab_ULONG b; /* bit buffer */ - register cab_ULONG k; /* number of bits in bit buffer */ + register cab_ULONG e; /* table entry flag/number of extra bits */ + cab_ULONG n, d; /* length and index for copy */ + cab_ULONG w; /* current window position */ + const struct Ziphuft *t; /* pointer to table entry */ + cab_ULONG ml, md; /* masks for bl and bd bits */ + register cab_ULONG b; /* bit buffer */ + register cab_ULONG k; /* number of bits in bit buffer */ /* make local copies of globals */ b = ZIP(bb); /* initialize bit buffer */ @@ -1507,7 +1507,6 @@ cab_UBYTE *inpos = CAB(inbuf); cab_UBYTE *window = QTM(window); cab_UBYTE *runsrc, *rundest; - cab_ULONG window_posn = QTM(window_posn); cab_ULONG window_size = QTM(window_size); @@ -1677,7 +1676,7 @@ */ static int LZXfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) { cab_UBYTE *inpos = CAB(inbuf); - cab_UBYTE *endinp = inpos + inlen; + const cab_UBYTE *endinp = inpos + inlen; cab_UBYTE *window = LZX(window); cab_UBYTE *runsrc, *rundest; cab_UWORD *hufftbl; /* used in READ_HUFFSYM macro as chosen decoding table */ @@ -2007,7 +2006,7 @@ * is also where we jump to additional cabinets in the case of split * cab's, and provide (some of) the NEXT_CABINET notification semantics. */ -static int fdi_decomp(struct fdi_file *fi, int savemode, fdi_decomp_state *decomp_state, +static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state *decomp_state, char *pszCabPath, PFNFDINOTIFY pfnfdin, void *pvUser) { cab_ULONG bytes = savemode ? fi->length : fi->offset - CAB(offset); @@ -2108,7 +2107,7 @@ do { - pathlen = (userpath) ? strlen(userpath) : 0; + pathlen = strlen(userpath); filenamelen = (cab->mii.nextname) ? strlen(cab->mii.nextname) : 0; /* slight overestimation here to save CPU cycles in the developer's brain */

17 years, 4 months

[winesync] 26494: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Wed Apr 25 12:20:24 2007 New Revision: 26494 URL: http://svn.reactos.org/svn/reactos?rev=26494&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/avifil32/acmstream.c trunk/reactos/dll/win32/avifil32/api.c trunk/reactos/dll/win32/avifil32/avifile.c trunk/reactos/dll/win32/avifil32/avifile_private.h trunk/reactos/dll/win32/avifil32/editstream.c trunk/reactos/dll/win32/avifil32/extrachunk.c trunk/reactos/dll/win32/avifil32/extrachunk.h trunk/reactos/dll/win32/avifil32/factory.c trunk/reactos/dll/win32/avifil32/getframe.c trunk/reactos/dll/win32/avifil32/icmstream.c trunk/reactos/dll/win32/avifil32/regsvr.c trunk/reactos/dll/win32/avifil32/tmpfile.c trunk/reactos/dll/win32/avifil32/wavfile.c Modified: trunk/reactos/dll/win32/avifil32/acmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/acmstre… ============================================================================== --- trunk/reactos/dll/win32/avifil32/acmstream.c (original) +++ trunk/reactos/dll/win32/avifil32/acmstream.c Wed Apr 25 12:20:24 2007 @@ -23,7 +23,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winnls.h" #include "winerror.h" #include "mmsystem.h" #include "vfw.h" Modified: trunk/reactos/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?r… ============================================================================== --- trunk/reactos/dll/win32/avifil32/api.c (original) +++ trunk/reactos/dll/win32/avifil32/api.c Wed Apr 25 12:20:24 2007 @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #define COBJMACROS Modified: trunk/reactos/dll/win32/avifil32/avifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile.c (original) +++ trunk/reactos/dll/win32/avifil32/avifile.c Wed Apr 25 12:20:24 2007 @@ -210,19 +210,19 @@ static HRESULT AVIFILE_AddRecord(IAVIFileImpl *This); static DWORD AVIFILE_ComputeMoviStart(IAVIFileImpl *This); static void AVIFILE_ConstructAVIStream(IAVIFileImpl *paf, DWORD nr, - LPAVISTREAMINFOW asi); + const AVISTREAMINFOW *asi); static void AVIFILE_DestructAVIStream(IAVIStreamImpl *This); static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This); -static HRESULT AVIFILE_LoadIndex(IAVIFileImpl *This, DWORD size, DWORD offset); -static HRESULT AVIFILE_ParseIndex(IAVIFileImpl *This, AVIINDEXENTRY *lp, +static HRESULT AVIFILE_LoadIndex(const IAVIFileImpl *This, DWORD size, DWORD offset); +static HRESULT AVIFILE_ParseIndex(const IAVIFileImpl *This, AVIINDEXENTRY *lp, LONG count, DWORD pos, BOOL *bAbsolute); static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD start, LPVOID buffer, LONG size); -static void AVIFILE_SamplesToBlock(IAVIStreamImpl *This, LPLONG pos, +static void AVIFILE_SamplesToBlock(const IAVIStreamImpl *This, LPLONG pos, LPLONG offset); static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This); -static HRESULT AVIFILE_SaveIndex(IAVIFileImpl *This); -static ULONG AVIFILE_SearchStream(IAVIFileImpl *This, DWORD fccType, +static HRESULT AVIFILE_SaveIndex(const IAVIFileImpl *This); +static ULONG AVIFILE_SearchStream(const IAVIFileImpl *This, DWORD fccType, LONG lSkip); static void AVIFILE_UpdateInfo(IAVIFileImpl *This); static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block, @@ -1502,7 +1502,7 @@ return dwPos; } -static void AVIFILE_ConstructAVIStream(IAVIFileImpl *paf, DWORD nr, LPAVISTREAMINFOW asi) +static void AVIFILE_ConstructAVIStream(IAVIFileImpl *paf, DWORD nr, const AVISTREAMINFOW *asi) { IAVIStreamImpl *pstream; @@ -1902,7 +1902,7 @@ return AVIERR_OK; } -static HRESULT AVIFILE_LoadIndex(IAVIFileImpl *This, DWORD size, DWORD offset) +static HRESULT AVIFILE_LoadIndex(const IAVIFileImpl *This, DWORD size, DWORD offset) { AVIINDEXENTRY *lp; DWORD pos, n; @@ -1975,7 +1975,7 @@ return hr; } -static HRESULT AVIFILE_ParseIndex(IAVIFileImpl *This, AVIINDEXENTRY *lp, +static HRESULT AVIFILE_ParseIndex(const IAVIFileImpl *This, AVIINDEXENTRY *lp, LONG count, DWORD pos, BOOL *bAbsolute) { if (lp == NULL) @@ -2064,8 +2064,7 @@ return AVIERR_OK; } -static void AVIFILE_SamplesToBlock(IAVIStreamImpl *This, LPLONG pos, - LPLONG offset) +static void AVIFILE_SamplesToBlock(const IAVIStreamImpl *This, LPLONG pos, LPLONG offset) { LONG block; @@ -2317,7 +2316,7 @@ return AVIERR_OK; } -static HRESULT AVIFILE_SaveIndex(IAVIFileImpl *This) +static HRESULT AVIFILE_SaveIndex(const IAVIFileImpl *This) { IAVIStreamImpl *pStream; AVIINDEXENTRY idx; @@ -2447,7 +2446,7 @@ return AVIERR_OK; } -static ULONG AVIFILE_SearchStream(IAVIFileImpl *This, DWORD fcc, LONG lSkip) +static ULONG AVIFILE_SearchStream(const IAVIFileImpl *This, DWORD fcc, LONG lSkip) { UINT i; UINT nStream; Modified: trunk/reactos/dll/win32/avifil32/avifile_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_private.h (original) +++ trunk/reactos/dll/win32/avifil32/avifile_private.h Wed Apr 25 12:20:24 2007 @@ -67,7 +67,7 @@ extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj); extern PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream); extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream); -extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams,PAVISTREAM *ppStreams); +extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams); extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName); Modified: trunk/reactos/dll/win32/avifil32/editstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/editstr… ============================================================================== --- trunk/reactos/dll/win32/avifil32/editstream.c (original) +++ trunk/reactos/dll/win32/avifil32/editstream.c Wed Apr 25 12:20:24 2007 @@ -23,7 +23,6 @@ #include "winbase.h" #include "winuser.h" #include "wingdi.h" -#include "winnls.h" #include "winerror.h" #include "mmsystem.h" #include "vfw.h" Modified: trunk/reactos/dll/win32/avifil32/extrachunk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/extrach… ============================================================================== --- trunk/reactos/dll/win32/avifil32/extrachunk.c (original) +++ trunk/reactos/dll/win32/avifil32/extrachunk.c Wed Apr 25 12:20:24 2007 @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile); /* reads a chunk outof the extrachunk-structure */ -HRESULT ReadExtraChunk(const LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lpData,LPLONG size) +HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lpData,LPLONG size) { LPBYTE lp; DWORD cb; @@ -99,7 +99,7 @@ } /* reads a chunk fomr the HMMIO into the extrachunk-structure */ -HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck) +HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck) { LPDWORD lp; DWORD cb; Modified: trunk/reactos/dll/win32/avifil32/extrachunk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/extrach… ============================================================================== --- trunk/reactos/dll/win32/avifil32/extrachunk.h (original) +++ trunk/reactos/dll/win32/avifil32/extrachunk.h Wed Apr 25 12:20:24 2007 @@ -35,13 +35,13 @@ } EXTRACHUNKS, *LPEXTRACHUNKS; /* reads a chunk outof the extrachunk-structure */ -HRESULT ReadExtraChunk(const LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lp,LPLONG size); +HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lp,LPLONG size); /* writes a chunk into the extrachunk-structure */ HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size); /* reads a chunk fomr the HMMIO into the extrachunk-structure */ -HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck); +HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck); /* reads all non-junk chunks into the extrachunk-structure until it finds * the given chunk or the optional parent-chunk is at the end */ Modified: trunk/reactos/dll/win32/avifil32/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory… ============================================================================== --- trunk/reactos/dll/win32/avifil32/factory.c (original) +++ trunk/reactos/dll/win32/avifil32/factory.c Wed Apr 25 12:20:24 2007 @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #define COBJMACROS @@ -25,7 +24,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winnls.h" #include "winerror.h" #include "ole2.h" Modified: trunk/reactos/dll/win32/avifil32/getframe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/getfram… ============================================================================== --- trunk/reactos/dll/win32/avifil32/getframe.c (original) +++ trunk/reactos/dll/win32/avifil32/getframe.c Wed Apr 25 12:20:24 2007 @@ -16,12 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "wingdi.h" #include "winuser.h" #include "vfw.h" Modified: trunk/reactos/dll/win32/avifil32/icmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/icmstre… ============================================================================== --- trunk/reactos/dll/win32/avifil32/icmstream.c (original) +++ trunk/reactos/dll/win32/avifil32/icmstream.c Wed Apr 25 12:20:24 2007 @@ -23,11 +23,9 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winnls.h" #include "winerror.h" #include "mmsystem.h" #include "vfw.h" -#include "msacm.h" #include "avifile_private.h" Modified: trunk/reactos/dll/win32/avifil32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/regsvr.… ============================================================================== --- trunk/reactos/dll/win32/avifil32/regsvr.c (original) +++ trunk/reactos/dll/win32/avifil32/regsvr.c Wed Apr 25 12:20:24 2007 @@ -28,7 +28,6 @@ #include "winreg.h" #include "winerror.h" -#include "mmsystem.h" #include "vfw.h" #include "avifile_private.h" Modified: trunk/reactos/dll/win32/avifil32/tmpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/tmpfile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/tmpfile.c (original) +++ trunk/reactos/dll/win32/avifil32/tmpfile.c Wed Apr 25 12:20:24 2007 @@ -16,16 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winnls.h" #include "winerror.h" -#include "mmsystem.h" #include "vfw.h" #include "avifile_private.h" @@ -71,7 +68,7 @@ PAVISTREAM *ppStreams; } ITmpFileImpl; -PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, PAVISTREAM *ppStreams) { +PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) { ITmpFileImpl *tmpFile; int i; Modified: trunk/reactos/dll/win32/avifil32/wavfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/wavfile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/wavfile.c (original) +++ trunk/reactos/dll/win32/avifil32/wavfile.c Wed Apr 25 12:20:24 2007 @@ -212,7 +212,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This); static HRESULT AVIFILE_LoadSunFile(IAVIFileImpl *This); -static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This); +static HRESULT AVIFILE_SaveFile(const IAVIFileImpl *This); HRESULT AVIFILE_CreateWAVFile(REFIID riid, LPVOID *ppv) { @@ -1248,7 +1248,7 @@ return AVIERR_OK; } -static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This) +static HRESULT AVIFILE_SaveFile(const IAVIFileImpl *This) { MMCKINFO ckRIFF; MMCKINFO ck;

17 years, 4 months

← Newer
1
...
8
9
10
11
12
13
14
...
38
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 April 2007