Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[cwittich] 22151: -forgot to add world.bmp
by cwittich＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: cwittich Date: Thu Jun 1 21:26:49 2006 New Revision: 22151 URL: http://svn.reactos.ru/svn/reactos?rev=22151&view=rev Log: -forgot to add world.bmp Added: trunk/reactos/dll/cpl/timedate/resources/world.bmp (with props) Added: trunk/reactos/dll/cpl/timedate/resources/world.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/resources/… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/timedate/resources/world.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[hpoussin] 22150: If the section name contained a dot, sometimes the right section to install was not found
by hpoussin＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: hpoussin Date: Thu Jun 1 21:08:28 2006 New Revision: 22150 URL: http://svn.reactos.ru/svn/reactos?rev=22150&view=rev Log: If the section name contained a dot, sometimes the right section to install was not found Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Thu Jun 1 21:08:28 2006 @@ -93,6 +93,7 @@ PSP_ALTPLATFORM_INFO PlatformInfo; BYTE ProductType; WORD SuiteMask; + DWORD PrefixLength; WCHAR BestSection[LINE_LEN + 1]; DWORD BestScore1, BestScore2, BestScore3, BestScore4, BestScore5; }; @@ -1052,7 +1053,7 @@ * Field[5] Suite mask * Remark: lastests fields may be NULL if the information is not provided */ - Fields[0] = strchrW(Section, '.'); + Fields[0] = Section; if (Fields[0] == NULL) { TRACE("No extension found\n"); @@ -1209,8 +1210,11 @@ DWORD Score1, Score2, Score3, Score4, Score5; BOOL ret; + if (SectionName[info->PrefixLength] != '.') + return TRUE; + ret = CheckSectionValid( - SectionName, + &SectionName[info->PrefixLength], info->PlatformInfo, info->ProductType, info->SuiteMask, @@ -1318,6 +1322,7 @@ CallbackInfo.PlatformInfo = pPlatformInfo; CallbackInfo.ProductType = ProductType; CallbackInfo.SuiteMask = SuiteMask; + CallbackInfo.PrefixLength = strlenW(InfSectionName); CallbackInfo.BestScore1 = ULONG_MAX; CallbackInfo.BestScore2 = ULONG_MAX; CallbackInfo.BestScore3 = ULONG_MAX; @@ -7629,7 +7634,7 @@ ret = SetupDiGetActualSectionToInstallW( SelectedDriver->InfFileDetails->hInf, SelectedDriver->Details.SectionName, - SectionName, MAX_PATH - strlenW(DotCoInstallers), &SectionNameLength, NULL); + SectionName, MAX_PATH, &SectionNameLength, NULL); if (!ret) goto done; @@ -7946,7 +7951,6 @@ strcatW(Windir, BackSlash); strcatW(Windir, InfDirectory); - DPRINT1("Comparing %S and %S\n", FullName, Windir); if (strncmpiW(FullName, Windir, last - FullName) == 0) { /* The path is %SYSTEMROOT%\Inf */

1 0

[gedmurphy] 22149: hmm, tortoise is messing me about ; )
by gedmurphy＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: gedmurphy Date: Thu Jun 1 20:47:11 2006 New Revision: 22149 URL: http://svn.reactos.ru/svn/reactos?rev=22149&view=rev Log: hmm, tortoise is messing me about ;) Modified: trunk/reactos/base/applications/servman/En.rc Modified: trunk/reactos/base/applications/servman/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/E… ============================================================================== --- trunk/reactos/base/applications/servman/En.rc (original) +++ trunk/reactos/base/applications/servman/En.rc Thu Jun 1 20:47:11 2006 @@ -79,7 +79,7 @@ EDITTEXT IDC_DISP_NAME, 70, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY - CONTROL "",IDC_START_TYPE,"ComboBox",0x50010003,70,107,176,40 + CONTROL "", IDC_START_TYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 70, 107, 176, 40 PUSHBUTTON "Start", IDC_START, 6, 155, 54, 15, WS_DISABLED PUSHBUTTON "Stop", IDC_STOP, 68, 155, 54, 15, WS_DISABLED PUSHBUTTON "Pause", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED @@ -90,7 +90,7 @@ LTEXT "Path to executable:", IDC_STATIC, 6, 73, 82, 9 LTEXT "Startup type:", IDC_STATIC, 6, 108, 53, 11 LTEXT "Service status:", IDC_STATIC, 4, 138, 53, 11 - CONTROL "",IDC_SERV_STATUS,"Static",0x50000000,70,138,176,11 + LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE LTEXT "You can specify the start parameters that apply when you start the service from here.",IDC_STATIC, 6,177,240,15 LTEXT "Start parameters:", IDC_STATIC, 6, 200, 58, 11 EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP @@ -164,8 +164,6 @@ END -IDB_BUTTONS BITMAP DISCARDABLE "res/toolbar.bmp" - STRINGTABLE DISCARDABLE BEGIN @@ -196,11 +194,12 @@ IDS_TOOLTIP_PROP "Properties" IDS_TOOLTIP_REFRESH "Refresh" IDS_TOOLTIP_EXPORT "Export list" + IDS_TOOLTIP_CREATE "Create a new service" + IDS_TOOLTIP_DELETE "Deletes an existing service" IDS_TOOLTIP_START "Start service" IDS_TOOLTIP_STOP "Stop service" IDS_TOOLTIP_PAUSE "Pause service" IDS_TOOLTIP_RESTART "Restart service" - IDS_TOOLTIP_NEW "Create a new service" IDS_TOOLTIP_HELP "Help" IDS_TOOLTIP_EXIT "Exit" END

