Ros-diffs

ros-diffs@reactos.org

81390 discussions

[khornicek] 55012: [WINED3DCFG] Add a simple control panel applet for WineD3D runtime configuration.
by khornicek＠svn.reactos.org 19 Jan '12

19 Jan '12

Author: khornicek Date: Thu Jan 19 18:15:49 2012 New Revision: 55012 URL: http://svn.reactos.org/svn/reactos?rev=55012&view=rev Log: [WINED3DCFG] Add a simple control panel applet for WineD3D runtime configuration. Added: trunk/reactos/dll/cpl/wined3dcfg/ (with props) trunk/reactos/dll/cpl/wined3dcfg/CMakeLists.txt (with props) trunk/reactos/dll/cpl/wined3dcfg/general.c (with props) trunk/reactos/dll/cpl/wined3dcfg/lang/ (with props) trunk/reactos/dll/cpl/wined3dcfg/lang/en-US.rc (with props) trunk/reactos/dll/cpl/wined3dcfg/resource.h (with props) trunk/reactos/dll/cpl/wined3dcfg/resources/ (with props) trunk/reactos/dll/cpl/wined3dcfg/resources/wined3dcfg.ico (with props) trunk/reactos/dll/cpl/wined3dcfg/rsrc.rc (with props) trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.c (with props) trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.h (with props) trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rbuild (with props) trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc (with props) trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.spec (with props) Modified: trunk/reactos/dll/cpl/ (props changed) trunk/reactos/dll/cpl/CMakeLists.txt trunk/reactos/dll/cpl/cpl.rbuild Propchange: trunk/reactos/dll/cpl/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jan 19 18:15:49 2012 @@ -1,7 +1,8 @@ -GNUmakefile -*.vcproj -*.user *.cbp *.ncb +*.sln *.suo -*.sln +*.user +*.vcproj +GNUmakefile +wined3dcfg Modified: trunk/reactos/dll/cpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/dll/cpl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/CMakeLists.txt [iso-8859-1] Thu Jan 19 18:15:49 2012 @@ -18,3 +18,4 @@ add_subdirectory(telephon) add_subdirectory(timedate) add_subdirectory(usrmgr) +add_subdirectory(wined3dcfg) Modified: trunk/reactos/dll/cpl/cpl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/cpl.rbuild?rev=550… ============================================================================== --- trunk/reactos/dll/cpl/cpl.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/cpl.rbuild [iso-8859-1] Thu Jan 19 18:15:49 2012 @@ -55,4 +55,7 @@ <directory name="usrmgr"> <xi:include href="usrmgr/usrmgr.rbuild" /> </directory> +<directory name="wined3dcfg"> + <xi:include href="wined3dcfg/wined3dcfg.rbuild" /> +</directory> </group> Propchange: trunk/reactos/dll/cpl/wined3dcfg/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Jan 19 18:15:49 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/cpl/wined3dcfg/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/cpl/wined3dcfg/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/cpl/wined3dcfg/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/cpl/wined3dcfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/CMakeLi… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/CMakeLists.txt (added) +++ trunk/reactos/dll/cpl/wined3dcfg/CMakeLists.txt [iso-8859-1] Thu Jan 19 18:15:49 2012 @@ -1,0 +1,22 @@ + +set_rc_compiler() + +spec2def(wined3dcfg.cpl wined3dcfg.spec) + +add_library(wined3dcfg SHARED + wined3dcfg.c + general.c + wined3dcfg.rc + ${CMAKE_CURRENT_BINARY_DIR}/wined3dcfg.def) + +set_module_type(wined3dcfg cpl UNICODE) + +add_importlibs(wined3dcfg + msvcrt + user32 + comctl32 + advapi32 + kernel32) + +add_pch(wined3dcfg wined3dcfg.h) +add_cd_file(TARGET wined3dcfg DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/cpl/wined3dcfg/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/wined3dcfg/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/general… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/general.c (added) +++ trunk/reactos/dll/cpl/wined3dcfg/general.c [iso-8859-1] Thu Jan 19 18:15:49 2012 @@ -1,0 +1,163 @@ +#include "wined3dcfg.h" + +static LONG ReadSetting(HKEY hKey, PWCHAR szKey, PWCHAR szBuffer, DWORD dwSize) +{ + return RegQueryValueExW(hKey, szKey, NULL, NULL, (LPBYTE)szBuffer, &dwSize); +} + +static VOID SaveSetting(HKEY hKey, PWCHAR szKey, PWCHAR szState) +{ + RegSetValueExW(hKey, szKey, 0, REG_SZ, (LPBYTE)szState, (wcslen(szState) + 1) * sizeof(WCHAR)); +} + +static VOID InitSettings(HWND hWndDlg) +{ + HKEY hKey; + WCHAR szBuffer[MAX_KEY_LENGTH]; + DWORD dwSize = MAX_KEY_LENGTH; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, + KEY_WINE, + 0, + KEY_READ, + &hKey) != ERROR_SUCCESS) + { + return; + } + + if(ReadSetting(hKey, KEY_GLSL, szBuffer, dwSize) == ERROR_SUCCESS) + CheckDlgButton(hWndDlg, IDC_GLSL, (wcscmp(VALUE_DISABLED, szBuffer) != 0) ? BST_CHECKED : BST_UNCHECKED); + + if(ReadSetting(hKey, KEY_MULTISAMPLING, szBuffer, dwSize) == ERROR_SUCCESS) + CheckDlgButton(hWndDlg, IDC_MULTISAMPLING, (wcscmp(VALUE_ENABLED, szBuffer) == 0) ? BST_CHECKED : BST_UNCHECKED); + + if(ReadSetting(hKey, KEY_PIXELSHADERS, szBuffer, dwSize) == ERROR_SUCCESS) + CheckDlgButton(hWndDlg, IDC_PIXELSHADERS, (wcscmp(VALUE_ENABLED, szBuffer) == 0) ? BST_CHECKED : BST_UNCHECKED); + + if(ReadSetting(hKey, KEY_STRICTDRAWORDERING, szBuffer, dwSize) == ERROR_SUCCESS) + CheckDlgButton(hWndDlg, IDC_STRICTDRAWORDERING, (wcscmp(VALUE_ENABLED, szBuffer) == 0) ? BST_CHECKED : BST_UNCHECKED); + + if(ReadSetting(hKey, KEY_VERTEXSHADERS, szBuffer, dwSize) == ERROR_SUCCESS) + CheckDlgButton(hWndDlg, IDC_VERTEXSHADERS, (wcscmp(VALUE_NONE, szBuffer) != 0) ? BST_CHECKED : BST_UNCHECKED); + + SendDlgItemMessageW(hWndDlg, IDC_OFFSCREEN, CB_ADDSTRING, 0, (LPARAM)VALUE_FBO); + SendDlgItemMessageW(hWndDlg, IDC_OFFSCREEN, CB_ADDSTRING, 0, (LPARAM)VALUE_BACKBUFFER); + + SendDlgItemMessageW(hWndDlg, IDC_OFFSCREEN, CB_SETITEMDATA, ITEM_FBO, (LPARAM)ITEM_FBO); + SendDlgItemMessageW(hWndDlg, IDC_OFFSCREEN, CB_SETITEMDATA, ITEM_BACKBUFFER, (LPARAM)ITEM_BACKBUFFER); + + if(ReadSetting(hKey, KEY_OFFSCREEN, szBuffer, dwSize) == ERROR_SUCCESS && !wcscmp(VALUE_BACKBUFFER, szBuffer)) + SendDlgItemMessageW(hWndDlg, IDC_OFFSCREEN, CB_SETCURSEL, 1, 0); + else + SendDlgItemMessageW(hWndDlg, IDC_OFFSCREEN, CB_SETCURSEL, 0, 0); + + SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_ADDSTRING, 0, (LPARAM)VALUE_READTEX); + SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_ADDSTRING, 0, (LPARAM)VALUE_READDRAW); + SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_ADDSTRING, 0, (LPARAM)VALUE_DISABLED); + + SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_SETITEMDATA, (WPARAM)ITEM_READTEX, (LPARAM)ITEM_READTEX); + SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_SETITEMDATA, (WPARAM)ITEM_READDRAW, (LPARAM)ITEM_READDRAW); + SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_SETITEMDATA, (WPARAM)ITEM_DISABLED, (LPARAM)ITEM_DISABLED); + + SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_SETCURSEL, 0, 0); + + if(ReadSetting(hKey, KEY_LOCKING, szBuffer, dwSize) == ERROR_SUCCESS) + { + if(!wcscmp(VALUE_READDRAW, szBuffer)) + SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_SETCURSEL, 1, 0); + else if(!wcscmp(VALUE_DISABLED, szBuffer)) + SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_SETCURSEL, 2, 0); + } + + RegCloseKey(hKey); +} + +static VOID WriteSettings(HWND hWndDlg) +{ + HKEY hKey; + INT iCurSel; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, + KEY_WINE, + 0, + KEY_WRITE, + &hKey) != ERROR_SUCCESS) + { + return; + } + + SaveSetting(hKey, KEY_GLSL, (IsDlgButtonChecked(hWndDlg, IDC_GLSL) == BST_CHECKED) ? VALUE_ENABLED : VALUE_DISABLED); + SaveSetting(hKey, KEY_MULTISAMPLING, (IsDlgButtonChecked(hWndDlg, IDC_MULTISAMPLING) == BST_CHECKED) ? VALUE_ENABLED : VALUE_DISABLED); + SaveSetting(hKey, KEY_PIXELSHADERS, (IsDlgButtonChecked(hWndDlg, IDC_PIXELSHADERS) == BST_CHECKED) ? VALUE_ENABLED : VALUE_DISABLED); + SaveSetting(hKey, KEY_STRICTDRAWORDERING, (IsDlgButtonChecked(hWndDlg, IDC_STRICTDRAWORDERING) == BST_CHECKED) ? VALUE_ENABLED : VALUE_DISABLED); + SaveSetting(hKey, KEY_VERTEXSHADERS, (IsDlgButtonChecked(hWndDlg, IDC_VERTEXSHADERS) == BST_CHECKED) ? VALUE_ENABLED : VALUE_NONE); + + iCurSel = (INT)SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_GETCURSEL, 0, 0); + + if(iCurSel != CB_ERR) + { + iCurSel = (INT)SendDlgItemMessageW(hWndDlg, IDC_LOCKING, CB_GETITEMDATA, (WPARAM)iCurSel, 0); + + if(iCurSel == ITEM_READDRAW) + SaveSetting(hKey, KEY_LOCKING, VALUE_READDRAW); + else if(iCurSel == ITEM_DISABLED) + SaveSetting(hKey, KEY_LOCKING, VALUE_DISABLED); + else + SaveSetting(hKey, KEY_LOCKING, VALUE_READTEX); + } + + iCurSel = (INT)SendDlgItemMessageW(hWndDlg, IDC_OFFSCREEN, CB_GETCURSEL, 0, 0); + + if(iCurSel != CB_ERR) + { + iCurSel = (INT)SendDlgItemMessageW(hWndDlg, IDC_OFFSCREEN, CB_GETITEMDATA, (WPARAM)iCurSel, 0); + + if(iCurSel == ITEM_BACKBUFFER) + SaveSetting(hKey, KEY_OFFSCREEN, VALUE_BACKBUFFER); + else + SaveSetting(hKey, KEY_OFFSCREEN, VALUE_FBO); + } + + RegCloseKey(hKey); +} + + +INT_PTR CALLBACK GeneralPageProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + LPPSHNOTIFY lppsn; + + switch (uMsg) + { + case WM_INITDIALOG: + InitSettings(hWndDlg); + return TRUE; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_GLSL: + case IDC_LOCKING: + case IDC_MULTISAMPLING: + case IDC_OFFSCREEN: + case IDC_PIXELSHADERS: + case IDC_STRICTDRAWORDERING: + case IDC_VERTEXSHADERS: + PropSheet_Changed(GetParent(hWndDlg), hWndDlg); + break; + default: + break; + } + break; + + case WM_NOTIFY: + lppsn = (LPPSHNOTIFY)lParam; + if (lppsn->hdr.code == PSN_APPLY) + { + WriteSettings(hWndDlg); + return TRUE; + } + break; + } + + return FALSE; +} Propchange: trunk/reactos/dll/cpl/wined3dcfg/general.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/wined3dcfg/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Jan 19 18:15:49 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/cpl/wined3dcfg/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/cpl/wined3dcfg/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/cpl/wined3dcfg/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/cpl/wined3dcfg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/en… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/lang/en-US.rc (added) +++ trunk/reactos/dll/cpl/wined3dcfg/lang/en-US.rc [iso-8859-1] Thu Jan 19 18:15:49 2012 @@ -1,0 +1,27 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 21, 20 + GROUPBOX "Shaders", -1, 5, 35, 230, 65 + AUTOCHECKBOX "Enable &GLSL", IDC_GLSL, 15, 50, 150, 10 + AUTOCHECKBOX "Enable &pixel shaders", IDC_PIXELSHADERS, 15, 65, 150, 10 + AUTOCHECKBOX "Enable &Vertex shaders", IDC_VERTEXSHADERS, 15, 80, 150, 10 + GROUPBOX "Rendering", -1, 5, 110, 230, 85 + AUTOCHECKBOX "Force &multisampling", IDC_MULTISAMPLING, 15, 125, 150, 10 + AUTOCHECKBOX "Force &strict draw ordering", IDC_STRICTDRAWORDERING, 15, 140, 150, 10 + LTEXT "Offscreen rendering:", -1, 15, 157, 80, 10 + COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Render target locking:", -1, 15, 175, 72, 10, SS_LEFT + COMBOBOX IDC_LOCKING, 95, 173, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "WineD3D" + IDS_CPLDESCRIPTION "Configures WineD3D runtime settings." +END Propchange: trunk/reactos/dll/cpl/wined3dcfg/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/wined3dcfg/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/resourc… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/resource.h (added) +++ trunk/reactos/dll/cpl/wined3dcfg/resource.h [iso-8859-1] Thu Jan 19 18:15:49 2012 @@ -1,0 +1,23 @@ +#pragma once + +/* Icons */ +#define IDI_CPLICON 1 + +/* Dialogs */ +#define IDD_PROPPAGEGENERAL 100 + +/* Controls */ +#define IDC_PIXELSHADERS 1001 +#define IDC_GLSL 1002 +#define IDC_VERTEXSHADERS 1003 +#define IDC_MULTISAMPLING 1004 +#define IDC_STRICTDRAWORDERING 1005 +#define IDC_OFFSCREEN 1006 +#define IDC_LOCKING 1007 + + +/* Strings */ +#define IDS_CPLNAME 10000 +#define IDS_CPLDESCRIPTION 10001 + +/* EOF */ Propchange: trunk/reactos/dll/cpl/wined3dcfg/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/wined3dcfg/resources/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Jan 19 18:15:49 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/cpl/wined3dcfg/resources/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/cpl/wined3dcfg/resources/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/cpl/wined3dcfg/resources/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/cpl/wined3dcfg/resources/wined3dcfg.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/resourc… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/wined3dcfg/resources/wined3dcfg.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/wined3dcfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/rsrc.rc… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/rsrc.rc (added) +++ trunk/reactos/dll/cpl/wined3dcfg/rsrc.rc [iso-8859-1] Thu Jan 19 18:15:49 2012 @@ -1,0 +1,6 @@ +#include <windows.h> +#include "resource.h" + +// UTF-8 +#pragma code_page(65001) +#include "lang/en-US.rc" Propchange: trunk/reactos/dll/cpl/wined3dcfg/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/wined3d… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.c (added) +++ trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.c [iso-8859-1] Thu Jan 19 18:15:49 2012 @@ -1,0 +1,77 @@ +#include "wined3dcfg.h" + +HINSTANCE hApplet = 0; + +LONG CALLBACK AppletInit(HWND hWnd) +{ + PROPSHEETPAGEW psp; + PROPSHEETHEADERW psh; + WCHAR szCaption[1024]; + + LoadStringW(hApplet, IDS_CPLNAME, szCaption, sizeof(szCaption) / sizeof(WCHAR)); + + ZeroMemory(&psp, sizeof(PROPSHEETPAGE)); + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT; + psp.hInstance = hApplet; + psp.pszTemplate = MAKEINTRESOURCE(IDD_PROPPAGEGENERAL); + psp.pfnDlgProc = GeneralPageProc; + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE; + psh.hwndParent = hWnd; + psh.hInstance = hApplet; + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLICON)); + psh.pszCaption = szCaption; + psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); + psh.nStartPage = 0; + psh.ppsp = &psp; + + return (LONG)(PropertySheet(&psh) != -1); +} + +LONG CALLBACK CPlApplet(HWND hWnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + switch (uMsg) + { + case CPL_INIT: + return TRUE; + + case CPL_GETCOUNT: + return 1; + + case CPL_INQUIRE: + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = IDI_CPLICON; + CPlInfo->idInfo = IDS_CPLDESCRIPTION; + CPlInfo->idName = IDS_CPLNAME; + } + break; + + case CPL_DBLCLK: + AppletInit(hWnd); + break; + } + + return FALSE; +} + + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) +{ + UNREFERENCED_PARAMETER(lpvReserved); + + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + hApplet = hinstDLL; + break; + } + + return TRUE; +} + Propchange: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/wined3d… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.h (added) +++ trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.h [iso-8859-1] Thu Jan 19 18:15:49 2012 @@ -1,0 +1,37 @@ +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> +#include <stdio.h> +#include <initguid.h> +#include <debug.h> + +#include "resource.h" + +#define MAX_KEY_LENGTH 256 + +#define ITEM_FBO 0 +#define ITEM_BACKBUFFER 1 + +#define ITEM_READTEX 0 +#define ITEM_READDRAW 1 +#define ITEM_DISABLED 2 + +#define VALUE_READTEX L"readtex" +#define VALUE_READDRAW L"readdraw" +#define VALUE_ENABLED L"enabled" +#define VALUE_DISABLED L"disabled" +#define VALUE_NONE L"none" +#define VALUE_BACKBUFFER L"backbuffer" +#define VALUE_FBO L"fbo" + +#define KEY_WINE L"Software\\Wine\\Direct3D" + +#define KEY_GLSL L"UseGLSL" +#define KEY_VERTEXSHADERS L"VertexShaderMode" +#define KEY_PIXELSHADERS L"PixelShaderMode" +#define KEY_STRICTDRAWORDERING L"StrictDrawOrdering" +#define KEY_OFFSCREEN L"OffscreenRenderingMode" +#define KEY_MULTISAMPLING L"Multisampling" +#define KEY_LOCKING L"RenderTargetLockMode" + +INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); Propchange: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/wined3d… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rbuild (added) +++ trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rbuild [iso-8859-1] Thu Jan 19 18:15:49 2012 @@ -1,0 +1,14 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="wined3dcfg" type="win32dll" extension=".cpl" installbase="system32" installname="wined3dcfg.cpl" crt="msvcrt" unicode="yes"> + <importlibrary definition="wined3dcfg.spec" /> + <include base="wined3dcfg">.</include> + <library>user32</library> + <library>comctl32</library> + <library>advapi32</library> + <library>kernel32</library> + <file>wined3dcfg.c</file> + <file>general.c</file> + <file>wined3dcfg.rc</file> + <pch>wined3dcfg.h</pch> +</module> Propchange: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/wined3d… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc (added) +++ trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc [iso-8859-1] Thu Jan 19 18:15:49 2012 @@ -1,0 +1,15 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS WineD3D Configuration Control Panel\0" +#define REACTOS_STR_INTERNAL_NAME "WineD3Dcfg\0" +#define REACTOS_STR_ORIGINAL_FILENAME "WineD3Dcfg.cpl\0" +#include <reactos/version.rc> + +/* Icons */ +IDI_CPLICON ICON "resources/wined3dcfg.ico" + +#include "rsrc.rc" Propchange: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/wined3d… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.spec (added) +++ trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.spec [iso-8859-1] Thu Jan 19 18:15:49 2012 @@ -1,0 +1,2 @@ +@ stdcall CPlApplet(ptr long ptr ptr) + Propchange: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 55011: * Branch for the 0.3.14 release.
by akhaldi＠svn.reactos.org 19 Jan '12

