Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 22207: Convert result struct only if NtUserEnumDisplaySettings returned success
by hpoussin＠svn.reactos.org 04 Jun '06

04 Jun '06

Author: hpoussin Date: Sun Jun 4 18:10:21 2006 New Revision: 22207 URL: http://svn.reactos.ru/svn/reactos?rev=22207&view=rev Log: Convert result struct only if NtUserEnumDisplaySettings returned success Modified: trunk/reactos/dll/win32/user32/misc/display.c Modified: trunk/reactos/dll/win32/user32/misc/display.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/misc/displ… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/display.c (original) +++ trunk/reactos/dll/win32/user32/misc/display.c Sun Jun 4 18:10:21 2006 @@ -218,6 +218,8 @@ rc = NtUserEnumDisplaySettings ( &DeviceName, iModeNum, &lpDevModeW, dwFlags ); + if (!rc) + goto done; #define COPYS(f,len) WideCharToMultiByte( CP_THREAD_ACP, 0, lpDevModeW.f, len, (LPSTR)lpDevMode->f, len, NULL, NULL ) #define COPYN(f) lpDevMode->f = lpDevModeW.f

1 0

[hpoussin] 22206: Don't crash when no working display adapter is present
by hpoussin＠svn.reactos.org 04 Jun '06

04 Jun '06

