Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[gedmurphy] 22413: [AUDIT] winscard only contains stubs
by gedmurphy＠svn.reactos.org 19 Jun '06

19 Jun '06

Author: gedmurphy Date: Mon Jun 19 16:43:39 2006 New Revision: 22413 URL: http://svn.reactos.ru/svn/reactos?rev=22413&view=rev Log: [AUDIT] winscard only contains stubs Modified: trunk/reactos/dll/win32/winscard/precomp.h (props changed) trunk/reactos/dll/win32/winscard/winscard.c (props changed) trunk/reactos/dll/win32/winscard/winscard.def (props changed) trunk/reactos/dll/win32/winscard/winscard.rc (props changed) Propchange: trunk/reactos/dll/win32/winscard/precomp.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/winscard/winscard.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/winscard/winscard.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/winscard/winscard.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[fireball] 22412: Alexey Zavyalov: Start implementing new International Settings applet (Windows XP-alike style, and eventually will work in Windows XP). I keep the old intl.cpl in our tree since it contains some hacks to switch languages/locales/layouts, which will soon be gone (along with the old intl.cpl logically)
by fireball＠svn.reactos.org 19 Jun '06

19 Jun '06

Author: fireball Date: Mon Jun 19 16:43:29 2006 New Revision: 22412 URL: http://svn.reactos.ru/svn/reactos?rev=22412&view=rev Log: Alexey Zavyalov: Start implementing new International Settings applet (Windows XP-alike style, and eventually will work in Windows XP). I keep the old intl.cpl in our tree since it contains some hacks to switch languages/locales/layouts, which will soon be gone (along with the old intl.cpl logically) Added: trunk/reactos/dll/cpl/intl_new/ trunk/reactos/dll/cpl/intl_new/En.rc trunk/reactos/dll/cpl/intl_new/extra.c (with props) trunk/reactos/dll/cpl/intl_new/intl.c (with props) trunk/reactos/dll/cpl/intl_new/intl.def (with props) trunk/reactos/dll/cpl/intl_new/intl.h (with props) trunk/reactos/dll/cpl/intl_new/intl.rbuild (with props) trunk/reactos/dll/cpl/intl_new/intl.rc (with props) trunk/reactos/dll/cpl/intl_new/locale.c (with props) trunk/reactos/dll/cpl/intl_new/resource.h (with props) trunk/reactos/dll/cpl/intl_new/resources/ trunk/reactos/dll/cpl/intl_new/resources/applet.ico (with props) trunk/reactos/dll/cpl/intl_new/resources/flags.ico (with props) Modified: trunk/reactos/dll/cpl/cpl.rbuild Modified: trunk/reactos/dll/cpl/cpl.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/cpl.rbuild?rev=2241… ============================================================================== --- trunk/reactos/dll/cpl/cpl.rbuild (original) +++ trunk/reactos/dll/cpl/cpl.rbuild Mon Jun 19 16:43:29 2006 @@ -12,6 +12,9 @@ </directory> <directory name="intl"> <xi:include href="intl/intl.rbuild" /> +</directory> +<directory name="intl_new"> + <xi:include href="intl_new/intl.rbuild" /> </directory> <directory name="main"> <xi:include href="main/main.rbuild" /> Added: trunk/reactos/dll/cpl/intl_new/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/intl_new/En.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/En.rc (added) +++ trunk/reactos/dll/cpl/intl_new/En.rc Mon Jun 19 16:43:29 2006 @@ -1,0 +1,48 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_REGOPTSPAGE DIALOGEX 0, 0, 252, 236 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Regional options" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Regional options and standards", IDC_GROUPBOX, 5, 3, 242, 165 + LTEXT "This option influences a way of display by some programs of numbers, sums of money, dates and time.", IDC_STATIC, 14, 15, 230, 16 + LTEXT "&Choose an element from the list or press the button ""Setup"" to set formats independently:", IDC_STATIC, 14, 36, 230, 16 + COMBOBOX IDC_SETREG_COMBO, 14, 54, 168, 120, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + PUSHBUTTON "Se&tup...", IDC_SETUP_BUTTON, 187, 54, 52, 13 + LTEXT "Samples", IDC_STATIC, 14, 73, 70, 10 + LTEXT "Number:", IDC_STATIC, 16, 86, 48, 10 + LTEXT "Monetary:", IDC_STATIC, 16, 101, 48, 10 + LTEXT "Time:", IDC_STATIC, 16, 116, 48, 10 + LTEXT "Short date:", IDC_STATIC, 16, 131, 48, 10 + LTEXT "Long date:", IDC_STATIC, 16, 146, 48, 10 + EDITTEXT IDC_NUMSAMPLE_EDIT, 69, 86, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_MONEYSAMPLE_EDIT, 69, 101, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE_EDIT, 69, 116, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 69, 131, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 69, 146, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Geographic location", IDC_GROUPBOX, 5, 172, 242, 56 + LTEXT "Set up your location that services could supply you with the local information, for example, news and reports of weather", IDC_STATIC, 14, 184, 225, 24 + COMBOBOX IDC_LOCATION_COMBO, 14, 211, 225, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT +END + +IDD_EXTRAOPTSPAGE DIALOGEX 0, 0, 252, 236 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Extra" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Program language that not unicode supported", IDC_GROUPBOX, 5, 5, 242, 90 + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 225, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "This option...", IDC_STATIC, 14, 18, 223, 33 + LTEXT "Select language...", IDC_STATIC, 14, 55, 223, 18 + GROUPBOX "Transformation tables codepages", IDC_GROUPBOX, 5, 101, 242, 88 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Language and regional options" + IDS_CPLDESCRIPTION "Choose language and formats of numbers, currencies, time and date" +END Added: trunk/reactos/dll/cpl/intl_new/extra.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/intl_new/extra.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/extra.c (added) +++ trunk/reactos/dll/cpl/intl_new/extra.c Mon Jun 19 16:43:29 2006 @@ -1,0 +1,102 @@ +/* + * PROJECT: ReactOS International Control Panel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/cpl/intl/extra.c + * PURPOSE: Extra parameters page + * PROGRAMMERS: Alexey Zavyalov (gen_x(a)mail.ru) +*/ + +/* INCLUDES *****************************************************************/ + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> + +#include "intl.h" +#include "resource.h" + +/* GLOBALS ******************************************************************/ + +HWND hLanguageList; + +/* FUNCTIONS ****************************************************************/ + +/* Language enumerate procedure */ +BOOL +CALLBACK +LanguagesEnumProc(LPTSTR lpLanguage) +{ + LCID Lcid; + TCHAR Lang[MAX_STR_SIZE]; + int Index; + + Lcid = wcstoul(lpLanguage, NULL, 16); + + GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, Lang, sizeof(Lang)); + Index = SendMessageW(hLanguageList, + CB_ADDSTRING, + 0, + (LPARAM)Lang); + + SendMessageW(hLanguageList, + CB_SETITEMDATA, + Index, + (LPARAM)Lcid); + + return TRUE; +} + +/* Enumerate all installed language identifiers */ +static +VOID +CreateLanguagesList(HWND hWnd) +{ + TCHAR LangSel[MAX_STR_SIZE]; + + hLanguageList = hWnd; + + EnumSystemLocalesW(LanguagesEnumProc, LCID_INSTALLED); + + // Select current locale + GetLocaleInfo(GetUserDefaultLCID(), + LOCALE_SLANGUAGE, + LangSel, + sizeof(LangSel)); + + SendMessageW(hLanguageList, + CB_SELECTSTRING, + -1, + (LPARAM)LangSel); +} + + +/* Extra Parameters page dialog callback */ +INT_PTR +CALLBACK +ExtraOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch(uMsg) + { + case WM_INITDIALOG: + CreateLanguagesList(GetDlgItem(hwndDlg, IDC_LANGUAGE_COMBO)); + break; + + case WM_COMMAND: + + break; + + case WM_NOTIFY: + { + LPNMHDR Lpnm = (LPNMHDR)lParam; + /* If push apply button */ + if (Lpnm->code == (UINT)PSN_APPLY) + { + // TODO: Implement + } + } + break; + } + return FALSE; +} + +/* EOF */ Propchange: trunk/reactos/dll/cpl/intl_new/extra.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/intl_new/intl.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/intl.c (added) +++ trunk/reactos/dll/cpl/intl_new/intl.c Mon Jun 19 16:43:29 2006 @@ -1,0 +1,138 @@ +/* + * PROJECT: ReactOS International Control Panel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/cpl/intl/intl.c + * PURPOSE: ReactOS International Control Panel + * PROGRAMMERS: Eric Kohl + * Alexey Zavyalov (gen_x(a)mail.ru) +*/ + +/* INCLUDES *****************************************************************/ + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> + +#include "resource.h" +#include "intl.h" + +/* GLOBALS ******************************************************************/ + +#define NUM_APPLETS (1) +#define NUM_SHEETS 2 + +LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam); + +HINSTANCE hApplet; + +APPLET Applets[NUM_APPLETS] = +{ + {IDC_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, Applet} +}; + +/* FUNCTIONS ****************************************************************/ + +static +VOID +InitPropSheetPage(PROPSHEETPAGE *PsPage, WORD IdDlg, DLGPROC DlgProc) +{ + ZeroMemory(PsPage, sizeof(PROPSHEETPAGE)); + PsPage->dwSize = sizeof(PROPSHEETPAGE); + PsPage->dwFlags = PSP_DEFAULT; + PsPage->hInstance = hApplet; + PsPage->pszTemplate = MAKEINTRESOURCE(IdDlg); + PsPage->pfnDlgProc = DlgProc; +} + +/* Create applets */ +LONG +APIENTRY +Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) +{ + + PROPSHEETPAGE PsPage[NUM_SHEETS]; + PROPSHEETHEADER psh; + TCHAR Caption[MAX_STR_SIZE]; + + LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USECALLBACK | PSH_PROPTITLE; + psh.hwndParent = NULL; + psh.hInstance = hApplet; + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); + psh.pszCaption = Caption; + psh.nPages = sizeof(PsPage) / sizeof(PROPSHEETPAGE); + psh.nStartPage = 0; + psh.ppsp = PsPage; + + InitPropSheetPage(&PsPage[0], IDD_REGOPTSPAGE, RegOptsProc); + InitPropSheetPage(&PsPage[1], IDD_EXTRAOPTSPAGE, ExtraOptsProc); + + return (LONG)(PropertySheet(&psh) != -1); +} + +/* Control Panel Callback */ +LONG +CALLBACK +CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + switch(uMsg) + { + case CPL_INIT: + { + return TRUE; + } + case CPL_GETCOUNT: + { + return NUM_APPLETS; + } + case CPL_INQUIRE: + { + CPLINFO *CplInfo = (CPLINFO*)lParam2; + UINT uAppIndex = (UINT)lParam1; + + CplInfo->lData = 0; + CplInfo->idIcon = Applets[uAppIndex].idIcon; + CplInfo->idName = Applets[uAppIndex].idName; + CplInfo->idInfo = Applets[uAppIndex].idDescription; + break; + } + case CPL_DBLCLK: + { + UINT uAppIndex = (UINT)lParam1; + Applets[uAppIndex].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + break; + } + } + + return FALSE; +} + +/* Standart DLL entry */ + +BOOL +STDCALL +DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) +{ + INITCOMMONCONTROLSEX InitControls; + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + { + InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX); + InitControls.dwICC = ICC_LISTVIEW_CLASSES | ICC_UPDOWN_CLASS | ICC_BAR_CLASSES; + InitCommonControlsEx(&InitControls); + + hApplet = hinstDLL; + break; + } + } + + + return TRUE; +} + +/* EOF */ Propchange: trunk/reactos/dll/cpl/intl_new/intl.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/intl_new/intl.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.def?r… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/intl.def (added) +++ trunk/reactos/dll/cpl/intl_new/intl.def Mon Jun 19 16:43:29 2006 @@ -1,0 +1,8 @@ +LIBRARY intl.cpl + +EXPORTS +CPlApplet@16 +RegOptsProc@16 +ExtraOptsProc@16 + +; EOF Propchange: trunk/reactos/dll/cpl/intl_new/intl.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/intl_new/intl.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.h?rev… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/intl.h (added) +++ trunk/reactos/dll/cpl/intl_new/intl.h Mon Jun 19 16:43:29 2006 @@ -1,0 +1,31 @@ +#ifndef __INTL_H +#define __INTL_H + +/* GLOBALS ******************************************************************/ + +#define MAX_STR_SIZE 128 +#define MAX_FMT_SIZE 30 + +typedef struct +{ + int idIcon; + int idName; + int idDescription; + APPLET_PROC AppletProc; +} APPLET, *PAPPLET; + +extern HINSTANCE hApplet; + +/* locale.c */ +INT_PTR +CALLBACK +RegOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + +/* extra.c */ +INT_PTR +CALLBACK +ExtraOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + +#endif /* __INTL_H */ + +/* EOF */ Propchange: trunk/reactos/dll/cpl/intl_new/intl.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/intl_new/intl.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.rbuil… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/intl.rbuild (added) +++ trunk/reactos/dll/cpl/intl_new/intl.rbuild Mon Jun 19 16:43:29 2006 @@ -1,0 +1,18 @@ +<module name="intl_new" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}" installbase="system32" installname="intl_new.cpl" usewrc="false"> + <importlibrary definition="intl.def" /> + <include base="intl">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <library>advapi32</library> + <file>intl.c</file> + <file>locale.c</file> + <file>extra.c</file> + <file>intl.rc</file> +</module> Propchange: trunk/reactos/dll/cpl/intl_new/intl.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/intl_new/intl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.rc?re… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/intl.rc (added) +++ trunk/reactos/dll/cpl/intl_new/intl.rc Mon Jun 19 16:43:29 2006 @@ -1,0 +1,20 @@ +#include <windows.h> +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Control Panel\0" +#define REACTOS_STR_INTERNAL_NAME "intl\0" +#define REACTOS_STR_ORIGINAL_FILENAME "intl.cpl\0" +#include <reactos/version.rc> + +IDC_CPLICON ICON "resources/applet.ico" +IDC_FLAGS ICON "resources/flags.ico" + + +/* + * Everything specific to any language goes in one of the specific + * files. Note that you can and may override resources which also have + * a neutral version. This is to get localized bitmaps for example. +*/ + +#include "En.rc" Propchange: trunk/reactos/dll/cpl/intl_new/intl.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/intl_new/locale.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/intl_new/locale.c?r… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/locale.c (added) +++ trunk/reactos/dll/cpl/intl_new/locale.c Mon Jun 19 16:43:29 2006 @@ -1,0 +1,301 @@ +/* + * PROJECT: ReactOS International Control Panel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/cpl/intl/locale.h + * PURPOSE: Regional parameters page + * PROGRAMMERS: Eric Kohl + * Alexey Zavyalov (gen_x(a)mail.ru) +*/ + +/* INCLUDES *****************************************************************/ + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> + +#include "intl.h" +#include "resource.h" + +/* GLOBALS ******************************************************************/ + +#define SAMPLE_NUMBER L"123456789" +#define NO_FLAG 0 + +HWND hLocaleList, hGeoList; + +/* FUNCTIONS ****************************************************************/ + +/* Location enumerate procedure */ +BOOL +CALLBACK +LocationsEnumProc(GEOID gId) +{ + TCHAR loc[MAX_STR_SIZE]; + int index; + + GetGeoInfo(gId, GEO_FRIENDLYNAME, loc, MAX_FMT_SIZE, LANG_SYSTEM_DEFAULT); + index = SendMessageW(hGeoList, + CB_ADDSTRING, + 0, + (LPARAM)loc); + + SendMessageW(hGeoList, + CB_SETITEMDATA, + index, + (LPARAM)gId); + + return TRUE; +} + +/* Enumerate all system locations identifiers */ +static +VOID +CreateLocationsList(HWND hWnd) +{ + GEOID userGeoID; + TCHAR loc[MAX_STR_SIZE]; + + hGeoList = hWnd; + + EnumSystemGeoID(GEOCLASS_NATION, 0, LocationsEnumProc); + + // Select current location + userGeoID = GetUserGeoID(GEOCLASS_NATION); + GetGeoInfo(userGeoID, + GEO_FRIENDLYNAME, + loc, + MAX_FMT_SIZE, + LANG_SYSTEM_DEFAULT); + + SendMessageW(hGeoList, + CB_SELECTSTRING, + -1, + (LPARAM)loc); +} + +/* Locale enumerate procedure */ +BOOL +CALLBACK +LocalesEnumProc(LPTSTR lpLocale) +{ + LCID lcid; + TCHAR lang[MAX_STR_SIZE]; + int index; + + lcid = wcstoul(lpLocale, NULL, 16); + + GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)); + index = SendMessageW(hLocaleList, + CB_ADDSTRING, + 0, + (LPARAM)lang); + + SendMessageW(hLocaleList, + CB_SETITEMDATA, + index, + (LPARAM)lcid); + + return TRUE; +} + +/* Enumerate all installed locale identifiers */ +static +VOID +CreateLanguagesList(HWND hWnd) +{ + TCHAR langSel[MAX_STR_SIZE]; + + hLocaleList = hWnd; + + EnumSystemLocalesW(LocalesEnumProc, LCID_INSTALLED); + + // Select current locale + GetLocaleInfo(GetUserDefaultLCID(), + LOCALE_SLANGUAGE, + langSel, + sizeof(langSel)); + + SendMessageW(hLocaleList, + CB_SELECTSTRING, + -1, + (LPARAM)langSel); +} + + +/* Update all locale samples */ +static +VOID +UpdateLocaleSample(HWND hwndDlg, LCID lcidLocale) +{ + WCHAR OutBuffer[MAX_FMT_SIZE]; + + /* Get number format sample */ + GetNumberFormatW(lcidLocale, NO_FLAG, SAMPLE_NUMBER, NULL, OutBuffer, + MAX_FMT_SIZE); + SendMessageW(GetDlgItem(hwndDlg, IDC_NUMSAMPLE_EDIT), + WM_SETTEXT, 0, (LPARAM)OutBuffer); + + /* Get monetary format sample */ + GetCurrencyFormatW(lcidLocale, LOCALE_USE_CP_ACP, SAMPLE_NUMBER, NULL, + OutBuffer, MAX_FMT_SIZE); + SendMessageW(GetDlgItem(hwndDlg, IDC_MONEYSAMPLE_EDIT), + WM_SETTEXT, 0, (LPARAM)OutBuffer); + + /* Get time format sample */ + GetTimeFormatW(lcidLocale, NO_FLAG, NULL, NULL, OutBuffer, MAX_FMT_SIZE); + SendMessageW(GetDlgItem(hwndDlg, IDC_TIMESAMPLE_EDIT), + WM_SETTEXT, + 0, + (LPARAM)OutBuffer); + + /* Get short date format sample */ + GetDateFormatW(lcidLocale, DATE_SHORTDATE, NULL, NULL, OutBuffer, + MAX_FMT_SIZE); + SendMessageW(GetDlgItem(hwndDlg, IDC_SHORTTIMESAMPLE_EDIT), WM_SETTEXT, + 0, (LPARAM)OutBuffer); + + /* Get long date sample */ + GetDateFormatW(lcidLocale, DATE_LONGDATE, NULL, NULL, OutBuffer, + MAX_FMT_SIZE); + SendMessageW(GetDlgItem(hwndDlg, IDC_FULLTIMESAMPLE_EDIT), + WM_SETTEXT, 0, (LPARAM)OutBuffer); +} + +/* Setting up new locale */ +static +VOID +SetNewLocale(LCID LcidLocale) +{ + int RetCode; + TCHAR OutBuff[MAX_STR_SIZE]; + int LocaleCounter; + HKEY LocaleKey; + TCHAR Value[9]; + DWORD ValueSize; + + //SetUserDefaultLCID(LcidLocale); // Not implemented in MS :( + + if(!IsValidLocale(LcidLocale, LCID_INSTALLED)) + { + MessageBoxW(NULL, L"Invalid locale.", L"Critical error", + MB_OK | MB_ICONERROR); + return; + } + + //HACKHACK: I'm sure there is a better way to do this + for(LocaleCounter = LOCALE_ILANGUAGE; + LocaleCounter <= LOCALE_SISO3166CTRYNAME; LocaleCounter++) + { + RetCode = GetLocaleInfoW(LcidLocale, + (LCTYPE)LocaleCounter, + OutBuff, + sizeof(OutBuff)); + if(RetCode == ERROR_INVALID_PARAMETER) + continue; + SetLocaleInfoW(LOCALE_USER_DEFAULT, (LCTYPE)LocaleCounter, OutBuff); + } + + RetCode = RegOpenKeyW(HKEY_CURRENT_USER, + L"Control Panel\\International", + &LocaleKey); + + if(RetCode != ERROR_SUCCESS) + { + MessageBoxW(NULL, + L"Problem opening HKCU\\Control Panel\\International key", + L"Critical error", MB_OK | MB_ICONERROR); + return; + } + + wsprintf(Value, L"%04X", (DWORD)LcidLocale); + ValueSize = (wcslen(Value) + 1) * sizeof(WCHAR); + + RegSetValueExW(LocaleKey, L"Locale", 0, REG_SZ, (BYTE *)Value, ValueSize); + RegCloseKey(LocaleKey); +} + +/* Regional Parameters page dialog callback */ +INT_PTR +CALLBACK +RegOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + int CurrSel; + LCID NewLCID; + GEOID NewLocation; + + switch(uMsg) + { + case WM_INITDIALOG: + CreateLocationsList(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO)); + CreateLanguagesList(GetDlgItem(hwndDlg, IDC_SETREG_COMBO)); + /* Update locale samples */ + UpdateLocaleSample(hwndDlg, LOCALE_USER_DEFAULT); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_SETUP_BUTTON: + // setup button code... + MessageBox(NULL, L"Not implemented yet", L"Info", + MB_OK | MB_ICONINFORMATION); + break; + + /* If selected other locale */ + case IDC_SETREG_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE || + HIWORD(wParam) == CBN_EDITCHANGE) + { + CurrSel = SendMessageW((HWND)lParam, CB_GETCURSEL, + 0, 0); + NewLCID = SendMessageW((HWND)lParam, CB_GETITEMDATA, + CurrSel, 0); + UpdateLocaleSample(hwndDlg, + MAKELCID(NewLCID, SORT_DEFAULT)); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + + case IDC_LOCATION_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE || + HIWORD(wParam) == CBN_EDITCHANGE) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + break; + + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + /* If push apply button */ + if (lpnm->code == (UINT)PSN_APPLY) + { + /* Set locale */ + CurrSel = SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO), + CB_GETCURSEL, 0, 0); + NewLCID = SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO), + CB_GETITEMDATA, CurrSel, 0); + if (NewLCID == (LCID)CB_ERR) break; + + SetNewLocale(MAKELCID(NewLCID, SORT_DEFAULT)); + + /* Set geo location */ + CurrSel = SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO), + CB_GETCURSEL, + 0, + 0); + NewLocation = SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO), + CB_GETITEMDATA, + CurrSel, + 0); + SetUserGeoID(NewLocation); + } + } + break; + } + return FALSE; +} + +/* EOF */ Propchange: trunk/reactos/dll/cpl/intl_new/locale.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/intl_new/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/intl_new/resource.h… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/resource.h (added) +++ trunk/reactos/dll/cpl/intl_new/resource.h Mon Jun 19 16:43:29 2006 @@ -1,0 +1,38 @@ +#ifndef __CPL_RESOURCE_H +#define __CPL_RESOURCE_H + +/* CPL file info */ +#define IDC_CPLICON 1 +#define IDC_FLAGS 2 +#define IDC_ICON1 3 + +#define IDS_CPLNAME 10 +#define IDS_CPLDESCRIPTION 11 + +/* Region page options */ +#define IDD_REGOPTSPAGE 100 + +#define IDC_GROUPBOX 101 +#define IDC_STATIC 102 +#define IDC_SETREG_COMBO 103 +#define IDC_SETUP_BUTTON 104 +#define IDC_NUMSAMPLE_EDIT 105 +#define IDC_MONEYSAMPLE_EDIT 106 +#define IDC_TIMESAMPLE_EDIT 107 +#define IDC_SHORTTIMESAMPLE_EDIT 108 +#define IDC_FULLTIMESAMPLE_EDIT 109 +#define IDC_LOCATION_COMBO 110 + +/* Extra page options */ + +#define IDD_EXTRAOPTSPAGE 200 + +#define IDC_LANGUAGE_COMBO 103 + +/* Other page options */ + +// ... something + +#endif /* __CPL_RESOURCE_H */ + +/* EOF */ Propchange: trunk/reactos/dll/cpl/intl_new/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/intl_new/resources/applet.ico URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/intl_new/resources/… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/intl_new/resources/applet.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/intl_new/resources/flags.ico URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/intl_new/resources/… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/intl_new/resources/flags.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[gedmurphy] 22411: [AUDIT] vdmdbg only contains stubs
by gedmurphy＠svn.reactos.org 19 Jun '06