19 Jan '12

Author: akhaldi Date: Thu Jan 19 15:13:24 2012 New Revision: 55011 URL: http://svn.reactos.org/svn/reactos?rev=55011&view=rev Log: * Branch for the 0.3.14 release. Added: branches/ros-branch-0_3_14/ (props changed) - copied from r55010, trunk/reactos/ Propchange: branches/ros-branch-0_3_14/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Jan 19 15:13:24 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-branch-0_3_14/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-branch-0_3_14/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-branch-0_3_14/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jan 19 15:13:24 2012 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/ros-branch-0_3_14/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jan 19 15:13:24 2012 @@ -1,0 +1,13 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 +/branches/wlan-bringup:54809-54998 Propchange: branches/ros-branch-0_3_14/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[khornicek] 55010: [MSTSC] - Add full screen support. - Fix starting from command line.
by khornicek＠svn.reactos.org 19 Jan '12

19 Jan '12

Author: khornicek Date: Thu Jan 19 14:10:02 2012 New Revision: 55010 URL: http://svn.reactos.org/svn/reactos?rev=55010&view=rev Log: [MSTSC] - Add full screen support. - Fix starting from command line. Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/precomp.h trunk/reactos/base/applications/mstsc/settings.c 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Thu Jan 19 14:10:02 2012 @@ -26,10 +26,6 @@ static VOID ReLoadGeneralPage(PINFO pInfo); static VOID ReLoadDisplayPage(PINFO pInfo); - -#ifndef IDC_NAMEEDIT - #define IDC_NAMEEDIT 1015 -#endif static VOID DoOpenFile(PINFO pInfo) @@ -539,7 +535,7 @@ newEntry->Resolutions = HeapAlloc(GetProcessHeap(), 0, - ResolutionsCount * sizeof(RESOLUTION_INFO)); + ResolutionsCount * (sizeof(RESOLUTION_INFO) + 1)); if (!newEntry->Resolutions) goto ByeBye; newEntry->ResolutionsCount = ResolutionsCount; @@ -557,6 +553,11 @@ i++; } } + + /* fullscreen */ + newEntry->Resolutions[i].dmPelsWidth = GetSystemMetrics(SM_CXSCREEN); + newEntry->Resolutions[i].dmPelsHeight = GetSystemMetrics(SM_CYSCREEN); + descriptionSize = (wcslen(DisplayDevice->DeviceString) + 1) * sizeof(WCHAR); description = HeapAlloc(GetProcessHeap(), 0, descriptionSize); if (!description) goto ByeBye; @@ -761,8 +762,11 @@ { DWORD index; INT width, height, pos = 0; - INT bpp, num, i; + INT bpp, num, i, screenmode; BOOL bSet = FALSE; + + /* get fullscreen info */ + screenmode = GetIntegerFromSettings(pInfo->pRdpSettings, L"screen mode id"); /* set trackbar position */ width = GetIntegerFromSettings(pInfo->pRdpSettings, L"desktopwidth"); @@ -770,13 +774,24 @@ if (width != -1 && height != -1) { - for (index = 0; index < pInfo->CurrentDisplayDevice->ResolutionsCount; index++) - { - if (pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsWidth == width && - pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsHeight == height) - { - pos = index; - break; + if(screenmode == 2) + { + pos = SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_GEOSLIDER, + TBM_GETRANGEMAX, + 0, + 0); + } + else + { + for (index = 0; index < pInfo->CurrentDisplayDevice->ResolutionsCount; index++) + { + if (pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsWidth == width && + pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsHeight == height) + { + pos = index; + break; + } } } } Modified: trunk/reactos/base/applications/mstsc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pr… ============================================================================== --- trunk/reactos/base/applications/mstsc/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/precomp.h [iso-8859-1] Thu Jan 19 14:10:02 2012 @@ -17,7 +17,7 @@ #define MAXKEY 256 #define MAXVALUE 256 -#define NUM_SETTINGS 5 +#define NUM_SETTINGS 6 extern LPWSTR lpSettings[]; typedef struct _SETTINGS Modified: trunk/reactos/base/applications/mstsc/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/settings.c [iso-8859-1] Thu Jan 19 14:10:02 2012 @@ -9,6 +9,7 @@ L"session bpp", L"full address", L"username", + L"screen mode id", }; VOID @@ -28,7 +29,7 @@ szValue); } - /* resolution */ + /* resolution and fullscreen*/ ret = SendDlgItemMessage(pInfo->hDisplayPage, IDC_GEOSLIDER, TBM_GETPOS, @@ -36,6 +37,9 @@ 0); if (ret != -1) { + SetIntegerToSettings(pInfo->pRdpSettings, + L"screen mode id", + (ret == SendDlgItemMessageW(pInfo->hDisplayPage, IDC_GEOSLIDER, TBM_GETRANGEMAX, 0, 0)) ? 2 : 1); SetIntegerToSettings(pInfo->pRdpSettings, L"desktopwidth", pInfo->DisplayDeviceList->Resolutions[ret].dmPelsWidth); 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/win32.c [iso-8859-1] Thu Jan 19 14:10:02 2012 @@ -1027,8 +1027,10 @@ } else { - /* default to 16bpp */ + /* default to screen size, 16bpp */ SetIntegerToSettings(pRdpSettings, L"session bpp", 16); + SetIntegerToSettings(pRdpSettings, L"desktopwidth", GetSystemMetrics(SM_CXSCREEN)); + SetIntegerToSettings(pRdpSettings, L"desktopheight", GetSystemMetrics(SM_CYSCREEN)); lpToken = wcstok(lpStr, szSeps); while (lpToken) @@ -1056,6 +1058,10 @@ lpToken += 2; SetIntegerToSettings(pRdpSettings, L"desktopheight", _wtoi(lpToken)); } + else if (*lpToken == L'f') + { + SetIntegerToSettings(pRdpSettings, L"screen mode id", 2); + } lpToken = wcstok(NULL, szSeps); } @@ -1109,12 +1115,21 @@ strcpy(g_password, ""); g_server_depth = GetIntegerFromSettings(pRdpSettings, L"session bpp"); if (g_server_depth > 16) g_server_depth = 16; /* hack, we don't support 24bpp yet */ + g_screen_width = GetSystemMetrics(SM_CXSCREEN); + g_screen_height = GetSystemMetrics(SM_CYSCREEN); g_width = GetIntegerFromSettings(pRdpSettings, L"desktopwidth"); g_height = GetIntegerFromSettings(pRdpSettings, L"desktopheight"); - g_screen_width = GetSystemMetrics(SM_CXSCREEN); - g_screen_height = GetSystemMetrics(SM_CYSCREEN); - g_xoff = GetSystemMetrics(SM_CXEDGE) * 2; - g_yoff = GetSystemMetrics(SM_CYCAPTION) + GetSystemMetrics(SM_CYEDGE) * 2; + if (GetIntegerFromSettings(pRdpSettings, L"screen mode id") == 2) + { + g_fullscreen = 1; + g_xoff = 0; + g_yoff = 0; + } + else + { + g_xoff = GetSystemMetrics(SM_CXEDGE) * 2; + g_yoff = GetSystemMetrics(SM_CYCAPTION) + GetSystemMetrics(SM_CYEDGE) * 2; + } ui_main(); ret = 0;

