Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[gedmurphy] 30289: convert to unicode in an attempt to address bug 2805

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Nov 9 14:40:54 2007 New Revision: 30289 URL: http://svn.reactos.org/svn/reactos?rev=30289&view=rev Log: convert to unicode in an attempt to address bug 2805 Modified: trunk/reactos/base/applications/charmap/about.c trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/lrgcell.c trunk/reactos/base/applications/charmap/map.c trunk/reactos/base/applications/charmap/precomp.h Modified: trunk/reactos/base/applications/charmap/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/about.c (original) +++ trunk/reactos/base/applications/charmap/about.c Fri Nov 9 14:40:54 2007 @@ -24,30 +24,34 @@ case WM_INITDIALOG: { HWND hLicenseEditWnd; - TCHAR strLicense[700]; + WCHAR strLicense[700]; - hIcon = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_ICON), - IMAGE_ICON, - 16, - 16, - 0); - - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hIcon); + hIcon = LoadImageW(hInstance, + MAKEINTRESOURCEW(IDI_ICON), + IMAGE_ICON, + 16, + 16, + 0); + if (hIcon) + { + SendMessage(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); + } hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE_EDIT); - LoadString(hInstance, - IDS_LICENSE, - strLicense, - sizeof(strLicense) / sizeof(TCHAR)); + if (LoadStringW(hInstance, + IDS_LICENSE, + strLicense, + sizeof(strLicense) / sizeof(WCHAR))) + { + SetWindowTextW(hLicenseEditWnd, + strLicense); + } - SetWindowText(hLicenseEditWnd, - strLicense); return TRUE; } @@ -72,8 +76,8 @@ VOID ShowAboutDlg(HWND hWndParent) { - DialogBox(hInstance, - MAKEINTRESOURCE(IDD_ABOUTBOX), - hWndParent, - AboutDialogProc); + DialogBoxW(hInstance, + MAKEINTRESOURCEW(IDD_ABOUTBOX), + hWndParent, + AboutDialogProc); } Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c (original) +++ trunk/reactos/base/applications/charmap/charmap.c Fri Nov 9 14:40:54 2007 @@ -15,39 +15,39 @@ /* Font-enumeration callback */ static int CALLBACK -EnumFontNames(ENUMLOGFONTEX *lpelfe, - NEWTEXTMETRICEX *lpntme, +EnumFontNames(ENUMLOGFONTEXW *lpelfe, + NEWTEXTMETRICEXW *lpntme, DWORD FontType, LPARAM lParam) { HWND hwndCombo = (HWND)lParam; - TCHAR *pszName = lpelfe->elfLogFont.lfFaceName; + LPWSTR pszName = lpelfe->elfLogFont.lfFaceName; /* make sure font doesn't already exist in our list */ - if(SendMessage(hwndCombo, - CB_FINDSTRING, - 0, - (LPARAM)pszName) == CB_ERR) + if(SendMessageW(hwndCombo, + CB_FINDSTRING, + 0, + (LPARAM)pszName) == CB_ERR) { INT idx; BOOL fFixed; BOOL fTrueType; /* add the font */ - idx = (INT)SendMessage(hwndCombo, - CB_ADDSTRING, - 0, - (LPARAM)pszName); + idx = (INT)SendMessageW(hwndCombo, + CB_ADDSTRING, + 0, + (LPARAM)pszName); /* record the font's attributes (Fixedwidth and Truetype) */ fFixed = (lpelfe->elfLogFont.lfPitchAndFamily & FIXED_PITCH) ? TRUE : FALSE; fTrueType = (lpelfe->elfLogFont.lfOutPrecision == OUT_STROKE_PRECIS) ? TRUE : FALSE; /* store this information in the list-item's userdata area */ - SendMessage(hwndCombo, - CB_SETITEMDATA, - idx, - MAKEWPARAM(fFixed, fTrueType)); + SendMessageW(hwndCombo, + CB_SETITEMDATA, + idx, + MAKEWPARAM(fFixed, fTrueType)); } return 1; @@ -59,35 +59,35 @@ FillFontStyleComboList(HWND hwndCombo) { HDC hdc; - LOGFONT lf; + LOGFONTW lf; /* FIXME: for fun, draw each font in its own style */ HFONT hFont = GetStockObject(DEFAULT_GUI_FONT); - SendMessage(hwndCombo, - WM_SETFONT, - (WPARAM)hFont, - 0); + SendMessageW(hwndCombo, + WM_SETFONT, + (WPARAM)hFont, + 0); lf.lfCharSet = DEFAULT_CHARSET; - lf.lfFaceName[0] = _T('\0'); // all fonts + lf.lfFaceName[0] = L'\0'; // all fonts lf.lfPitchAndFamily = 0; hdc = GetDC(hwndCombo); /* store the list of fonts in the combo */ - EnumFontFamiliesEx(hdc, - &lf, - (FONTENUMPROC)EnumFontNames, - (LPARAM)hwndCombo, - 0); + EnumFontFamiliesExW(hdc, + &lf, + (FONTENUMPROCW)EnumFontNames, + (LPARAM)hwndCombo, + 0); ReleaseDC(hwndCombo, hdc); - SendMessage(hwndCombo, - CB_SETCURSEL, - 0, - 0); + SendMessageW(hwndCombo, + CB_SETCURSEL, + 0, + 0); } @@ -96,12 +96,12 @@ { HWND hCombo; HWND hMap; - LPTSTR lpFontName; + LPWSTR lpFontName; INT Len; hCombo = GetDlgItem(hDlg, IDC_FONTCOMBO); - Len = GetWindowTextLength(hCombo); + Len = GetWindowTextLengthW(hCombo); if (Len != 0) { @@ -111,17 +111,17 @@ if (lpFontName) { - SendMessage(hCombo, - WM_GETTEXT, - Len + 1, - (LPARAM)lpFontName); + SendMessageW(hCombo, + WM_GETTEXT, + Len + 1, + (LPARAM)lpFontName); hMap = GetDlgItem(hDlg, IDC_FONTMAP); - SendMessage(hMap, - FM_SETFONT, - 0, - (LPARAM)lpFontName); + SendMessageW(hMap, + FM_SETFONT, + 0, + (LPARAM)lpFontName); } } } @@ -129,9 +129,9 @@ static VOID AddCharToSelection(HWND hText, - TCHAR ch) -{ - LPTSTR lpText; + WCHAR ch) +{ + LPWSTR lpText; INT Len = GetWindowTextLength(hText); if (Len != 0) @@ -142,22 +142,22 @@ if (lpText) { - LPTSTR lpStr = lpText; - - SendMessage(hText, - WM_GETTEXT, - Len + 1, - (LPARAM)lpStr); + LPWSTR lpStr = lpText; + + SendMessageW(hText, + WM_GETTEXT, + Len + 1, + (LPARAM)lpStr); lpStr += Len; *lpStr = ch; lpStr++; - *lpStr = _T('\0'); - - SendMessage(hText, - WM_SETTEXT, - 0, - (LPARAM)lpText); + *lpStr = L'\0'; + + SendMessageW(hText, + WM_SETTEXT, + 0, + (LPARAM)lpText); HeapFree(GetProcessHeap(), 0, @@ -166,15 +166,15 @@ } else { - TCHAR szText[2]; + WCHAR szText[2]; szText[0] = ch; - szText[1] = _T('\0'); - - SendMessage(hText, - WM_SETTEXT, - 0, - (LPARAM)szText); + szText[1] = L'\0'; + + SendMessageW(hText, + WM_SETTEXT, + 0, + (LPARAM)szText); } } @@ -185,35 +185,42 @@ WPARAM wParam, LPARAM lParam) { + static HICON hSmIcon; + static HICON hBgIcon; + switch(Message) { case WM_INITDIALOG: { - HICON hSmIcon; - HICON hBgIcon; HMENU hSysMenu; - hSmIcon = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_ICON), - IMAGE_ICON, - 16, - 16, - 0); - hBgIcon = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_ICON), - IMAGE_ICON, - 32, - 32, - 0); - - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hSmIcon); - SendMessage(hDlg, - WM_SETICON, - ICON_BIG, - (LPARAM)hBgIcon); + hSmIcon = LoadImageW(hInstance, + MAKEINTRESOURCEW(IDI_ICON), + IMAGE_ICON, + 16, + 16, + 0); + if (hSmIcon) + { + SendMessageW(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hSmIcon); + } + + hBgIcon = LoadImageW(hInstance, + MAKEINTRESOURCEW(IDI_ICON), + IMAGE_ICON, + 32, + 32, + 0); + if (hBgIcon) + { + SendMessageW(hDlg, + WM_SETICON, + ICON_BIG, + (LPARAM)hBgIcon); + } FillFontStyleComboList(GetDlgItem(hDlg, IDC_FONTCOMBO)); @@ -224,30 +231,24 @@ FALSE); if (hSysMenu != NULL) { - LPCTSTR lpAboutText = NULL; - - if (LoadString(hInstance, - IDS_ABOUT, - (LPTSTR)&lpAboutText, - 0)) + LPCWSTR lpAboutText = NULL; + + if (LoadStringW(hInstance, + IDS_ABOUT, + (LPWSTR)&lpAboutText, + 0)) { - AppendMenu(hSysMenu, - MF_SEPARATOR, - 0, - NULL); - AppendMenu(hSysMenu, - MF_STRING, - ID_ABOUT, - lpAboutText); + AppendMenuW(hSysMenu, + MF_SEPARATOR, + 0, + NULL); + AppendMenuW(hSysMenu, + MF_STRING, + ID_ABOUT, + lpAboutText); } } return TRUE; - } - break; - - case WM_CLOSE: - { - EndDialog(hDlg, 0); } break; @@ -269,7 +270,7 @@ TCHAR ch; HWND hMap = GetDlgItem(hDlg, IDC_FONTMAP); - ch = (TCHAR) SendMessage(hMap, FM_GETCHAR, 0, 0); + ch = (TCHAR) SendMessageW(hMap, FM_GETCHAR, 0, 0); if (ch) { @@ -281,6 +282,10 @@ } case IDOK: + if (hSmIcon) + DestroyIcon(hSmIcon); + if (hBgIcon) + DestroyIcon(hBgIcon); EndDialog(hDlg, 0); break; } @@ -321,6 +326,14 @@ } break; + case WM_CLOSE: + if (hSmIcon) + DestroyIcon(hSmIcon); + if (hBgIcon) + DestroyIcon(hBgIcon); + EndDialog(hDlg, 0); + break; + default: return FALSE; } @@ -346,10 +359,10 @@ if (RegisterMapClasses(hInstance)) { - Ret = DialogBox(hInstance, - MAKEINTRESOURCE(IDD_CHARMAP), - NULL, - (DLGPROC)DlgProc) >= 0; + Ret = DialogBoxW(hInstance, + MAKEINTRESOURCEW(IDD_CHARMAP), + NULL, + (DLGPROC)DlgProc) >= 0; UnregisterMapClasses(hInstance); } Modified: trunk/reactos/base/applications/charmap/lrgcell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lrgcell.c (original) +++ trunk/reactos/base/applications/charmap/lrgcell.c Fri Nov 9 14:40:54 2007 @@ -13,17 +13,17 @@ static HFONT SetLrgFont(PMAP infoPtr) { - LOGFONT lf; + LOGFONTW lf; HFONT hFont = NULL; HDC hdc; HWND hCombo; - LPTSTR lpFontName; + LPWSTR lpFontName; INT Len; hCombo = GetDlgItem(infoPtr->hParent, IDC_FONTCOMBO); - Len = GetWindowTextLength(hCombo); + Len = GetWindowTextLengthW(hCombo); if (Len != 0) { @@ -33,10 +33,10 @@ if (lpFontName) { - SendMessage(hCombo, - WM_GETTEXT, - 31, - (LPARAM)lpFontName); + SendMessageW(hCombo, + WM_GETTEXT, + 31, + (LPARAM)lpFontName); ZeroMemory(&lf, sizeof(lf)); @@ -48,10 +48,10 @@ hdc); lf.lfCharSet = DEFAULT_CHARSET; - lstrcpy(lf.lfFaceName, - lpFontName); + wcscpy(lf.lfFaceName, + lpFontName); - hFont = CreateFontIndirect(&lf); + hFont = CreateFontIndirectW(&lf); HeapFree(GetProcessHeap(), 0, @@ -75,7 +75,7 @@ static RECT rc; static HFONT hFont = NULL; - infoPtr = (PMAP)GetWindowLongPtr(hwnd, + infoPtr = (PMAP)GetWindowLongPtrW(hwnd, GWLP_USERDATA); if (infoPtr == NULL && uMsg != WM_CREATE) @@ -87,11 +87,11 @@ { case WM_CREATE: { - infoPtr = (PMAP)(((LPCREATESTRUCT)lParam)->lpCreateParams); + infoPtr = (PMAP)(((LPCREATESTRUCTW)lParam)->lpCreateParams); - SetWindowLongPtr(hwnd, - GWLP_USERDATA, - (LONG_PTR)infoPtr); + SetWindowLongPtrW(hwnd, + GWLP_USERDATA, + (LONG_PTR)infoPtr); hFont = SetLrgFont(infoPtr); @@ -128,11 +128,11 @@ hOldFont = SelectObject(hdc, hFont); - DrawText(hdc, - &infoPtr->pActiveCell->ch, - 1, - &rc, - DT_CENTER | DT_VCENTER | DT_SINGLELINE); + DrawTextW(hdc, + &infoPtr->pActiveCell->ch, + 1, + &rc, + DT_CENTER | DT_VCENTER | DT_SINGLELINE); SelectObject(hdc, hOldFont); @@ -152,10 +152,10 @@ default: { HandleDefaultMessage: - Ret = DefWindowProc(hwnd, - uMsg, - wParam, - lParam); + Ret = DefWindowProcW(hwnd, + uMsg, + wParam, + lParam); break; } } Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c (original) +++ trunk/reactos/base/applications/charmap/map.c Fri Nov 9 14:40:54 2007 @@ -9,12 +9,12 @@ #include <precomp.h> -static const TCHAR szMapWndClass[] = TEXT("FontMapWnd"); -static const TCHAR szLrgCellWndClass[] = TEXT("LrgCellWnd"); +static const WCHAR szMapWndClass[] = L"FontMapWnd"; +static const WCHAR szLrgCellWndClass[] = L"LrgCellWnd"; static VOID TagFontToCell(PCELL pCell, - TCHAR ch) + WCHAR ch) { pCell->ch = ch; } @@ -82,7 +82,7 @@ HDC hdc) { HFONT hOldFont; - TCHAR ch; + WCHAR ch; INT x, y; hOldFont = SelectObject(hdc, @@ -91,15 +91,15 @@ for (y = 0; y < YCELLS; y++) for (x = 0; x < XCELLS; x++) { - ch = (TCHAR)((256 * infoPtr->iPage) + (XCELLS * y) + x); + ch = (WCHAR)((256 * infoPtr->iPage) + (XCELLS * y) + x); TagFontToCell(&infoPtr->Cells[y][x], ch); - DrawText(hdc, - &ch, - 1, - &infoPtr->Cells[y][x].CellInt, - DT_CENTER | DT_VCENTER | DT_SINGLELINE); + DrawTextW(hdc, + &ch, + 1, + &infoPtr->Cells[y][x].CellInt, + DT_CENTER | DT_VCENTER | DT_SINGLELINE); } SelectObject(hdc, @@ -124,18 +124,18 @@ XLARGE - XCELLS, YLARGE - YCELLS); - infoPtr->hLrgWnd = CreateWindowEx(0, - szLrgCellWndClass, - NULL, - WS_CHILDWINDOW | WS_VISIBLE, - rLarge.left, - rLarge.top, - rLarge.right - rLarge.left, - rLarge.bottom - rLarge.top, - infoPtr->hParent, - NULL, - hInstance, - infoPtr); + infoPtr->hLrgWnd = CreateWindowExW(0, + szLrgCellWndClass, + NULL, + WS_CHILDWINDOW | WS_VISIBLE, + rLarge.left, + rLarge.top, + rLarge.right - rLarge.left, + rLarge.bottom - rLarge.top, + infoPtr->hParent, + NULL, + hInstance, + infoPtr); if (!infoPtr->hLrgWnd) return FALSE; @@ -175,7 +175,7 @@ static VOID SetFont(PMAP infoPtr, - LPTSTR lpFontName) + LPWSTR lpFontName) { HDC hdc; @@ -183,7 +183,7 @@ DeleteObject(infoPtr->hFont); ZeroMemory(&infoPtr->CurrentFont, - sizeof(LOGFONT)); + sizeof(LOGFONTW)); hdc = GetDC(infoPtr->hMapWnd); infoPtr->CurrentFont.lfHeight = GetDeviceCaps(hdc, @@ -191,10 +191,10 @@ ReleaseDC(infoPtr->hMapWnd, hdc); infoPtr->CurrentFont.lfCharSet = DEFAULT_CHARSET; - lstrcpy(infoPtr->CurrentFont.lfFaceName, - lpFontName); - - infoPtr->hFont = CreateFontIndirect(&infoPtr->CurrentFont); + wcscpy(infoPtr->CurrentFont.lfFaceName, + lpFontName); + + infoPtr->hFont = CreateFontIndirectW(&infoPtr->CurrentFont); InvalidateRect(infoPtr->hMapWnd, NULL, @@ -205,7 +205,7 @@ static LRESULT NotifyParentOfSelection(PMAP infoPtr, UINT code, - TCHAR ch) + WCHAR ch) { LRESULT Ret = 0; @@ -311,9 +311,9 @@ if (infoPtr) { SetLastError(0); - SetWindowLongPtr(hwnd, - 0, - (DWORD_PTR)infoPtr); + SetWindowLongPtrW(hwnd, + 0, + (DWORD_PTR)infoPtr); if (GetLastError() == 0) { ZeroMemory(infoPtr, @@ -375,8 +375,7 @@ } infoPtr->iPage = max(0, - min(infoPtr->iPage, - 255)); + min(infoPtr->iPage, 255)); SetScrollPos(infoPtr->hMapWnd, SB_VERT, @@ -440,8 +439,8 @@ PMAP infoPtr; LRESULT Ret = 0; - infoPtr = (PMAP)GetWindowLongPtr(hwnd, - 0); + infoPtr = (PMAP)GetWindowLongPtrW(hwnd, + 0); switch (uMsg) { @@ -487,7 +486,7 @@ case FM_SETFONT: { - LPTSTR lpFontName = (LPTSTR)lParam; + LPWSTR lpFontName = (LPWSTR)lParam; SetFont(infoPtr, lpFontName); @@ -518,18 +517,18 @@ HeapFree(GetProcessHeap(), 0, infoPtr); - SetWindowLongPtr(hwnd, - 0, - (DWORD_PTR)NULL); + SetWindowLongPtrW(hwnd, + 0, + (DWORD_PTR)NULL); break; } default: { - Ret = DefWindowProc(hwnd, - uMsg, - wParam, - lParam); + Ret = DefWindowProcW(hwnd, + uMsg, + wParam, + lParam); break; } } @@ -541,24 +540,24 @@ BOOL RegisterMapClasses(HINSTANCE hInstance) { - WNDCLASS wc = {0}; + WNDCLASSW wc = {0}; wc.style = CS_DBLCLKS; wc.lpfnWndProc = MapWndProc; wc.cbWndExtra = sizeof(PMAP); wc.hInstance = hInstance; - wc.hCursor = LoadCursor(NULL, - (LPTSTR)IDC_ARROW); + wc.hCursor = LoadCursorW(NULL, + (LPWSTR)IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wc.lpszClassName = szMapWndClass; - if (RegisterClass(&wc)) + if (RegisterClassW(&wc)) { wc.lpfnWndProc = LrgCellWndProc; wc.cbWndExtra = 0; wc.lpszClassName = szLrgCellWndClass; - return RegisterClass(&wc) != 0; + return RegisterClassW(&wc) != 0; } return FALSE; @@ -567,9 +566,9 @@ VOID UnregisterMapClasses(HINSTANCE hInstance) { - UnregisterClass(szMapWndClass, + UnregisterClassW(szMapWndClass, hInstance); - UnregisterClass(szLrgCellWndClass, + UnregisterClassW(szLrgCellWndClass, hInstance); } Modified: trunk/reactos/base/applications/charmap/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/precomp.h (original) +++ trunk/reactos/base/applications/charmap/precomp.h Fri Nov 9 14:40:54 2007 @@ -23,7 +23,7 @@ RECT CellInt; BOOL bActive; BOOL bLarge; - TCHAR ch; + WCHAR ch; } CELL, *PCELL; typedef struct _MAP @@ -36,13 +36,13 @@ CELL Cells[YCELLS][XCELLS]; PCELL pActiveCell; HFONT hFont; - LOGFONT CurrentFont; + LOGFONTW CurrentFont; INT iPage; } MAP, *PMAP; typedef struct { NMHDR hdr; - TCHAR ch; + WCHAR ch; } MAPNOTIFY, *LPMAPNOTIFY;

