Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[greatlrd] 30179: add 10 more guids for ksguid.a
by greatlrd＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: greatlrd Date: Mon Nov 5 18:20:17 2007 New Revision: 30179 URL: http://svn.reactos.org/svn/reactos?rev=30179&view=rev Log: add 10 more guids for ksguid.a Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/lib/sdk/ksguid/k… ============================================================================== --- branches/reactx/reactos/lib/sdk/ksguid/ksguid.c (original) +++ branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Mon Nov 5 18:20:17 2007 @@ -14,6 +14,17 @@ #include <basetyps.h> #include <guiddef.h> + +DEFINE_GUID(KSNODETYPE_LEVEL_CALIBRATION_NOISE_SOURCE 0xDFF220E1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_1394_DV_STREAM_SOUNDTRACK, 0xDFF21FE7, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_1394_DA_STREAM, 0xDFF21FE6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_SPDIF_INTERFACE, 0xDFF21FE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_LEGACY_AUDIO_CONNECTOR, 0xDFF21FE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_LINE_CONNECTOR, 0xDFF21FE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DIGITAL_AUDIO_INTERFACE, 0xDFF21FE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_ANALOG_CONNECTOR, 0xDFF21FE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DOWN_LINE_PHONE, 0xDFF21EE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_TELEPHONE, 0xDFF21EE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_PHONE_LINE, 0xDFF21EE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_ECHO_CANCELING_SPEAKERPHONE, 0xDFF21DE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_ECHO_SUPPRESSING_SPEAKERPHONE, 0xDFF21DE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96);

1 0

[gedmurphy] 30178: Adding a note to ask translators not to work on this app yet. The base file is constantly changing, and it becomes difficult to keep track of those changes across multiple resources. Thanks
by gedmurphy＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: gedmurphy Date: Mon Nov 5 18:05:51 2007 New Revision: 30178 URL: http://svn.reactos.org/svn/reactos?rev=30178&view=rev Log: Adding a note to ask translators not to work on this app yet. The base file is constantly changing, and it becomes difficult to keep track of those changes across multiple resources. Thanks Modified: trunk/reactos/base/applications/mstsc/lang/en-US.rc Modified: trunk/reactos/base/applications/mstsc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/en-US.rc Mon Nov 5 18:05:51 2007 @@ -1,3 +1,5 @@ +/* please do not translate yet */ + LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_GENERAL DIALOGEX 0, 0, 242, 175

1 0