Author: hpoussin Date: Sun Jun 4 18:09:29 2006 New Revision: 22206 URL: http://svn.reactos.ru/svn/reactos?rev=22206&view=rev Log: Don't crash when no working display adapter is present Modified: trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Sun Jun 4 18:09:29 2006 @@ -1,12 +1,11 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Display Control Panel * FILE: lib/cpl/desk/settings.c * PURPOSE: Settings property page - * + * * PROGRAMMERS: Trevor McCort (lycan359(a)gmail.com) - * Hervé Poussineau (poussine(a)freesurf.fr) + * Hervé Poussineau (hpoussin(a)reactos.org) */ #include "desk.h" @@ -54,14 +53,13 @@ TCHAR Buffer[64]; TCHAR Pixel[64]; DWORD index; - + LoadString(hApplet, IDS_PIXEL, Pixel, sizeof(Pixel) / sizeof(TCHAR)); _stprintf(Buffer, Pixel, CurrentDisplayDevice->CurrentSettings->dmPelsWidth, CurrentDisplayDevice->CurrentSettings->dmPelsHeight, Pixel); SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION_TEXT, WM_SETTEXT, 0, (LPARAM)Buffer); - for (index = 0; index < CurrentDisplayDevice->ResolutionsCount; index++) - { + { if (CurrentDisplayDevice->Resolutions[index].dmPelsWidth == CurrentDisplayDevice->CurrentSettings->dmPelsWidth && CurrentDisplayDevice->Resolutions[index].dmPelsHeight == CurrentDisplayDevice->CurrentSettings->dmPelsHeight) @@ -70,7 +68,7 @@ break; } } - if (LoadString(hApplet, (2900 + CurrentDisplayDevice->CurrentSettings->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) + if (LoadString(hApplet, (2900 + CurrentDisplayDevice->CurrentSettings->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SELECTSTRING, -1, (LPARAM)Buffer); } @@ -85,7 +83,7 @@ HDC hDC; PSETTINGS_ENTRY Current; DWORD bpp, xres, yres, checkbpp; - + /* Get current settings */ *CurrentSettings = NULL; hDC = CreateIC(NULL, DeviceName, NULL, NULL); @@ -94,23 +92,22 @@ xres = GetDeviceCaps(hDC, HORZRES); yres = GetDeviceCaps(hDC, VERTRES); DeleteDC(hDC); - + /* List all settings */ devmode.dmSize = (WORD)sizeof(DEVMODE); devmode.dmDriverExtra = 0; while (EnumDisplaySettingsEx(DeviceName, iMode, &devmode, dwFlags)) { - if (devmode.dmBitsPerPel==8 || devmode.dmBitsPerPel==16 || devmode.dmBitsPerPel==24 || devmode.dmBitsPerPel==32) checkbpp=1; else checkbpp=0; if (devmode.dmPelsWidth < 640 || devmode.dmPelsHeight < 480 || checkbpp == 0) { - iMode++; - continue; - } - + iMode++; + continue; + } + Current = HeapAlloc(GetProcessHeap(), 0, sizeof(SETTINGS_ENTRY)); if (Current != NULL) { @@ -123,7 +120,7 @@ while (Next != NULL && ( Next->dmPelsHeight < Current->dmPelsHeight || (Next->dmPelsHeight == Current->dmPelsHeight && Next->dmBitsPerPel < Current->dmBitsPerPel) || - (Next->dmPelsHeight == Current->dmPelsHeight && + (Next->dmPelsHeight == Current->dmPelsHeight && Next->dmBitsPerPel == Current->dmBitsPerPel && Next->dmPelsWidth < Current->dmPelsWidth))) { @@ -146,12 +143,12 @@ } iMode++; } - + *pSettingsCount = NbSettings; return Settings; } -static VOID +static BOOL AddDisplayDevice(IN LPTSTR Description, IN LPTSTR DeviceName) { PDISPLAY_DEVICE_ENTRY newEntry = NULL; @@ -162,17 +159,18 @@ PSETTINGS_ENTRY Current; DWORD ResolutionsCount = 1; DWORD i; - + newEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(DISPLAY_DEVICE_ENTRY)); + memset(newEntry, 0, sizeof(DISPLAY_DEVICE_ENTRY)); if (!newEntry) goto ByeBye; - + newEntry->Settings = GetPossibleSettings(DeviceName, &newEntry->SettingsCount, &newEntry->CurrentSettings); if (!newEntry->Settings) goto ByeBye; - + newEntry->InitialSettings.dmPelsWidth = newEntry->CurrentSettings->dmPelsWidth; newEntry->InitialSettings.dmPelsHeight = newEntry->CurrentSettings->dmPelsHeight; newEntry->InitialSettings.dmBitsPerPel = newEntry->CurrentSettings->dmBitsPerPel; - + /* Count different resolutions */ for (Current = newEntry->Settings; Current != NULL; Current = Current->Flink) if (Current->Flink != NULL && @@ -190,23 +188,23 @@ newEntry->Resolutions[i].dmPelsHeight = Current->dmPelsHeight; i++; } - + descriptionSize = (_tcslen(Description) + 1) * sizeof(TCHAR); description = HeapAlloc(GetProcessHeap(), 0, descriptionSize); if (!description) goto ByeBye; - + nameSize = (_tcslen(DeviceName) + 1) * sizeof(TCHAR); name = HeapAlloc(GetProcessHeap(), 0, nameSize); if (!name) goto ByeBye; - + memcpy(description, Description, descriptionSize); memcpy(name, DeviceName, nameSize); newEntry->DeviceDescription = description; newEntry->DeviceName = name; newEntry->Flink = DisplayDeviceList; DisplayDeviceList = newEntry; - return; - + return TRUE; + ByeBye: if (newEntry != NULL) { @@ -228,6 +226,7 @@ HeapFree(GetProcessHeap(), 0, description); if (name != NULL) HeapFree(GetProcessHeap(), 0, name); + return FALSE; } static VOID @@ -235,9 +234,9 @@ { PSETTINGS_ENTRY Current; DWORD index; - + CurrentDisplayDevice = pDeviceEntry; /* Update global variable */ - + /* Fill color depths combo box */ SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_RESETCONTENT, 0, 0); for (Current = pDeviceEntry->Settings; Current != NULL; Current = Current->Flink) @@ -253,11 +252,11 @@ } } } - + /* Fill resolutions slider */ SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_CLEARTICS, TRUE, 0); SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_SETRANGE, TRUE, MAKELONG(0, pDeviceEntry->ResolutionsCount - 1)); - + UpdateDisplay(hwndDlg); } @@ -267,16 +266,16 @@ DWORD Result = 0; DWORD iDevNum = 0; DISPLAY_DEVICE displayDevice; - BITMAP bitmap; - + BITMAP bitmap; + /* Get video cards list */ displayDevice.cb = (DWORD)sizeof(DISPLAY_DEVICE); while (EnumDisplayDevices(NULL, iDevNum, &displayDevice, 0)) { if ((displayDevice.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) != 0) { - AddDisplayDevice(displayDevice.DeviceString, displayDevice.DeviceName); - Result++; + if (AddDisplayDevice(displayDevice.DeviceString, displayDevice.DeviceName)) + Result++; } iDevNum++; } @@ -300,14 +299,14 @@ /* FIXME: choose selected adapter being the primary one */ } - hBitmap = LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_LOADTRANSPARENT); - if (hBitmap != NULL) - { - GetObject(hBitmap, sizeof(BITMAP), &bitmap); - - cxSource = bitmap.bmWidth; - cySource = bitmap.bmHeight; - } + hBitmap = LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_LOADTRANSPARENT); + if (hBitmap != NULL) + { + GetObject(hBitmap, sizeof(BITMAP), &bitmap); + + cxSource = bitmap.bmWidth; + cySource = bitmap.bmHeight; + } } static VOID @@ -321,11 +320,11 @@ DWORD dmNewBitsPerPel; DWORD index; TCHAR Buffer[64]; - + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, WM_GETTEXT, (WPARAM)(sizeof(Buffer) / sizeof(TCHAR)), (LPARAM)Buffer); index = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer); dmNewBitsPerPel = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_GETITEMDATA, index, 0); - + /* find if new parameters are valid */ Current = CurrentDisplayDevice->CurrentSettings; if (dmNewBitsPerPel == Current->dmBitsPerPel) @@ -333,9 +332,9 @@ /* no change */ return; } - + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - + if (dmNewBitsPerPel < Current->dmBitsPerPel) { Current = Current->Blink; @@ -368,7 +367,7 @@ Current = Current->Flink; } } - + /* search smaller resolution compatible with current color depth */ Current = CurrentDisplayDevice->CurrentSettings->Blink; while (Current != NULL) @@ -381,7 +380,7 @@ } Current = Current->Blink; } - + /* search bigger resolution compatible with current color depth */ Current = CurrentDisplayDevice->CurrentSettings->Flink; while (Current != NULL) @@ -394,7 +393,7 @@ } Current = Current->Flink; } - + /* we shouldn't go there */ } @@ -408,7 +407,7 @@ PSETTINGS_ENTRY Current; DWORD dmNewPelsHeight = CurrentDisplayDevice->Resolutions[NewPosition].dmPelsHeight; DWORD dmNewPelsWidth = CurrentDisplayDevice->Resolutions[NewPosition].dmPelsWidth; - + /* find if new parameters are valid */ Current = CurrentDisplayDevice->CurrentSettings; if (dmNewPelsHeight == Current->dmPelsHeight && dmNewPelsWidth == Current->dmPelsWidth) @@ -416,9 +415,9 @@ /* no change */ return; } - + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - + if (dmNewPelsHeight < Current->dmPelsHeight) { Current = Current->Blink; @@ -451,7 +450,7 @@ Current = Current->Flink; } } - + /* search bigger color depth compatible with current resolution */ Current = CurrentDisplayDevice->CurrentSettings->Flink; while (Current != NULL) @@ -464,7 +463,7 @@ } Current = Current->Flink; } - + /* search smaller color depth compatible with current resolution */ Current = CurrentDisplayDevice->CurrentSettings->Blink; while (Current != NULL) @@ -477,7 +476,7 @@ } Current = Current->Blink; } - + /* we shouldn't go there */ } @@ -500,7 +499,7 @@ { DWORD controlId = LOWORD(wParam); DWORD command = HIWORD(wParam); - + if (controlId == IDC_SETTINGS_ADVANCED && command == BN_CLICKED) OnAdvancedButton(); else if (controlId == IDC_SETTINGS_BPP && command == CBN_SELCHANGE) @@ -572,22 +571,23 @@ break; } - case WM_PAINT: - { - PAINTSTRUCT ps; - HDC hdc, hdcMem; - - hdc = BeginPaint(hwndDlg, &ps); - - hdcMem = CreateCompatibleDC(hdc); - SelectObject(hdcMem, hBitmap); - - TransparentBlt(hdc, 98, 0, cxSource, cySource, hdcMem, 0, 0, cxSource, cySource, 0xFF80FF); - - DeleteDC(hdcMem); - EndPaint(hwndDlg, &ps); - - } break; + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc, hdcMem; + + hdc = BeginPaint(hwndDlg, &ps); + + hdcMem = CreateCompatibleDC(hdc); + SelectObject(hdcMem, hBitmap); + + TransparentBlt(hdc, 98, 0, cxSource, cySource, hdcMem, 0, 0, cxSource, cySource, 0xFF80FF); + + DeleteDC(hdcMem); + EndPaint(hwndDlg, &ps); + + break; + } case WM_DESTROY: { @@ -606,7 +606,7 @@ Current = Next; } - DeleteObject(hBitmap); + DeleteObject(hBitmap); } } return FALSE;