16 years, 10 months

[fireball] 30288: - Copy except and memccpy.c from libcntpr.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Nov 9 14:22:29 2007 New Revision: 30288 URL: http://svn.reactos.org/svn/reactos?rev=30288&view=rev Log: - Copy except and memccpy.c from libcntpr. Added: trunk/reactos/lib/sdk/crt/except_nt/ - copied from r30261, trunk/reactos/lib/sdk/libcntpr/except/ trunk/reactos/lib/sdk/crt/mem/memccpy.c - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/mem/memccpy.c

16 years, 10 months

[jimtabor] 30287: Fix bug spoted by Stefan100 on IRC.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Nov 9 12:13:01 2007 New Revision: 30287 URL: http://svn.reactos.org/svn/reactos?rev=30287&view=rev Log: Fix bug spoted by Stefan100 on IRC. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Fri Nov 9 12:13:01 2007 @@ -668,9 +668,19 @@ NtGdiDeleteObject(HGDIOBJ hObject) { DPRINT("NtGdiDeleteObject handle 0x%08x\n", hObject); - - return NULL != hObject - ? GDIOBJ_FreeObj(GdiHandleTable, hObject, GDI_OBJECT_TYPE_DONTCARE) : FALSE; + INT Index = GDI_HANDLE_GET_INDEX(hObject); + PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; + // We check to see if the objects are knocking on deaths door. + if ((Entry->Type & ~GDI_ENTRY_REUSE_MASK) != 0 && Entry->KernelData != NULL) + { + return NULL != hObject + ? GDIOBJ_FreeObj(GdiHandleTable, hObject, GDI_OBJECT_TYPE_DONTCARE) : FALSE; + } + else + { + DPRINT1("Attempt DeleteObject 0x%x currently being destroyed!!!\n",hObject); + return TRUE; // return true and move on. + } } /*!