[fireball] 30177: Dmitry Chapyshev <lentind@yandex.ru> - Russian translation fixes. - Size changes, so it looks better.
by fireball＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: fireball Date: Mon Nov 5 17:53:11 2007 New Revision: 30177 URL: http://svn.reactos.org/svn/reactos?rev=30177&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Russian translation fixes. - Size changes, so it looks better. Added: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc (with props) Modified: trunk/reactos/dll/cpl/appwiz/lang/en-US.rc trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc trunk/reactos/dll/cpl/appwiz/rsrc.rc Modified: trunk/reactos/dll/cpl/appwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/en-US.rc Mon Nov 5 17:53:11 2007 @@ -105,8 +105,8 @@ LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT - LTEXT "Click Next to continue.", -1, 120, 100, 90, 10 + PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "Click Next to continue.", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -116,7 +116,7 @@ BEGIN LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "Click Finish to create the shortcut.", -1, 120, 50, 150, 10 + LTEXT "Click Finish to create the shortcut.", -1, 118, 97, 178, 17 END IDD_INFORMATION DIALOG 5, 100, 269, 218 Modified: trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc Mon Nov 5 17:53:11 2007 @@ -105,8 +105,8 @@ LTEXT "Cet assistant vous aider à créer des raccourcis vers des programmes, des fichiers, des dossiers, des ordinateurs,\nou des adresses Internet locaux ou sur le réseau.", -1, 120, 15, 200, 30 LTEXT "Entrez la localisation de l'élément:", -1, 120, 50, 120, 10 EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "Parcourir...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT - LTEXT "Cliquez sur Suivant pour continuer.", -1, 120, 100, 90, 10 + PUSHBUTTON "Parcourir...", IDC_SHORTCUT_BROWSE, 272, 65, 60, 15, ES_LEFT + LTEXT "Cliquez sur Suivant pour continuer.", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -116,7 +116,7 @@ BEGIN LTEXT "En&trez un nom pour ce raccourci:", -1, 120, 15, 150, 10 EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "Cliquez sur Terminer pour créer le raccourci.", -1, 120, 50, 150, 10 + LTEXT "Cliquez sur Terminer pour créer le raccourci.", -1, 118, 97, 178, 17 END IDD_INFORMATION DIALOG 5, 100, 269, 218 Added: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc (added) +++ trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc Mon Nov 5 17:53:11 2007 @@ -1,0 +1,169 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDR_POPUP_APP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "????????/&???????",ID_APP_MODIFYREMOVE + MENUITEM "&??????????", ID_APP_INFORMATION + END +END + +IDR_POPUP_UPD MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&???????", ID_UPD_REMOVE + MENUITEM "&??????????", ID_UPD_INFORMATION + END +END + +IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "???????? ??? ??????? ?????????" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,6,16,16 + LTEXT "????????? ??????????? ??????????? ????? ????????????? ???????. ??? ???????? ??? ????????? ????????????? ??????????? ???????? ?????? ? ???????? ""????????/???????"".",-1,36,7,PROPSHEETWIDTH-48,22 + LTEXT "?????:",-1,PROPSHEETPADDING,33,30,8 + EDITTEXT IDC_FIND_EDIT, PROPSHEETPADDING+30, 30, 180, 14, WS_VISIBLE | WS_TABSTOP + LTEXT "???:",-1,250,33,30,8 + COMBOBOX IDC_VIEW_COMBO, 280, 30, 94, 80, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + CONTROL "", IDC_SOFTWARELIST, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL, PROPSHEETPADDING, 50, PROPSHEETWIDTH-12, 155, WS_EX_CLIENTEDGE + PUSHBUTTON "????????/&???????", IDC_ADDREMOVE, PROPSHEETPADDING, 210, 80, 14, WS_DISABLED + PUSHBUTTON "&??????????", IDC_INFO_BUTTON, PROPSHEETPADDING+85, 210, 80, 14, WS_DISABLED +END + +IDD_PROPPAGEUPDATES DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "???????? ??????????" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_UPDATES,-1,PROPSHEETPADDING,6,16,16 + LTEXT "????????? ?????????? ????? ???? ????????????? ???????. ??? ???????? ?????????? ???????? ?????? ? ???????? ""???????"".",-1,36,7,PROPSHEETWIDTH-48,22 + LTEXT "?????:",-1,PROPSHEETPADDING,33,30,8 + EDITTEXT IDC_UPD_FIND_EDIT, PROPSHEETPADDING+30, 30, 180, 14, WS_VISIBLE | WS_TABSTOP + LTEXT "???:",-1,250,33,30,8 + COMBOBOX IDC_UPD_VIEW_COMBO, 280, 30, 94, 80, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + CONTROL "", IDC_UPDATESLIST, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL, PROPSHEETPADDING, 50, PROPSHEETWIDTH-12, 155, WS_EX_CLIENTEDGE + PUSHBUTTON "&???????", IDC_UPD_REMOVE, PROPSHEETPADDING, 210, 80, 14, WS_DISABLED + PUSHBUTTON "&??????????", IDC_UPD_INFO_BUTTON, PROPSHEETPADDING+85, 210, 80, 14, WS_DISABLED +END + +IDD_PROPPAGEADD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "???????? ????? ?????????" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,10,32,32 + LTEXT "??? ????????? ????? ????????? ???????? ""??????????"".",-1,36,11,PROPSHEETWIDTH-48,8 + PUSHBUTTON "&??????????...", IDC_INSTALL, PROPSHEETWIDTH-(90), 46, 80, 14 + LTEXT "", -1, PROPSHEETPADDING, 70, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + ICON IDI_DOWNLOADICO,-1,PROPSHEETPADDING,80,32,32 + LTEXT "??? ?????????? ? ????????? ????? ????????, ???????? ""??????? !"".",-1,36,83,PROPSHEETWIDTH-48,17 + PUSHBUTTON "&??????? !", IDC_ADD_DOWNLOAD_BUTTON, PROPSHEETWIDTH-(90), 125, 80, 14, WS_DISABLED + LTEXT "", -1, PROPSHEETPADDING, 150, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + ICON IDI_APPINETICO,-1,PROPSHEETPADDING,160,32,32 + LTEXT "?????? ?????? ""????? ? ?????????"" ??? ?????? ????? ????????? ???????? ? ?????????.",-1,36,161,PROPSHEETWIDTH-48,17 + PUSHBUTTON "&????????...", IDC_ADD_PROP_BUTTON, PROPSHEETWIDTH-(175), 205, 80, 14, WS_DISABLED + PUSHBUTTON "&????? ? ?????????", IDC_ADD_FIND_BUTTON, PROPSHEETWIDTH-(90), 205, 80, 14, WS_DISABLED +END + +IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "????????? ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_REACTOS,-1,PROPSHEETPADDING,6,16,16 + LTEXT "",-1,36,7,PROPSHEETWIDTH-48,22 +END + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "???????? ??????" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "???????? ??????" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 +END + +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "???????? ??????" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "???? ?????? ??????? ??????? ????? ??? ????????? ???\n??????? ????????, ??????, ?????, ??????????? ???\n????????-???????.", -1, 120, 15, 200, 30 + LTEXT "???????? ?????????????? ????????:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "?????...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "???????? ""?????"" ??? ???????????.", -1, 120, 97, 162, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "????? ????????? ??? ?????????" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&??????? ????????? ??????:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "???????? ""?????????"" ??? ???????? ??????.", -1, 118, 97, 178, 17 +END + +IDD_INFORMATION DIALOG 5, 100, 269, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "??????????" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDS_INFO_DISPNAME, PROPSHEETPADDING, 6, 258, 15, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "???????????????? ??:", -1, PROPSHEETPADDING, 27, 97, 8 + EDITTEXT IDS_INFO_REGOWNER, PROPSHEETPADDING+97, 25, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "??? ????????:", -1, PROPSHEETPADDING, 44, 97, 8 + EDITTEXT IDS_INFO_PRODUCTID, PROPSHEETPADDING+97, 42, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "????????:", -1, PROPSHEETPADDING, 61, 97, 8 + EDITTEXT IDS_INFO_PUBLISHER, PROPSHEETPADDING+97, 59, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "??????:", -1, PROPSHEETPADDING, 78, 97, 8 + EDITTEXT IDS_INFO_VERSION, PROPSHEETPADDING+97, 76, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "?????????? ????:", -1, PROPSHEETPADDING, 95, 97, 8 + EDITTEXT IDS_INFO_CONTACT, PROPSHEETPADDING+97, 93, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "???????? ? ?????????:", -1, PROPSHEETPADDING, 112, 97, 8 + EDITTEXT IDS_INFO_SUPPORTINFO, PROPSHEETPADDING+97, 110, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "??????? ?????????:", -1, PROPSHEETPADDING, 129, 97, 8 + EDITTEXT IDS_INFO_SUPPORTPHONE, PROPSHEETPADDING+97, 127, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "?????????? ????????:", -1, PROPSHEETPADDING, 146, 97, 8 + EDITTEXT IDS_INFO_PRODUCT_UPDATES, PROPSHEETPADDING+97, 144, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "???? ""Readme"":", -1, PROPSHEETPADDING, 163, 97, 8 + EDITTEXT IDS_INFO_README, PROPSHEETPADDING+97, 161, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "???????????:", -1, PROPSHEETPADDING, 180, 97, 8 + EDITTEXT IDS_INFO_COMMENTS, PROPSHEETPADDING+97, 178, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&???????", IDCANCEL, 212, 198, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "????????? ? ???????? ????????" + IDS_CPLSYSTEMDESCRIPTION "?????? ? ???????????, ???????????? ? ????????." + IDS_ERROR "??????" + IDS_UNABLEREAD_UNINSTSTR "?? ??????? ????????? UninstallString. ??? ???????? ???????? ??? ??????? MSI-????????????." + IDS_UNABLEOPEN_UNINSTKEY "?? ??????? ??????? ???? ????????" + IDS_APPLIST "?????? ????????????? ????????" + IDS_UPDATESLIST "?????? ????????????? ??????????" + IDS_LARGEICONS "??????? ??????" + IDS_LIST "??????" + IDS_DETAILS "???????" + IDS_CREATE_SHORTCUT "??????? ?????" + IDS_ERROR_NOT_FOUND "???? %s ?? ??????." + IDS_UNABLEREAD_INFORMATION "?? ??????? ??????? ???? ??????????" + IDS_NO_INFORMATION "??? ??????????" + IDS_NONE_APP "??? ????????????? ??????????." + IDS_NONE_UPD "??? ????????????? ??????????." +END Propchange: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/rsrc.rc (original) +++ trunk/reactos/dll/cpl/appwiz/rsrc.rc Mon Nov 5 17:53:11 2007 @@ -3,3 +3,4 @@ #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/ru-RU.rc"

1 0