1 0

[hpoussin] 22205: Convert result struct only if NtUserEnumDisplayDevices returned success
by hpoussin＠svn.reactos.org 04 Jun '06

04 Jun '06

Author: hpoussin Date: Sun Jun 4 17:36:39 2006 New Revision: 22205 URL: http://svn.reactos.ru/svn/reactos?rev=22205&view=rev Log: Convert result struct only if NtUserEnumDisplayDevices returned success Modified: trunk/reactos/dll/win32/user32/misc/display.c Modified: trunk/reactos/dll/win32/user32/misc/display.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/misc/displ… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/display.c (original) +++ trunk/reactos/dll/win32/user32/misc/display.c Sun Jun 4 17:36:39 2006 @@ -67,25 +67,27 @@ iDevNum, &DisplayDeviceW, dwFlags ); - - /* Copy result from DisplayDeviceW to lpDisplayDevice */ - lpDisplayDevice->StateFlags = DisplayDeviceW.StateFlags; - WideCharToMultiByte(CP_ACP,0, - DisplayDeviceW.DeviceName,wcslen(DisplayDeviceW.DeviceName), - lpDisplayDevice->DeviceName,sizeof(lpDisplayDevice->DeviceName) / sizeof(lpDisplayDevice->DeviceName[0]), - NULL,NULL); - WideCharToMultiByte(CP_ACP,0, - DisplayDeviceW.DeviceString,wcslen(DisplayDeviceW.DeviceString), - lpDisplayDevice->DeviceString,sizeof(lpDisplayDevice->DeviceString) / sizeof(lpDisplayDevice->DeviceString[0]), - NULL,NULL); - WideCharToMultiByte(CP_ACP,0, - DisplayDeviceW.DeviceID,wcslen(DisplayDeviceW.DeviceID), - lpDisplayDevice->DeviceID,sizeof(lpDisplayDevice->DeviceID) / sizeof(lpDisplayDevice->DeviceID[0]), - NULL,NULL); - WideCharToMultiByte(CP_ACP,0, - DisplayDeviceW.DeviceKey,wcslen(DisplayDeviceW.DeviceKey), - lpDisplayDevice->DeviceKey,sizeof(lpDisplayDevice->DeviceKey) / sizeof(lpDisplayDevice->DeviceKey[0]), - NULL,NULL); + if (!rc) + { + /* Copy result from DisplayDeviceW to lpDisplayDevice */ + lpDisplayDevice->StateFlags = DisplayDeviceW.StateFlags; + WideCharToMultiByte(CP_ACP,0, + DisplayDeviceW.DeviceName,wcslen(DisplayDeviceW.DeviceName), + lpDisplayDevice->DeviceName,sizeof(lpDisplayDevice->DeviceName) / sizeof(lpDisplayDevice->DeviceName[0]), + NULL,NULL); + WideCharToMultiByte(CP_ACP,0, + DisplayDeviceW.DeviceString,wcslen(DisplayDeviceW.DeviceString), + lpDisplayDevice->DeviceString,sizeof(lpDisplayDevice->DeviceString) / sizeof(lpDisplayDevice->DeviceString[0]), + NULL,NULL); + WideCharToMultiByte(CP_ACP,0, + DisplayDeviceW.DeviceID,wcslen(DisplayDeviceW.DeviceID), + lpDisplayDevice->DeviceID,sizeof(lpDisplayDevice->DeviceID) / sizeof(lpDisplayDevice->DeviceID[0]), + NULL,NULL); + WideCharToMultiByte(CP_ACP,0, + DisplayDeviceW.DeviceKey,wcslen(DisplayDeviceW.DeviceKey), + lpDisplayDevice->DeviceKey,sizeof(lpDisplayDevice->DeviceKey) / sizeof(lpDisplayDevice->DeviceKey[0]), + NULL,NULL); + } RtlFreeUnicodeString ( &Device );