19 Jun '06

Author: gedmurphy Date: Mon Jun 19 16:36:40 2006 New Revision: 22411 URL: http://svn.reactos.ru/svn/reactos?rev=22411&view=rev Log: [AUDIT] vdmdbg only contains stubs Modified: trunk/reactos/dll/win32/vdmdbg/vdmdbg.c (props changed) trunk/reactos/dll/win32/vdmdbg/vdmdbg.def (props changed) trunk/reactos/dll/win32/vdmdbg/vdmdbg.h (props changed) Propchange: trunk/reactos/dll/win32/vdmdbg/vdmdbg.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/vdmdbg/vdmdbg.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/vdmdbg/vdmdbg.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 22410: [AUDIT] snmpapi only contains stubs
by gedmurphy＠svn.reactos.org 19 Jun '06

19 Jun '06

Author: gedmurphy Date: Mon Jun 19 16:34:31 2006 New Revision: 22410 URL: http://svn.reactos.ru/svn/reactos?rev=22410&view=rev Log: [AUDIT] snmpapi only contains stubs Modified: trunk/reactos/dll/win32/snmpapi/debug.h (props changed) trunk/reactos/dll/win32/snmpapi/snmpapi.c (props changed) trunk/reactos/dll/win32/snmpapi/snmpapi.def (props changed) trunk/reactos/dll/win32/snmpapi/snmpapi.rc (props changed) Propchange: trunk/reactos/dll/win32/snmpapi/debug.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/snmpapi/snmpapi.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/snmpapi/snmpapi.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/snmpapi/snmpapi.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 22409: [AUDIT] samsrv only contains stubs
by gedmurphy＠svn.reactos.org 19 Jun '06