[gedmurphy] 30176: various rough additions towards a working dialog
by gedmurphy＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: gedmurphy Date: Mon Nov 5 17:39:24 2007 New Revision: 30176 URL: http://svn.reactos.org/svn/reactos?rev=30176&view=rev Log: various rough additions towards a working dialog Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/lang/en-US.rc trunk/reactos/base/applications/mstsc/resource.h trunk/reactos/base/applications/mstsc/rsrc.rc trunk/reactos/base/applications/mstsc/win32.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Mon Nov 5 17:39:24 2007 @@ -1,4 +1,4 @@ -/* -*- c-basic-offset: 8 -*- +/* rdesktop: A Remote Desktop Protocol client. Connection settings dialog Copyright (C) Ged Murphy 2007 @@ -20,10 +20,48 @@ #include <windows.h> #include <commctrl.h> +#include <stdio.h> +#include <tchar.h> #include "resource.h" +/* As slider control can't contain user data, we have to keep an + * array of RESOLUTION_INFO to have our own associated data. + */ +typedef struct _RESOLUTION_INFO +{ + DWORD dmPelsWidth; + DWORD dmPelsHeight; +} RESOLUTION_INFO, *PRESOLUTION_INFO; + +typedef struct _SETTINGS_ENTRY +{ + struct _SETTINGS_ENTRY *Blink; + struct _SETTINGS_ENTRY *Flink; + DWORD dmBitsPerPel; + DWORD dmPelsWidth; + DWORD dmPelsHeight; +} SETTINGS_ENTRY, *PSETTINGS_ENTRY; + +typedef struct _DISPLAY_DEVICE_ENTRY +{ + struct _DISPLAY_DEVICE_ENTRY *Flink; + LPTSTR DeviceDescription; + LPTSTR DeviceName; + LPTSTR DeviceKey; + LPTSTR DeviceID; + DWORD DeviceStateFlags; + PSETTINGS_ENTRY Settings; /* sorted by increasing dmPelsHeight, BPP */ + DWORD SettingsCount; + PRESOLUTION_INFO Resolutions; + DWORD ResolutionsCount; + PSETTINGS_ENTRY CurrentSettings; /* Points into Settings list */ + SETTINGS_ENTRY InitialSettings; +} DISPLAY_DEVICE_ENTRY, *PDISPLAY_DEVICE_ENTRY; + typedef struct _INFO { + PDISPLAY_DEVICE_ENTRY DisplayDeviceList; + PDISPLAY_DEVICE_ENTRY CurrentDisplayDevice; HWND hSelf; HWND hTab; HWND hGeneralPage; @@ -65,7 +103,7 @@ SetWindowPos(pInfo->hGeneralPage, NULL, 15, - 122, + 110, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); @@ -138,13 +176,326 @@ } +static PSETTINGS_ENTRY +GetPossibleSettings(IN LPCTSTR DeviceName, OUT DWORD* pSettingsCount, OUT PSETTINGS_ENTRY* CurrentSettings) +{ + DEVMODE devmode; + DWORD NbSettings = 0; + DWORD iMode = 0; + DWORD dwFlags = 0; + PSETTINGS_ENTRY Settings = NULL; + HDC hDC; + PSETTINGS_ENTRY Current; + DWORD bpp, xres, yres, checkbpp; + DWORD curDispFreq; + + + /* Get current settings */ + *CurrentSettings = NULL; + hDC = CreateIC(NULL, DeviceName, NULL, NULL); + bpp = GetDeviceCaps(hDC, PLANES); + bpp *= GetDeviceCaps(hDC, BITSPIXEL); + xres = GetDeviceCaps(hDC, HORZRES); + yres = GetDeviceCaps(hDC, VERTRES); + DeleteDC(hDC); + + /* List all settings */ + devmode.dmSize = (WORD)sizeof(DEVMODE); + devmode.dmDriverExtra = 0; + + if (!EnumDisplaySettingsEx(DeviceName, ENUM_CURRENT_SETTINGS, &devmode, dwFlags)) + return NULL; + + curDispFreq = devmode.dmDisplayFrequency; + + while (EnumDisplaySettingsEx(DeviceName, iMode, &devmode, dwFlags)) + { + if ((devmode.dmBitsPerPel==8 || + devmode.dmBitsPerPel==16 || + devmode.dmBitsPerPel==24 || + devmode.dmBitsPerPel==32) && + devmode.dmDisplayFrequency==curDispFreq) + { + checkbpp=1; + } + else + checkbpp=0; + + if (devmode.dmPelsWidth < 640 || + devmode.dmPelsHeight < 480 || checkbpp == 0) + { + iMode++; + continue; + } + + Current = HeapAlloc(GetProcessHeap(), 0, sizeof(SETTINGS_ENTRY)); + if (Current != NULL) + { + /* Sort resolutions by increasing height, and BPP */ + PSETTINGS_ENTRY Previous = NULL; + PSETTINGS_ENTRY Next = Settings; + Current->dmPelsWidth = devmode.dmPelsWidth; + Current->dmPelsHeight = devmode.dmPelsHeight; + Current->dmBitsPerPel = devmode.dmBitsPerPel; + while (Next != NULL && ( + Next->dmPelsWidth < Current->dmPelsWidth || + (Next->dmPelsWidth == Current->dmPelsWidth && Next->dmPelsHeight < Current->dmPelsHeight) || + (Next->dmPelsHeight == Current->dmPelsHeight && + Next->dmPelsWidth == Current->dmPelsWidth && + Next->dmBitsPerPel < Current->dmBitsPerPel ))) + { + Previous = Next; + Next = Next->Flink; + } + Current->Blink = Previous; + Current->Flink = Next; + if (Previous == NULL) + Settings = Current; + else + Previous->Flink = Current; + if (Next != NULL) + Next->Blink = Current; + if (devmode.dmPelsWidth == xres && devmode.dmPelsHeight == yres && devmode.dmBitsPerPel == bpp) + { + *CurrentSettings = Current; + } + NbSettings++; + } + iMode++; + } + + *pSettingsCount = NbSettings; + return Settings; +} + + +AddDisplayDevice(PINFO pInfo, PDISPLAY_DEVICE DisplayDevice) +{ + PDISPLAY_DEVICE_ENTRY newEntry = NULL; + LPTSTR description = NULL; + LPTSTR name = NULL; + LPTSTR key = NULL; + LPTSTR devid = NULL; + DWORD descriptionSize, nameSize, keySize, devidSize; + PSETTINGS_ENTRY Current; + DWORD ResolutionsCount = 1; + DWORD i; + + newEntry = HeapAlloc(GetProcessHeap(), + 0, + sizeof(DISPLAY_DEVICE_ENTRY)); + if (!newEntry) goto ByeBye; + ZeroMemory(newEntry, sizeof(DISPLAY_DEVICE_ENTRY)); + + newEntry->Settings = GetPossibleSettings(DisplayDevice->DeviceName, + &newEntry->SettingsCount, + &newEntry->CurrentSettings); + if (!newEntry->Settings) goto ByeBye; + + newEntry->InitialSettings.dmPelsWidth = newEntry->CurrentSettings->dmPelsWidth; + newEntry->InitialSettings.dmPelsHeight = newEntry->CurrentSettings->dmPelsHeight; + newEntry->InitialSettings.dmBitsPerPel = newEntry->CurrentSettings->dmBitsPerPel; + + /* Count different resolutions */ + for (Current = newEntry->Settings; Current != NULL; Current = Current->Flink) + { + if (Current->Flink != NULL && + ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) && + (Current->dmPelsHeight != Current->Flink->dmPelsHeight))) + { + ResolutionsCount++; + } + } + + newEntry->Resolutions = HeapAlloc(GetProcessHeap(), + 0, + ResolutionsCount * sizeof(RESOLUTION_INFO)); + if (!newEntry->Resolutions) goto ByeBye; + + newEntry->ResolutionsCount = ResolutionsCount; + + /* Fill resolutions infos */ + for (Current = newEntry->Settings, i = 0; Current != NULL; Current = Current->Flink) + { + if (Current->Flink == NULL || + (Current->Flink != NULL && + ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) && + (Current->dmPelsHeight != Current->Flink->dmPelsHeight)))) + { + newEntry->Resolutions[i].dmPelsWidth = Current->dmPelsWidth; + newEntry->Resolutions[i].dmPelsHeight = Current->dmPelsHeight; + i++; + } + } + descriptionSize = (_tcslen(DisplayDevice->DeviceString) + 1) * sizeof(TCHAR); + description = HeapAlloc(GetProcessHeap(), 0, descriptionSize); + if (!description) goto ByeBye; + + nameSize = (_tcslen(DisplayDevice->DeviceName) + 1) * sizeof(TCHAR); + name = HeapAlloc(GetProcessHeap(), 0, nameSize); + if (!name) goto ByeBye; + + keySize = (_tcslen(DisplayDevice->DeviceKey) + 1) * sizeof(TCHAR); + key = HeapAlloc(GetProcessHeap(), 0, keySize); + if (!key) goto ByeBye; + + devidSize = (_tcslen(DisplayDevice->DeviceID) + 1) * sizeof(TCHAR); + devid = HeapAlloc(GetProcessHeap(), 0, devidSize); + if (!devid) goto ByeBye; + + memcpy(description, DisplayDevice->DeviceString, descriptionSize); + memcpy(name, DisplayDevice->DeviceName, nameSize); + memcpy(key, DisplayDevice->DeviceKey, keySize); + memcpy(devid, DisplayDevice->DeviceID, devidSize); + newEntry->DeviceDescription = description; + newEntry->DeviceName = name; + newEntry->DeviceKey = key; + newEntry->DeviceID = devid; + newEntry->DeviceStateFlags = DisplayDevice->StateFlags; + newEntry->Flink = pInfo->DisplayDeviceList; + pInfo->DisplayDeviceList = newEntry; + return TRUE; + +ByeBye: + if (newEntry != NULL) + { + if (newEntry->Settings != NULL) + { + Current = newEntry->Settings; + while (Current != NULL) + { + PSETTINGS_ENTRY Next = Current->Flink; + HeapFree(GetProcessHeap(), 0, Current); + Current = Next; + } + } + if (newEntry->Resolutions != NULL) + HeapFree(GetProcessHeap(), 0, newEntry->Resolutions); + HeapFree(GetProcessHeap(), 0, newEntry); + } + if (description != NULL) + HeapFree(GetProcessHeap(), 0, description); + if (name != NULL) + HeapFree(GetProcessHeap(), 0, name); + if (key != NULL) + HeapFree(GetProcessHeap(), 0, key); + if (devid != NULL) + HeapFree(GetProcessHeap(), 0, devid); + return FALSE; +} + +static VOID +UpdateDisplay(IN HWND hwndDlg, PINFO pGlobalData, IN BOOL bUpdateThumb) +{ + TCHAR Buffer[64]; + TCHAR Pixel[64]; + DWORD index; + + LoadString(hInst, IDS_PIXEL, Pixel, sizeof(Pixel) / sizeof(TCHAR)); + _stprintf(Buffer, Pixel, pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth, pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight, Pixel); + //SendDlgItemMessage(pGlobalData->hDisplayPage, IDC_SETTINGS_RESOLUTION_TEXT, WM_SETTEXT, 0, (LPARAM)Buffer); + SetDlgItemText(pGlobalData->hDisplayPage, pGlobalData->hDisplayPage, Buffer); + + if (LoadString(hInst, (2900 + pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) + SendDlgItemMessage(hwndDlg, IDC_GEOSLIDER, CB_SELECTSTRING, (WPARAM)-1, (LPARAM)Buffer); +} + + +static VOID +FillResolutionsAndColors(PINFO pInfo) +{ + PSETTINGS_ENTRY Current; + DWORD index, i, num; + DWORD MaxBpp = 0; + UINT HighBpp; + + pInfo->CurrentDisplayDevice = pInfo->DisplayDeviceList; /* Update global variable */ + + /* find max bpp */ + SendDlgItemMessage(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_RESETCONTENT, + 0, + 0); + for (Current = pInfo->DisplayDeviceList->Settings; Current != NULL; Current = Current->Flink) + { + if (Current->dmBitsPerPel > MaxBpp) + MaxBpp = Current->dmBitsPerPel; + } + switch (MaxBpp) + { + case 32: + case 24: HighBpp = IDS_HIGHCOLOR24; break; + case 16: HighBpp = IDS_HIGHCOLOR16; break; + case 8: HighBpp = IDS_256COLORS; break; + } + + /* Fill color depths combo box */ + SendDlgItemMessage(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_RESETCONTENT, + 0, + 0); + num = HighBpp - IDS_256COLORS; + + for (i = 0, Current = pInfo->DisplayDeviceList->Settings; + i <= num && Current != NULL; + i++, Current = Current->Flink) + { + TCHAR Buffer[64]; + if (LoadString(hInst, + (IDS_256COLORS + i), + Buffer, + sizeof(Buffer) / sizeof(TCHAR))) + { + index = (DWORD)SendDlgItemMessage(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_FINDSTRINGEXACT, + -1, + (LPARAM)Buffer); + if (index == (DWORD)CB_ERR) + { + index = (DWORD)SendDlgItemMessage(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_ADDSTRING, + 0, + (LPARAM)Buffer); + SendDlgItemMessage(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_SETITEMDATA, + index, + Current->dmBitsPerPel); + } + } + } + + /* Fill resolutions slider */ + SendDlgItemMessage(pInfo->hDisplayPage, + IDC_GEOSLIDER, + TBM_CLEARTICS, + TRUE, + 0); + SendDlgItemMessage(pInfo->hDisplayPage, + IDC_GEOSLIDER, + TBM_SETRANGE, + TRUE, + MAKELONG(0, pInfo->DisplayDeviceList->ResolutionsCount)); //extra 1 for full screen + + UpdateDisplay(pInfo->hDisplayPage, pInfo, TRUE); +} + + static VOID DisplayOnInit(PINFO pInfo) { + DISPLAY_DEVICE displayDevice; + DWORD iDevNum = 0; + BOOL GotDev = FALSE; + SetWindowPos(pInfo->hDisplayPage, NULL, 15, - 122, + 110, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); @@ -191,6 +542,21 @@ sizeof(BITMAP), &pInfo->bitmap); } + + /* Get video cards list */ + displayDevice.cb = (DWORD)sizeof(DISPLAY_DEVICE); + while (EnumDisplayDevices(NULL, iDevNum, &displayDevice, 0x1)) + { + if ((displayDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) != 0) + { + if (AddDisplayDevice(pInfo, &displayDevice)) + GotDev = TRUE; + } + iDevNum++; + } + + if (GotDev) + FillResolutionsAndColors(pInfo); } @@ -238,19 +604,45 @@ break; } - case WM_CLOSE: - { - if (pInfo->hRemote) - DestroyIcon(pInfo->hRemote); - - if (pInfo->hColor) - DestroyIcon(pInfo->hColor); - - if (pInfo->hSpectrum) - DeleteObject(pInfo->hSpectrum); - - break; - } + case WM_HSCROLL: + { + switch (LOWORD(wParam)) + { + case TB_LINEUP: + case TB_LINEDOWN: + case TB_PAGEUP: + case TB_PAGEDOWN: + case TB_TOP: + case TB_BOTTOM: + case TB_ENDTRACK: + { + DWORD newPosition = (DWORD)SendDlgItemMessage(hDlg, IDC_GEOSLIDER, TBM_GETPOS, 0, 0); + //OnResolutionChanged(hwndDlg, pGlobalData, newPosition, TRUE); + UpdateDisplay(hDlg, pInfo, TRUE); + break; + } + + case TB_THUMBTRACK: + //OnResolutionChanged(hDlg, pInfo, HIWORD(wParam), FALSE); + UpdateDisplay(hDlg, pInfo, TRUE); + break; + } + break; + } + + case WM_CLOSE: + { + if (pInfo->hRemote) + DestroyIcon(pInfo->hRemote); + + if (pInfo->hColor) + DestroyIcon(pInfo->hColor); + + if (pInfo->hSpectrum) + DeleteObject(pInfo->hSpectrum); + + break; + } break; } Modified: trunk/reactos/base/applications/mstsc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/en-US.rc Mon Nov 5 17:39:24 2007 @@ -27,22 +27,23 @@ ICON "", IDC_REMICON, 15,19,20,20 ICON "", IDC_COLORSICON, 15,98,20,20 LTEXT "Set the screen size of your remote desktop. Drag the slider to the far right to go fullscreen",IDC_STATIC,53,22,175,21 - CONTROL "",IDC_GEOSLIDER,"msctls_trackbar32",WS_TABSTOP,56,49,124,15 - COMBOBOX IDC_BPPCOMBO,56,102,128,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,13 + CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 + COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 LTEXT "Note: Settings on the remote computer might override this setting.",IDC_STATIC,56,143,165,18 - LTEXT "Less",IDC_STATIC,35,52,15,8 - LTEXT "More",IDC_STATIC,189,51,17,8 + LTEXT "Less",IDC_STATIC,35,42,15,8 + LTEXT "More",IDC_STATIC,189,42,17,8 + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 124, 10, SS_CENTER END -IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 277 +IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 267 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Remote Desktop Connection" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Connect",IDOK,147,256,50,14 - PUSHBUTTON "Cancel",IDCANCEL,203,256,50,14 - CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,54,246,198 + DEFPUSHBUTTON "Connect",IDOK,147,249,50,14 + PUSHBUTTON "Cancel",IDCANCEL,203,249,50,14 + CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,54,246,190 END @@ -50,4 +51,10 @@ BEGIN IDS_TAB_GENERAL "General" IDS_TAB_DISPLAY "Display" + IDS_256COLORS "256 Colors" + IDS_HIGHCOLOR15 "High Color (15 bit)" + IDS_HIGHCOLOR16 "High Color (16 bit)" + IDS_HIGHCOLOR24 "True Color (24 bit)" + IDS_PIXEL "%lux%lu Pixels" + IDS_FULLSCREEN "Full Screen" END Modified: trunk/reactos/base/applications/mstsc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… ============================================================================== --- trunk/reactos/base/applications/mstsc/resource.h (original) +++ trunk/reactos/base/applications/mstsc/resource.h Mon Nov 5 17:39:24 2007 @@ -1,6 +1,7 @@ +#define IDC_STATIC -1 + #define IDD_CONNECTDIALOG 101 #define IDD_GENERAL 105 -#define IDS_TAB_DISPLAY 106 #define IDD_DISPLAY 107 #define IDC_TAB 1003 #define IDC_SERVERCOMBO 1007 @@ -9,6 +10,7 @@ #define IDC_OPEN 1010 #define IDC_GEOSLIDER 1012 #define IDC_BPPCOMBO 1013 +#define IDC_SETTINGS_RESOLUTION_TEXT 1014 #define IDC_LOGONICON 1016 #define IDC_CONNICON 1017 @@ -19,10 +21,19 @@ #define IDB_SPECT 1017 #define IDC_COLORIMAGE 1018 -#define IDS_TAB_GENERAL 1104 -#define IDC_STATIC -1 #define IDI_LOGON 2000 #define IDI_CONN 2001 #define IDI_REMOTE 2002 #define IDI_COLORS 2003 +#define IDI_MSTSC 2004 + +#define IDS_TAB_DISPLAY 3000 +#define IDS_TAB_GENERAL 3001 +#define IDS_PIXEL 3006 +#define IDS_FULLSCREEN 3007 + +#define IDS_256COLORS 4000 +#define IDS_HIGHCOLOR15 4001 +#define IDS_HIGHCOLOR16 4002 +#define IDS_HIGHCOLOR24 4003 Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… ============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc Mon Nov 5 17:39:24 2007 @@ -3,8 +3,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -//1 24 DISCARDABLE "manifest.xml" +1 24 DISCARDABLE "manifest.xml" +IDI_MSTSC ICON "res/mstsc.ico" IDI_LOGON ICON "res/logon.ico" IDI_CONN ICON "res/connection.ico" IDI_REMOTE ICON "res/remote.ico" Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c (original) +++ trunk/reactos/base/applications/mstsc/win32.c Mon Nov 5 17:39:24 2007 @@ -18,18 +18,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef _WIN32_WCE -#define MYWINCE -#endif - #include <winsock2.h> /* winsock2.h first */ #include <windows.h> -#ifdef MYWINCE -#include <aygshell.h> /* aygshell.lib */ -#endif /* MYWINCE */ #include <winuser.h> #include <stdio.h> #include "uimain.h" +#include "resource.h" extern char g_username[]; extern char g_hostname[]; @@ -69,9 +63,6 @@ static int g_clip_bottom = 600; static RECT g_wnd_clip; /* this client area of whats actually visable */ /* set from WM_SIZE */ -#ifdef MYWINCE -static int g_sip_up = 0; -#endif /*****************************************************************************/ static void @@ -665,79 +656,6 @@ return 0; } -#ifdef MYWINCE -/*****************************************************************************/ -static LRESULT -handle_WM_SETTINGCHANGE(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - SIPINFO si; - SHMENUBARINFO mb; - int x; - int y; - int w; - int h; - int style; - - ZeroMemory(&si, sizeof(SIPINFO)); - si.cbSize = sizeof(SIPINFO); - SHSipInfo(SPI_GETSIPINFO, lParam, &si, 0); - x = si.rcVisibleDesktop.left; - y = si.rcVisibleDesktop.top; - w = si.rcVisibleDesktop.right - x; - h = si.rcVisibleDesktop.bottom - y; - /* get rid of menu */ - DestroyWindow(SHFindMenuBar(g_Wnd)); - if (si.fdwFlags & SIPF_ON) - { - g_sip_up = 1; /* used for WM_SETFOCUS */ - ZeroMemory(&mb, sizeof(SHMENUBARINFO)); - mb.cbSize = sizeof(SHMENUBARINFO); - mb.hwndParent = g_Wnd; - mb.dwFlags = SHCMBF_EMPTYBAR; - SHCreateMenuBar(&mb); - MoveWindow(g_Wnd, x, y, w, h, FALSE); - SHFullScreen(g_Wnd, SHFS_SHOWTASKBAR | SHFS_SHOWSIPBUTTON | - SHFS_SHOWSTARTICON); - } - else - { - g_sip_up = 0; - if (g_fullscreen) - { - MoveWindow(g_Wnd, 0, 0, g_screen_width, g_screen_height, FALSE); - } - else - { - MoveWindow(g_Wnd, x, y, w, h, FALSE); - } - if ((g_fullscreen && g_width <= g_screen_width && - g_height <= g_screen_height) || - (!g_fullscreen && g_width <= w && g_height <= h)) - { - style = GetWindowLong(g_Wnd, GWL_STYLE); - if (style & WS_HSCROLL) - { - style &= ~WS_HSCROLL; - style &= ~WS_VSCROLL; - SetWindowLong(g_Wnd, GWL_STYLE, style); - g_xscroll = 0; - g_yscroll = 0; - } - } - if (g_fullscreen) - { - SHFullScreen(g_Wnd, SHFS_HIDETASKBAR | SHFS_SHOWSIPBUTTON | - SHFS_SHOWSTARTICON); - } - else - { - SHFullScreen(g_Wnd, SHFS_SHOWTASKBAR | SHFS_SHOWSIPBUTTON | - SHFS_SHOWSTARTICON); - } - } - return 0; -} -#endif /* MYWINCE */ /*****************************************************************************/ LRESULT CALLBACK @@ -793,18 +711,8 @@ return handle_WM_HSCROLL(hWnd, message, wParam, lParam); case WM_VSCROLL: return handle_WM_VSCROLL(hWnd, message, wParam, lParam); -#ifdef MYWINCE - case WM_SETTINGCHANGE: - return handle_WM_SETTINGCHANGE(hWnd, message, wParam, lParam); -#endif /* MYWINCE */ case WM_SETFOCUS: mi_check_modifier(); -#ifdef MYWINCE - if (g_sip_up) - { - SHSipPreference(hWnd, SIP_UP); - } -#endif return DefWindowProc(hWnd, message, wParam, lParam); default: return DefWindowProc(hWnd, message, wParam, lParam); @@ -854,6 +762,8 @@ str_to_uni(classname, "rdesktop"); wc.lpszClassName = classname; str_to_uni(caption, "ReactOS Remote Desktop"); + wc.hIcon = LoadIcon(g_Instance, + MAKEINTRESOURCE(IDI_MSTSC)); /* Register the window class. */ if (!RegisterClass(&wc)) { @@ -863,21 +773,7 @@ rc.right = rc.left + UI_MIN(g_width, g_screen_width); rc.top = 0; rc.bottom = rc.top + UI_MIN(g_height, g_screen_height); -#ifdef MYWINCE - SHInitExtraControls(); - x = CW_USEDEFAULT; - y = CW_USEDEFAULT; - w = CW_USEDEFAULT; - h = CW_USEDEFAULT; - style = WS_VISIBLE; - if (g_fullscreen) - { - x = 0; - y = 0; - w = g_screen_width; - h = g_screen_height; - } -#else /* MYWINCE */ + if (g_fullscreen) { style = WS_POPUP; @@ -896,7 +792,7 @@ y = CW_USEDEFAULT; w = rc.right - rc.left; h = rc.bottom - rc.top; -#endif /* MYWINCE */ + g_Wnd = CreateWindow(wc.lpszClassName, caption, style, x, y, w, h, (HWND) NULL, (HMENU) NULL, g_Instance, @@ -915,26 +811,9 @@ } UpdateWindow(g_Wnd); -#ifdef MYWINCE - if (g_fullscreen) - { - SHFullScreen(g_Wnd, SHFS_HIDETASKBAR | SHFS_SHOWSIPBUTTON | - SHFS_SHOWSTARTICON); - } - else - { - SHFullScreen(g_Wnd, SHFS_SHOWTASKBAR | SHFS_SHOWSIPBUTTON | - SHFS_SHOWSTARTICON); - } -#endif /* MYWINCE */ - - /* WinCE doesn't have WSAAsyncSelect */ -#ifdef MYWINCE - SetTimer(g_Wnd, 1, 1000 / 60, 0); /* 60 per second */ -#else /* MYWINCE */ WSAAsyncSelect(g_tcp_sck, g_Wnd, WM_APP + 1, FD_READ); SetTimer(g_Wnd, 1, 333, 0); -#endif /* MYWINCE */ + return 1; } @@ -1151,7 +1030,7 @@ { state = 0; g_server_depth = atol(param1); - if (g_server_depth != 8 && g_server_depth != 15 && g_server_depth != 16) + if (g_server_depth != 8 && g_server_depth != 15 && g_server_depth != 16 && g_server_depth != 24) { mi_error("invalid server bpp\r\n"); } @@ -1207,31 +1086,19 @@ } else if (g_workarea) { -#ifdef MYWINCE - g_xoff = 0; - g_yoff = 0; - g_width = g_screen_width; - g_height = g_screen_height - 26; /* start menu size is 26 */ -#else /* MYWINCE */ g_xoff = GetSystemMetrics(SM_CXEDGE) * 2; g_yoff = GetSystemMetrics(SM_CYCAPTION) + GetSystemMetrics(SM_CYEDGE) * 2; g_width = g_screen_width; g_height = g_screen_height; g_height = (g_height - g_yoff) - g_xoff - 20; /* todo */ -#endif /* MYWINCE */ g_width_height_set = 1; } else { -#ifdef MYWINCE - g_xoff = 0; - g_yoff = 0; -#else /* MYWINCE */ g_xoff = GetSystemMetrics(SM_CXEDGE) * 2; g_yoff = GetSystemMetrics(SM_CYCAPTION) + GetSystemMetrics(SM_CYEDGE) * 2; -#endif /* MYWINCE */ } g_width = g_width & (~3); return 1; @@ -1260,11 +1127,8 @@ valueindex = 0; vname[vnameindex] = 0; value[valueindex] = 0; -#ifdef MYWINCE - str_to_uni(filename, "\\My Documents\\winrdesktop.ini"); -#else /* MYWINCE */ str_to_uni(filename, ".\\winrdesktop.ini"); -#endif /* MYWINCE */ + fd = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -1334,9 +1198,7 @@ { char param[256]; char param1[256]; -#ifndef MYWINCE TCHAR l_username[256]; -#endif DWORD size; int len; int i; @@ -1347,8 +1209,7 @@ strcpy(g_username, "pda"); /* get username and convert it from unicode */ size = 255; -#ifndef MYWINCE - /* WinCE doesn't have GetUserName */ + if (GetUserName(l_username, &size)) { for (i = size; i >= 0; i--) @@ -1361,7 +1222,7 @@ { mi_show_error("GetUserName"); } -#endif /* MYWINCE */ + /* get computer name */ if (gethostname(g_hostname, 255) != 0) { @@ -1605,12 +1466,8 @@ HRGN rgn; int ok_to_ScrollWindowEx; - /* WinCE can't scroll in 2 directions at once */ -#ifdef MYWINCE - ok_to_ScrollWindowEx = cx == 0 || cy == 0; -#else /* MYWINCE */ ok_to_ScrollWindowEx = 1; -#endif /* MYWINCE */ + if (!ok_to_ScrollWindowEx) { rgn = CreateRectRgn(x - g_xscroll, y - g_yscroll, @@ -1667,9 +1524,6 @@ int width, int height, unsigned char * andmask, unsigned char * xormask) { -#ifdef MYWINCE - return (void *) 1; -#else /* MYWINCE */ HCURSOR hCur; hCur = CreateCursor(g_Instance, x, y, width, height, andmask, xormask); @@ -1678,32 +1532,25 @@ hCur = LoadCursor(NULL, IDC_ARROW); } return hCur; -#endif /* MYWINCE */ } /*****************************************************************************/ void mi_destroy_cursor(void * cursor) { -#ifdef MYWINCE -#else /* MYWINCE */ if (g_cursor == cursor) { g_cursor = 0; } DestroyCursor(cursor); -#endif /* MYWINCE */ } /*****************************************************************************/ void mi_set_cursor(void * cursor) { -#ifdef MYWINCE -#else /* MYWINCE */ g_cursor = cursor; SetCursor(g_cursor); -#endif /* MYWINCE */ } /*****************************************************************************/