1 0

[janderwald] 22204: _strdate should return maximum 8 chars does not work yet
by janderwald＠svn.reactos.org 04 Jun '06

04 Jun '06

Author: janderwald Date: Sun Jun 4 17:20:09 2006 New Revision: 22204 URL: http://svn.reactos.ru/svn/reactos?rev=22204&view=rev Log: _strdate should return maximum 8 chars does not work yet Modified: trunk/reactos/lib/crt/time/strdate.c trunk/reactos/lib/crt/time/wstrdate.c Modified: trunk/reactos/lib/crt/time/strdate.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/time/strdate.c?rev=… ============================================================================== --- trunk/reactos/lib/crt/time/strdate.c (original) +++ trunk/reactos/lib/crt/time/strdate.c Sun Jun 4 17:20:09 2006 @@ -24,6 +24,7 @@ } t = time(NULL); d = localtime(&t); - sprintf(dt,"%d/%d/%d",d->tm_mday,d->tm_mon+1,d->tm_year); + + sprintf(dt,"%.2d/%.2d/%.2d",d->tm_mday,d->tm_mon+1,d->tm_year ); return dt; } Modified: trunk/reactos/lib/crt/time/wstrdate.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/time/wstrdate.c?rev… ============================================================================== --- trunk/reactos/lib/crt/time/wstrdate.c (original) +++ trunk/reactos/lib/crt/time/wstrdate.c Sun Jun 4 17:20:09 2006 @@ -24,6 +24,6 @@ } t = time(NULL); d = localtime(&t); - swprintf(dt,L"%d/%d/%d",d->tm_mday,d->tm_mon+1,d->tm_year); + swprintf(dt,L"%.2d/%.2d/%.2d",d->tm_mday,d->tm_mon+1,d->tm_year); return dt; }

