Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mnordell] 29656: Feeble attempt at getting NT4 vga.sys working by implementing HalFrameBufferCachingInformation case for HaliQuerySystemInformation.
by mnordell＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: mnordell Date: Thu Oct 18 12:00:59 2007 New Revision: 29656 URL: http://svn.reactos.org/svn/reactos?rev=29656&view=rev Log: Feeble attempt at getting NT4 vga.sys working by implementing HalFrameBufferCachingInformation case for HaliQuerySystemInformation. Modified: trunk/reactos/hal/halx86/generic/sysinfo.c Modified: trunk/reactos/hal/halx86/generic/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/sysinfo… ============================================================================== --- trunk/reactos/hal/halx86/generic/sysinfo.c (original) +++ trunk/reactos/hal/halx86/generic/sysinfo.c Thu Oct 18 12:00:59 2007 @@ -23,13 +23,54 @@ NTSTATUS NTAPI -HaliQuerySystemInformation(IN HAL_QUERY_INFORMATION_CLASS InformationClass, - IN ULONG BufferSize, - IN OUT PVOID Buffer, - OUT PULONG ReturnedLength) +HaliQuerySystemInformation(IN HAL_QUERY_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN OUT PVOID Buffer, + OUT PULONG ReturnedLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; +#define REPORT_THIS_CASE(X) case X: DPRINT1("Unhandled case: %s\n", #X); break + switch (InformationClass) + { + REPORT_THIS_CASE(HalInstalledBusInformation); + REPORT_THIS_CASE(HalProfileSourceInformation); + REPORT_THIS_CASE(HalInformationClassUnused1); + REPORT_THIS_CASE(HalPowerInformation); + REPORT_THIS_CASE(HalProcessorSpeedInformation); + REPORT_THIS_CASE(HalCallbackInformation); + REPORT_THIS_CASE(HalMapRegisterInformation); + REPORT_THIS_CASE(HalMcaLogInformation); + case HalFrameBufferCachingInformation: + if (BufferSize >= 1) + { + // The only caller that has been seen calling this function told + // us it expected a single byte back. We therefore guess it expects + // a BOOLEAN, and we dream up the value TRUE to (we think) tell it + // "Sure, the framebuffer is cached". + DPRINT("%s: caller expects %u bytes (should be 1)\n", "HalFrameBufferCachingInformation", BufferSize); + BOOLEAN ToReturn = TRUE; + ASSERT(sizeof(BOOLEAN) == 1); + *ReturnedLength = sizeof(BOOLEAN); + RtlCopyMemory(Buffer, &ToReturn, sizeof(BOOLEAN)); + return STATUS_SUCCESS; + } + break; + REPORT_THIS_CASE(HalDisplayBiosInformation); + REPORT_THIS_CASE(HalProcessorFeatureInformation); + REPORT_THIS_CASE(HalNumaTopologyInterface); + REPORT_THIS_CASE(HalErrorInformation); + REPORT_THIS_CASE(HalCmcLogInformation); + REPORT_THIS_CASE(HalCpeLogInformation); + REPORT_THIS_CASE(HalQueryMcaInterface); + REPORT_THIS_CASE(HalQueryAMLIIllegalIOPortAddresses); + REPORT_THIS_CASE(HalQueryMaxHotPlugMemoryAddress); + REPORT_THIS_CASE(HalPartitionIpiInterface); + REPORT_THIS_CASE(HalPlatformInformation); + REPORT_THIS_CASE(HalQueryProfileSourceList); + } +#undef REPORT_THIS_CASE + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS

1 0