19 Jun '06

Author: gedmurphy Date: Mon Jun 19 16:22:44 2006 New Revision: 22409 URL: http://svn.reactos.ru/svn/reactos?rev=22409&view=rev Log: [AUDIT] samsrv only contains stubs Modified: trunk/reactos/dll/win32/samsrv/samsrv.c (props changed) trunk/reactos/dll/win32/samsrv/samsrv.def (props changed) trunk/reactos/dll/win32/samsrv/samsrv.rc (props changed) Propchange: trunk/reactos/dll/win32/samsrv/samsrv.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/samsrv/samsrv.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/samsrv/samsrv.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 22408: [AUDIT] authz Confirmed to be clean by Thomas Weidenmueller
by gedmurphy＠svn.reactos.org 19 Jun '06

19 Jun '06

Author: gedmurphy Date: Mon Jun 19 16:14:39 2006 New Revision: 22408 URL: http://svn.reactos.ru/svn/reactos?rev=22408&view=rev Log: [AUDIT] authz Confirmed to be clean by Thomas Weidenmueller Modified: trunk/reactos/dll/win32/authz/authz.c (props changed) trunk/reactos/dll/win32/authz/authz.def (props changed) trunk/reactos/dll/win32/authz/authz.rc (props changed) trunk/reactos/dll/win32/authz/clictx.c (props changed) trunk/reactos/dll/win32/authz/precomp.h (props changed) trunk/reactos/dll/win32/authz/resman.c (props changed) Propchange: trunk/reactos/dll/win32/authz/authz.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/authz/authz.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/authz/authz.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/authz/clictx.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/authz/precomp.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/authz/resman.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 22407: [AUDIT] opengl32 Confirmed to be clean by Anich Gregor (blight)
by gedmurphy＠svn.reactos.org 19 Jun '06