1 0

[hpoussin] 22203: IntEnumDisplaySettings returns a BOOL, not a NTSTATUS
by hpoussin＠svn.reactos.org 04 Jun '06

04 Jun '06

Author: hpoussin Date: Sun Jun 4 17:09:25 2006 New Revision: 22203 URL: http://svn.reactos.ru/svn/reactos?rev=22203&view=rev Log: IntEnumDisplaySettings returns a BOOL, not a NTSTATUS Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Sun Jun 4 17:09:25 2006 @@ -2862,7 +2862,7 @@ if ((dwflags & CDS_FULLSCREEN) == CDS_FULLSCREEN) { - DEVMODE lpDevMode; + DEVMODEW lpDevMode; /* Full Screen */ dwflags &= ~CDS_FULLSCREEN; DPRINT1("flag CDS_FULLSCREEN partially implemented"); @@ -2873,9 +2873,9 @@ lpDevMode.dmPelsHeight =0; lpDevMode.dmDriverExtra =0; - lpDevMode.dmSize = sizeof(DEVMODE); - Status = IntEnumDisplaySettings(pDeviceName, ENUM_CURRENT_SETTINGS, &lpDevMode, 0); - if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; + lpDevMode.dmSize = sizeof(DEVMODEW); + if (!IntEnumDisplaySettings(pDeviceName, ENUM_CURRENT_SETTINGS, &lpDevMode, 0)) + return DISP_CHANGE_FAILED; DPRINT1("Req Mode : %d x %d x %d\n", DevMode->dmPelsWidth,DevMode->dmPelsHeight,DevMode->dmBitsPerPel); DPRINT1("Current Mode : %d x %d x %d\n", lpDevMode.dmPelsWidth,lpDevMode.dmPelsHeight, lpDevMode.dmBitsPerPel);

1 0

[janderwald] 22202: make _tfullpath pass all msvcrt_winetest dir tests
by janderwald＠svn.reactos.org 04 Jun '06

04 Jun '06