1 0

[peterw] 30175: - Add the last bit to scut.cmd, should behave properly now.
by peterw＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: peterw Date: Mon Nov 5 16:50:23 2007 New Revision: 30175 URL: http://svn.reactos.org/svn/reactos?rev=30175&view=rev Log: - Add the last bit to scut.cmd, should behave properly now. Modified: trunk/tools/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Mon Nov 5 16:50:23 2007 @@ -37,11 +37,25 @@ call "%_ROSBE_BASEDIR%\Tools\scut.exe" %* goto :EOC ) +if /i "%1" == "/?" ( + "%_ROSBE_BASEDIR%\Tools\scut.exe" %* + goto :EOC +) +if /i "%1" == "-h" ( + call "%_ROSBE_BASEDIR%\Tools\scut.exe" %* + goto :EOC +) +if /i "%1" == "--help" ( + call "%_ROSBE_BASEDIR%\Tools\scut.exe" %* + goto :EOC +) if not "%1" == "" ( for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools\scut.exe" %*"`) do ( if /i not "%%i" == "Default" ( - cd /d %%i - set _ROSBE_ROSSOURCEDIR=%%i + if exist "%%i\." ( + cd /d %%i + set _ROSBE_ROSSOURCEDIR=%%i + ) ) ) goto :EOC