1 0

[gedmurphy] 22148: - Start a complete overhaul of servman, using abstraction instead of the old messy way. - Far to many changes to list, so I'm not even gonna even try ; )
by gedmurphy＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: gedmurphy Date: Thu Jun 1 20:42:08 2006 New Revision: 22148 URL: http://svn.reactos.ru/svn/reactos?rev=22148&view=rev Log: - Start a complete overhaul of servman, using abstraction instead of the old messy way. - Far to many changes to list, so I'm not even gonna even try ;) Added: trunk/reactos/base/applications/servman/mainwnd.c trunk/reactos/base/applications/servman/misc.c trunk/reactos/base/applications/servman/precomp.h trunk/reactos/base/applications/servman/stop.c Removed: trunk/reactos/base/applications/servman/geterror.c trunk/reactos/base/applications/servman/servman.h Modified: trunk/reactos/base/applications/servman/about.c trunk/reactos/base/applications/servman/control.c trunk/reactos/base/applications/servman/create.c trunk/reactos/base/applications/servman/delete.c trunk/reactos/base/applications/servman/export.c trunk/reactos/base/applications/servman/progress.c trunk/reactos/base/applications/servman/propsheet.c trunk/reactos/base/applications/servman/query.c trunk/reactos/base/applications/servman/resource.h trunk/reactos/base/applications/servman/servman.c trunk/reactos/base/applications/servman/servman.rbuild trunk/reactos/base/applications/servman/servman.rc trunk/reactos/base/applications/servman/start.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/servman/about.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/a… Modified: trunk/reactos/base/applications/servman/control.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/c… Modified: trunk/reactos/base/applications/servman/create.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/c… Modified: trunk/reactos/base/applications/servman/delete.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/d… Modified: trunk/reactos/base/applications/servman/export.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/e… Removed: trunk/reactos/base/applications/servman/geterror.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/g… Added: trunk/reactos/base/applications/servman/mainwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/m… Added: trunk/reactos/base/applications/servman/misc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/m… Added: trunk/reactos/base/applications/servman/precomp.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/p… Modified: trunk/reactos/base/applications/servman/progress.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/p… Modified: trunk/reactos/base/applications/servman/propsheet.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/p… Modified: trunk/reactos/base/applications/servman/query.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/q… Modified: trunk/reactos/base/applications/servman/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/r… Modified: trunk/reactos/base/applications/servman/servman.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/s… Removed: trunk/reactos/base/applications/servman/servman.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/s… Modified: trunk/reactos/base/applications/servman/servman.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/s… Modified: trunk/reactos/base/applications/servman/servman.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/s… Modified: trunk/reactos/base/applications/servman/start.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/s… Added: trunk/reactos/base/applications/servman/stop.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/servman/s…

1 0