Author: janderwald Date: Sun Jun 4 14:23:28 2006 New Revision: 22202 URL: http://svn.reactos.ru/svn/reactos?rev=22202&view=rev Log: make _tfullpath pass all msvcrt_winetest dir tests Modified: trunk/reactos/lib/crt/stdlib/fullpath.c Modified: trunk/reactos/lib/crt/stdlib/fullpath.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdlib/fullpath.c?r… ============================================================================== --- trunk/reactos/lib/crt/stdlib/fullpath.c (original) +++ trunk/reactos/lib/crt/stdlib/fullpath.c Sun Jun 4 14:23:28 2006 @@ -17,8 +17,16 @@ _TCHAR* _tfullpath(_TCHAR* absPath, const _TCHAR* relPath, size_t maxLength) { _TCHAR* lpFilePart; + DWORD copied; - if (GetFullPathName(relPath,maxLength,absPath,&lpFilePart) == 0) + if (!absPath) + { + maxLength = MAX_PATH; + absPath = malloc(maxLength); + } + + copied = GetFullPathName(relPath,maxLength,absPath,&lpFilePart); + if (copied == 0 || copied > maxLength) return NULL; return absPath;

1 0

[greatlrd] 22201: [AUDIT] this code is clear, no signs of revers is found it is only around 3-4 line of one function
by greatlrd＠svn.reactos.org 04 Jun '06

04 Jun '06

Author: greatlrd Date: Sun Jun 4 14:14:45 2006 New Revision: 22201 URL: http://svn.reactos.ru/svn/reactos?rev=22201&view=rev Log: [AUDIT] this code is clear, no signs of revers is found it is only around 3-4 line of one function Modified: trunk/reactos/lib/crt/stdlib/fullpath.c (props changed) Propchange: trunk/reactos/lib/crt/stdlib/fullpath.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 22200: do not cuase crash in dhcp when no networkcard is found
by greatlrd＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: greatlrd Date: Sun Jun 4 00:29:26 2006 New Revision: 22200 URL: http://svn.reactos.ru/svn/reactos?rev=22200&view=rev Log: do not cuase crash in dhcp when no networkcard is found Modified: trunk/reactos/base/services/dhcp/util.c Modified: trunk/reactos/base/services/dhcp/util.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/services/dhcp/util.c?r… ============================================================================== --- trunk/reactos/base/services/dhcp/util.c (original) +++ trunk/reactos/base/services/dhcp/util.c Sun Jun 4 00:29:26 2006 @@ -98,10 +98,19 @@ int read_client_conf(void) { /* What a strage dance */ - struct client_config *config = ifi->client->config; + struct client_config *config; char ComputerName [MAX_COMPUTERNAME_LENGTH + 1]; DWORD ComputerNameSize = sizeof ComputerName / sizeof ComputerName[0]; + if ((ifi!= NULL) && (ifi->client->config != NULL)) + config = ifi->client->config; + else + { + warn("util.c read_client_conf poorly implemented!"); + return 0; + } + + GetComputerName(ComputerName, & ComputerNameSize); /* This never gets freed since it's only called once */ LPSTR lpCompName =

1 0