[weiden] 29655: Fix status output
by weiden＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: weiden Date: Thu Oct 18 10:28:02 2007 New Revision: 29655 URL: http://svn.reactos.org/svn/reactos?rev=29655&view=rev Log: Fix status output Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/dwnl/dwnl.c (original) +++ trunk/reactos/base/applications/network/dwnl/dwnl.c Thu Oct 18 10:28:02 2007 @@ -39,6 +39,27 @@ } static void +write_status(LPCTSTR lpFmt, ...) +{ + va_list args; + + /* FIXME: Determine line length! */ + TCHAR szTxt[80]; + int c; + + va_start(args, lpFmt); + _vstprintf(szTxt, lpFmt, args); + va_end(args); + + c = _tcslen(szTxt); + while (c < (sizeof(szTxt) / sizeof(szTxt[0])) - 1) + szTxt[c++] = _T(' '); + szTxt[c] = _T('\0'); + + _tprintf(_T("\r%.79s"), szTxt); +} + +static void CBindStatusCallback_UpdateProgress(CBindStatusCallback *This) { /* FIXME: better output */ @@ -50,12 +71,12 @@ if (Percentage > 99) Percentage = 99; - _tprintf(_T("\r%2d%% (%I64u bytes downloaded)"), Percentage, This->Progress); + write_status(_T("%2d%% (%I64u bytes downloaded)"), Percentage, This->Progress); } else { /* Unknown size */ - _tprintf(_T("\r%I64u bytes downloaded"), This->Progress); + write_status(_T("%I64u bytes downloaded"), This->Progress); } } @@ -214,7 +235,8 @@ break; case BINDSTATUS_ENDDOWNLOADDATA: - _tprintf(_T("\rFile saved.\n")); + write_status(_T("File saved.")); + _tprintf(_T("\n")); break; case BINDSTATUS_DOWNLOADINGDATA: @@ -415,6 +437,8 @@ static int print_err(int iErr) { + write_status(_T("")); + if (iErr == DWNL_E_LASTERROR) { if (GetLastError() == ERROR_SUCCESS)

1 0