[cwittich] 22147: -forgot to check lpDrawItem->CtlID
by cwittich＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: cwittich Date: Thu Jun 1 20:34:53 2006 New Revision: 22147 URL: http://svn.reactos.ru/svn/reactos?rev=22147&view=rev Log: -forgot to check lpDrawItem->CtlID Modified: trunk/reactos/dll/cpl/timedate/timedate.c Modified: trunk/reactos/dll/cpl/timedate/timedate.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.c… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.c (original) +++ trunk/reactos/dll/cpl/timedate/timedate.c Thu Jun 1 20:34:53 2006 @@ -809,18 +809,21 @@ case WM_DRAWITEM: { LPDRAWITEMSTRUCT lpDrawItem; - PAINTSTRUCT ps; - HDC hdc, hdcMem; lpDrawItem = (LPDRAWITEMSTRUCT) lParam; - hdc = BeginPaint(hwndDlg, &ps); - hdcMem = CreateCompatibleDC(hdc); - SelectObject(hdcMem, hBitmap); - StretchBlt(lpDrawItem->hDC, lpDrawItem->rcItem.left, lpDrawItem->rcItem.top, - lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, - lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, - hdcMem, 0, 0, cxSource, cySource, SRCCOPY); - DeleteDC(hdcMem); - EndPaint(hwndDlg, &ps); + if(lpDrawItem->CtlID == IDC_WORLD_BACKGROUND) + { + PAINTSTRUCT ps; + HDC hdc, hdcMem; + hdc = BeginPaint(hwndDlg, &ps); + hdcMem = CreateCompatibleDC(hdc); + SelectObject(hdcMem, hBitmap); + StretchBlt(lpDrawItem->hDC, lpDrawItem->rcItem.left, lpDrawItem->rcItem.top, + lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, + lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, + hdcMem, 0, 0, cxSource, cySource, SRCCOPY); + DeleteDC(hdcMem); + EndPaint(hwndDlg, &ps); + } break; } case WM_COMMAND:

1 0