[frik85] 22199: Security update: Fix a new well known MySQL bug (http://dev.mysql.com/doc/refman/4.1/en/news-4-1-20.html).
by frik85＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: frik85 Date: Sat Jun 3 22:02:24 2006 New Revision: 22199 URL: http://svn.reactos.ru/svn/reactos?rev=22199&view=rev Log: Security update: Fix a new well known MySQL bug (http://dev.mysql.com/doc/refman/4.1/en/news-4-1-20.html). Modified: trunk/web/reactos.org/htdocs/roscms/index.php trunk/web/reactos.org/htdocs/support/index.php trunk/web/reactos.org/htdocs/wiki/index.php Modified: trunk/web/reactos.org/htdocs/roscms/index.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/roscms/index… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/index.php (original) +++ trunk/web/reactos.org/htdocs/roscms/index.php Sat Jun 3 22:02:24 2006 @@ -32,12 +32,19 @@ //include("./inc/db/connect_db.inc.php"); include("connect.db.php"); + + // stop MySQL bug (http://dev.mysql.com/doc/refman/4.1/en/news-4-1-20.html): + $SQLinjectionprevention ="SET GLOBAL sql_mode='NO_BACKSLASH_ESCAPES';"; + $SQLinjectionprevention_query=mysql_query($SQLinjectionprevention); + + + /* * ReactOS CMS System - Version 2006-05-22 * * (c) by Klemens Friedl <frik85> * - */ + */ if ( !defined('ROSCMS_SYSTEM') ) { define ("ROSCMS_SYSTEM", "Version 0.1"); // to prevent hacking activity @@ -392,7 +399,7 @@ include("inc/body.php"); break; - case "generate_fast": // Generate the static HTML pages (for direct link, e.g. http://www.reactos.org/roscms/?page=generate"); TODO check why this link doesn't work -> errors, etc.? + case "generate_fast_secret": // Generate the static HTML pages (for direct link, e.g. http://www.reactos.org/roscms/?page=generate"); TODO check why this link doesn't work -> errors, etc.? //require("inc/login.php"); include("inc/generate_page.php"); // static page generator break; Modified: trunk/web/reactos.org/htdocs/support/index.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inde… ============================================================================== --- trunk/web/reactos.org/htdocs/support/index.php (original) +++ trunk/web/reactos.org/htdocs/support/index.php Sat Jun 3 22:02:24 2006 @@ -1,29 +1,11 @@ <?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - 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. - - This 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. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* * ReactOS Support Database System - RSDB * * (c) by Klemens Friedl <frik85> * - * 2005 - 2006 + * 11/2005, 12/2005, 01/2006, 02/2006 */ error_reporting(E_ALL); @@ -33,10 +15,19 @@ die("ERROR: Disable 'magic quotes' in php.ini (=Off)"); } + + //global $HTTP_GET_VARS; // set the Get var global require_once("connect.db.php"); + + + + // stop MySQL bug (http://dev.mysql.com/doc/refman/4.1/en/news-4-1-20.html): + $SQLinjectionprevention ="SET GLOBAL sql_mode='NO_BACKSLASH_ESCAPES';"; + $SQLinjectionprevention_query=mysql_query($SQLinjectionprevention); + Modified: trunk/web/reactos.org/htdocs/wiki/index.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/wiki/index.p… ============================================================================== --- trunk/web/reactos.org/htdocs/wiki/index.php (original) +++ trunk/web/reactos.org/htdocs/wiki/index.php Sat Jun 3 22:02:24 2006 @@ -61,6 +61,13 @@ require_once( './LocalSettings.php' ); require_once( 'includes/Setup.php' ); + + + // stop MySQL bug (http://dev.mysql.com/doc/refman/4.1/en/news-4-1-20.html): + $SQLinjectionprevention ="SET GLOBAL sql_mode='NO_BACKSLASH_ESCAPES';"; + $SQLinjectionprevention_query=mysql_query($SQLinjectionprevention); + + wfProfileIn( 'main-misc-setup' ); OutputPage::setEncodings(); # Not really used yet

1 0

[greatlrd] 22198: sorrry I did break the build
by greatlrd＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: greatlrd Date: Sat Jun 3 21:45:07 2006 New Revision: 22198 URL: http://svn.reactos.ru/svn/reactos?rev=22198&view=rev Log: sorrry I did break the build Modified: trunk/reactos/lib/crt/stdlib/malloc.c Modified: trunk/reactos/lib/crt/stdlib/malloc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdlib/malloc.c?rev… ============================================================================== --- trunk/reactos/lib/crt/stdlib/malloc.c (original) +++ trunk/reactos/lib/crt/stdlib/malloc.c Sat Jun 3 21:45:07 2006 @@ -60,7 +60,7 @@ size_t nSize = _nmemb * _size; size_t cSize = ROUND_SIZE(nSize); - if ((_nmemb > ((size_t)-1 / _size) || (cSize<nSize)) + if ( (_nmemb > ((size_t)-1 / _size)) || (cSize<nSize)) return NULL; return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, cSize ); @@ -73,7 +73,7 @@ { size_t nSize; - if (( _size == 0) && (_ptr !=NULL) + if (( _size == 0) && (_ptr !=NULL)) return NULL; nSize = ROUND_SIZE(_size);

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