16 years, 10 months

[cfinck] 30286: Add some more names and aliases to the contributors.rbuild file

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Nov 9 01:56:27 2007 New Revision: 30286 URL: http://svn.reactos.org/svn/reactos?rev=30286&view=rev Log: Add some more names and aliases to the contributors.rbuild file Modified: branches/rbuild/reactos/contributors.rbuild Modified: branches/rbuild/reactos/contributors.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/contributors.rbu… ============================================================================== --- branches/rbuild/reactos/contributors.rbuild (original) +++ branches/rbuild/reactos/contributors.rbuild Fri Nov 9 01:56:27 2007 @@ -15,30 +15,33 @@ <contributor firstname="Christoph" lastname="von Wittich" mail="christoph_vw(a)reactos.org" alias="cwittich" /> <contributor firstname="Daniel" lastname="Reimer" alias="dreimer" /> <contributor firstname="David" lastname="Welch" mail="welch(a)cwcom.net" alias="dwelch" /> + <contributor firstname="Dmitry" lastname="Gorbachev" alias="dgorbachev" /> + <contributor firstname="Dominic" lastname="Cote" alias="dcote" /> <contributor firstname="Emanuele" lastname="Aliberti" mail="ea(a)iol.it" alias="ea" /> <contributor firstname="Eric" lastname="Kohl" mail="ekohl(a)rz-online.de" alias="ekohl" /> - <contributor firstname="Eugene" lastname="Ingerman" mail="geneing(a)myrealbox.com" /> + <contributor firstname="Eugene" lastname="Ingerman" mail="geneing(a)myrealbox.com" alias="ei" /> <contributor firstname="Filip" lastname="Navara" mail="xnavara(a)volny.cz" alias="navaraf" /> <contributor firstname="Frederik" lastname="Leemans" /> <contributor firstname="Gé" lastname="van Geldorp" mail="ge(a)gse.nl" alias="gvg" /> <contributor firstname="Ged" lastname="Murphy" mail="gedmurphy(a)reactos.org" alias="gedmurphy" /> + <contributor firstname="Gregor" lastname="Anich" alias="blight" /> <contributor firstname="Gregor" lastname="Brunmar" alias="gbrunmar" /> - <contributor firstname="Guido" lastname="de Jong" /> + <contributor firstname="Guido" lastname="de Jong" alias="guido" /> <contributor firstname="Gunnar Andre'" lastname="Dalsnes" mail="hardon(a)online.no" alias="gdalsnes" /> <contributor firstname="Hans" lastname="Kremer" /> <contributor firstname="Hartmut" lastname="Birr" mail="hartmut.birr(a)gmx.de" alias="hbirr" /> - <contributor firstname="Hernan" lastname="Ochoa" /> + <contributor firstname="Hernan" lastname="Ochoa" alias="hochoa" /> <contributor firstname="Hervé" lastname="Poussineau" mail="hpoussin(a)reactos.com" alias="hpoussin" /> <contributor firstname="Iwan" lastname="Fatahi" mail="i_fatahi(a)hotmail.com" /> <contributor firstname="James B." lastname="Tabor" mail="jimtabor(a)adsl-64-217-116-74.dsl.hstntx.swbell.net" alias="jimtabor" /> <contributor firstname="Jason" lastname="Eager" /> <contributor firstname="Jason" lastname="Filby" mail="jasonfilby(a)yahoo.com" alias="jfilby" /> <contributor firstname="Jason" lastname="Weiler" /> - <contributor firstname="Jean" lastname="Michault" /> + <contributor firstname="Jean" lastname="Michault" alias="jean" /> <contributor firstname="Jim" lastname="Noeth" /> <contributor firstname="Johannes" lastname="Anderwald" mail="johannes.anderwald(a)student.tugraz.at" alias="janderwald" /> <contributor firstname="Jonathan" lastname="Wilson" mail="jonwil(a)tpgi.com.au" /> - <contributor firstname="Jurgen" lastname="van Gael" mail="jurgen.vangael(a)student.kuleuven.ac.be" /> + <contributor firstname="Jurgen" lastname="van Gael" mail="jurgen.vangael(a)student.kuleuven.ac.be" alias="jvangael" /> <contributor firstname="KJK::Hyperion" mail="noog(a)libero.it" alias="hyperion" /> <contributor firstname="Klemens R." lastname="Friedl" mail="klemens_friedl(a)gmx.net" alias="frik85" /> <contributor firstname="Maarten" lastname="Bosma" mail="maarten.paul(a)bosma.de" alias="mbosma" /> @@ -47,15 +50,16 @@ <contributor firstname="Mark" lastname="Tempel" mail="mtempel(a)visi.com" alias="mtempel" /> <contributor firstname="Mark" lastname="Weaver" mail="mark(a)npsl.co.uk" /> <contributor firstname="Martin" lastname="Fuchs" mail="martin-fuchs(a)gmx.net" alias="martinf" /> - <contributor firstname="Marty" lastname="Dill" mail="mdill(a)uvic.ca" /> + <contributor firstname="Marty" lastname="Dill" mail="mdill(a)uvic.ca" alias="mdill" /> <contributor firstname="Matt" lastname="Pyne" /> <contributor firstname="Mike" lastname="Nordell" alias="mnordell" /> <contributor firstname="Mindflyer" mail="mf(a)mufunyo.net" alias="mflyer" /> <contributor firstname="Nathan" lastname="Woods" mail="npwoods(a)mess.org" alias="npwoods" /> - <contributor firstname="Pablo" lastname="Borobia" mail="pborobia(a)gmail.com" /> - <contributor firstname="Paolo" lastname="Pantaleo" mail="paolopan(a)freemail.it" /> + <contributor firstname="Pablo" lastname="Borobia" mail="pborobia(a)gmail.com" alias="pborobia" /> + <contributor firstname="Paolo" lastname="Pantaleo" mail="paolopan(a)freemail.it" alias="paolopan" /> <contributor firstname="Peter" lastname="Ward" alias="peterw" /> - <contributor firstname="Phillip" lastname="Susi" mail="phreak(a)iag.net" /> + <contributor firstname="Phillip" lastname="Susi" mail="phreak(a)iag.net" alias="phreak" /> + <contributor firstname="Pierre" lastname="Schweitzer" alias="pschweitzer" /> <contributor firstname="Rex" lastname="Jolliff" mail="rex(a)lvcablemodem.com" alias="rex" /> <contributor firstname="Richard" lastname="Campbell" mail="betam4x(a)gmail.com" alias="rcampbell" /> <contributor firstname="Robert" lastname="Bergkvist" mail="fragdance(a)hotmail.com" />

16 years, 10 months