19 Jun '06

Author: gedmurphy Date: Mon Jun 19 16:09:56 2006 New Revision: 22407 URL: http://svn.reactos.ru/svn/reactos?rev=22407&view=rev Log: [AUDIT] opengl32 Confirmed to be clean by Anich Gregor (blight) Modified: trunk/reactos/dll/win32/opengl32/gl.c (props changed) trunk/reactos/dll/win32/opengl32/glfuncs.h (props changed) trunk/reactos/dll/win32/opengl32/icdlist.h (props changed) trunk/reactos/dll/win32/opengl32/icdtable.h (props changed) trunk/reactos/dll/win32/opengl32/opengl32.c (props changed) trunk/reactos/dll/win32/opengl32/opengl32.dsp (props changed) trunk/reactos/dll/win32/opengl32/opengl32.dsw (props changed) trunk/reactos/dll/win32/opengl32/opengl32.h (props changed) trunk/reactos/dll/win32/opengl32/teb.h (props changed) trunk/reactos/dll/win32/opengl32/wgl.c (props changed) Propchange: trunk/reactos/dll/win32/opengl32/gl.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/opengl32/glfuncs.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/opengl32/icdlist.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/opengl32/icdtable.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/opengl32/opengl32.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/opengl32/opengl32.dsp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/opengl32/opengl32.dsw ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/opengl32/opengl32.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/opengl32/teb.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/opengl32/wgl.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 22406: [AUDIT] mswsock All stubs with the exception of TransmitFile, which is a simple wrapper
by gedmurphy＠svn.reactos.org 19 Jun '06