1 0

[greatlrd] 30174: add 27 more guids for ksguid.a
by greatlrd＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: greatlrd Date: Mon Nov 5 16:19:44 2007 New Revision: 30174 URL: http://svn.reactos.org/svn/reactos?rev=30174&view=rev Log: add 27 more guids for ksguid.a Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/lib/sdk/ksguid/k… ============================================================================== --- branches/reactx/reactos/lib/sdk/ksguid/ksguid.c (original) +++ branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Mon Nov 5 16:19:44 2007 @@ -14,63 +14,90 @@ #include <basetyps.h> #include <guiddef.h> -DEFINE_GUID(KSDEGRADESETID_Standard, 0x9F564180, 0x704C, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSEVENTSETID_Connection, 0x7F4BCBE0, 0x9EA5, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSEVENTSETID_Clock, 0x364D8E20, 0x62C7, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_Clock, 0xDF12A4C0, 0xAC17, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_Stream, 0x65AABA60, 0x98AE, 0x11CF, 0xA1, 0x0D, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSPROPSETID_StreamInterface, 0x1FDD8EE1, 0x9CD3, 0x11D0, 0x82, 0xAA, 0x00, 0x00, 0xF8, 0x22, 0xFE, 0x8A); -DEFINE_GUID(KSPROPSETID_StreamAllocator, 0xCF6E4342, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSMETHODSETID_StreamAllocator, 0xCF6E4341, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSEVENTSETID_StreamAllocator, 0x75D95571, 0x073C, 0x11D0, 0xA1, 0x61, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSMEMORY_TYPE_DEVICE_UNKNOWN, 0x091BB639, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(KSMEMORY_TYPE_KERNEL_NONPAGED, 0x4A6D5FC4, 0x7895, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(KSMEMORY_TYPE_KERNEL_PAGED, 0xD833F8F8, 0x7894, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(KSMEMORY_TYPE_USER, 0x8CB0FC28, 0x7893, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(KSMEMORY_TYPE_SYSTEM, 0x091BB638, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(KSPROPSETID_Connection, 0x1D58C920, 0xAC9B, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_Quality, 0xD16AD380, 0xAC1A, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_NONE, 0x0F6417D6, 0xC318, 0x11D0, 0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_FILEHANDLE, 0x65E8773C, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_FILENAME, 0xAA797B40, 0xE974, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_NONE, 0xE436EB8E, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); -DEFINE_GUID(KSDATAFORMAT_TYPE_STREAM, 0xE436EB83, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); -DEFINE_GUID(KSNAME_TopologyNode, 0x0621061A, 0xEE75, 0x11D0, 0xB9, 0x15, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNAME_Allocator, 0x642F5D00, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSNAME_Clock, 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSNAME_Pin, 0x146F1A80, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSNAME_Filter, 0x9B365890, 0x165F, 0x11D0, 0xA1, 0x95, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSPROPSETID_Pin, 0x8C134960, 0x51AD, 0x11CF, 0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSMEDIUMSETID_Standard, 0x4747B320, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSINTERFACESETID_FileIo, 0x8C6F932C, 0xE771, 0x11D0, 0xB8, 0xFF, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSINTERFACESETID_Standard, 0x1A8766A0, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSTIME_FORMAT_MEDIA_TIME, 0x7B785574, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); -DEFINE_GUID(KSTIME_FORMAT_FIELD, 0x7B785573, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); -DEFINE_GUID(KSTIME_FORMAT_SAMPLE, 0x7B785572, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); -DEFINE_GUID(KSTIME_FORMAT_BYTE, 0x7B785571, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); -DEFINE_GUID(KSTIME_FORMAT_FRAME, 0x7B785570, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); -DEFINE_GUID(KSCATEGORY_QUALITY, 0x97EBAACB, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_PROXY, 0x97EBAACA, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_CLOCK, 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_FILESYSTEM, 0x760FED5E, 0x9357, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_MEDIUMTRANSFORM, 0xCF1DDA2E, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_INTERFACETRANSFORM, 0xCF1DDA2D, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_COMMUNICATIONSTRANSFORM, 0xCF1DDA2C, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_DATATRANSFORM, 0x2EB07EA0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_DATADECOMPRESSOR, 0x2721AE20, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_DATACOMPRESSOR, 0x1E84C900, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_SPLITTER, 0x0A4252A0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_MIXER, 0xAD809C00, 0x7B88, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_RENDER, 0x65E8773E, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_CAPTURE, 0x65E8773D, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_BRIDGE, 0x085AFF00, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_GM, 0xAF627536, 0xE719, 0x11D2, 0x8A, 0x1D, 0x00, 0x60, 0x97, 0xD2, 0xDF, 0x5D); -DEFINE_GUID(KSPROPSETID_Topology, 0x720D4AC0, 0x7533, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_MediaSeeking, 0xEE904F0C, 0xD09B, 0x11D0, 0xAB, 0xE9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSMETHODSETID_StreamIo, 0x65D003CA, 0x1523, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSPROPSETID_General, 0x1464EDA5, 0x6A8F, 0x11D1, 0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSPROPTYPESETID_General, 0x97E99BA0, 0xBDEA, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(GUID_NULL, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); -DEFINE_GUID(BUSID_SoftwareDeviceEnumerator, 0x4747B320, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSNODETYPE_PHONE_LINE, 0xDFF21EE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_ECHO_CANCELING_SPEAKERPHONE, 0xDFF21DE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_ECHO_SUPPRESSING_SPEAKERPHONE, 0xDFF21DE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_SPEAKERPHONE_NO_ECHO_REDUCTION, 0xDFF21DE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_HEADSET, 0xDFF21DE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_HANDSET, 0xDFF21DE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_LOW_FREQUENCY_EFFECTS_SPEAKER, 0xDFF21CE7, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_COMMUNICATION_SPEAKER, 0xDFF21CE6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_ROOM_SPEAKER, 0xDFF21CE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DESKTOP_SPEAKER, 0xDFF21CE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_HEAD_MOUNTED_DISPLAY_AUDIO, 0xDFF21CE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_HEADPHONES, 0xDFF21CE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_SPEAKER, 0xDFF21CE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_MICROPHONE_ARRAY_PROCESSOR, 0x830A44F2, 0xA32D, 0x476B, 0xBE, 0x97, 0x42, 0x84, 0x56, 0x73, 0xB3, 0x5A); +DEFINE_GUID(KSNODETYPE_PROCESSING_MICROPHONE_ARRAY, 0xDFF21BE6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_MICROPHONE_ARRAY, 0xDFF21BE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_OMNI_DIRECTIONAL_MICROPHONE, 0xDFF21BE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_PERSONAL_MICROPHONE, 0xDFF21BE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DESKTOP_MICROPHONE, 0xDFF21BE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_MICROPHONE, 0xDFF21BE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCOMPONENTID_USBAUDIO, 0x8F1275F0, 0x26E9, 0x4264, 0xBA, 0x4D, 0x39, 0xFF, 0xF0, 0x1D, 0x94, 0xAA); +DEFINE_GUID(KSINTERFACESETID_Media, 0x3A13EB40, 0x30A7, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSMEDIUMSETID_VPBus, 0xA18C15EC, 0xCE43, 0x11D0, 0xAB, 0xE7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSMEDIUMSETID_MidiBus, 0x05908040, 0x3246, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Service, 0x3C0D501B, 0x140B, 0x11D1, 0xB4, 0x0F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNAME_Server, 0x3C0D501A, 0x140B, 0x11D1, 0xB4, 0x0F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(GUID_BUS_INTERFACE_MEDIUMS, 0x4EC35C3E, 0x201B, 0x11D2, 0x87, 0x45, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDEGRADESETID_Standard, 0x9F564180, 0x704C, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSEVENTSETID_Connection, 0x7F4BCBE0, 0x9EA5, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSEVENTSETID_Clock, 0x364D8E20, 0x62C7, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Clock, 0xDF12A4C0, 0xAC17, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Stream, 0x65AABA60, 0x98AE, 0x11CF, 0xA1, 0x0D, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSPROPSETID_StreamInterface, 0x1FDD8EE1, 0x9CD3, 0x11D0, 0x82, 0xAA, 0x00, 0x00, 0xF8, 0x22, 0xFE, 0x8A); +DEFINE_GUID(KSPROPSETID_StreamAllocator, 0xCF6E4342, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSMETHODSETID_StreamAllocator, 0xCF6E4341, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSEVENTSETID_StreamAllocator, 0x75D95571, 0x073C, 0x11D0, 0xA1, 0x61, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSMEMORY_TYPE_DEVICE_UNKNOWN, 0x091BB639, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSMEMORY_TYPE_KERNEL_NONPAGED, 0x4A6D5FC4, 0x7895, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSMEMORY_TYPE_KERNEL_PAGED, 0xD833F8F8, 0x7894, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSMEMORY_TYPE_USER, 0x8CB0FC28, 0x7893, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSMEMORY_TYPE_SYSTEM, 0x091BB638, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSPROPSETID_Connection, 0x1D58C920, 0xAC9B, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Quality, 0xD16AD380, 0xAC1A, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_NONE, 0x0F6417D6, 0xC318, 0x11D0, 0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_FILEHANDLE, 0x65E8773C, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_FILENAME, 0xAA797B40, 0xE974, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_NONE, 0xE436EB8E, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_TYPE_STREAM, 0xE436EB83, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSNAME_TopologyNode, 0x0621061A, 0xEE75, 0x11D0, 0xB9, 0x15, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNAME_Allocator, 0x642F5D00, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSNAME_Clock, 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSNAME_Pin, 0x146F1A80, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSNAME_Filter, 0x9B365890, 0x165F, 0x11D0, 0xA1, 0x95, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSPROPSETID_Pin, 0x8C134960, 0x51AD, 0x11CF, 0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSMEDIUMSETID_Standard, 0x4747B320, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSINTERFACESETID_FileIo, 0x8C6F932C, 0xE771, 0x11D0, 0xB8, 0xFF, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSINTERFACESETID_Standard, 0x1A8766A0, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSTIME_FORMAT_MEDIA_TIME, 0x7B785574, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); +DEFINE_GUID(KSTIME_FORMAT_FIELD, 0x7B785573, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); +DEFINE_GUID(KSTIME_FORMAT_SAMPLE, 0x7B785572, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); +DEFINE_GUID(KSTIME_FORMAT_BYTE, 0x7B785571, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); +DEFINE_GUID(KSTIME_FORMAT_FRAME, 0x7B785570, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); +DEFINE_GUID(KSCATEGORY_QUALITY, 0x97EBAACB, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_PROXY, 0x97EBAACA, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_CLOCK, 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_FILESYSTEM, 0x760FED5E, 0x9357, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_MEDIUMTRANSFORM, 0xCF1DDA2E, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_INTERFACETRANSFORM, 0xCF1DDA2D, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_COMMUNICATIONSTRANSFORM, 0xCF1DDA2C, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_DATATRANSFORM, 0x2EB07EA0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_DATADECOMPRESSOR, 0x2721AE20, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_DATACOMPRESSOR, 0x1E84C900, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_SPLITTER, 0x0A4252A0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_MIXER, 0xAD809C00, 0x7B88, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_RENDER, 0x65E8773E, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_CAPTURE, 0x65E8773D, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_BRIDGE, 0x085AFF00, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_GM, 0xAF627536, 0xE719, 0x11D2, 0x8A, 0x1D, 0x00, 0x60, 0x97, 0xD2, 0xDF, 0x5D); +DEFINE_GUID(KSPROPSETID_Topology, 0x720D4AC0, 0x7533, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_MediaSeeking, 0xEE904F0C, 0xD09B, 0x11D0, 0xAB, 0xE9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSMETHODSETID_StreamIo, 0x65D003CA, 0x1523, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSPROPSETID_General, 0x1464EDA5, 0x6A8F, 0x11D1, 0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSPROPTYPESETID_General, 0x97E99BA0, 0xBDEA, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(GUID_NULL, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); +DEFINE_GUID(BUSID_SoftwareDeviceEnumerator, 0x4747B320, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00);