[weiden] 29654: Display basic download status
by weiden＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: weiden Date: Thu Oct 18 10:00:17 2007 New Revision: 29654 URL: http://svn.reactos.org/svn/reactos?rev=29654&view=rev Log: Display basic download status Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c trunk/reactos/base/applications/network/dwnl/dwnl.rbuild Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/dwnl/dwnl.c (original) +++ trunk/reactos/base/applications/network/dwnl/dwnl.c Thu Oct 18 10:00:17 2007 @@ -1,5 +1,7 @@ #include <stdio.h> +#define COBJMACROS #include <urlmon.h> +#include <wininet.h> #include <tchar.h> /* FIXME: add correct definitions to urlmon.idl */ @@ -9,39 +11,453 @@ #define URLDownloadToFile URLDownloadToFileA #endif +#define DWNL_E_LASTERROR 0 +#define DWNL_E_NEEDTARGETFILENAME -1 +#define DWNL_E_UNSUPPORTEDSCHEME -2 + +typedef struct +{ + const IBindStatusCallbackVtbl* lpIBindStatusCallbackVtbl; + LONG ref; + TCHAR szHostName[INTERNET_MAX_HOST_NAME_LENGTH + 1]; + TCHAR szMimeType[128]; + UINT64 Size; + UINT64 Progress; + UINT bResolving : 1; + UINT bConnecting : 1; + UINT bSendingReq : 1; + UINT bBeginTransfer : 1; +} CBindStatusCallback; + +#define impl_to_interface(impl,iface) (struct iface *)(&(impl)->lp##iface##Vtbl) +#define interface_to_impl(instance,iface) ((CBindStatusCallback*)((ULONG_PTR)instance - FIELD_OFFSET(CBindStatusCallback,lp##iface##Vtbl))) + +static void +CBindStatusCallback_Destroy(CBindStatusCallback *This) +{ + return; +} + +static void +CBindStatusCallback_UpdateProgress(CBindStatusCallback *This) +{ + /* FIXME: better output */ + if (This->Size != 0) + { + UINT Percentage; + + Percentage = (UINT)((This->Progress * 100) / This->Size); + if (Percentage > 99) + Percentage = 99; + + _tprintf(_T("\r%2d%% (%I64u bytes downloaded)"), Percentage, This->Progress); + } + else + { + /* Unknown size */ + _tprintf(_T("\r%I64u bytes downloaded"), This->Progress); + } +} + +static ULONG STDMETHODCALLTYPE +CBindStatusCallback_AddRef(IBindStatusCallback *iface) +{ + CBindStatusCallback *This = interface_to_impl(iface, IBindStatusCallback); + ULONG ret; + + ret = InterlockedIncrement((PLONG)&This->ref); + return ret; +} + +static ULONG STDMETHODCALLTYPE +CBindStatusCallback_Release(IBindStatusCallback *iface) +{ + CBindStatusCallback *This = interface_to_impl(iface, IBindStatusCallback); + ULONG ret; + + ret = InterlockedDecrement((PLONG)&This->ref); + if (ret == 0) + { + CBindStatusCallback_Destroy(This); + + HeapFree(GetProcessHeap(), + 0, + This); + } + + return ret; +} + +static HRESULT STDMETHODCALLTYPE +CBindStatusCallback_QueryInterface(IBindStatusCallback *iface, + REFIID iid, + PVOID *pvObject) +{ + CBindStatusCallback *This = interface_to_impl(iface, IBindStatusCallback); + + *pvObject = NULL; + + if (IsEqualIID(iid, + &IID_IBindStatusCallback) || + IsEqualIID(iid, + &IID_IUnknown)) + { + *pvObject = impl_to_interface(This, IBindStatusCallback); + } + else + return E_NOINTERFACE; + + CBindStatusCallback_AddRef(iface); + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE +CBindStatusCallback_OnStartBinding(IBindStatusCallback *iface, + DWORD dwReserved, + IBinding* pib) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +CBindStatusCallback_GetPriority(IBindStatusCallback *iface, + LONG* pnPriority) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +CBindStatusCallback_OnLowResource(IBindStatusCallback *iface, + DWORD reserved) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +CBindStatusCallback_OnProgress(IBindStatusCallback *iface, + ULONG ulProgress, + ULONG ulProgressMax, + ULONG ulStatusCode, + LPCWSTR szStatusText) +{ + CBindStatusCallback *This = interface_to_impl(iface, IBindStatusCallback); + + switch (ulStatusCode) + { + case BINDSTATUS_FINDINGRESOURCE: + if (!This->bResolving) + { + _tcscpy(This->szHostName, szStatusText); + This->bResolving = TRUE; + + _tprintf(_T("Resolving %s... "), This->szHostName); + } + break; + + case BINDSTATUS_CONNECTING: + This->bConnecting = TRUE; + This->bSendingReq = FALSE; + This->bBeginTransfer = FALSE; + This->szMimeType[0] = _T('\0'); + if (This->bResolving) + { + _tprintf(_T("done.\n")); + _tprintf(_T("Connecting to %s[%s]... "), This->szHostName, szStatusText); + } + else + _tprintf(_T("Connecting to %s... "), szStatusText); + break; + + case BINDSTATUS_REDIRECTING: + This->bResolving = FALSE; + This->bConnecting = FALSE; + This->bSendingReq = FALSE; + This->bBeginTransfer = FALSE; + This->szMimeType[0] = _T('\0'); + _tprintf(_T("Redirecting to %s... "), szStatusText); + break; + + case BINDSTATUS_SENDINGREQUEST: + This->bBeginTransfer = FALSE; + This->szMimeType[0] = _T('\0'); + if (This->bResolving || This->bConnecting) + _tprintf(_T("done.\n")); + + if (!This->bSendingReq) + _tprintf(_T("Sending request... ")); + + This->bSendingReq = TRUE; + break; + + case BINDSTATUS_MIMETYPEAVAILABLE: + _tcscpy(This->szMimeType, szStatusText); + break; + + case BINDSTATUS_BEGINDOWNLOADDATA: + This->Progress = (UINT64)ulProgress; + This->Size = (UINT64)ulProgressMax; + + if (This->bSendingReq) + _tprintf(_T("done.\n")); + + if (!This->bBeginTransfer && This->Size != 0) + { + if (This->szMimeType[0] != _T('\0')) + _tprintf(_T("Length: %I64u [%s]\n"), This->Size, This->szMimeType); + else + _tprintf(_T("Length: %ull\n"), This->Size); + } + + _tprintf(_T("\n")); + + This->bBeginTransfer = TRUE; + break; + + case BINDSTATUS_ENDDOWNLOADDATA: + _tprintf(_T("\rFile saved.\n")); + break; + + case BINDSTATUS_DOWNLOADINGDATA: + This->Progress = (UINT64)ulProgress; + This->Size = (UINT64)ulProgressMax; + + CBindStatusCallback_UpdateProgress(This); + break; + } + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE +CBindStatusCallback_OnStopBinding(IBindStatusCallback *iface, + HRESULT hresult, + LPCWSTR szError) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +CBindStatusCallback_GetBindInfo(IBindStatusCallback *iface, + DWORD* grfBINDF, + BINDINFO* pbindinfo) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +CBindStatusCallback_OnDataAvailable(IBindStatusCallback *iface, + DWORD grfBSCF, + DWORD dwSize, + FORMATETC* pformatetc, + STGMEDIUM* pstgmed) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +CBindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface, + REFIID riid, + IUnknown* punk) +{ + return E_NOTIMPL; +} + +static const struct IBindStatusCallbackVtbl vtblIBindStatusCallback = +{ + CBindStatusCallback_QueryInterface, + CBindStatusCallback_AddRef, + CBindStatusCallback_Release, + CBindStatusCallback_OnStartBinding, + CBindStatusCallback_GetPriority, + CBindStatusCallback_OnLowResource, + CBindStatusCallback_OnProgress, + CBindStatusCallback_OnStopBinding, + CBindStatusCallback_GetBindInfo, + CBindStatusCallback_OnDataAvailable, + CBindStatusCallback_OnObjectAvailable, +}; + +static IBindStatusCallback * +CreateBindStatusCallback(void) +{ + CBindStatusCallback *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (This == NULL) + return NULL; + + ZeroMemory(This, sizeof(*This)); + + This->lpIBindStatusCallbackVtbl = &vtblIBindStatusCallback; + This->ref = 1; + + return impl_to_interface(This, IBindStatusCallback); +} + + // ToDo: Show status, get file name from webserver, better error reporting +static int +get_display_url(IN LPURL_COMPONENTS purl, + OUT TCHAR *szBuffer, + IN PDWORD pdwBufferSize) +{ + URL_COMPONENTS urlc; + + /* Hide the password */ + urlc = *purl; + urlc.lpszPassword = NULL; + urlc.dwPasswordLength = 0; + + if (!InternetCreateUrl(&urlc, ICU_ESCAPE, szBuffer, pdwBufferSize)) + return DWNL_E_LASTERROR; + + return 1; +} + +static int +download_file(IN LPCTSTR pszUrl, + IN LPCTSTR pszFile OPTIONAL) +{ + TCHAR szScheme[INTERNET_MAX_SCHEME_LENGTH + 1]; + TCHAR szHostName[INTERNET_MAX_HOST_NAME_LENGTH + 1]; + TCHAR szUserName[INTERNET_MAX_USER_NAME_LENGTH + 1]; + TCHAR szPassWord[INTERNET_MAX_PASSWORD_LENGTH + 1]; + TCHAR szUrlPath[INTERNET_MAX_PATH_LENGTH + 1]; + TCHAR szExtraInfo[INTERNET_MAX_PATH_LENGTH + 1]; + TCHAR szUrl[INTERNET_MAX_URL_LENGTH + 1]; + DWORD dwUrlLen; + LPTSTR pszFilePart; + URL_COMPONENTS urlc; + IBindStatusCallback *pbsc; + int iRet; + + if (pszFile != NULL && pszFile[0] == _T('\0')) + pszFile = NULL; + + urlc.dwStructSize = sizeof(urlc); + urlc.lpszScheme = szScheme; + urlc.dwSchemeLength = sizeof(szScheme) / sizeof(szScheme[0]); + urlc.lpszHostName = szHostName; + urlc.dwHostNameLength = sizeof(szHostName) / sizeof(szHostName[0]); + urlc.lpszUserName = szUserName; + urlc.dwUserNameLength = sizeof(szUserName) / sizeof(szUserName[0]); + urlc.lpszPassword = szPassWord; + urlc.dwPasswordLength = sizeof(szPassWord) / sizeof(szPassWord[0]); + urlc.lpszUrlPath = szUrlPath; + urlc.dwUrlPathLength = sizeof(szUrlPath) / sizeof(szUrlPath[0]); + urlc.lpszExtraInfo = szExtraInfo; + urlc.dwExtraInfoLength = sizeof(szExtraInfo) / sizeof(szExtraInfo[0]); + if (!InternetCrackUrl(pszUrl, _tcslen(pszUrl), ICU_ESCAPE, &urlc)) + return DWNL_E_LASTERROR; + + if (urlc.nScheme != INTERNET_SCHEME_FTP && + urlc.nScheme != INTERNET_SCHEME_GOPHER && + urlc.nScheme != INTERNET_SCHEME_HTTP && + urlc.nScheme != INTERNET_SCHEME_HTTPS) + { + return DWNL_E_UNSUPPORTEDSCHEME; + } + + if (urlc.nScheme == INTERNET_SCHEME_FTP && urlc.dwUserNameLength == 0 && urlc.dwPasswordLength == 0) + { + _tcscpy(szUserName, _T("anonymous")); + urlc.dwUserNameLength = _tcslen(szUserName); + } + + /* FIXME: Get file name from server */ + if (urlc.dwUrlPathLength == 0 && pszFile == NULL) + return DWNL_E_NEEDTARGETFILENAME; + + pszFilePart = _tcsrchr(szUrlPath, _T('/')); + if (pszFilePart != NULL) + pszFilePart++; + + if (pszFilePart == NULL && pszFile == NULL) + return DWNL_E_NEEDTARGETFILENAME; + + if (pszFile == NULL) + pszFile = pszFilePart; + + if (urlc.dwUserNameLength == 0) + urlc.lpszUserName = NULL; + + if (urlc.dwPasswordLength == 0) + urlc.lpszPassword = NULL; + + /* Generate the URL to be displayed (without a password) */ + dwUrlLen = sizeof(szUrl) / sizeof(szUrl[0]); + iRet = get_display_url(&urlc, szUrl, &dwUrlLen); + if (iRet <= 0) + return iRet; + + _tprintf(_T("Download `%s\'\n\t=> `%s\'\n"), szUrl, pszFile); + + /* Generate the URL to download */ + dwUrlLen = sizeof(szUrl) / sizeof(szUrl[0]); + if (!InternetCreateUrl(&urlc, ICU_ESCAPE, szUrl, &dwUrlLen)) + return DWNL_E_LASTERROR; + + pbsc = CreateBindStatusCallback(); + if (pbsc == NULL) + return DWNL_E_LASTERROR; + + if(!SUCCEEDED(URLDownloadToFile(NULL, szUrl, pszFile, 0, pbsc))) + { + IBindStatusCallback_Release(pbsc); + return DWNL_E_LASTERROR; /* FIXME */ + } + + IBindStatusCallback_Release(pbsc); + return 1; +} + +static int +print_err(int iErr) +{ + if (iErr == DWNL_E_LASTERROR) + { + if (GetLastError() == ERROR_SUCCESS) + { + /* File not found */ + _ftprintf(stderr, _T("\nERROR: Download failed.\n")); + } + else + { + /* Display last error code */ + _ftprintf(stderr, _T("\nERROR: %u\n"), GetLastError()); + } + } + else + { + switch (iErr) + { + case DWNL_E_NEEDTARGETFILENAME: + _ftprintf(stderr, _T("\nERROR: Cannot determine filename, please specify a destination file name.\n")); + break; + + case DWNL_E_UNSUPPORTEDSCHEME: + _ftprintf(stderr, _T("\nERROR: Unsupported protocol.\n")); + break; + } + } + + return 1; +} + int _tmain(int argc, TCHAR **argv) { - TCHAR* filename = argv[1]; - int i; - - if(argc != 2) - { - _tprintf(_T("Usage: dwnl <url>")); - return 2; - } - - for(i=_tcslen(filename);i>0 - &&filename[i]!=_T('/') - &&filename[i]!=_T('\\') - &&filename[i]!=_T('?') - &&filename[i]!=_T('*') - &&filename[i]!=_T(':') - &&filename[i]!=_T('\"') - &&filename[i]!=_T('<') - &&filename[i]!=_T('>') - &&filename[i]!=_T('|');i--); - filename = &argv[1][i+1]; - - _tprintf(_T("Downloading %s... "), filename); - - if(URLDownloadToFile(NULL, argv[1], filename, 0, NULL) != S_OK) - { - _tprintf(_T("Failed.\n")); - return 1; - } - - _tprintf(_T("Finished.\n")); - return 0; -} + int iErr, iRet = 0; + + if(argc != 2 && argc != 3) + { + _tprintf(_T("Usage: dwnl URL [DESTINATION]")); + return 2; + } + + iErr = download_file(argv[1], argc == 3 ? argv[2] : NULL); + if (iErr <= 0) + iRet = print_err(iErr); + + return iRet; +} Modified: trunk/reactos/base/applications/network/dwnl/dwnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/dwnl/dwnl.rbuild (original) +++ trunk/reactos/base/applications/network/dwnl/dwnl.rbuild Thu Oct 18 10:00:17 2007 @@ -4,6 +4,8 @@ <include base="dwnl">.</include> <library>kernel32</library> <library>urlmon</library> + <library>wininet</library> + <library>uuid</library> <define name="__USE_W32API" /> <define name="WINVER">0x0501</define> <define name="_WIN32_IE">0x0600</define>