[hpoussin] 22146: Amovible devices should be checked when doing automatic install
by hpoussin＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: hpoussin Date: Thu Jun 1 20:25:15 2006 New Revision: 22146 URL: http://svn.reactos.ru/svn/reactos?rev=22146&view=rev Log: Amovible devices should be checked when doing automatic install Modified: trunk/reactos/dll/win32/newdev/newdev.c trunk/reactos/dll/win32/newdev/newdev_private.h trunk/reactos/dll/win32/newdev/wizard.c Modified: trunk/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?r… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.c (original) +++ trunk/reactos/dll/win32/newdev/newdev.c Thu Jun 1 20:25:15 2006 @@ -27,6 +27,12 @@ /* Global variables */ HINSTANCE hDllInstance; +static BOOL +SearchDriver( + IN PDEVINSTDATA DevInstData, + IN LPCTSTR Directory OPTIONAL, + IN LPCTSTR InfFile OPTIONAL); + /* * @implemented */ @@ -241,7 +247,7 @@ } /* Directory and InfFile MUST NOT be specified simultaneously */ -BOOL +static BOOL SearchDriver( IN PDEVINSTDATA DevInstData, IN LPCTSTR Directory OPTIONAL, @@ -269,7 +275,10 @@ _tcsncpy(DevInstallParams.DriverPath, Directory, MAX_PATH); } else + { + DevInstallParams.Flags &= ~DI_ENUMSINGLEINF; *DevInstallParams.DriverPath = _T('\0'); + } ret = SetupDiSetDeviceInstallParams( DevInstData->hDevInfo, @@ -334,7 +343,7 @@ return _T(""); } -BOOL +static BOOL SearchDriverRecursive( IN PDEVINSTDATA DevInstData, IN LPCTSTR Path) @@ -405,6 +414,118 @@ } BOOL +ScanFoldersForDriver( + IN PDEVINSTDATA DevInstData) +{ + BOOL result; + + /* Search in default location */ + result = SearchDriver(DevInstData, NULL, NULL); + + if (DevInstData->CustomSearchPath) + { + /* Search only in specified paths */ + /* We need to check all specified directories to be + * sure to find the best driver for the device. + */ + LPCTSTR Path; + for (Path = DevInstData->CustomSearchPath; *Path != '\0'; Path += _tcslen(Path) + 1) + { + TRACE("Search driver in %S\n", Path); + if (_tcslen(Path) == 2 && Path[1] == ':') + { + if (SearchDriverRecursive(DevInstData, Path)) + result = TRUE; + } + else + { + if (SearchDriver(DevInstData, Path, NULL)) + result = TRUE; + } + } + } + + return result; +} + +BOOL +PrepareFoldersToScan( + IN PDEVINSTDATA DevInstData, + IN BOOL IncludeRemovableDevices, + IN BOOL IncludeCustomPath, + IN HWND hwndCombo OPTIONAL) +{ + TCHAR drive[] = {'?',':',0}; + DWORD dwDrives = 0; + DWORD i; + UINT nType; + DWORD CustomTextLength = 0; + DWORD LengthNeeded = 0; + LPTSTR Buffer; + + TRACE("Include removable devices: %s\n", IncludeRemovableDevices ? "yes" : "no"); + TRACE("Include custom path : %s\n", IncludeCustomPath ? "yes" : "no"); + + /* Calculate length needed to store the search paths */ + if (IncludeRemovableDevices) + { + dwDrives = GetLogicalDrives(); + for (drive[0] = 'A', i = 1; drive[0] <= 'Z'; drive[0]++, i <<= 1) + { + if (dwDrives & i) + { + nType = GetDriveType(drive); + if (nType == DRIVE_REMOVABLE || nType == DRIVE_CDROM) + { + LengthNeeded += 3; + } + } + } + } + if (IncludeCustomPath) + { + CustomTextLength = 1 + ComboBox_GetTextLength(hwndCombo); + LengthNeeded += CustomTextLength; + } + + /* Allocate space for search paths */ + HeapFree(GetProcessHeap(), 0, DevInstData->CustomSearchPath); + DevInstData->CustomSearchPath = Buffer = HeapAlloc( + GetProcessHeap(), + 0, + (LengthNeeded + 1) * sizeof(TCHAR)); + if (!Buffer) + { + TRACE("HeapAlloc() failed\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Fill search paths */ + if (IncludeRemovableDevices) + { + for (drive[0] = 'A', i = 1; drive[0] <= 'Z'; drive[0]++, i <<= 1) + { + if (dwDrives & i) + { + nType = GetDriveType(drive); + if (nType == DRIVE_REMOVABLE || nType == DRIVE_CDROM) + { + Buffer += 1 + _stprintf(Buffer, drive); + } + } + } + } + if (IncludeCustomPath) + { + Buffer += 1 + ComboBox_GetText(hwndCombo, Buffer, CustomTextLength); + } + *Buffer = _T('\0'); + + return TRUE; +} + +BOOL InstallCurrentDriver( IN PDEVINSTDATA DevInstData) { @@ -623,8 +744,13 @@ TRACE("Installing %S (%S)\n", DevInstData->buffer, InstanceId); - /* Search driver in default location */ - if (SearchDriver(DevInstData, NULL, NULL)) + /* Search driver in default location and removable devices */ + if (!PrepareFoldersToScan(DevInstData, TRUE, FALSE, NULL)) + { + TRACE("PrepareFoldersToScan() failed with error 0x%lx\n", GetLastError()); + goto cleanup; + } + if (ScanFoldersForDriver(DevInstData)) { /* Driver found ; install it */ retval = InstallCurrentDriver(DevInstData); Modified: trunk/reactos/dll/win32/newdev/newdev_private.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/newdev_pri… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev_private.h (original) +++ trunk/reactos/dll/win32/newdev/newdev_private.h Thu Jun 1 20:25:15 2006 @@ -36,16 +36,17 @@ #define WM_INSTALL_FINISHED (WM_USER + 11) /* newdev.c */ -BOOL -SearchDriver( - IN PDEVINSTDATA DevInstData, - IN LPCTSTR Directory OPTIONAL, - IN LPCTSTR InfFile OPTIONAL); BOOL -SearchDriverRecursive( +ScanFoldersForDriver( + IN PDEVINSTDATA DevInstData); + +BOOL +PrepareFoldersToScan( IN PDEVINSTDATA DevInstData, - IN LPCTSTR Path); + IN BOOL IncludeRemovableDevices, + IN BOOL IncludeCustomPath, + IN HWND hwndCombo OPTIONAL); BOOL InstallCurrentDriver( Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?r… ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c (original) +++ trunk/reactos/dll/win32/newdev/wizard.c Thu Jun 1 20:25:15 2006 @@ -176,91 +176,6 @@ return Ret; } -static BOOL -PrepareFoldersToScan( - IN PDEVINSTDATA DevInstData, - IN HWND hwndDlg) -{ - TCHAR drive[] = {'?',':',0}; - DWORD dwDrives = 0; - DWORD i; - UINT nType; - DWORD CustomTextLength = 0; - DWORD LengthNeeded = 0; - LPTSTR Buffer; - - TRACE("Include removable devices: %s\n", IsDlgButtonChecked(hwndDlg, IDC_CHECK_MEDIA) ? "yes" : "no"); - TRACE("Include custom path : %s\n", IsDlgButtonChecked(hwndDlg, IDC_CHECK_PATH) ? "yes" : "no"); - - /* Calculate length needed to store the search paths */ - if (IsDlgButtonChecked(hwndDlg, IDC_CHECK_MEDIA)) - { - dwDrives = GetLogicalDrives(); - for (drive[0] = 'A', i = 1; drive[0] <= 'Z'; drive[0]++, i <<= 1) - { - if (dwDrives & i) - { - nType = GetDriveType(drive); - if (nType == DRIVE_REMOVABLE || nType == DRIVE_CDROM) - { - LengthNeeded += 3; - } - } - } - } - if (IsDlgButtonChecked(hwndDlg, IDC_CHECK_PATH)) - { - CustomTextLength = 1 + SendDlgItemMessage( - hwndDlg, - IDC_COMBO_PATH, - WM_GETTEXTLENGTH, - (WPARAM)0, - (LPARAM)0); - LengthNeeded += CustomTextLength; - } - - /* Allocate space for search paths */ - HeapFree(GetProcessHeap(), 0, DevInstData->CustomSearchPath); - DevInstData->CustomSearchPath = Buffer = HeapAlloc( - GetProcessHeap(), - 0, - (LengthNeeded + 1) * sizeof(TCHAR)); - if (!Buffer) - { - TRACE("HeapAlloc() failed\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - /* Fill search paths */ - if (IsDlgButtonChecked(hwndDlg, IDC_CHECK_MEDIA)) - { - for (drive[0] = 'A', i = 1; drive[0] <= 'Z'; drive[0]++, i <<= 1) - { - if (dwDrives & i) - { - nType = GetDriveType(drive); - if (nType == DRIVE_REMOVABLE || nType == DRIVE_CDROM) - { - Buffer += 1 + _stprintf(Buffer, drive); - } - } - } - } - if (IsDlgButtonChecked(hwndDlg, IDC_CHECK_PATH)) - { - Buffer += 1 + SendDlgItemMessage( - hwndDlg, - IDC_COMBO_PATH, - WM_GETTEXT, - (WPARAM)CustomTextLength, - (LPARAM)Buffer); - } - *Buffer = _T('\0'); - - return TRUE; -} - static DWORD WINAPI FindDriverProc( IN LPVOID lpParam) @@ -271,39 +186,7 @@ DevInstData = (PDEVINSTDATA)lpParam; - /* Yes, we can safely ignore the problem (if any) */ - SetupDiDestroyDriverInfoList( - DevInstData->hDevInfo, - &DevInstData->devInfoData, - SPDIT_COMPATDRIVER); - - if (!DevInstData->CustomSearchPath) - { - /* Search in default location */ - result = SearchDriver(DevInstData, NULL, NULL); - } - else - { - /* Search only in specified paths */ - /* We need to check all specified directories to be - * sure to find the best driver for the device. - */ - LPCTSTR Path; - for (Path = DevInstData->CustomSearchPath; *Path != '\0'; Path += _tcslen(Path) + 1) - { - TRACE("Search driver in %S\n", Path); - if (_tcslen(Path) == 2 && Path[1] == ':') - { - if (SearchDriverRecursive(DevInstData, Path)) - result = TRUE; - } - else - { - if (SearchDriver(DevInstData, Path, NULL)) - result = TRUE; - } - } - } + result = ScanFoldersForDriver(DevInstData); if (result) { @@ -600,7 +483,12 @@ case PSN_WIZNEXT: /* Handle a Next button click, if necessary */ if (SendDlgItemMessage(hwndDlg, IDC_RADIO_AUTO, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_CHECKED) - PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_SEARCHDRV); + { + if (PrepareFoldersToScan(DevInstData, TRUE, FALSE, NULL)) + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_SEARCHDRV); + else + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_INSTALLFAILED); + } return TRUE; default: @@ -748,10 +636,18 @@ SaveCustomPath(GetDlgItem(hwndDlg, IDC_COMBO_PATH)); HeapFree(GetProcessHeap(), 0, DevInstData->CustomSearchPath); DevInstData->CustomSearchPath = NULL; - if (PrepareFoldersToScan(DevInstData, hwndDlg)) + if (PrepareFoldersToScan( + DevInstData, + IsDlgButtonChecked(hwndDlg, IDC_CHECK_MEDIA), + IsDlgButtonChecked(hwndDlg, IDC_CHECK_PATH), + GetDlgItem(hwndDlg, IDC_COMBO_PATH))) + { PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_SEARCHDRV); + } else + { PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_INSTALLFAILED); + } } else /* FIXME */; @@ -832,6 +728,11 @@ { case PSN_SETACTIVE: PropSheet_SetWizButtons(GetParent(hwndDlg), !PSWIZB_NEXT | !PSWIZB_BACK); + /* Yes, we can safely ignore the problem (if any) */ + SetupDiDestroyDriverInfoList( + DevInstData->hDevInfo, + &DevInstData->devInfoData, + SPDIT_COMPATDRIVER); hThread = CreateThread(NULL, 0, FindDriverProc, DevInstData, 0, &dwThreadId); break;