19 Jun '06

Author: gedmurphy Date: Mon Jun 19 15:49:15 2006 New Revision: 22406 URL: http://svn.reactos.ru/svn/reactos?rev=22406&view=rev Log: [AUDIT] mswsock All stubs with the exception of TransmitFile, which is a simple wrapper Modified: trunk/reactos/dll/win32/mswsock/extensions.c (props changed) trunk/reactos/dll/win32/mswsock/mswsock.def (props changed) trunk/reactos/dll/win32/mswsock/mswsock.rc (props changed) trunk/reactos/dll/win32/mswsock/stubs.c (props changed) Propchange: trunk/reactos/dll/win32/mswsock/extensions.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/mswsock/mswsock.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/mswsock/mswsock.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/mswsock/stubs.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[fireball] 22405: Change entrypoint to be a get-style method of class Module, having a boolean param which define if the entrypoint is to be returned with or without the leading underscore. Internal entrypoint string holds entrypoint without leading underscore. This makes both mingw and msvc backend happy about entry point names.
by fireball＠svn.reactos.org 18 Jun '06

18 Jun '06

Author: fireball Date: Mon Jun 19 00:30:52 2006 New Revision: 22405 URL: http://svn.reactos.ru/svn/reactos?rev=22405&view=rev Log: Change entrypoint to be a get-style method of class Module, having a boolean param which define if the entrypoint is to be returned with or without the leading underscore. Internal entrypoint string holds entrypoint without leading underscore. This makes both mingw and msvc backend happy about entry point names. Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Jun 19 00:30:52 2006 @@ -2302,7 +2302,7 @@ string linkerParameters = ssprintf ( "-Wl,-T,%s%cntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared", module.GetBasePath ().c_str (), cSep, - module.entrypoint.c_str (), + module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, "${gcc}", @@ -2389,7 +2389,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared", - module.entrypoint.c_str (), + module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, "${gcc}", @@ -2437,7 +2437,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared", - module.entrypoint.c_str (), + module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, "${gcc}", @@ -2484,7 +2484,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -shared", - module.entrypoint.c_str (), + module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, "${gcc}", @@ -2531,7 +2531,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib", - module.entrypoint.c_str (), + module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, "${gcc}", @@ -2584,7 +2584,7 @@ linker = "${gcc}"; string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -shared", - module.entrypoint.c_str (), + module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, linker, @@ -2637,7 +2637,7 @@ linker = "${gcc}"; string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000", - module.entrypoint.c_str (), + module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, linker, @@ -2690,7 +2690,7 @@ linker = "${gcc}"; string linkerParameters = ssprintf ( "-Wl,--subsystem,windows -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000", - module.entrypoint.c_str (), + module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, linker, @@ -3255,7 +3255,7 @@ linker = "${gcc}"; string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000", - module.entrypoint.c_str (), + module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, linker, Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/v… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Mon Jun 19 00:30:52 2006 @@ -393,7 +393,7 @@ fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 ); fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 ); - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DriverEntry" : module.entrypoint.c_str ()); + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint(false) == "" ? "DriverEntry" : module.GetEntryPoint(false).c_str ()); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x10000" : baseaddr.c_str ()); } else if ( exe ) @@ -424,7 +424,7 @@ } else if ( dll ) { - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DllMain" : module.entrypoint.c_str ()); + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint(false) == "" ? "DllMain" : module.GetEntryPoint(false).c_str ()); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str ()); } fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 ); Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?rev… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Mon Jun 19 00:30:52 2006 @@ -825,29 +825,29 @@ switch ( type ) { case Kernel: - return "_NtProcessStartup"; + return "NtProcessStartup"; case KernelModeDLL: case KernelModeDriver: case ExportDriver: - return "_DriverEntry@8"; + return "DriverEntry@8"; case NativeDLL: - return "_DllMainCRTStartup@12"; + return "DllMainCRTStartup@12"; case NativeCUI: - return "_NtProcessStartup@4"; + return "NtProcessStartup@4"; case Win32DLL: - return "_DllMain@12"; + return "DllMain@12"; case Win32CUI: case Test: if ( isUnicode ) - return "_wmainCRTStartup"; + return "wmainCRTStartup"; else - return "_mainCRTStartup"; + return "mainCRTStartup"; case Win32SCR: case Win32GUI: if ( isUnicode ) - return "_wWinMainCRTStartup"; + return "wWinMainCRTStartup"; else - return "_WinMainCRTStartup"; + return "WinMainCRTStartup"; case BuildTool: case StaticLibrary: case ObjectLibrary: @@ -1038,6 +1038,17 @@ index ); } +string +Module::GetEntryPoint(bool leadingUnderscore) const +{ + string result = ""; + if (leadingUnderscore) + result = "_"; + + result += entrypoint; + return result; +} + bool Module::HasFileWithExtension ( const IfableData& data, Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=2… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Mon Jun 19 00:30:52 2006 @@ -285,7 +285,6 @@ std::string name; std::string guid; std::string extension; - std::string entrypoint; std::string baseaddress; std::string payload; std::string path; @@ -328,6 +327,7 @@ std::string GetPath () const; // "path/foo.exe" std::string GetPathWithPrefix ( const std::string& prefix ) const; // "path/prefixfoo.exe" std::string GetPathToBaseDir() const; // "../" offset to rootdirectory + std::string GetEntryPoint(bool leadingUnderscore) const; void GetTargets ( string_list& ) const; std::string GetInvocationTarget ( const int index ) const; bool HasFileWithExtension ( const IfableData&, const std::string& extension ) const; @@ -339,6 +339,7 @@ std::string GetDefaultModuleExtension () const; std::string GetDefaultModuleEntrypoint () const; std::string GetDefaultModuleBaseaddress () const; + std::string entrypoint; void ProcessXMLSubElement ( const XMLElement& e, const std::string& path, ParseContext& parseContext );