1 0

[mnordell] 29653: Patch from aicommander. Actually copy uniata.sys from the installation media, and disable VGA resolution selection as VGA is broken.
by mnordell＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: mnordell Date: Thu Oct 18 08:01:53 2007 New Revision: 29653 URL: http://svn.reactos.org/svn/reactos?rev=29653&view=rev Log: Patch from aicommander. Actually copy uniata.sys from the installation media, and disable VGA resolution selection as VGA is broken. Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Thu Oct 18 08:01:53 2007 @@ -32,6 +32,7 @@ ntfs.sys = 3 ntoskrnl.exe = 2 scsiport.sys = 3 +uniata.sys = 3 vfatfs.sys = 3 [Cabinets] @@ -69,7 +70,7 @@ [Display] ;<id> = <user friendly name>,<spare>,<service key name>,<hight>,<width>,<bpp> -vga = "VGA Display (640x480x4)",,Vga,640,480,4 +;vga = "VGA Display (640x480x4)",,Vga,640,480,4 vbe_640x480x8 = "VESA Display (640x480x8)",,VBE,640,480,8 vbe_640x480x16 = "VESA Display (640x480x16)",,VBE,640,480,16 vbe_640x480x32 = "VESA Display (640x480x32)",,VBE,640,480,32

1 0