1 0

[fireball] 30173: Dmitry Chapyshev <lentind@yandex.ru> - Change sizes of some dialog windows(in all language resources) and controls, so that match generic UI considerations in Windows. - Change sizes of some dialog windows, so that extensions fit in them (in all language resources). - Make it look better in general.
by fireball＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: fireball Date: Mon Nov 5 16:17:07 2007 New Revision: 30173 URL: http://svn.reactos.org/svn/reactos?rev=30173&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Change sizes of some dialog windows(in all language resources) and controls, so that match generic UI considerations in Windows. - Change sizes of some dialog windows, so that extensions fit in them (in all language resources). - Make it look better in general. Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/eo-EO.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KO.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/wa-WA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/eo-… Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… Modified: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nb-… Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/wa-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-…

1 0

[fireball] 30172: - Add more debug prints in failure cases.
by fireball＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: fireball Date: Mon Nov 5 16:06:53 2007 New Revision: 30172 URL: http://svn.reactos.org/svn/reactos?rev=30172&view=rev Log: - Add more debug prints in failure cases. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Mon Nov 5 16:06:53 2007 @@ -1097,7 +1097,10 @@ FirstConfigCall); if (!NT_SUCCESS(Status)) + { + DPRINT1("SpiCreatePortConfig() failed with Status 0x%08X\n", Status); break; + } /* Allocate and initialize port configuration info */ PortConfigSize = (sizeof(PORT_CONFIGURATION_INFORMATION) + @@ -5600,8 +5603,13 @@ else { /* Info was not found, exit */ + DPRINT1("ZwOpenKey() failed with Status=0x%08X\n", Status); return STATUS_DEVICE_DOES_NOT_EXIST; } + } + else + { + DPRINT1("ZwOpenKey() failed with Status=0x%08X\n", Status); } }