1 0

[khornicek] 55009: what's wrong with the cmake build bot I don't know. someone please fix it
by khornicek＠svn.reactos.org 19 Jan '12

19 Jan '12

Author: khornicek Date: Thu Jan 19 02:50:20 2012 New Revision: 55009 URL: http://svn.reactos.org/svn/reactos?rev=55009&view=rev Log: what's wrong with the cmake build bot I don't know. someone please fix it Modified: trunk/reactos/base/applications/mstsc/connectdialog.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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Thu Jan 19 02:50:20 2012 @@ -27,6 +27,9 @@ static VOID ReLoadGeneralPage(PINFO pInfo); static VOID ReLoadDisplayPage(PINFO pInfo); +#ifndef IDC_NAMEEDIT + #define IDC_NAMEEDIT 1015 +#endif static VOID DoOpenFile(PINFO pInfo)

1 0

[khornicek] 55008: [MSTSC] - Add support for user name settings. - Obtain user name / domain hints from registry. - Pass user/domain info to the server if available. - Add Czech translation.
by khornicek＠svn.reactos.org 19 Jan '12

19 Jan '12

Author: khornicek Date: Thu Jan 19 02:27:20 2012 New Revision: 55008 URL: http://svn.reactos.org/svn/reactos?rev=55008&view=rev Log: [MSTSC] - Add support for user name settings. - Obtain user name / domain hints from registry. - Pass user/domain info to the server if available. - Add Czech translation. Added: trunk/reactos/base/applications/mstsc/lang/cs-CZ.rc (with props) Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/lang/bg-BG.rc trunk/reactos/base/applications/mstsc/lang/ca-ES.rc trunk/reactos/base/applications/mstsc/lang/de-DE.rc trunk/reactos/base/applications/mstsc/lang/el-GR.rc trunk/reactos/base/applications/mstsc/lang/en-US.rc trunk/reactos/base/applications/mstsc/lang/es-ES.rc trunk/reactos/base/applications/mstsc/lang/fr-FR.rc trunk/reactos/base/applications/mstsc/lang/it-IT.rc trunk/reactos/base/applications/mstsc/lang/ja-JP.rc trunk/reactos/base/applications/mstsc/lang/ko-KR.rc trunk/reactos/base/applications/mstsc/lang/lt-LT.rc trunk/reactos/base/applications/mstsc/lang/no-NO.rc trunk/reactos/base/applications/mstsc/lang/pl-PL.rc trunk/reactos/base/applications/mstsc/lang/ro-RO.rc trunk/reactos/base/applications/mstsc/lang/ru-RU.rc trunk/reactos/base/applications/mstsc/lang/sk-SK.rc trunk/reactos/base/applications/mstsc/lang/sv-SE.rc trunk/reactos/base/applications/mstsc/lang/uk-UA.rc trunk/reactos/base/applications/mstsc/lang/zh-CN.rc trunk/reactos/base/applications/mstsc/lang/zh-TW.rc trunk/reactos/base/applications/mstsc/precomp.h trunk/reactos/base/applications/mstsc/resource.h trunk/reactos/base/applications/mstsc/rsrc.rc trunk/reactos/base/applications/mstsc/settings.c 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -99,6 +99,61 @@ static VOID +LoadUsernameHint(HWND hDlg, INT iCur) +{ + WCHAR szValue[MAXVALUE+1000]; + WCHAR szName[MAX_KEY_NAME]; + WCHAR szKeyName[] = L"Software\\Microsoft\\Terminal Server Client\\Servers"; + PWCHAR lpAddress; + HKEY hKey; + HKEY hSubKey; + LONG lRet = ERROR_SUCCESS; + INT iIndex = 0; + DWORD dwSize = MAX_KEY_NAME; + + SendDlgItemMessageW(hDlg, IDC_SERVERCOMBO, CB_GETLBTEXT, (WPARAM)iCur, (LPARAM)szValue); + + /* remove possible port number */ + lpAddress = wcstok(szValue, L":"); + + if (lpAddress == NULL) + return; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, + szKeyName, + 0, + KEY_READ, + &hKey) == ERROR_SUCCESS) + { + while (lRet == ERROR_SUCCESS) + { + dwSize = MAX_KEY_NAME; + + lRet = RegEnumKeyExW(hKey, iIndex, szName, &dwSize, NULL, NULL, NULL, NULL); + + if(lRet == ERROR_SUCCESS && wcscmp(szName, lpAddress) == 0) + { + if(RegOpenKeyExW(hKey, szName, 0, KEY_READ, &hSubKey) != ERROR_SUCCESS) + break; + + dwSize = MAXVALUE; + + if(RegQueryValueExW(hKey, L"UsernameHint", 0, NULL, (LPBYTE)szValue, &dwSize) == ERROR_SUCCESS) + { + SetDlgItemTextW(hDlg, IDC_NAMEEDIT, szValue); + } + + RegCloseKey(hSubKey); + break; + } + iIndex++; + } + RegCloseKey(hKey); + } +} + + +static VOID FillServerAddesssCombo(PINFO pInfo) { HKEY hKey; @@ -107,6 +162,7 @@ LONG ret = ERROR_SUCCESS; DWORD size; INT i = 0; + BOOL found = FALSE; if (RegOpenKeyExW(HKEY_CURRENT_USER, KeyName, @@ -152,6 +208,7 @@ CB_ADDSTRING, 0, (LPARAM)lpAddress); + found = TRUE; } HeapFree(GetProcessHeap(), @@ -177,6 +234,17 @@ 0, (LPARAM)Name); } + + if(found) + { + SendDlgItemMessageW(pInfo->hGeneralPage, + IDC_SERVERCOMBO, + CB_SETCURSEL, + 0, + 0); + LoadUsernameHint(pInfo->hGeneralPage, 0); + } + } @@ -192,6 +260,16 @@ { SetDlgItemTextW(pInfo->hGeneralPage, IDC_SERVERCOMBO, + lpText); + } + + /* set user name */ + lpText = GetStringFromSettings(pInfo->pRdpSettings, + L"username"); + if (lpText) + { + SetDlgItemTextW(pInfo->hGeneralPage, + IDC_NAMEEDIT, lpText); } } @@ -279,15 +357,18 @@ CB_GETCURSEL, 0, 0); - cur++; last = SendDlgItemMessageW(hDlg, IDC_SERVERCOMBO, CB_GETCOUNT, 0, 0); - if (cur == last) + if ((cur + 1) == last) MessageBoxW(hDlg, L"SMB is not yet supported", L"RDP error", MB_ICONERROR); + else + { + LoadUsernameHint(hDlg, cur); + } } break; Modified: trunk/reactos/base/applications/mstsc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/bg-BG.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ LTEXT "Ð¡ÑÑÐ²ÑÑ:",IDC_STATIC,37,41,30,8 LTEXT "ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»:",IDC_STATIC,37,58,48,8 COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "ÐÐ°Ð¿Ð¸Ñ",IDC_SAVE,67,139,50,14 PUSHBUTTON "ÐÐ°Ð¿Ð¸Ñ ÐºÐ°ÑÐ¾...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "ÐÑÐ²Ð°ÑÑÐ½Ðµ...",IDC_OPEN,177,139,50,14 Modified: trunk/reactos/base/applications/mstsc/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ca-ES.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ LTEXT "Servidor:",IDC_STATIC,47,41,25,8 LTEXT "Nom d'usuari:",IDC_STATIC,47,58,38,8 COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "Desa",IDC_SAVE,67,139,50,14 PUSHBUTTON "Desa com...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "Obre...",IDC_OPEN,177,139,50,14 Added: trunk/reactos/base/applications/mstsc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/mstsc/lang/cs-CZ.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -1,0 +1,64 @@ +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDD_GENERAL DIALOGEX 0, 0, 242, 175 +STYLE DS_SHELLFONT | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "PÅihlaÅ¡ovacÃ Ãºdaje",IDC_STATIC,7,7,228,89 + GROUPBOX "NastavenÃ spojenÃ",IDC_STATIC,7,103,228,65 + ICON "", IDC_LOGONICON, 15,19,20,20 + LTEXT "Zadejte adresu serveru",IDC_STATIC,47,24,81,8 + LTEXT "Server:",IDC_STATIC,47,41,25,8 + LTEXT "UÅ¾ivatelskÃ© jmÃ©no:",IDC_STATIC,47,58,60,8 + COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL + PUSHBUTTON "UloÅ¾it",IDC_SAVE,67,139,50,14 + PUSHBUTTON "UloÅ¾it jako...",IDC_SAVEAS,123,139,50,14 + PUSHBUTTON "OtevÅÃt...",IDC_OPEN,177,139,50,14 + ICON "", IDC_CONNICON, 16,114,20,20 + LTEXT "UloÅ¾it souÄasnÃ© nastavenÃ nebo naÄÃst nastavenÃ ze souboru",IDC_STATIC,50,115,172,20 +END + +IDD_DISPLAY DIALOGEX 0, 0, 242, 175 +STYLE DS_SHELLFONT | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Velikost vzdÃ¡lenÃ© plochy",IDC_STATIC,7,7,228,68 + GROUPBOX "Barvy",IDC_STATIC,7,83,228,85 + ICON "", IDC_REMICON, 15,19,20,20 + ICON "", IDC_COLORSICON, 15,98,20,20 + LTEXT "NastavenÃm posuvnÃku do krajnÃ pravÃ© polohy zvolÃte reÅ¾im celÃ© obrazovky",IDC_STATIC,53,22,175,21 + 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 "PoznÃ¡mka: Toto nastavenÃ mÅ¯Å¾e bÃ½t zmÄnÄno nastavenÃm na serveru",IDC_STATIC,56,143,165,18 + LTEXT "MÃ©nÄ",IDC_STATIC,35,42,16,8 + LTEXT "VÃce",IDC_STATIC,189,42,17,8 + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER +END + +IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "PÅipojenÃ ke vzdÃ¡lenÃ© ploÅ¡e" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "PÅipojit",IDOK,147,245,50,14 + PUSHBUTTON "Storno",IDCANCEL,203,245,50,14 + CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,50,246,190 +END + + +STRINGTABLE +BEGIN + IDS_TAB_GENERAL "ObecnÃ©" + IDS_TAB_DISPLAY "ZobrazenÃ" + IDS_256COLORS "256 Barev" + IDS_HIGHCOLOR15 "32,768 Barev (15 bit)" + IDS_HIGHCOLOR16 "65,536 Barev (16 bit)" + IDS_HIGHCOLOR24 "16,777,216 Barev (24 bit)" + IDS_PIXEL "%lux%lu PixelÅ¯" + IDS_FULLSCREEN "CelÃ¡ obrazovka" + IDS_BROWSESERVER "<NajÃt dalÅ¡Ã...>" + IDS_HEADERTEXT1 "VzdÃ¡lenÃ¡ plocha" + IDS_HEADERTEXT2 "PÅipojenÃ" +END Propchange: trunk/reactos/base/applications/mstsc/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mstsc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/de-DE.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ LTEXT "Server:",IDC_STATIC,47,41,25,8 LTEXT "Benutzername:",IDC_STATIC,47,58,50,8 COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "Speichern",IDC_SAVE,67,139,50,14 PUSHBUTTON "Speichern unter",IDC_SAVEAS,120,139,55,14 PUSHBUTTON "Ãffnen...",IDC_OPEN,177,139,50,14 Modified: trunk/reactos/base/applications/mstsc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/el-GR.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ LTEXT "ÎÎ¹Î±ÎºÎ¿Î¼Î¹ÏÏÎ®Ï:",IDC_STATIC,47,41,30,8 LTEXT "ÎÎ½Î¿Î¼Î± ÏÏÎ®ÏÏÎ·:",IDC_STATIC,47,58,38,8 COMBOBOX IDC_SERVERCOMBO,89,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ·",IDC_SAVE,67,139,50,14 PUSHBUTTON "ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ· Î©Ï...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "ÎÎ½Î¿Î¹Î³Î¼Î±...",IDC_OPEN,177,139,50,14 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/en-US.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ LTEXT "Server:",IDC_STATIC,47,41,25,8 LTEXT "User name:",IDC_STATIC,47,58,38,8 COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "Save",IDC_SAVE,67,139,50,14 PUSHBUTTON "Save As...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "Open...",IDC_OPEN,177,139,50,14 Modified: trunk/reactos/base/applications/mstsc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/es-ES.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -16,6 +16,7 @@ LTEXT "Servidor:",IDC_STATIC,47,41,28,8 LTEXT "Nombre de usuario:",IDC_STATIC,47,58,70,8 COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "Guardar",IDC_SAVE,60,139,50,14 //67 PUSHBUTTON "Guardar Como...",IDC_SAVEAS,115,139,58,14 //123,50 PUSHBUTTON "Abrir...",IDC_OPEN,177,139,50,14 Modified: trunk/reactos/base/applications/mstsc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/fr-FR.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ LTEXT "Serveur:",IDC_STATIC,47,41,25,8 LTEXT "Nom d'utilisateur:",IDC_STATIC,47,58,38,8 COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "Enregistrer",IDC_SAVE,67,139,50,14 PUSHBUTTON "Enregistrer Sous...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "Ouvrir...",IDC_OPEN,177,139,50,14 Modified: trunk/reactos/base/applications/mstsc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/it-IT.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ LTEXT "Computer:",IDC_STATIC,47,41,35,8 LTEXT "Nome utente:",IDC_STATIC,47,58,68,8 COMBOBOX IDC_SERVERCOMBO,90,39,136,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "Salva",IDC_SAVE,43,139,58,14 PUSHBUTTON "Salva con nome",IDC_SAVEAS,107,139,58,14 PUSHBUTTON "Apri",IDC_OPEN,169,139,58,14 Modified: trunk/reactos/base/applications/mstsc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ja-JP.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ LTEXT "ãµã¼ã:",IDC_STATIC,47,41,25,8 LTEXT "ã¦ã¼ã¶ã¼å:",IDC_STATIC,47,58,38,8 COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "ä¿å",IDC_SAVE,67,139,50,14 PUSHBUTTON "ååãä»ãã¦ä¿å...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "éã...",IDC_OPEN,177,139,50,14 Modified: trunk/reactos/base/applications/mstsc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ko-KR.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -15,6 +15,7 @@ LTEXT "ìë² ì£¼ì:",IDC_STATIC,47,41,25,8 LTEXT "ì¬ì©ì ì´ë¦:",IDC_STATIC,47,58,38,8 COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "ì ì¥",IDC_SAVE,67,139,50,14 PUSHBUTTON "ë¤ë¥¸ ì´ë¦ì¼ë¡ ì ì¥...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "ì´ê¸°...",IDC_OPEN,177,139,50,14 Modified: trunk/reactos/base/applications/mstsc/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/lt-LT.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -13,6 +13,7 @@ LTEXT "Serveris:",IDC_STATIC,47,41,30,8 LTEXT "Vartotojo vardas:",IDC_STATIC,47,58,60,8 COMBOBOX IDC_SERVERCOMBO,107,39,113,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "Saugoti",IDC_SAVE,67,139,50,14 PUSHBUTTON "Saugoti kaip...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "Atidaryti...",IDC_OPEN,177,139,50,14 Modified: trunk/reactos/base/applications/mstsc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/no-NO.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ LTEXT "Server:",IDC_STATIC,47,41,25,8 LTEXT "Brukernavn:",IDC_STATIC,47,58,38,8 COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "Lagre",IDC_SAVE,67,139,50,14 PUSHBUTTON "Lagre som...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "Ãpne...",IDC_OPEN,177,139,50,14 Modified: trunk/reactos/base/applications/mstsc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/pl-PL.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -21,6 +21,7 @@ LTEXT "Serwer:",IDC_STATIC,39,42,29,8 LTEXT "Nazwa uÅ¼ytkownika:",IDC_STATIC,39,57,42,18 COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "Zapisz",IDC_SAVE,67,139,50,14 PUSHBUTTON "Zapisz jako...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "OtwÃ³rz...",IDC_OPEN,177,139,50,14 Modified: trunk/reactos/base/applications/mstsc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ro-RO.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -18,6 +18,7 @@ LTEXT "Server:", IDC_STATIC,47,41,25,8 LTEXT "Nume utilizator:", IDC_STATIC,47,58,58,8 COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "PÄ&streazÄ", IDC_SAVE,57,139,50,14 PUSHBUTTON "&PÄstrare Ã®nâ¦", IDC_SAVEAS,112,139,60,14 PUSHBUTTON "&Deschidereâ¦", IDC_OPEN,177,139,50,14 Modified: trunk/reactos/base/applications/mstsc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ru-RU.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -11,6 +11,7 @@ LTEXT "Ð¡ÐµÑÐ²ÐµÑ:",IDC_STATIC,52,41,31,8 LTEXT "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:",IDC_STATIC,15,58,67,8 COMBOBOX IDC_SERVERCOMBO,86,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ",IDC_SAVE,49,139,50,14 PUSHBUTTON "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÐºÐ°Ðº...",IDC_SAVEAS,103,139,70,14 PUSHBUTTON "ÐÑÐºÑÑÑÑ...",IDC_OPEN,177,139,50,14 Modified: trunk/reactos/base/applications/mstsc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/sk-SK.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -15,6 +15,7 @@ LTEXT "Server:",IDC_STATIC,47,41,25,8 LTEXT "PouÅ¾ÃvateÄ¾skÃ© meno:",IDC_STATIC,47,58,38,8 COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "&UloÅ¾iÅ¥",IDC_SAVE,67,139,50,14 PUSHBUTTON "UloÅ¾iÅ¥ &ako...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "&OtvoriÅ¥...",IDC_OPEN,177,139,50,14 Modified: trunk/reactos/base/applications/mstsc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/sv-SE.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -18,6 +18,7 @@ LTEXT "Server:",IDC_STATIC,47,41,25,8 LTEXT "AnvÃ¤ndarnamn:",IDC_STATIC,47,58,38,8 COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "Spara",IDC_SAVE,67,139,50,14 PUSHBUTTON "Spara som...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "Ãppna...",IDC_OPEN,177,139,50,14 Modified: trunk/reactos/base/applications/mstsc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/uk-UA.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -19,6 +19,7 @@ LTEXT "Ð¡ÐµÑÐ²ÐµÑ:",IDC_STATIC,47,41,27,8 LTEXT "ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ñ:",IDC_STATIC,47,58,41,8 COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "ÐÐ±ÐµÑÐµÐ³ÑÐ¸",IDC_SAVE,67,139,50,14 PUSHBUTTON "ÐÐ±ÐµÑÐµÐ³ÑÐ¸ ÑÐº...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "ÐÑÐ´ÐºÑÐ¸ÑÐ¸...",IDC_OPEN,177,139,50,14 Modified: trunk/reactos/base/applications/mstsc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/zh-CN.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -15,6 +15,7 @@ LTEXT "æå¡å¨ï¼",IDC_STATIC,47,41,25,8 LTEXT "ç¨æ·åï¼",IDC_STATIC,47,58,38,8 COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "ä¿å",IDC_SAVE,67,139,50,14 PUSHBUTTON "å¦åä¸º...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "æå¼...",IDC_OPEN,177,139,50,14 Modified: trunk/reactos/base/applications/mstsc/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/zh-TW.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -18,6 +18,7 @@ LTEXT "ä¼ºæå¨ï¼",IDC_STATIC,47,41,25,8 LTEXT "ç¨æ¶åï¼",IDC_STATIC,47,58,38,8 COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_NAMEEDIT, 110, 55, 110, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "å²å",IDC_SAVE,67,139,50,14 PUSHBUTTON "å¦åçº...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "éå...",IDC_OPEN,177,139,50,14 Modified: trunk/reactos/base/applications/mstsc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pr… ============================================================================== --- trunk/reactos/base/applications/mstsc/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/precomp.h [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -17,7 +17,7 @@ #define MAXKEY 256 #define MAXVALUE 256 -#define NUM_SETTINGS 4 +#define NUM_SETTINGS 5 extern LPWSTR lpSettings[]; typedef struct _SETTINGS 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/resource.h [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -16,6 +16,7 @@ #define IDC_GEOSLIDER 1012 #define IDC_BPPCOMBO 1013 #define IDC_SETTINGS_RESOLUTION_TEXT 1014 +#define IDC_NAMEEDIT 1015 #define IDC_LOGONICON 1016 #define IDC_CONNICON 1017 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -16,6 +16,7 @@ #pragma code_page(65001) #include "lang/bg-BG.rc" #include "lang/ca-ES.rc" +#include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" Modified: trunk/reactos/base/applications/mstsc/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/settings.c [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -8,6 +8,7 @@ L"desktopheight", L"session bpp", L"full address", + L"username", }; VOID @@ -63,6 +64,17 @@ ret); } } + + /* user name */ + if (GetDlgItemText(pInfo->hGeneralPage, + IDC_NAMEEDIT, + szValue, + MAXVALUE)) + { + SetStringToSettings(pInfo->pRdpSettings, + L"username", + szValue); + } } 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/win32.c [iso-8859-1] Thu Jan 19 02:27:20 2012 @@ -982,6 +982,33 @@ return iPort; } +static VOID +SetDomainAndUsername(PCHAR pName) +{ + PCHAR pDomain; + PCHAR pUsername; + + strcpy(g_domain, ""); + strcpy(g_username, ""); + + pDomain = strtok(pName, "\\"); + + if(pDomain == NULL) + return; + + pUsername = strtok(NULL, "\\"); + + if(pUsername == NULL) + { + strcpy(g_username, pDomain); + return; + } + + strcpy(g_username, pUsername); + strcpy(g_domain, pDomain); + return; +} + static BOOL ParseCommandLine(LPWSTR lpCmdLine, PRDPSETTINGS pRdpSettings, @@ -1077,7 +1104,8 @@ /* GetPortNumber also removes possible trailing port number from address */ g_tcp_port_rdp = GetPortNumber(szValue); strcpy(g_servername, szValue); - strcpy(g_username, ""); + uni_to_str(szValue, GetStringFromSettings(pRdpSettings, L"username")); + SetDomainAndUsername(szValue); strcpy(g_password, ""); g_server_depth = GetIntegerFromSettings(pRdpSettings, L"session bpp"); if (g_server_depth > 16) g_server_depth = 16; /* hack, we don't support 24bpp yet */