[peterw] 29652: - Add dwnl.exe utility to the bootcd, patch by Cameron Gutman (aicommander).
by peterw＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: peterw Date: Thu Oct 18 06:40:12 2007 New Revision: 29652 URL: http://svn.reactos.org/svn/reactos?rev=29652&view=rev Log: - Add dwnl.exe utility to the bootcd, patch by Cameron Gutman (aicommander). Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Thu Oct 18 06:40:12 2007 @@ -45,6 +45,7 @@ base\applications\logoff\logoff.exe 1 base\applications\msconfig\msconfig.exe 1 base\applications\network\arp\arp.exe 1 +base\applications\network\dwnl\dwnl.exe 1 base\applications\network\route\route.exe 1 base\applications\network\finger\finger.exe 1 base\applications\network\ftp\ftp.exe 1

1 0

[hpoussin] 29651: Better resource freeing Fix a bug introduced in r29644, when WM_CREATE was sometimes leaking to WM_DESTROY
by hpoussin＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: hpoussin Date: Wed Oct 17 23:35:41 2007 New Revision: 29651 URL: http://svn.reactos.org/svn/reactos?rev=29651&view=rev Log: Better resource freeing Fix a bug introduced in r29644, when WM_CREATE was sometimes leaking to WM_DESTROY Modified: trunk/reactos/base/system/winlogon/sas.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c (original) +++ trunk/reactos/base/system/winlogon/sas.c Wed Oct 17 23:35:41 2007 @@ -220,20 +220,20 @@ } /* FIXME: Append variables of Session->Profile->pszEnvironment */ - //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); - /* FIXME: UpdatePerUserSystemParameters(0, TRUE); */ + DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); + UpdatePerUserSystemParameters(0, TRUE); + + /* Set default language */ + if (!SetDefaultLanguage(TRUE)) + { + WARN("WL: SetDefaultLanguage() failed\n"); + goto cleanup; + } /* Get privilege */ /* FIXME: who should do it? winlogon or gina? */ /* FIXME: reverting to lower privileges after creating user shell? */ RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &Old); - - /* Set default language */ - if (!SetDefaultLanguage(TRUE)) - { - WARN("WL: SetDefaultLanguage() failed\n"); - goto cleanup; - } if (!Session->Gina.Functions.WlxActivateUserShell( Session->Gina.Context, @@ -255,7 +255,11 @@ ret = TRUE; cleanup: - HeapFree(GetProcessHeap(), 0, Session->Profile); + if (Session->Profile) + { + HeapFree(GetProcessHeap(), 0, Session->Profile->pszProfile); + HeapFree(GetProcessHeap(), 0, Session->Profile); + } Session->Profile = NULL; if (!ret && ProfileInfo.hProfile != INVALID_HANDLE_VALUE) @@ -487,9 +491,9 @@ return STATUS_UNSUCCESSFUL; } - //UnloadUserProfile(Session->UserToken, Session->hProfileInfo); - //CloseHandle(Session->UserToken); - //UpdatePerUserSystemParameters(0, FALSE); + UnloadUserProfile(Session->UserToken, Session->hProfileInfo); + CloseHandle(Session->UserToken); + UpdatePerUserSystemParameters(0, FALSE); Session->LogonStatus = WKSTA_IS_LOGGED_OFF; Session->UserToken = NULL; return STATUS_SUCCESS; @@ -869,10 +873,9 @@ /* Save the Session pointer */ SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)Session); - if (!GetSetupType()) - { - return RegisterHotKeys(Session, hwndDlg); - } + if (GetSetupType() == 0) + return TRUE; + return RegisterHotKeys(Session, hwndDlg); } case WM_DESTROY: {