[cfinck] 30285: - Create the %AppData%\RosBE directory if it does not exist - Change all 'FILE *FILE' variables to 'FILE *fp' to avoid variable name/type name confusions

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Nov 9 01:34:49 2007 New Revision: 30285 URL: http://svn.reactos.org/svn/reactos?rev=30285&view=rev Log: - Create the %AppData%\RosBE directory if it does not exist - Change all 'FILE *FILE' variables to 'FILE *fp' to avoid variable name/type name confusions Modified: trunk/tools/RosBE/RosBE-Windows/Tools/scut.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/scut.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/sc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/scut.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/scut.c Fri Nov 9 01:34:49 2007 @@ -22,6 +22,7 @@ #define LINE_MAX 1024 char* programname; +char rosbeappdata[260]; char shortcutfile[260]; PSHORTCUT addshortcut(PSHORTCUT ptr, char* name, char* path); @@ -43,8 +44,10 @@ int removed = 0; programname = argv[0]; - strcpy(shortcutfile, getenv("APPDATA")); - strcat(shortcutfile, "\\RosBE\\srclist.txt"); + strcpy(rosbeappdata, getenv("APPDATA")); + strcat(rosbeappdata, "\\RosBE"); + strcpy(shortcutfile, rosbeappdata); + strcat(shortcutfile, "\\srclist.txt"); checkfile(); if (argc > 4) @@ -328,20 +331,29 @@ void checkfile(void) { - FILE *FILE; - - FILE = fopen(shortcutfile, "r"); - if (!FILE) - { - FILE = fopen(shortcutfile, "w"); - if (!FILE) + FILE *fp; + + fp = fopen(shortcutfile, "r"); + if (!fp) + { + if(access(rosbeappdata, F_OK) == -1) + { + // Directory does not exist, create it + if(mkdir(rosbeappdata) == -1) + { + fprintf(stderr, "%s: Error creating the directory for the RosBE files.\n", programname); + } + } + + fp = fopen(shortcutfile, "w"); + if (!fp) { fprintf(stderr, "%s: Error creating file.\n", programname); } else { - fprintf(FILE, "Default,Default\n"); - if (fclose(FILE)) + fprintf(fp, "Default,Default\n"); + if (fclose(fp)) { fprintf(stderr, "%s: Error closing file.\n", programname); } @@ -349,7 +361,7 @@ } else { - if (fclose(FILE)) + if (fclose(fp)) { fprintf(stderr, "%s: Error closing file.\n", programname); } @@ -510,22 +522,22 @@ PSHORTCUT readshortcuts(void) { - FILE *FILE; + FILE *fp; PSHORTCUT head = NULL; char strbuff[LINE_MAX]; char *name = NULL, *path = NULL; - FILE = fopen(shortcutfile, "r"); - if (!FILE) + fp = fopen(shortcutfile, "r"); + if (!fp) { fprintf(stderr, "%s: Error file doesn't seem to exist.\n", programname); return NULL; } else { - while(!feof(FILE)) - { - fgets(strbuff, LINE_MAX, FILE); + while(!feof(fp)) + { + fgets(strbuff, LINE_MAX, fp); name = strtok(strbuff, ","); path = strtok(NULL, "\n"); if (name && path) @@ -533,7 +545,7 @@ head = addshortcut(head, name, path); } } - if (fclose(FILE)) + if (fclose(fp)) { fprintf(stderr, "%s: Error closing file.\n", programname); freeshortcuts(head); @@ -546,10 +558,10 @@ int writeshortcuts(PSHORTCUT head) { - FILE *FILE; - - FILE = fopen(shortcutfile, "w"); - if (!FILE) + FILE *fp; + + fp = fopen(shortcutfile, "w"); + if (!fp) { fprintf(stderr, "%s: Error file doesn't seem to exist.\n", programname); return -1; @@ -558,10 +570,10 @@ { while(head) { - fprintf(FILE, "%s,%s\n", head->name, head->path); + fprintf(fp, "%s,%s\n", head->name, head->path); head = head->next; } - if (fclose(FILE)) + if (fclose(fp)) { fprintf(stderr, "%s: Error closing file.\n", programname); return -1;

16 years, 10 months

[cfinck] 30284: Create a "RosBE" folder and move the "RosBE-Windows" and "RosBE-Unix" folders there. The new "RosBE" folder can now contain shared stuff. Move the "Patches" folder from "RosBE-Windows" to this folder as well, since we plan to use exactly the same Build Tools codebase and patches for the Windows and the Unix version now.

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Nov 9 00:25:55 2007 New Revision: 30284 URL: http://svn.reactos.org/svn/reactos?rev=30284&view=rev Log: Create a "RosBE" folder and move the "RosBE-Windows" and "RosBE-Unix" folders there. The new "RosBE" folder can now contain shared stuff. Move the "Patches" folder from "RosBE-Windows" to this folder as well, since we plan to use exactly the same Build Tools codebase and patches for the Windows and the Unix version now. Added: trunk/tools/RosBE/ trunk/tools/RosBE/Patches/ - copied from r30276, trunk/tools/RosBE-Windows/Patches/ trunk/tools/RosBE/RosBE-Unix/ - copied from r30276, trunk/tools/RosBE-Unix/ trunk/tools/RosBE/RosBE-Windows/ - copied from r30276, trunk/tools/RosBE-Windows/ trunk/tools/RosBE/RosBE-Windows/Tools/ - copied from r30283, trunk/tools/RosBE-Windows/Tools/ Removed: trunk/tools/RosBE-Unix/ trunk/tools/RosBE-Windows/ trunk/tools/RosBE/RosBE-Windows/Patches/

16 years, 10 months