1 0

[akhaldi] 55007: [PORTCLS] * Fix a bug in PcNewResourceSublist which led to memory corruption.
by akhaldi＠svn.reactos.org 18 Jan '12

18 Jan '12

Author: akhaldi Date: Wed Jan 18 23:34:26 2012 New Revision: 55007 URL: http://svn.reactos.org/svn/reactos?rev=55007&view=rev Log: [PORTCLS] * Fix a bug in PcNewResourceSublist which led to memory corruption. Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [iso-8859-1] Wed Jan 18 23:34:26 2012 @@ -427,7 +427,7 @@ #endif /* Allocate resource list */ - NewList->m_TranslatedResourceList = (PCM_RESOURCE_LIST)AllocateItem(PoolType, sizeof(CM_RESOURCE_LIST), TAG_PORTCLASS); + NewList->m_TranslatedResourceList = (PCM_RESOURCE_LIST)AllocateItem(PoolType, ResourceSize, TAG_PORTCLASS); if (!NewList->m_TranslatedResourceList) { /* No memory */ @@ -436,7 +436,7 @@ } /* Allocate resource list */ - NewList->m_UntranslatedResourceList = (PCM_RESOURCE_LIST)AllocateItem(PoolType, sizeof(CM_RESOURCE_LIST), TAG_PORTCLASS); + NewList->m_UntranslatedResourceList = (PCM_RESOURCE_LIST)AllocateItem(PoolType, ResourceSize, TAG_PORTCLASS); if (!NewList->m_UntranslatedResourceList) { /* No memory */