1 0

[greatlrd] 22404: rename .xml to rbuild forget we using .rbuild as ext
by greatlrd＠svn.reactos.org 18 Jun '06

18 Jun '06

Author: greatlrd Date: Mon Jun 19 00:14:40 2006 New Revision: 22404 URL: http://svn.reactos.ru/svn/reactos?rev=22404&view=rev Log: rename .xml to rbuild forget we using .rbuild as ext Added: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild - copied unchanged from r22402, trunk/reactos/dll/cpl/hdwwiz/hdwwiz.xml Removed: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.xml Modified: trunk/reactos/dll/cpl/cpl.rbuild Modified: trunk/reactos/dll/cpl/cpl.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/cpl.rbuild?rev=2240… ============================================================================== --- trunk/reactos/dll/cpl/cpl.rbuild (original) +++ trunk/reactos/dll/cpl/cpl.rbuild Mon Jun 19 00:14:40 2006 @@ -8,7 +8,7 @@ <xi:include href="desk/desk.rbuild" /> </directory> <directory name="hdwwiz"> - <xi:include href="hdwwiz/hdwwiz.xml" /> + <xi:include href="hdwwiz/hdwwiz.rbuild" /> </directory> <directory name="intl"> <xi:include href="intl/intl.rbuild" /> Removed: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.xml URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.xml?r… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.xml (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.xml (removed) @@ -1,13 +1,0 @@ -<module name="hdwwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_HDWWIZ}" installbase="system32" installname="hdwwiz.cpl"> - <importlibrary definition="hdwwiz.def" /> - <include base="hdwwiz">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <library>setupapi</library> - <file>hdwwiz.c</file> - <file>hdwwiz.rc</file> -</module>

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
60
Older →

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 June 2006