[fireball] 30283: - Sync some changes in strings from libcntpr. - Move string implementation (in "header" files) into /string dir. - Copy over libcntpr-specific implementations into _nt.c files (for now, later they could do with a define). - libcntpr's is now almost fully syncronized and could be merged into the tree except for "except" directory.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Nov 9 00:06:20 2007 New Revision: 30283 URL: http://svn.reactos.org/svn/reactos?rev=30283&view=rev Log: - Sync some changes in strings from libcntpr. - Move string implementation (in "header" files) into /string dir. - Copy over libcntpr-specific implementations into _nt.c files (for now, later they could do with a define). - libcntpr's is now almost fully syncronized and could be merged into the tree except for "except" directory. Added: trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/string/mbstowcs.c trunk/reactos/lib/sdk/crt/string/tcscat.h - copied unchanged from r30261, trunk/reactos/lib/sdk/crt/include/internal/tcscat.h trunk/reactos/lib/sdk/crt/string/tcschr.h - copied unchanged from r30261, trunk/reactos/lib/sdk/crt/include/internal/tcschr.h trunk/reactos/lib/sdk/crt/string/tcscmp.h - copied unchanged from r30261, trunk/reactos/lib/sdk/crt/include/internal/tcscmp.h trunk/reactos/lib/sdk/crt/string/tcscpy.h - copied unchanged from r30261, trunk/reactos/lib/sdk/crt/include/internal/tcscpy.h trunk/reactos/lib/sdk/crt/string/tcslen.h - copied unchanged from r30261, trunk/reactos/lib/sdk/crt/include/internal/tcslen.h trunk/reactos/lib/sdk/crt/string/tcsncat.h - copied unchanged from r30261, trunk/reactos/lib/sdk/crt/include/internal/tcsncat.h trunk/reactos/lib/sdk/crt/string/tcsncmp.h - copied unchanged from r30261, trunk/reactos/lib/sdk/crt/include/internal/tcsncmp.h trunk/reactos/lib/sdk/crt/string/tcsncpy.h - copied unchanged from r30261, trunk/reactos/lib/sdk/crt/include/internal/tcsncpy.h trunk/reactos/lib/sdk/crt/string/tcsnlen.h - copied unchanged from r30261, trunk/reactos/lib/sdk/crt/include/internal/tcsnlen.h trunk/reactos/lib/sdk/crt/string/tcsrchr.h - copied unchanged from r30261, trunk/reactos/lib/sdk/crt/include/internal/tcsrchr.h trunk/reactos/lib/sdk/crt/string/wcstombs_nt.c - copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/string/wcstombs.c Removed: trunk/reactos/lib/sdk/crt/include/internal/tcscat.h trunk/reactos/lib/sdk/crt/include/internal/tcschr.h trunk/reactos/lib/sdk/crt/include/internal/tcscmp.h trunk/reactos/lib/sdk/crt/include/internal/tcscpy.h trunk/reactos/lib/sdk/crt/include/internal/tcslen.h trunk/reactos/lib/sdk/crt/include/internal/tcsncat.h trunk/reactos/lib/sdk/crt/include/internal/tcsncmp.h trunk/reactos/lib/sdk/crt/include/internal/tcsncpy.h trunk/reactos/lib/sdk/crt/include/internal/tcsnlen.h trunk/reactos/lib/sdk/crt/include/internal/tcsrchr.h Modified: trunk/reactos/lib/sdk/crt/string/itoa.c trunk/reactos/lib/sdk/crt/string/itow.c trunk/reactos/lib/sdk/crt/string/strcat.c trunk/reactos/lib/sdk/crt/string/strchr.c trunk/reactos/lib/sdk/crt/string/strcmp.c trunk/reactos/lib/sdk/crt/string/strcpy.c trunk/reactos/lib/sdk/crt/string/stricmp.c trunk/reactos/lib/sdk/crt/string/strlen.c trunk/reactos/lib/sdk/crt/string/strlwr.c trunk/reactos/lib/sdk/crt/string/strncat.c trunk/reactos/lib/sdk/crt/string/strncmp.c trunk/reactos/lib/sdk/crt/string/strncpy.c trunk/reactos/lib/sdk/crt/string/strnicmp.c trunk/reactos/lib/sdk/crt/string/strnlen.c trunk/reactos/lib/sdk/crt/string/strrchr.c trunk/reactos/lib/sdk/crt/string/strset.c trunk/reactos/lib/sdk/crt/string/strstr.c trunk/reactos/lib/sdk/crt/string/strtol.c trunk/reactos/lib/sdk/crt/string/strtoul.c trunk/reactos/lib/sdk/crt/string/strtoull.c trunk/reactos/lib/sdk/crt/string/wcscat.c trunk/reactos/lib/sdk/crt/string/wcschr.c trunk/reactos/lib/sdk/crt/string/wcscmp.c trunk/reactos/lib/sdk/crt/string/wcscpy.c trunk/reactos/lib/sdk/crt/string/wcslen.c trunk/reactos/lib/sdk/crt/string/wcsncat.c trunk/reactos/lib/sdk/crt/string/wcsncmp.c trunk/reactos/lib/sdk/crt/string/wcsncpy.c trunk/reactos/lib/sdk/crt/string/wcsnlen.c trunk/reactos/lib/sdk/crt/string/wcsrchr.c trunk/reactos/lib/sdk/crt/string/wcstol.c trunk/reactos/lib/sdk/crt/string/wcstoul.c trunk/reactos/lib/sdk/crt/string/wtoi64.c trunk/reactos/lib/sdk/crt/string/wtol.c Removed: trunk/reactos/lib/sdk/crt/include/internal/tcscat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/tcscat.h (original) +++ trunk/reactos/lib/sdk/crt/include/internal/tcscat.h (removed) @@ -1,17 +1,0 @@ -/* $Id$ - */ - -#include <tchar.h> - -_TCHAR * _tcscat(_TCHAR * s, const _TCHAR * append) -{ - _TCHAR * save = s; - - for(; *s; ++s); - - while((*s++ = *append++)); - - return save; -} - -/* EOF */ Removed: trunk/reactos/lib/sdk/crt/include/internal/tcschr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/tcschr.h (original) +++ trunk/reactos/lib/sdk/crt/include/internal/tcschr.h (removed) @@ -1,22 +1,0 @@ -/* $Id$ - */ - -#include <tchar.h> - -_TCHAR * _tcschr(const _TCHAR * s, _XINT c) -{ - _TCHAR cc = c; - - while(*s) - { - if(*s == cc) return (_TCHAR *)s; - - s++; - } - - if(cc == 0) return (_TCHAR *)s; - - return 0; -} - -/* EOF */ Removed: trunk/reactos/lib/sdk/crt/include/internal/tcscmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/tcscmp.h (original) +++ trunk/reactos/lib/sdk/crt/include/internal/tcscmp.h (removed) @@ -1,19 +1,0 @@ -/* $Id$ - */ - -#include <tchar.h> - -int _tcscmp(const _TCHAR* s1, const _TCHAR* s2) -{ - while(*s1 == *s2) - { - if(*s1 == 0) return 0; - - s1 ++; - s2 ++; - } - - return *s1 - *s2; -} - -/* EOF */ Removed: trunk/reactos/lib/sdk/crt/include/internal/tcscpy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/tcscpy.h (original) +++ trunk/reactos/lib/sdk/crt/include/internal/tcscpy.h (removed) @@ -1,13 +1,0 @@ -/* $Id$ - */ - -#include <tchar.h> - -_TCHAR * _tcscpy(_TCHAR * to, const _TCHAR * from) -{ - _TCHAR *save = to; - - for (; (*to = *from); ++from, ++to); - - return save; -} Removed: trunk/reactos/lib/sdk/crt/include/internal/tcslen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/tcslen.h (original) +++ trunk/reactos/lib/sdk/crt/include/internal/tcslen.h (removed) @@ -1,18 +1,0 @@ -/* $Id$ - */ - -#include <stddef.h> -#include <tchar.h> - -size_t _tcslen(const _TCHAR * str) -{ - const _TCHAR * s; - - if(str == 0) return 0; - - for(s = str; *s; ++ s); - - return s - str; -} - -/* EOF */ Removed: trunk/reactos/lib/sdk/crt/include/internal/tcsncat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/tcsncat.h (original) +++ trunk/reactos/lib/sdk/crt/include/internal/tcsncat.h (removed) @@ -1,30 +1,0 @@ -/* $Id$ - */ - -#include <stddef.h> -#include <tchar.h> - -_TCHAR * _tcsncat(_TCHAR * dst, const _TCHAR * src, size_t n) -{ - if(n != 0) - { - _TCHAR * d = dst; - const _TCHAR * s = src; - - while(*d != 0) ++ d; - - do - { - if((*d = *s++) == 0) break; - - ++ d; - } - while (--n != 0); - - *d = 0; - } - - return dst; -} - -/* EOF */ Removed: trunk/reactos/lib/sdk/crt/include/internal/tcsncmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/tcsncmp.h (original) +++ trunk/reactos/lib/sdk/crt/include/internal/tcsncmp.h (removed) @@ -1,21 +1,0 @@ -/* $Id$ - */ - -#include <stddef.h> -#include <tchar.h> - -int _tcsncmp(const _TCHAR * s1, const _TCHAR * s2, size_t n) -{ - if(n == 0) return 0; - - do - { - if(*s1 != *s2 ++) return *s1 - *-- s2; - if(*s1 ++ == 0) break; - } - while (-- n != 0); - - return 0; -} - -/* EOF */ Removed: trunk/reactos/lib/sdk/crt/include/internal/tcsncpy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/tcsncpy.h (original) +++ trunk/reactos/lib/sdk/crt/include/internal/tcsncpy.h (removed) @@ -1,28 +1,0 @@ -/* $Id$ - */ - -#include <stddef.h> -#include <tchar.h> - -_TCHAR * _tcsncpy(_TCHAR * dst, const _TCHAR * src, size_t n) -{ - if(n != 0) - { - _TCHAR * d = dst; - const _TCHAR * s = src; - - do - { - if((*d ++ = *s ++) == 0) - { - while (-- n != 0) *d ++ = 0; - break; - } - } - while(-- n != 0); - } - - return dst; -} - -/* EOF */ Removed: trunk/reactos/lib/sdk/crt/include/internal/tcsnlen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/tcsnlen.h (original) +++ trunk/reactos/lib/sdk/crt/include/internal/tcsnlen.h (removed) @@ -1,18 +1,0 @@ -/* $Id$ - */ - -#include <stddef.h> -#include <tchar.h> - -int _tcsnlen(const _TCHAR * str, size_t count) -{ - const _TCHAR * s; - - if(str == 0) return 0; - - for(s = str; *s && count; ++ s, -- count); - - return s - str; -} - -/* EOF */ Removed: trunk/reactos/lib/sdk/crt/include/internal/tcsrchr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/tcsrchr.h (original) +++ trunk/reactos/lib/sdk/crt/include/internal/tcsrchr.h (removed) @@ -1,22 +1,0 @@ -/* $Id$ - */ - -#include <tchar.h> - -_TCHAR * _tcsrchr(const _TCHAR * s, _XINT c) -{ - _TCHAR cc = c; - const _TCHAR * sp = (_TCHAR *)0; - - while(*s) - { - if(*s == cc) sp = s; - s ++; - } - - if(cc == 0) sp = s; - - return (_TCHAR *)sp; -} - -/* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/itoa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/itoa.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/itoa.c (original) +++ trunk/reactos/lib/sdk/crt/string/itoa.c Fri Nov 9 00:06:20 2007 @@ -1,112 +1,144 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/msvcrt/stdlib/itoa.c - * PURPOSE: converts a integer to ascii - * PROGRAMER: + * FILE: lib/crt/?????? + * PURPOSE: Unknown + * PROGRAMER: Unknown * UPDATE HISTORY: - * 1995: Created - * 1998: Added ltoa by Ariadne + * 25/11/05: Added license header */ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ - #include <precomp.h> /* * @implemented + * copy _i64toa from wine cvs 2006 month 05 day 21 */ -char* _itoa(int value, char* string, int radix) +char * +_i64toa(__int64 value, char *string, int radix) { - char tmp[33]; - char* tp = tmp; - int i; - unsigned v; - int sign; - char* sp; + ULONGLONG val; + int negative; + char buffer[65]; + char *pos; + int digit; - if (radix > 36 || radix <= 1) - { - __set_errno(EDOM); - return 0; - } + if (value < 0 && radix == 10) { + negative = 1; + val = -value; + } else { + negative = 0; + val = value; + } /* if */ - sign = (radix == 10 && value < 0); - if (sign) - v = -value; - else - v = (unsigned)value; - while (v || tp == tmp) - { - i = v % radix; - v = v / radix; - if (i < 10) - *tp++ = i+'0'; - else - *tp++ = i + 'a' - 10; - } + pos = &buffer[64]; + *pos = '\0'; - if (string == 0) - string = (char*)malloc((tp-tmp)+sign+1); - sp = string; + do { + digit = val % radix; + val = val / radix; + if (digit < 10) { + *--pos = '0' + digit; + } else { + *--pos = 'a' + digit - 10; + } /* if */ + } while (val != 0L); - if (sign) - *sp++ = '-'; - while (tp > tmp) - *sp++ = *--tp; - *sp = 0; - return string; + if (negative) { + *--pos = '-'; + } /* if */ + + memcpy(string, pos, &buffer[64] - pos + 1); + return string; } + + +/* + * @implemented + * copy _i64toa from wine cvs 2006 month 05 day 21 + */ +char * +_ui64toa(unsigned __int64 value, char *string, int radix) +{ + char buffer[65]; + char *pos; + int digit; + + pos = &buffer[64]; + *pos = '\0'; + + do { + digit = value % radix; + value = value / radix; + if (digit < 10) { + *--pos = '0' + digit; + } else { + *--pos = 'a' + digit - 10; + } /* if */ + } while (value != 0L); + + memcpy(string, pos, &buffer[64] - pos + 1); + return string; +} + /* * @implemented */ -char* _ltoa(long value, char* string, int radix) +char * +_itoa(int value, char *string, int radix) { - char tmp[33]; - char* tp = tmp; - long i; - unsigned long v; - int sign; - char* sp; + return _ltoa(value, string, radix); +} - if (radix > 36 || radix <= 1) - { - __set_errno(EDOM); - return 0; - } - - sign = (radix == 10 && value < 0); - if (sign) - v = -value; - else - v = (unsigned long)value; - while (v || tp == tmp) - { - i = v % radix; - v = v / radix; - if (i < 10) - *tp++ = i+'0'; - else - *tp++ = i + 'a' - 10; - } - - if (string == 0) - string = (char*)malloc((tp-tmp)+sign+1); - sp = string; - - if (sign) - *sp++ = '-'; - while (tp > tmp) - *sp++ = *--tp; - *sp = 0; - return string; -} /* * @implemented - * copy it from wine 0.9.0 with small modifcations do check for NULL */ -char* ultoa(unsigned long value, char* string, int radix) +char * +_ltoa(long value, char *string, int radix) +{ + unsigned long val; + int negative; + char buffer[33]; + char *pos; + int digit; + + if (value < 0 && radix == 10) { + negative = 1; + val = -value; + } else { + negative = 0; + val = value; + } /* if */ + + pos = &buffer[32]; + *pos = '\0'; + + do { + digit = val % radix; + val = val / radix; + if (digit < 10) { + *--pos = '0' + digit; + } else { + *--pos = 'a' + digit - 10; + } /* if */ + } while (val != 0L); + + if (negative) { + *--pos = '-'; + } /* if */ + + memcpy(string, pos, &buffer[32] - pos + 1); + return string; +} + + +/* + * @implemented + * copy it from wine 0.9.0 with small modifcations do check for NULL + */ +char * +_ultoa(unsigned long value, char *string, int radix) { char buffer[33]; char *pos; @@ -131,5 +163,6 @@ } while (value != 0L); memcpy(string, pos, &buffer[32] - pos + 1); + return string; } Modified: trunk/reactos/lib/sdk/crt/string/itow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/itow.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/itow.c (original) +++ trunk/reactos/lib/sdk/crt/string/itow.c Fri Nov 9 00:06:20 2007 @@ -1,16 +1,11 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/msvcrt/stdlib/itow.c + * FILE: lib/sdk/crt/itow.c * PURPOSE: converts a integer to wchar_t * PROGRAMER: * UPDATE HISTORY: - * 1995: Created - * 1998: Added ltoa by Ariadne - * 2000: derived from ./itoa.c by ea */ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ #include <precomp.h> @@ -18,18 +13,96 @@ * @implemented * from wine cvs 2006-05-21 */ -wchar_t* _itow(int value, wchar_t* string, int radix) +wchar_t * +_i64tow(__int64 value, wchar_t *string, int radix) { - return _ltow(value, string, radix); + ULONGLONG val; + int negative; + WCHAR buffer[65]; + PWCHAR pos; + WCHAR digit; + + if (value < 0 && radix == 10) { + negative = 1; + val = -value; + } else { + negative = 0; + val = value; + } /* if */ + + pos = &buffer[64]; + *pos = '\0'; + + do { + digit = val % radix; + val = val / radix; + if (digit < 10) { + *--pos = '0' + digit; + } else { + *--pos = 'a' + digit - 10; + } /* if */ + } while (val != 0L); + + if (negative) { + *--pos = '-'; + } /* if */ + + if (string != NULL) { + memcpy(string, pos, (&buffer[64] - pos + 1) * sizeof(WCHAR)); + } /* if */ + return string; } + + +/* + * @implemented + */ +wchar_t * +_ui64tow(unsigned __int64 value, wchar_t *string, int radix) +{ + WCHAR buffer[65]; + PWCHAR pos; + WCHAR digit; + + pos = &buffer[64]; + *pos = '\0'; + + do { + digit = value % radix; + value = value / radix; + if (digit < 10) { + *--pos = '0' + digit; + } else { + *--pos = 'a' + digit - 10; + } /* if */ + } while (value != 0L); + + if (string != NULL) { + memcpy(string, pos, (&buffer[64] - pos + 1) * sizeof(WCHAR)); + } /* if */ + return string; +} + /* * @implemented * from wine cvs 2006-05-21 */ -wchar_t* _ltow(long value, wchar_t* string, int radix) +wchar_t * +_itow(int value, wchar_t *string, int radix) { - unsigned long val; + return _ltow(value, string, radix); +} + + +/* + * @implemented + * from wine cvs 2006-05-21 + */ +wchar_t * +_ltow(long value, wchar_t *string, int radix) +{ + unsigned long val; int negative; WCHAR buffer[33]; PWCHAR pos; @@ -60,17 +133,19 @@ *--pos = '-'; } /* if */ - if (str != NULL) { + if (string != NULL) { memcpy(string, pos, (&buffer[32] - pos + 1) * sizeof(WCHAR)); } /* if */ return string; } + /* * @implemented * from wine cvs 2006-05-21 */ -wchar_t* _ultow(unsigned long value, wchar_t* string, int radix) +wchar_t * +_ultow(unsigned long value, wchar_t *string, int radix) { WCHAR buffer[33]; PWCHAR pos; Modified: trunk/reactos/lib/sdk/crt/string/strcat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strcat.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strcat.c (original) +++ trunk/reactos/lib/sdk/crt/string/strcat.c Fri Nov 9 00:06:20 2007 @@ -2,6 +2,6 @@ */ #include <string.h> -#include "internal/tcscat.h" +#include "tcscat.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/strchr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strchr.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strchr.c (original) +++ trunk/reactos/lib/sdk/crt/string/strchr.c Fri Nov 9 00:06:20 2007 @@ -3,6 +3,6 @@ #define _XINT int #include <string.h> -#include "internal/tcschr.h" +#include "tcschr.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/strcmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strcmp.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strcmp.c (original) +++ trunk/reactos/lib/sdk/crt/string/strcmp.c Fri Nov 9 00:06:20 2007 @@ -2,6 +2,6 @@ */ #include <string.h> -#include "internal/tcscmp.h" +#include "tcscmp.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/strcpy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strcpy.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strcpy.c (original) +++ trunk/reactos/lib/sdk/crt/string/strcpy.c Fri Nov 9 00:06:20 2007 @@ -2,6 +2,6 @@ */ #include <string.h> -#include "internal/tcscpy.h" +#include "tcscpy.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/stricmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/stricmp… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/stricmp.c (original) +++ trunk/reactos/lib/sdk/crt/string/stricmp.c Fri Nov 9 00:06:20 2007 @@ -1,4 +1,3 @@ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <precomp.h> /* Modified: trunk/reactos/lib/sdk/crt/string/strlen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strlen.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strlen.c (original) +++ trunk/reactos/lib/sdk/crt/string/strlen.c Fri Nov 9 00:06:20 2007 @@ -2,6 +2,6 @@ */ #include <string.h> -#include "internal/tcslen.h" +#include "tcslen.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/strlwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strlwr.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strlwr.c (original) +++ trunk/reactos/lib/sdk/crt/string/strlwr.c Fri Nov 9 00:06:20 2007 @@ -1,12 +1,3 @@ -/* - * The C RunTime DLL - * - * Implements C run-time functionality as known from UNIX. - * - * Copyright 1996,1998 Marcus Meissner - * Copyright 1996 Jukka Iivonen - * Copyright 1997 Uwe Bonnes - */ #include <precomp.h> Modified: trunk/reactos/lib/sdk/crt/string/strncat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strncat… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strncat.c (original) +++ trunk/reactos/lib/sdk/crt/string/strncat.c Fri Nov 9 00:06:20 2007 @@ -2,6 +2,6 @@ */ #include <string.h> -#include "internal/tcsncat.h" +#include "tcsncat.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/strncmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strncmp… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strncmp.c (original) +++ trunk/reactos/lib/sdk/crt/string/strncmp.c Fri Nov 9 00:06:20 2007 @@ -2,6 +2,6 @@ */ #include <string.h> -#include "internal/tcsncmp.h" +#include "tcsncmp.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/strncpy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strncpy… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strncpy.c (original) +++ trunk/reactos/lib/sdk/crt/string/strncpy.c Fri Nov 9 00:06:20 2007 @@ -1,6 +1,6 @@ /* $Id$ */ #include <string.h> -#include "internal/tcsncpy.h" +#include "tcsncpy.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/strnicmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strnicm… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strnicmp.c (original) +++ trunk/reactos/lib/sdk/crt/string/strnicmp.c Fri Nov 9 00:06:20 2007 @@ -1,4 +1,3 @@ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <precomp.h> /* Modified: trunk/reactos/lib/sdk/crt/string/strnlen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strnlen… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strnlen.c (original) +++ trunk/reactos/lib/sdk/crt/string/strnlen.c Fri Nov 9 00:06:20 2007 @@ -2,6 +2,6 @@ */ #include <string.h> -#include "internal/tcsnlen.h" +#include "tcsnlen.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/strrchr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strrchr… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strrchr.c (original) +++ trunk/reactos/lib/sdk/crt/string/strrchr.c Fri Nov 9 00:06:20 2007 @@ -3,6 +3,6 @@ #define _XINT int #include <string.h> -#include "internal/tcsrchr.h" +#include "tcsrchr.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/strset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strset.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strset.c (original) +++ trunk/reactos/lib/sdk/crt/string/strset.c Fri Nov 9 00:06:20 2007 @@ -13,11 +13,11 @@ /* * @implemented */ -char* _strnset (char* szToFill, int szFill, size_t sizeMaxFill) +char* _strnset(char* szToFill, int szFill, size_t sizeMaxFill) { char *t = szToFill; - size_t i = 0; - while( *szToFill != 0 && i < sizeMaxFill) + int i = 0; + while (*szToFill != 0 && i < (int) sizeMaxFill) { *szToFill = szFill; szToFill++; @@ -30,10 +30,10 @@ /* * @implemented */ -char* _strset (char* szToFill, int szFill) +char* _strset(char* szToFill, int szFill) { char *t = szToFill; - while( *szToFill != 0 ) + while (*szToFill != 0) { *szToFill = szFill; szToFill++; Modified: trunk/reactos/lib/sdk/crt/string/strstr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strstr.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strstr.c (original) +++ trunk/reactos/lib/sdk/crt/string/strstr.c Fri Nov 9 00:06:20 2007 @@ -8,14 +8,12 @@ * 25/11/05: Added license header */ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <precomp.h> - - /* * @implemented */ -char *strstr(const char *s, const char *find) +char * +strstr(const char *s, const char *find) { char c, sc; size_t len; @@ -31,5 +29,5 @@ } while (strncmp(s, find, len) != 0); s--; } - return (char *)s; + return (char *)((size_t)s); } Modified: trunk/reactos/lib/sdk/crt/string/strtol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtol.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strtol.c (original) +++ trunk/reactos/lib/sdk/crt/string/strtol.c Fri Nov 9 00:06:20 2007 @@ -1,4 +1,3 @@ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <precomp.h> /* @@ -80,11 +79,10 @@ if (any < 0) { acc = neg ? LONG_MIN : LONG_MAX; - __set_errno(ERANGE); } else if (neg) acc = -acc; if (endptr != 0) - *endptr = any ? (char *)s - 1 : (char *)nptr; + *endptr = any ? (char *)((size_t)(s - 1)) : (char *)((size_t)nptr); return acc; } Modified: trunk/reactos/lib/sdk/crt/string/strtoul.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtoul… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strtoul.c (original) +++ trunk/reactos/lib/sdk/crt/string/strtoul.c Fri Nov 9 00:06:20 2007 @@ -1,4 +1,3 @@ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <precomp.h> #include <ctype.h> @@ -64,11 +63,10 @@ if (any < 0) { acc = ULONG_MAX; - __set_errno(ERANGE); } else if (neg) acc = -acc; if (endptr != 0) - *endptr = any ? (char *)s - 1 : (char *)nptr; + *endptr = any ? (char *)((size_t)(s - 1)) : (char *)((size_t)nptr); return acc; } Modified: trunk/reactos/lib/sdk/crt/string/strtoull.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtoul… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strtoull.c (original) +++ trunk/reactos/lib/sdk/crt/string/strtoull.c Fri Nov 9 00:06:20 2007 @@ -1,24 +1,12 @@ -/* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <precomp.h> -#if defined (_MSC_VER) -#define UINT64_MAX 0xffffffffffffffff -#endif - -/* - * Convert a string to an unsigned long integer. - * - * Ignores `locale' stuff. Assumes that the upper and lower case - * alphabets and digits are each contiguous. - */ -UINT64 +unsigned long long strtoull(const char *nptr, char **endptr, int base) { const char *s = nptr; - UINT64 acc; + unsigned long long acc; int c; - UINT64 cutoff; + unsigned long long cutoff; int neg = 0, any, cutlim; /* @@ -43,8 +31,8 @@ } if (base == 0) base = c == '0' ? 8 : 10; - cutoff = UINT64_MAX / base; - cutlim = (int)(UINT64_MAX % base); + cutoff = (unsigned long long)ULLONG_MAX / (unsigned long long)base; + cutlim = (unsigned long long)ULLONG_MAX % (unsigned long long)base; for (acc = 0, any = 0;; c = *s++) { if (isdigit(c)) @@ -65,12 +53,11 @@ } if (any < 0) { - acc = UINT64_MAX; - __set_errno ( ERANGE ); + acc = ULLONG_MAX; } else if (neg) acc = -acc; if (endptr != 0) - *endptr = any ? (char *)s - 1 : (char *)nptr; + *endptr = any ? (char *)((size_t)(s - 1)) : (char *)((size_t)nptr); return acc; } Modified: trunk/reactos/lib/sdk/crt/string/wcscat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcscat.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcscat.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcscat.c Fri Nov 9 00:06:20 2007 @@ -3,6 +3,6 @@ #define _UNICODE #include <wchar.h> -#include "internal/tcscat.h" +#include "tcscat.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/wcschr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcschr.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcschr.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcschr.c Fri Nov 9 00:06:20 2007 @@ -4,6 +4,6 @@ #define _UNICODE #define _XINT wchar_t #include <wchar.h> -#include "internal/tcschr.h" +#include "tcschr.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/wcscmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcscmp.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcscmp.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcscmp.c Fri Nov 9 00:06:20 2007 @@ -3,6 +3,6 @@ #define _UNICODE #include <wchar.h> -#include "internal/tcscmp.h" +#include "tcscmp.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/wcscpy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcscpy.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcscpy.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcscpy.c Fri Nov 9 00:06:20 2007 @@ -3,6 +3,6 @@ #define _UNICODE #include <wchar.h> -#include "internal/tcscpy.h" +#include "tcscpy.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/wcslen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcslen.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcslen.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcslen.c Fri Nov 9 00:06:20 2007 @@ -3,6 +3,6 @@ #define _UNICODE #include <wchar.h> -#include "internal/tcslen.h" +#include "tcslen.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/wcsncat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcsncat… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcsncat.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcsncat.c Fri Nov 9 00:06:20 2007 @@ -3,6 +3,6 @@ #define _UNICODE #include <wchar.h> -#include "internal/tcsncat.h" +#include "tcsncat.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/wcsncmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcsncmp… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcsncmp.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcsncmp.c Fri Nov 9 00:06:20 2007 @@ -3,6 +3,6 @@ #define _UNICODE #include <wchar.h> -#include "internal/tcsncmp.h" +#include "tcsncmp.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/wcsncpy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcsncpy… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcsncpy.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcsncpy.c Fri Nov 9 00:06:20 2007 @@ -3,6 +3,6 @@ #define _UNICODE #include <wchar.h> -#include "internal/tcsncpy.h" +#include "tcsncpy.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/wcsnlen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcsnlen… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcsnlen.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcsnlen.c Fri Nov 9 00:06:20 2007 @@ -3,6 +3,6 @@ #define _UNICODE #include <wchar.h> -#include "internal/tcsnlen.h" +#include "tcsnlen.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/wcsrchr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcsrchr… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcsrchr.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcsrchr.c Fri Nov 9 00:06:20 2007 @@ -4,6 +4,6 @@ #define _UNICODE #define _XINT wchar_t #include <wchar.h> -#include "internal/tcsrchr.h" +#include "tcsrchr.h" /* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/wcstol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcstol.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcstol.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcstol.c Fri Nov 9 00:06:20 2007 @@ -9,37 +9,89 @@ */ #include <precomp.h> - /* * @implemented */ -long wcstol(const wchar_t *cp,wchar_t **endp,int base) +long +wcstol(const wchar_t *nptr, wchar_t **endptr, int base) { - long result = 0,value; - int sign = 1; + const wchar_t *s = nptr; + unsigned long acc; + int c; + unsigned long cutoff; + int neg = 0, any, cutlim; - if ( *cp == L'-' ) { - sign = -1; - cp++; - } + /* + * Skip white space and pick up leading +/- sign if any. + * If base is 0, allow 0x for hex and 0 for octal, else + * assume decimal; if base is already 16, allow 0x. + */ + do { + c = *s++; + } while (iswctype(c, _SPACE)); + if (c == '-') + { + neg = 1; + c = *s++; + } + else if (c == L'+') + c = *s++; + if ((base == 0 || base == 16) && + c == L'0' && (*s == L'x' || *s == L'X')) + { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = c == L'0' ? 8 : 10; - if (!base) { - base = 10; - if (*cp == L'0') { - base = 8; - cp++; - if ((*cp == L'x') && iswxdigit(cp[1])) { - cp++; - base = 16; - } - } - } - while (iswxdigit(*cp) && (value = iswdigit(*cp) ? *cp-L'0' : (iswlower(*cp) - ? towupper(*cp) : *cp)-L'A'+10) < base) { - result = result*base + value; - cp++; - } - if (endp) - *endp = (wchar_t *)cp; - return result * sign; + /* + * Compute the cutoff value between legal numbers and illegal + * numbers. That is the largest legal value, divided by the + * base. An input number that is greater than this value, if + * followed by a legal input character, is too big. One that + * is equal to this value may be valid or not; the limit + * between valid and invalid numbers is then based on the last + * digit. For instance, if the range for longs is + * [-2147483648..2147483647] and the input base is 10, + * cutoff will be set to 214748364 and cutlim to either + * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated + * a value > 214748364, or equal but the next digit is > 7 (or 8), + * the number is too big, and we will return a range error. + * + * Set any if any `digits' consumed; make it negative to indicate + * overflow. + */ + cutoff = neg ? -(unsigned long)LONG_MIN : LONG_MAX; + cutlim = cutoff % (unsigned long)base; + cutoff /= (unsigned long)base; + for (acc = 0, any = 0;; c = *s++) + { + if (iswctype(c, _DIGIT)) + c -= L'0'; + else if (iswctype(c, _ALPHA)) + c -= iswctype(c, _UPPER) ? L'A' - 10 : L'a' - 10; + else + break; + if (c >= base) + break; + if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim)) + any = -1; + else + { + any = 1; + acc *= base; + acc += c; + } + } + if (any < 0) + { + acc = neg ? LONG_MIN : LONG_MAX; + } + else if (neg) + acc = -acc; + if (endptr != 0) + *endptr = any ? (wchar_t *)((size_t)(s - 1)) : (wchar_t *)((size_t)nptr); + return acc; } Modified: trunk/reactos/lib/sdk/crt/string/wcstoul.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcstoul… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcstoul.c (original) +++ trunk/reactos/lib/sdk/crt/string/wcstoul.c Fri Nov 9 00:06:20 2007 @@ -1,5 +1,5 @@ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <precomp.h> + /* * Convert a unicode string to an unsigned long integer. @@ -23,7 +23,7 @@ */ do { c = *s++; - } while (iswspace(c)); + } while (iswctype(c, _SPACE)); if (c == L'-') { neg = 1; @@ -44,10 +44,10 @@ cutlim = (unsigned long)ULONG_MAX % (unsigned long)base; for (acc = 0, any = 0;; c = *s++) { - if (iswdigit(c)) + if (iswctype(c, _DIGIT)) c -= L'0'; - else if (iswalpha(c)) - c -= iswupper(c) ? L'A' - 10 : L'a' - 10; + else if (iswctype(c, _ALPHA)) + c -= iswctype(c, _UPPER) ? L'A' - 10 : L'a' - 10; else break; if (c >= base) @@ -63,38 +63,10 @@ if (any < 0) { acc = ULONG_MAX; - __set_errno(ERANGE); } else if (neg) acc = -acc; if (endptr != 0) - *endptr = any ? (wchar_t *)s - 1 : (wchar_t *)nptr; + *endptr = any ? (wchar_t *)((size_t)s - 1) : (wchar_t *)((size_t)nptr); return acc; } - -#if 0 -unsigned long wcstoul(const wchar_t *cp,wchar_t **endp,int base) -{ - unsigned long result = 0,value; - - if (!base) { - base = 10; - if (*cp == L'0') { - base = 8; - cp++; - if ((*cp == L'x') && iswxdigit(cp[1])) { - cp++; - base = 16; - } - } - } - while (iswxdigit(*cp) && (value = iswdigit(*cp) ? *cp-L'0' : (iswlower(*cp) - ? towupper(*cp) : *cp)-L'A'+10) < base) { - result = result*base + value; - cp++; - } - if (endp) - *endp = (wchar_t *)cp; - return result; -} -#endif Modified: trunk/reactos/lib/sdk/crt/string/wtoi64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wtoi64.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wtoi64.c (original) +++ trunk/reactos/lib/sdk/crt/string/wtoi64.c Fri Nov 9 00:06:20 2007 @@ -13,27 +13,33 @@ /* * @implemented */ -__int64 _wtoi64(const wchar_t* nptr) +__int64 +_wtoi64 (const wchar_t *nptr) { - wchar_t* s = (wchar_t*)nptr; - __int64 acc = 0; - int neg = 0; + int c; + __int64 value; + int sign; - while (iswspace((int)*s)) - s++; - if (*s == '-') { - neg = 1; - s++; - } - else if (*s == '+') - s++; + while (iswctype((int)*nptr, _SPACE)) + ++nptr; - while (iswdigit((int)*s)) { - acc = 10 * acc + ((int)*s - '0'); - s++; - } + c = (int)*nptr++; + sign = c; + if (c == L'-' || c == L'+') + c = (int)*nptr++; - if (neg) - acc *= -1; - return acc; + value = 0; + + while (iswctype(c, _DIGIT)) + { + value = 10 * value + (c - L'0'); + c = (int)*nptr++; + } + + if (sign == L'-') + return -value; + else + return value; } + +/* EOF */ Modified: trunk/reactos/lib/sdk/crt/string/wtol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wtol.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wtol.c (original) +++ trunk/reactos/lib/sdk/crt/string/wtol.c Fri Nov 9 00:06:20 2007 @@ -1,6 +1,35 @@ +#include <string.h> +#include <ctype.h> +#include <basetsd.h> -#define _UNICODE -#define UNICODE +/* Implementation comes from wine/dlls/ntdll/wcstring.c */ -#include "atol.c" +/* + * @implemented + */ +long +_wtol(const wchar_t *str) +{ + unsigned long RunningTotal = 0; + char bMinus = 0; + while (iswctype(*str, _SPACE) ) { + str++; + } /* while */ + + if (*str == L'+') { + str++; + } else if (*str == L'-') { + bMinus = 1; + str++; + } /* if */ + + while (*str >= L'0' && *str <= L'9') { + RunningTotal = RunningTotal * 10 + *str - L'0'; + str++; + } /* while */ + + return bMinus ? -RunningTotal : RunningTotal; +} + +