1 0

[khornicek] 55006: [TRANSLATION] - Add Czech resources for devmgmt.
by khornicek＠svn.reactos.org 18 Jan '12

18 Jan '12

Author: khornicek Date: Wed Jan 18 22:03:05 2012 New Revision: 55006 URL: http://svn.reactos.org/svn/reactos?rev=55006&view=rev Log: [TRANSLATION] - Add Czech resources for devmgmt. Added: trunk/reactos/base/applications/mscutils/devmgmt/lang/cs-CZ.rc (with props) Modified: trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc Added: trunk/reactos/base/applications/mscutils/devmgmt/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/cs-CZ.rc [iso-8859-1] Wed Jan 18 22:03:05 2012 @@ -1,0 +1,82 @@ +ï»¿LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "&Soubor" + BEGIN + MENUITEM "&Konec", IDC_EXIT + END + POPUP "&Akce" + BEGIN + MENUITEM "Tisk", IDC_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Vlastnosti", IDC_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "NÃ¡povÄda", IDC_PROGHELP, GRAYED + END + POPUP "&ZobrazenÃ" + BEGIN + MENUITEM "ZaÅÃzenÃ podle typu", IDC_DEVBYTYPE, CHECKED + MENUITEM "ZaÅÃzenÃ podle pÅipojenÃ", IDC_STATIC, GRAYED + MENUITEM "ProstÅedky podle typu", IDC_STATIC, GRAYED + MENUITEM "ProstÅedky podle pÅipojenÃ", IDC_STATIC, GRAYED + END + POPUP "NÃ¡povÄda" + BEGIN + MENUITEM "NÃ¡povÄda", IDC_PROGHELP + MENUITEM "O programu", IDC_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Vlastnosti", IDC_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "NÃ¡povÄda", IDC_PROGHELP + END +END + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "O SprÃ¡vci zaÅÃzenÃ" +FONT 8,"MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "SprÃ¡vce zaÅÃzenÃ v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 + PUSHBUTTON "ZavÅÃt", IDOK, 75, 162, 44, 15 + ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "Vlastnosti" + IDS_TOOLTIP_REFRESH "Obnovit" + IDS_TOOLTIP_HELP "NÃ¡povÄda" + IDS_TOOLTIP_EXIT "Konec" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS SprÃ¡vce zaÅÃzenÃ" + IDS_HINT_BLANK " " + IDS_HINT_EXIT " UkonÄit pogram." + IDS_HINT_REFRESH " Obnovit seznam zaÅÃzenÃ." + IDS_HINT_PROP " Zobrazit kartu vlastnostÃ pro vybranou poloÅ¾ku." + IDS_HINT_HELP " Zobrazit nÃ¡povÄdu." + IDS_HINT_ABOUT " O ReactOS SprÃ¡vci zaÅÃzenÃ." + + IDS_HINT_SYS_RESTORE " ObnovÃ normÃ¡lnÃ velikost okna." + IDS_HINT_SYS_MOVE " PÅesune okno." + IDS_HINT_SYS_SIZE " ZmÄnÃ velikost okna." + IDS_HINT_SYS_MINIMIZE " Minimalizuje okno." + IDS_HINT_SYS_MAXIMIZE " Maximalizuje okno." + IDS_HINT_SYS_CLOSE " ZavÅe toto okno." +END Propchange: trunk/reactos/base/applications/mscutils/devmgmt/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] Wed Jan 18 22:03:05 2012 @@ -15,6 +15,7 @@ // UTF-8 #pragma code_page(65001) #include "lang/bg-BG.rc" +#include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc"