1 0

[dreimer] 29650: Fix Bug 2756 thx to towerr for explaining how to fix it.
by dreimer＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: dreimer Date: Wed Oct 17 22:37:56 2007 New Revision: 29650 URL: http://svn.reactos.org/svn/reactos?rev=29650&view=rev Log: Fix Bug 2756 thx to towerr for explaining how to fix it. Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Wed Oct 17 22:37:56 2007 @@ -1,9 +1,11 @@ +// Russian language resource file (towerr, tumans(a)nm.ru 2007-10-17) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 207 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêè RosBE" -FONT 8, "MS Shell Dlg" +FONT 8,"MS Sans Serif",0,0 BEGIN LTEXT "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ÐåàêòÎÑ", 0x0, 10, 10, 140, 13 LTEXT "Öâåò Ôîíà", 0x0, 10, 35, 60, 12

1 0

[mnordell] 29649: Implement functionality for ctrl-home and ctrl-end
by mnordell＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: mnordell Date: Wed Oct 17 22:21:16 2007 New Revision: 29649 URL: http://svn.reactos.org/svn/reactos?rev=29649&view=rev Log: Implement functionality for ctrl-home and ctrl-end Modified: trunk/reactos/dll/win32/user32/controls/edit.c Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c Wed Oct 17 22:21:16 2007 @@ -201,7 +201,9 @@ static BOOL EDIT_MakeUndoFit(EDITSTATE *es, UINT size); static void EDIT_MoveBackward(EDITSTATE *es, BOOL extend); static void EDIT_MoveEnd(EDITSTATE *es, BOOL extend); +static void EDIT_MoveEndOfText(EDITSTATE *es, BOOL extend); static void EDIT_MoveForward(EDITSTATE *es, BOOL extend); +static void EDIT_MoveStartOfText(EDITSTATE *es, BOOL extend); static void EDIT_MoveHome(EDITSTATE *es, BOOL extend); static void EDIT_MoveWordBackward(EDITSTATE *es, BOOL extend); static void EDIT_MoveWordForward(EDITSTATE *es, BOOL extend); @@ -2059,6 +2061,28 @@ /********************************************************************* * + * EDIT_MoveEndOfText + * + * Handler for Ctrl+End. Move to end of text. Only for multiline. + * + */ +static void EDIT_MoveEndOfText(EDITSTATE *es, BOOL extend) +{ + BOOL after_wrap = FALSE; + INT e; + + assert(es->style & ES_MULTILINE); + + /* Just give it impossible high x&y to get the index of the last char */ + e = EDIT_CharFromPos(es, 0x3fffffff, 0x3fffffff, &after_wrap); + + EDIT_EM_SetSel(es, extend ? es->selection_start : e, e, after_wrap); + EDIT_EM_ScrollCaret(es); +} + + +/********************************************************************* + * * EDIT_MoveForward * */ @@ -2076,6 +2100,28 @@ } } EDIT_EM_SetSel(es, extend ? es->selection_start : e, e, FALSE); + EDIT_EM_ScrollCaret(es); +} + + +/********************************************************************* + * + * EDIT_MoveStartOfText + * + * Handler for Ctr+Home. Move to start of text. Only for multiline. + * + */ +static void EDIT_MoveStartOfText(EDITSTATE *es, BOOL extend) +{ + BOOL after_wrap = FALSE; + + assert(es->style & ES_MULTILINE); + + /* use CharFromPos instead of just plain zero, to get the wrap_flag */ + EDIT_CharFromPos(es, 0, 0, &after_wrap); + + + EDIT_EM_SetSel(es, 0, extend ? es->selection_end : 0, FALSE); EDIT_EM_ScrollCaret(es); } @@ -4571,10 +4617,18 @@ EDIT_MoveForward(es, shift); break; case VK_HOME: - EDIT_MoveHome(es, shift); + if (control && (es->style & ES_MULTILINE)) { + EDIT_MoveStartOfText(es, shift); + } else { + EDIT_MoveHome(es, shift); /* start of line */ + } break; case VK_END: - EDIT_MoveEnd(es, shift); + if (control && (es->style & ES_MULTILINE)) { + EDIT_MoveEndOfText(es, shift); + } else { + EDIT_MoveEnd(es, shift); /* end of line */ + } break; case VK_PRIOR: if (es->style & ES_MULTILINE)