1 0

[peterw] 30171: - Very quickly, make scut.exe create it's file if needed and remoce the srclist.txt from svn.
by peterw＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: peterw Date: Mon Nov 5 16:04:18 2007 New Revision: 30171 URL: http://svn.reactos.org/svn/reactos?rev=30171&view=rev Log: - Very quickly, make scut.exe create it's file if needed and remoce the srclist.txt from svn. Removed: trunk/tools/RosBE-Windows/Appdata/ Modified: trunk/tools/RosBE-Windows/Tools/scut.c Modified: trunk/tools/RosBE-Windows/Tools/scut.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/scut.c?r… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/scut.c (original) +++ trunk/tools/RosBE-Windows/Tools/scut.c Mon Nov 5 16:04:18 2007 @@ -25,6 +25,7 @@ char shortcutfile[260]; PSHORTCUT addshortcut(PSHORTCUT ptr, char* name, char* path); +void checkfile(void); int checkname(PSHORTCUT head, char* name); int checkpath(char* path); // Alters path by fully expanding it. void defaultshortcut(char* name); @@ -44,6 +45,7 @@ strcpy(shortcutfile, getenv("APPDATA")); strcat(shortcutfile, "\\RosBE\\srclist.txt"); + checkfile(); if (argc > 4) { @@ -324,6 +326,36 @@ return ptr; } +void checkfile(void) +{ + FILE *FILE; + + FILE = fopen(shortcutfile, "r"); + if (!FILE) + { + FILE = fopen(shortcutfile, "w"); + if (!FILE) + { + fprintf(stderr, "%s: Error creating file.\n", programname); + } + else + { + fprintf(FILE, "Default,Default\n"); + if (fclose(FILE)) + { + fprintf(stderr, "%s: Error closing file.\n", programname); + } + } + } + else + { + if (fclose(FILE)) + { + fprintf(stderr, "%s: Error closing file.\n", programname); + } + } +} + int checkname(PSHORTCUT head, char* name) { PSHORTCUT current = head;

1 0

[fireball] 30170: - SeSet/QuerySecurityAccessMask() should initialize DesiredAccess to 0 (inspired by 30154).
by fireball＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: fireball Date: Mon Nov 5 15:58:03 2007 New Revision: 30170 URL: http://svn.reactos.org/svn/reactos?rev=30170&view=rev Log: - SeSet/QuerySecurityAccessMask() should initialize DesiredAccess to 0 (inspired by 30154). Modified: trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=30… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c (original) +++ trunk/reactos/ntoskrnl/se/semgr.c Mon Nov 5 15:58:03 2007 @@ -1362,6 +1362,8 @@ SeQuerySecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, OUT PACCESS_MASK DesiredAccess) { + *DesiredAccess = 0; + if (SecurityInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION)) { @@ -1377,6 +1379,8 @@ SeSetSecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, OUT PACCESS_MASK DesiredAccess) { + *DesiredAccess = 0; + if (SecurityInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION)) { *DesiredAccess |= WRITE_OWNER;

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007