1 0

[rharabien] 55005: [EXPLORER-NEW] - Move helper macros for IDeskBarClient to shlobj.h - Remove duplicated commented out calls (spotted by Amine Khaldi)
by rharabien＠svn.reactos.org 18 Jan '12

18 Jan '12

Author: rharabien Date: Wed Jan 18 17:02:34 2012 New Revision: 55005 URL: http://svn.reactos.org/svn/reactos?rev=55005&view=rev Log: [EXPLORER-NEW] - Move helper macros for IDeskBarClient to shlobj.h - Remove duplicated commented out calls (spotted by Amine Khaldi) Modified: trunk/reactos/base/shell/explorer-new/startmnu.c trunk/reactos/base/shell/explorer-new/todo.h trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/base/shell/explorer-new/startmnu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/st… ============================================================================== --- trunk/reactos/base/shell/explorer-new/startmnu.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/startmnu.c [iso-8859-1] Wed Jan 18 17:02:34 2012 @@ -818,18 +818,13 @@ (PVOID)&pbb); if (SUCCEEDED(hRet)) { - // hRet = IBanneredBar_SetBitmap(pbb, - // hbmBanner); hRet = IBanneredBar_SetBitmap(pbb, hbmBanner); /* Update the icon size */ - //hRet = IBanneredBar_SetIconSize(pbb, - // bSmallIcons ? BMICON_SMALL : BMICON_LARGE); hRet = IBanneredBar_SetIconSize(pbb, bSmallIcons ? BMICON_SMALL : BMICON_LARGE); - //IBanneredBar_Release(pbb); IBanneredBar_Release(pbb); } @@ -888,10 +883,7 @@ hr = IMenuPopup_QueryInterface(pMp, &IID_IInitializeObject, (PVOID*)&pIo); if (SUCCEEDED(hr)) { - //hr = IInitializeObject_Initialize(pIo); hr = IInitializeObject_Initialize(pIo); - - //IInitializeObject_Release(pIo); IInitializeObject_Release(pIo); } else Modified: trunk/reactos/base/shell/explorer-new/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/to… ============================================================================== --- trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] Wed Jan 18 17:02:34 2012 @@ -1,29 +1,11 @@ #pragma once - -#ifdef INTERFACE -#undef INTERFACE -#endif /* FIXME: Ugly hack!!! FIX ASAP! Move to uuid! */ static const GUID VID_HACK_LargeIcons = {0x0057D0E0, 0x3573, 0x11CF, {0xAE, 0x69, 0x08, 0x00, 0x2B, 0x2E, 0x12, 0x62}}; #define VID_LargeIcons VID_HACK_LargeIcons -static const GUID IID_HACK_IDeskBarClient = {0xEB0FE175, 0x1A3A, 0x11D0, {0x89, 0xB3, 0x00, 0xA0, 0xC9, 0x0A, 0x90, 0xAC}}; -#define IID_IDeskBarClient IID_HACK_IDeskBarClient static const GUID IID_HACK_IDeskBar = {0xEB0FE173, 0x1A3A, 0x11D0, {0x89, 0xB3, 0x00, 0xA0, 0xC9, 0x0A, 0x90, 0xAC}}; #define IID_IDeskBar IID_HACK_IDeskBar static const GUID SID_HACK_SMenuPopup = {0xD1E7AFEB,0x6A2E,0x11D0,{0x8C,0x78,0x00,0xC0,0x4F,0xD9,0x18,0xB4}}; #define SID_SMenuPopup SID_HACK_SMenuPopup - -#ifdef COBJMACROS -#define IDeskBarClient_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) -#define IDeskBarClient_AddRef(T) (T)->lpVtbl->AddRef(T) -#define IDeskBarClient_Release(T) (T)->lpVtbl->Release(T) -#define IDeskBarClient_GetWindow(T,a) (T)->lpVtbl->GetWindow(T,a) -#define IDeskBarClient_ContextSensitiveHelp(T,a) (T)->lpVtbl->ContextSensitiveHelp(T,a) -#define IDeskBarClient_SetDeskBarSite(T,a) (T)->lpVtbl->SetDeskBarSite(T,a) -#define IDeskBarClient_SetModeDBC(T,a) (T)->lpVtbl->SetModeDBC(T,a) -#define IDeskBarClient_UIActivateDBC(T,a) (T)->lpVtbl->UIActivateDBC(T,a) -#define IDeskBarClient_GetSize(T,a,b) (T)->lpVtbl->GetSize(T,a,b) -#endif Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Wed Jan 18 17:02:34 2012 @@ -744,6 +744,21 @@ }; #undef INTERFACE +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IDeskBarClient_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDeskBarClient_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDeskBarClient_Release(p) (p)->lpVtbl->Release(p) +/*** IOleWindow methods ***/ +#define IDeskBarClient_GetWindow(p,a) (p)->lpVtbl->GetWindow(p,a) +#define IDeskBarClient_ContextSensitiveHelp(p,a) (p)->lpVtbl->ContextSensitiveHelp(p,a) +/*** IOleWindow IDeskBarClient ***/ +#define IDeskBarClient_SetDeskBarSite(p,a) (p)->lpVtbl->SetDeskBarSite(p,a) +#define IDeskBarClient_SetModeDBC(p,a) (p)->lpVtbl->SetModeDBC(p,a) +#define IDeskBarClient_UIActivateDBC(p,a) (p)->lpVtbl->UIActivateDBC(p,a) +#define IDeskBarClient_GetSize(p,a,b) (p)->lpVtbl->GetSize(p,a,b) +#endif + #define DBC_GS_IDEAL 0 #define DBC_GS_SIZEDOWN 1