1 0

[frik85] 29648: improve group-rights, suggested by Colin Finck
by frik85＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: frik85 Date: Wed Oct 17 22:18:23 2007 New Revision: 29648 URL: http://svn.reactos.org/svn/reactos?rev=29648&view=rev Log: improve group-rights, suggested by Colin Finck Modified: trunk/web/reactos.org/htdocs/wiki/LocalSettings.php Modified: trunk/web/reactos.org/htdocs/wiki/LocalSettings.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/LocalS… ============================================================================== --- trunk/web/reactos.org/htdocs/wiki/LocalSettings.php (original) +++ trunk/web/reactos.org/htdocs/wiki/LocalSettings.php Wed Oct 17 22:18:23 2007 @@ -128,12 +128,14 @@ # moderator group $wgGroupPermissions['mod']['protect'] = true; -$wgGroupPermissions['mod']['move'] = true; +$wgGroupPermissions['mod']['deletedhistory'] = true; # super moderator group $wgGroupPermissions['supermod']['protect'] = true; $wgGroupPermissions['supermod']['delete'] = true; -$wgGroupPermissions['supermod']['move'] = true; +$wgGroupPermissions['supermod']['deletedhistory'] = true; +$wgGroupPermissions['supermod']['undelete'] = true; +$wgGroupPermissions['supermod']['rollback'] = true; # deactivate DB SQL queries $wgAllowSysopQueries = false;

1 0

[peterw] 29647: - Fix options.exe compile with RosBE 0.3.8.1
by peterw＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: peterw Date: Wed Oct 17 22:04:24 2007 New Revision: 29647 URL: http://svn.reactos.org/svn/reactos?rev=29647&view=rev Log: - Fix options.exe compile with RosBE 0.3.8.1 Modified: trunk/tools/RosBE-Windows/Tools/config/makefile Modified: trunk/tools/RosBE-Windows/Tools/config/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/m… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/makefile (original) +++ trunk/tools/RosBE-Windows/Tools/config/makefile Wed Oct 17 22:04:24 2007 @@ -5,7 +5,7 @@ all: $(TARGET) CPP=mingw32-gcc -CFLAGS := -DWIN32 -DUNICODE -O2 -std=c99 +CFLAGS := $(HOST_CFLAGS) -DWIN32 -DUNICODE -O2 -std=c99 LFLAGS := -mwindows -s LIBS := @@ -21,7 +21,7 @@ $(CPP) $(CFLAGS) -c $< -o $@ $(RC:.rc=.coff): - windres $(RCFLAGS) -o $@ $(RC) + windres $(HOST_CFLAGS) $(RCFLAGS) -o $@ $(RC) .PHONY: clean clean:

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