1 0

[cwittich] 22145: -added a worldmap picture (source: http://en.wikipedia.org/wiki/Image:Earth_satellite_plane.jpg)
by cwittich＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: cwittich Date: Thu Jun 1 20:25:13 2006 New Revision: 22145 URL: http://svn.reactos.ru/svn/reactos?rev=22145&view=rev Log: -added a worldmap picture (source: http://en.wikipedia.org/wiki/Image:Earth_satellite_plane.jpg) Modified: trunk/reactos/dll/cpl/timedate/Cz.rc trunk/reactos/dll/cpl/timedate/De.rc trunk/reactos/dll/cpl/timedate/Dk.rc trunk/reactos/dll/cpl/timedate/En.rc trunk/reactos/dll/cpl/timedate/Es.rc trunk/reactos/dll/cpl/timedate/Fr.rc trunk/reactos/dll/cpl/timedate/Gr.rc trunk/reactos/dll/cpl/timedate/Hu.rc trunk/reactos/dll/cpl/timedate/Ja.rc trunk/reactos/dll/cpl/timedate/Nl.rc trunk/reactos/dll/cpl/timedate/Pl.rc trunk/reactos/dll/cpl/timedate/Ru.rc trunk/reactos/dll/cpl/timedate/Sv.rc trunk/reactos/dll/cpl/timedate/resource.h trunk/reactos/dll/cpl/timedate/timedate.c trunk/reactos/dll/cpl/timedate/timedate.rc Modified: trunk/reactos/dll/cpl/timedate/Cz.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Cz.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Cz.rc (original) +++ trunk/reactos/dll/cpl/timedate/Cz.rc Thu Jun 1 20:25:13 2006 @@ -29,6 +29,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "Provádìt zmìnu na letní èas a zpìt automaticky", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END Modified: trunk/reactos/dll/cpl/timedate/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/De.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/De.rc (original) +++ trunk/reactos/dll/cpl/timedate/De.rc Thu Jun 1 20:25:13 2006 @@ -30,6 +30,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "&Uhr automatisch auf Sommer-/Winterzeit umstellen", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END Modified: trunk/reactos/dll/cpl/timedate/Dk.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Dk.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Dk.rc (original) +++ trunk/reactos/dll/cpl/timedate/Dk.rc Thu Jun 1 20:25:13 2006 @@ -30,6 +30,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "Justere uret automatisk efter &Sommertid/Vintertid.", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END Modified: trunk/reactos/dll/cpl/timedate/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/En.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/En.rc (original) +++ trunk/reactos/dll/cpl/timedate/En.rc Thu Jun 1 20:25:13 2006 @@ -30,6 +30,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END Modified: trunk/reactos/dll/cpl/timedate/Es.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Es.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Es.rc (original) +++ trunk/reactos/dll/cpl/timedate/Es.rc Thu Jun 1 20:25:13 2006 @@ -29,6 +29,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END Modified: trunk/reactos/dll/cpl/timedate/Fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Fr.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Fr.rc (original) +++ trunk/reactos/dll/cpl/timedate/Fr.rc Thu Jun 1 20:25:13 2006 @@ -29,6 +29,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "Ajuster automatiquement l'heure lors du &passage à l'heure d'été" IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END Modified: trunk/reactos/dll/cpl/timedate/Gr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Gr.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Gr.rc (original) +++ trunk/reactos/dll/cpl/timedate/Gr.rc Thu Jun 1 20:25:13 2006 @@ -30,6 +30,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "Áõôüìáôç ñýèìéóç ñïëïãéïý ãéá &áëëáãÝò", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END Modified: trunk/reactos/dll/cpl/timedate/Hu.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Hu.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Hu.rc (original) +++ trunk/reactos/dll/cpl/timedate/Hu.rc Thu Jun 1 20:25:13 2006 @@ -31,6 +31,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "Automatikus átállás a nyári idõszámításra", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END Modified: trunk/reactos/dll/cpl/timedate/Ja.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Ja.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Ja.rc (original) +++ trunk/reactos/dll/cpl/timedate/Ja.rc Thu Jun 1 20:25:13 2006 @@ -30,6 +30,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "©®IÉT}[ ^CÌ²®ð·é(&D)", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END Modified: trunk/reactos/dll/cpl/timedate/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Nl.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Nl.rc (original) +++ trunk/reactos/dll/cpl/timedate/Nl.rc Thu Jun 1 20:25:13 2006 @@ -29,6 +29,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "&Klok automatisch aanpassen aan zomertijd", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END Modified: trunk/reactos/dll/cpl/timedate/Pl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Pl.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Pl.rc (original) +++ trunk/reactos/dll/cpl/timedate/Pl.rc Thu Jun 1 20:25:13 2006 @@ -31,6 +31,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "&Automatycznie uwzglêdnij zmiany czasu", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END Modified: trunk/reactos/dll/cpl/timedate/Ru.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Ru.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Ru.rc (original) +++ trunk/reactos/dll/cpl/timedate/Ru.rc Thu Jun 1 20:25:13 2006 @@ -29,6 +29,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "Àâòîìàòè&÷åñêèé ïåðåõîä íà ëåòíåå âðåìÿ è îáðàòíî", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END Modified: trunk/reactos/dll/cpl/timedate/Sv.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Sv.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Sv.rc (original) +++ trunk/reactos/dll/cpl/timedate/Sv.rc Thu Jun 1 20:25:13 2006 @@ -34,6 +34,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE AUTOCHECKBOX "&Justera klockan automatiskt för sommar- och vintertid", IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END Modified: trunk/reactos/dll/cpl/timedate/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/resource.h… ============================================================================== --- trunk/reactos/dll/cpl/timedate/resource.h (original) +++ trunk/reactos/dll/cpl/timedate/resource.h Thu Jun 1 20:25:13 2006 @@ -10,12 +10,14 @@ #define IDC_MONTHCALENDAR 103 #define IDC_TIMEZONE 106 #define IDC_TIMEPICKER 107 -#define IDC_YEAR 108 -#define IDC_YEARTEXT 109 +#define IDC_YEAR 108 +#define IDC_YEARTEXT 109 #define IDD_TIMEZONEPAGE 110 #define IDC_TIMEZONELIST 111 #define IDC_AUTODAYLIGHT 113 +#define IDC_WORLD_BACKGROUND 114 +#define IDC_WORLD 115 #define IDD_INETTIMEPAGE 120 #define IDC_SERVERLIST 121 Modified: trunk/reactos/dll/cpl/timedate/timedate.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.c… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.c (original) +++ trunk/reactos/dll/cpl/timedate/timedate.c Thu Jun 1 20:25:13 2006 @@ -50,6 +50,8 @@ PTIMEZONE_ENTRY TimeZoneListHead = NULL; PTIMEZONE_ENTRY TimeZoneListTail = NULL; +static HBITMAP hBitmap = NULL; +static int cxSource, cySource; /* Applets */ APPLET Applets[NUM_APPLETS] = @@ -786,14 +788,41 @@ WPARAM wParam, LPARAM lParam) { + BITMAP bitmap; + switch (uMsg) { case WM_INITDIALOG: CreateTimeZoneList(); ShowTimeZoneList(GetDlgItem(hwndDlg, IDC_TIMEZONELIST)); GetAutoDaylightInfo(GetDlgItem(hwndDlg, IDC_AUTODAYLIGHT)); - break; - + hBitmap = LoadImage(hApplet, MAKEINTRESOURCE(IDC_WORLD), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + if (hBitmap != NULL) + { + GetObject(hBitmap, sizeof(BITMAP), &bitmap); + + cxSource = bitmap.bmWidth; + cySource = bitmap.bmHeight; + } + break; + + case WM_DRAWITEM: + { + LPDRAWITEMSTRUCT lpDrawItem; + PAINTSTRUCT ps; + HDC hdc, hdcMem; + lpDrawItem = (LPDRAWITEMSTRUCT) lParam; + hdc = BeginPaint(hwndDlg, &ps); + hdcMem = CreateCompatibleDC(hdc); + SelectObject(hdcMem, hBitmap); + StretchBlt(lpDrawItem->hDC, lpDrawItem->rcItem.left, lpDrawItem->rcItem.top, + lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, + lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, + hdcMem, 0, 0, cxSource, cySource, SRCCOPY); + DeleteDC(hdcMem); + EndPaint(hwndDlg, &ps); + break; + } case WM_COMMAND: if ((LOWORD(wParam) == IDC_TIMEZONELIST && HIWORD(wParam) == CBN_SELCHANGE) || (LOWORD(wParam) == IDC_AUTODAYLIGHT && HIWORD(wParam) == BN_CLICKED)) @@ -805,6 +834,7 @@ case WM_DESTROY: DestroyTimeZoneList(); + DeleteObject(hBitmap); break; case WM_NOTIFY: Modified: trunk/reactos/dll/cpl/timedate/timedate.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.r… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.rc (original) +++ trunk/reactos/dll/cpl/timedate/timedate.rc Thu Jun 1 20:25:13 2006 @@ -14,6 +14,7 @@ IDC_CPLICON ICON "resources/applet.ico" +IDC_WORLD BITMAP "resources/world.bmp" #include "En.rc" #include "Cz.rc"

1 0

[greatlrd] 22144: Sorry I did wrong calc of the position of ungetc did not think of TCHAR size.
by greatlrd＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: greatlrd Date: Thu Jun 1 13:38:11 2006 New Revision: 22144 URL: http://svn.reactos.ru/svn/reactos?rev=22144&view=rev Log: Sorry I did wrong calc of the position of ungetc did not think of TCHAR size. Modified: trunk/reactos/lib/crt/stdio/ungetc.c Modified: trunk/reactos/lib/crt/stdio/ungetc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdio/ungetc.c?rev=… ============================================================================== --- trunk/reactos/lib/crt/stdio/ungetc.c (original) +++ trunk/reactos/lib/crt/stdio/ungetc.c Thu Jun 1 13:38:11 2006 @@ -21,13 +21,11 @@ if (f->_ptr == f->_base) { - if (f->_cnt == 0) - f->_ptr+=sizeof(_TCHAR); - else + if (!f->_cnt == 0) return _TEOF; - } + } - fseek(f, -1, SEEK_CUR); + fseek(f, -sizeof(_TCHAR), SEEK_CUR); if(*(_TCHAR*)f->_ptr != c) *((_TCHAR*)(f->_ptr)) = c;

1 0

[greatlrd] 22143: small rewrite by me, pass wine test and no bugs in ungetc accroing wine test of msvcrt.
by greatlrd＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: greatlrd Date: Thu Jun 1 13:26:32 2006 New Revision: 22143 URL: http://svn.reactos.ru/svn/reactos?rev=22143&view=rev Log: small rewrite by me, pass wine test and no bugs in ungetc accroing wine test of msvcrt. Modified: trunk/reactos/lib/crt/stdio/ungetc.c Modified: trunk/reactos/lib/crt/stdio/ungetc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdio/ungetc.c?rev=… ============================================================================== --- trunk/reactos/lib/crt/stdio/ungetc.c (original) +++ trunk/reactos/lib/crt/stdio/ungetc.c Thu Jun 1 13:26:32 2006 @@ -18,33 +18,20 @@ if (c == _TEOF) return _TEOF; - - if (f->_ptr == NULL || f->_base == NULL) - return _TEOF; - + if (f->_ptr == f->_base) - { + { if (f->_cnt == 0) f->_ptr+=sizeof(_TCHAR); else return _TEOF; - } - - f->_cnt+=sizeof(_TCHAR); - f->_ptr-=sizeof(_TCHAR); - -#if 1 - if (*((_TCHAR*)(f->_ptr)) != c) - { - f->_flag |= _IOUNGETC; - *((_TCHAR*)(f->_ptr)) = c; - } -#else - /* This is the old unicode version. Dunno what version is most correct. -Gunnar */ - f->_flag |= _IOUNGETC; - *((_TCHAR*)(f->_ptr)) = c; -#endif - - return c; + } + + fseek(f, -1, SEEK_CUR); + + if(*(_TCHAR*)f->_ptr != c) + *((_TCHAR*)(f->_ptr)) = c; + + return c; }

1 0

[greatlrd] 22142: [AUDIT] this code is clear base from djgpp with small modifcation, and bugs as hell. Bugfix will folllow in next commit
by greatlrd＠svn.reactos.org 01 Jun '06

01 Jun '06

Author: greatlrd Date: Thu Jun 1 13:23:00 2006 New Revision: 22142 URL: http://svn.reactos.ru/svn/reactos?rev=22142&view=rev Log: [AUDIT] this code is clear base from djgpp with small modifcation, and bugs as hell. Bugfix will folllow in next commit Modified: trunk/reactos/lib/crt/stdio/ungetc.c (props changed) Propchange: trunk/reactos/lib/crt/stdio/ungetc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

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