1 0

[rharabien] 55004: [EXPLORER-NEW] - Use macros for calling IBanneredBar methods - Remove some definitions from todo header because they are already in shlguid_undoc.h
by rharabien＠svn.reactos.org 18 Jan '12

18 Jan '12

Author: rharabien Date: Wed Jan 18 16:23:13 2012 New Revision: 55004 URL: http://svn.reactos.org/svn/reactos?rev=55004&view=rev Log: [EXPLORER-NEW] - Use macros for calling IBanneredBar methods - Remove some definitions from todo header because they are already in shlguid_undoc.h Modified: trunk/reactos/base/shell/explorer-new/startmnu.c trunk/reactos/base/shell/explorer-new/todo.h Modified: trunk/reactos/base/shell/explorer-new/startmnu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/st… ============================================================================== --- trunk/reactos/base/shell/explorer-new/startmnu.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/startmnu.c [iso-8859-1] Wed Jan 18 16:23:13 2012 @@ -820,18 +820,17 @@ { // hRet = IBanneredBar_SetBitmap(pbb, // hbmBanner); - hRet = pbb->lpVtbl->SetBitmap(pbb, - hbmBanner); + hRet = IBanneredBar_SetBitmap(pbb, hbmBanner); /* Update the icon size */ //hRet = IBanneredBar_SetIconSize(pbb, // bSmallIcons ? BMICON_SMALL : BMICON_LARGE); - hRet = pbb->lpVtbl->SetIconSize(pbb, + hRet = IBanneredBar_SetIconSize(pbb, bSmallIcons ? BMICON_SMALL : BMICON_LARGE); //IBanneredBar_Release(pbb); - pbb->lpVtbl->Release(pbb); + IBanneredBar_Release(pbb); } return hRet; @@ -890,10 +889,10 @@ if (SUCCEEDED(hr)) { //hr = IInitializeObject_Initialize(pIo); - hr = pIo->lpVtbl->Initialize(pIo); + hr = IInitializeObject_Initialize(pIo); //IInitializeObject_Release(pIo); - pIo->lpVtbl->Release(pIo); + IInitializeObject_Release(pIo); } else hr = S_OK; Modified: trunk/reactos/base/shell/explorer-new/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/to… ============================================================================== --- trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] Wed Jan 18 16:23:13 2012 @@ -5,10 +5,6 @@ #endif /* FIXME: Ugly hack!!! FIX ASAP! Move to uuid! */ -static const GUID IID_HACK_IShellView2 = {0x88E39E80,0x3578,0x11CF,{0xAE,0x69,0x08,0x00,0x2B,0x2E,0x12,0x62}}; -#define IID_IShellView2 IID_HACK_IShellView2 -static const GUID IID_HACK_IShellView3 = {0xEC39FA88,0xF8AF,0x41CF,{0x84,0x21,0x38,0xBE,0xD2,0x8F,0x46,0x73}}; -#define IID_IShellView3 IID_HACK_IShellView2 static const GUID VID_HACK_LargeIcons = {0x0057D0E0, 0x3573, 0x11CF, {0xAE, 0x69, 0x08, 0x00, 0x2B, 0x2E, 0x12, 0x62}}; #define VID_LargeIcons VID_HACK_LargeIcons @@ -16,14 +12,6 @@ #define IID_IDeskBarClient IID_HACK_IDeskBarClient static const GUID IID_HACK_IDeskBar = {0xEB0FE173, 0x1A3A, 0x11D0, {0x89, 0xB3, 0x00, 0xA0, 0xC9, 0x0A, 0x90, 0xAC}}; #define IID_IDeskBar IID_HACK_IDeskBar - -static const GUID IID_HACK_IMenuPopup = {0xD1E7AFEB,0x6A2E,0x11D0,{0x8C,0x78,0x00,0xC0,0x4F,0xD9,0x18,0xB4}}; -#define IID_IMenuPopup IID_HACK_IMenuPopup -static const GUID IID_HACK_IBanneredBar = {0x596A9A94,0x013E,0x11D1,{0x8D,0x34,0x00,0xA0,0xC9,0x0F,0x27,0x19}}; -#define IID_IBanneredBar IID_HACK_IBanneredBar - -static const GUID IID_HACK_IInitializeObject = {0x4622AD16,0xFF23,0x11D0,{0x8D,0x34,0x00,0xA0,0xC9,0x0F,0x27,0x19}}; -#define IID_IInitializeObject IID_HACK_IInitializeObject static const GUID SID_HACK_SMenuPopup = {0xD1E7AFEB,0x6A2E,0x11D0,{0x8C,0x78,0x00,0xC0,0x4F,0xD9,0x18,0xB4}}; #define SID_SMenuPopup SID_HACK_SMenuPopup