16 years, 10 months

[mpiulachs] 30282: - Build API stats on request (new target "make rgenstat" will create apistatus.xml) - Partly updated apistatus.lst

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Thu Nov 8 23:52:42 2007 New Revision: 30282 URL: http://svn.reactos.org/svn/reactos?rev=30282&view=rev Log: - Build API stats on request (new target "make rgenstat" will create apistatus.xml) - Partly updated apistatus.lst Modified: trunk/reactos/Makefile trunk/reactos/apistatus.lst Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=30282&r1=3028… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Thu Nov 8 23:52:42 2007 @@ -229,6 +229,7 @@ ECHO_TEST =@echo $(QUOTE)[TEST] $@$(QUOTE) ECHO_GENDIB =@echo $(QUOTE)[GENDIB] $@$(QUOTE) ECHO_STRIP =@echo $(QUOTE)[STRIP] $@$(QUOTE) + ECHO_RGENSTAT=@echo $(QUOTE)[RGENSTAT] $@$(QUOTE) else ECHO_CP = ECHO_MKDIR = @@ -258,6 +259,7 @@ ECHO_TEST = ECHO_GENDIB = ECHO_STRIP = + ECHO_RGENSTAT= endif # Set host compiler/linker @@ -429,6 +431,10 @@ sysregtest: $(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg +.PHONY: rgenstat +rgenstat: $(RGENSTAT_TARGET) + $(ECHO_RGENSTAT) + $(Q)$(RGENSTAT_TARGET) apistatus.lst apistatus.xml .PHONY: cb cb: $(RBUILD_TARGET) Modified: trunk/reactos/apistatus.lst URL: http://svn.reactos.org/svn/reactos/trunk/reactos/apistatus.lst?rev=30282&r1… ============================================================================== --- trunk/reactos/apistatus.lst (original) +++ trunk/reactos/apistatus.lst Thu Nov 8 23:52:42 2007 @@ -1,29 +1,27 @@ ; Format: ; COMPONENT_NAME PATH_TO_COMPONENT_SOURCES -; COMPONENT_NAME - Name of the component. Eg. kernel32.dll. -; PATH_TO_COMPONENT_SOURCES - Relative path to sources (relative to -; where rgenstat is run from). -advapi32.dll reactos/dll/win32/advapi32 -crtdll.dll reactos/dll/win32/crtdll -gdi32.dll reactos/dll/win32/gdi32 -gdiplus.dll reactos/dll/win32/gdiplus -iphlpapi.dll reactos/dll/win32/iphlpapi -kernel32.dll reactos/dll/win32/kernel32 -lz32.dll reactos/dll/win32/lzexpand -msvcrt.dll reactos/dll/win32/msvcrt -rpcrt4.dll reactos/dll/win32/rpcrt4 -secur32.dll reactos/dll/win32/secur32 -snmpapi.dll reactos/dll/win32/snmpapi -user32.dll reactos/dll/win32/user32 -version.dll reactos/dll/win32/version -winspool.dll reactos/dll/win32/winspool -ws2_32.dll reactos/dll/win32/ws2_32 -wsock32.dll reactos/dll/win32/wsock32 -videoprt.dll reactos/drivers/video/videoprt -ndis.sys reactos/drivers/network/ndis -tdi.sys reactos/drivers/network/tdi -class2.sys reactos/drivers/storage/class2 -scsiport.sys reactos/drivers/storage/scsiport -ntoskrnl.exe reactos/ntoskrnl -ntoskrnl.exe reactos/lib/rtl -win32k.sys reactos/subsystems/win32/win32k +; COMPONENT_NAME - Name of the module. Eg. kernel32. +; PATH_TO_COMPONENT_SOURCES - Relative path to sources (relative to where rgenstat is run from). + +advapi32 ../reactos/dll/win32/advapi32 +crtdll ../reactos/dll/win32/crtdll +gdi32 ../reactos/dll/win32/gdi32 +gdiplus ../reactos/dll/win32/gdiplus +iphlpapi ../reactos/dll/win32/iphlpapi +kernel32 ../reactos/dll/win32/kernel32 +msvcrt ../reactos/dll/win32/msvcrt +rpcrt4 ../reactos/dll/win32/rpcrt4 +secur32 ../reactos/dll/win32/secur32 +snmpapi ../reactos/dll/win32/snmpapi +user32 ../reactos/dll/win32/user32 +version ../reactos/dll/win32/version +winspool ../reactos/dll/win32/winspool +ws2_32 ../reactos/dll/win32/ws2_32 +wsock32 ../reactos/dll/win32/wsock32 +videoprt ../reactos/drivers/video/videoprt +ndis ../reactos/drivers/network/ndis +tdi ../reactos/drivers/network/tdi +scsiport ../reactos/drivers/storage/scsiport +ntoskrnl ../reactos/ntoskrnl +rtl ../reactos/lib/rtl +win32k ../reactos/subsystems/win32/win32k

16 years, 10 months

[mpiulachs] 30281: Don't build rgenstat when "make clean"

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Thu Nov 8 23:49:55 2007 New Revision: 30281 URL: http://svn.reactos.org/svn/reactos?rev=30281&view=rev Log: Don't build rgenstat when "make clean" Modified: trunk/reactos/tools/rgenstat/rgenstat.mak Modified: trunk/reactos/tools/rgenstat/rgenstat.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rgenstat/rgenstat.ma… ============================================================================== --- trunk/reactos/tools/rgenstat/rgenstat.mak (original) +++ trunk/reactos/tools/rgenstat/rgenstat.mak Thu Nov 8 23:49:55 2007 @@ -46,6 +46,6 @@ rgenstat: $(RGENSTAT_TARGET) .PHONY: rgenstat_clean -rgenstat_clean: $(RGENSTAT_TARGET) +rgenstat_clean: -@$(rm) $(RGENSTAT_TARGET) $(RGENSTAT_OBJECTS) 2>$(NUL) clean: rgenstat_clean

16 years, 10 months

[mpiulachs] 30280: Small fixes to notevil , removed the no longer necessary resource.h as it is now using autogenerated contributors

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Thu Nov 8 23:31:18 2007 New Revision: 30280 URL: http://svn.reactos.org/svn/reactos?rev=30280&view=rev Log: Small fixes to notevil , removed the no longer necessary resource.h as it is now using autogenerated contributors Removed: branches/rbuild/rosapps/notevil/resource.h Modified: branches/rbuild/rosapps/notevil/notevil.c branches/rbuild/rosapps/notevil/notevil.rbuild branches/rbuild/rosapps/notevil/readme.txt Modified: branches/rbuild/rosapps/notevil/notevil.c URL: http://svn.reactos.org/svn/reactos/branches/rbuild/rosapps/notevil/notevil.… ============================================================================== --- branches/rbuild/rosapps/notevil/notevil.c (original) +++ branches/rbuild/rosapps/notevil/notevil.c Thu Nov 8 23:31:18 2007 @@ -30,7 +30,6 @@ #include <stdio.h> #include <stdlib.h> #include <tchar.h> -#include "resource.h" #include "autocontributors.h" LPCTSTR app_name = _TEXT("notevil"); @@ -88,31 +87,6 @@ } #endif /* def DISPLAY_COORD */ - -INT -GetNextString( - LPTSTR Buffer, - INT BufferSize, - DWORD *Index) -{ - if (RES_LAST_INDEX == *Index) - { - *Index = RES_FIRST_INDEX; - } - else - { - ++*Index; - } - LoadString( - myself, - *Index, - Buffer, - BufferSize); - - return 0; -} - - VOID DisplayTitle(VOID) { Modified: branches/rbuild/rosapps/notevil/notevil.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/rosapps/notevil/notevil.… ============================================================================== --- branches/rbuild/rosapps/notevil/notevil.rbuild (original) +++ branches/rbuild/rosapps/notevil/notevil.rbuild Thu Nov 8 23:31:18 2007 @@ -1,6 +1,5 @@ <module name="notevil" type="win32cui" installbase="system32" installname="notevil.exe"> <include base="notevil">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <library>kernel32</library> Modified: branches/rbuild/rosapps/notevil/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/rbuild/rosapps/notevil/readme.t… ============================================================================== --- branches/rbuild/rosapps/notevil/readme.txt (original) +++ branches/rbuild/rosapps/notevil/readme.txt Thu Nov 8 23:31:18 2007 @@ -1,4 +1,4 @@ -$Id: readme.txt,v 1.1 1999/05/15 07:23:34 ea Exp $ +$Id$ ReactOS Coders Console Parade ----------------------------- @@ -9,9 +9,7 @@ "not evil" in the text box. To add a new name, add a new string in the -resource script notevil.rc (string index numbers must be -unique) and edit resource.h to update minimum and -maximum indices. +contributors.rbuild file Eventually run make. Removed: branches/rbuild/rosapps/notevil/resource.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/rosapps/notevil/resource… ============================================================================== --- branches/rbuild/rosapps/notevil/resource.h (original) +++ branches/rbuild/rosapps/notevil/resource.h (removed) @@ -1,2 +1,0 @@ -#define RES_FIRST_INDEX 1 -#define RES_LAST_INDEX 51

16 years, 10 months

← Newer
1
...
61
62
63
64
65
66
67
...
89
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007