1 0

[khornicek] 55003: [MSTSC] - Fix some corner cases for settings parsing (empty values, values containing delimiters). - If provided, take port number into account.
by khornicek＠svn.reactos.org 18 Jan '12

18 Jan '12

Author: khornicek Date: Wed Jan 18 13:09:18 2012 New Revision: 55003 URL: http://svn.reactos.org/svn/reactos?rev=55003&view=rev Log: [MSTSC] - Fix some corner cases for settings parsing (empty values, values containing delimiters). - If provided, take port number into account. Modified: trunk/reactos/base/applications/mstsc/settings.c trunk/reactos/base/applications/mstsc/win32.c Modified: trunk/reactos/base/applications/mstsc/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/settings.c [iso-8859-1] Wed Jan 18 13:09:18 2012 @@ -230,6 +230,7 @@ { LPWSTR lpStr = lpBuffer; WCHAR szSeps[] = L":\r\n"; + WCHAR szNewline[] = L"\r\n"; LPWSTR lpToken; BOOL bFound; INT i; @@ -258,7 +259,7 @@ else if (lpToken[0] == L's') { pRdpSettings->pSettings[i].Type = lpToken[0]; - lpToken = wcstok(NULL, szSeps); + lpToken = wcstok(NULL, szNewline); if (lpToken != NULL) wcscpy(pRdpSettings->pSettings[i].Value.s, lpToken); } @@ -268,10 +269,7 @@ /* move past the type and value */ if (!bFound) - { - lpToken = wcstok(NULL, szSeps); - lpToken = wcstok(NULL, szSeps); - } + lpToken = wcstok(NULL, szNewline); /* move to next key */ lpToken = wcstok(NULL, szSeps); 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/win32.c [iso-8859-1] Wed Jan 18 13:09:18 2012 @@ -958,6 +958,29 @@ } +static INT +GetPortNumber(PCHAR szAddress) +{ + PCHAR szPort; + INT iPort = TCP_PORT_RDP; + + szPort = strtok(szAddress, ":"); + + if (szPort != NULL) + { + szPort = strtok(NULL, ":"); + + if (szPort != NULL) + { + iPort = atoi(szPort); + + if (iPort <= 0 || iPort > 0xFFFF) + iPort = TCP_PORT_RDP; + } + } + + return iPort; +} static BOOL ParseCommandLine(LPWSTR lpCmdLine, @@ -1051,8 +1074,9 @@ uni_to_str(szValue, GetStringFromSettings(pRdpSettings, L"full address")); + /* GetPortNumber also removes possible trailing port number from address */ + g_tcp_port_rdp = GetPortNumber(szValue); strcpy(g_servername, szValue); - //g_port = 3389; strcpy(g_username, ""); strcpy(g_password, ""); g_server_depth = GetIntegerFromSettings(pRdpSettings, L"session bpp");

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs