Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 34035: Don't forget to free the parent nodes
by gedmurphy＠svn.reactos.org 20 Jun '08

20 Jun '08

Author: gedmurphy Date: Fri Jun 20 06:39:31 2008 New Revision: 34035 URL: http://svn.reactos.org/svn/reactos?rev=34035&view=rev Log: Don't forget to free the parent nodes Modified: trunk/rostests/winetests/GUI/browsewnd.c Modified: trunk/rostests/winetests/GUI/browsewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/browsewnd.c… ============================================================================== --- trunk/rostests/winetests/GUI/browsewnd.c [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/browsewnd.c [iso-8859-1] Fri Jun 20 06:39:31 2008 @@ -140,6 +140,8 @@ while (NodeHasChild(pInfo, hItem)) { HTREEITEM hChildItem; + + FreeItemTag(pInfo, hItem); hChildItem = TreeView_GetChild(pInfo->hBrowseTV, hItem);

1 0

[gedmurphy] 34034: Save the select test info on close. The browse dialog now lists all winetest dlls and allows selection of either all tests in all dlls, all tests within a dll, or the option to choose individual tests. (rewuires a modified winetest framework)
by gedmurphy＠svn.reactos.org 20 Jun '08

20 Jun '08

Author: gedmurphy Date: Fri Jun 20 06:20:26 2008 New Revision: 34034 URL: http://svn.reactos.org/svn/reactos?rev=34034&view=rev Log: Save the select test info on close. The browse dialog now lists all winetest dlls and allows selection of either all tests in all dlls, all tests within a dll, or the option to choose individual tests. (rewuires a modified winetest framework) Modified: trunk/rostests/winetests/GUI/browsewnd.c trunk/rostests/winetests/GUI/lang/en-US.rc trunk/rostests/winetests/GUI/misc.c trunk/rostests/winetests/GUI/precomp.h Modified: trunk/rostests/winetests/GUI/browsewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/browsewnd.c… ============================================================================== --- trunk/rostests/winetests/GUI/browsewnd.c [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/browsewnd.c [iso-8859-1] Fri Jun 20 06:20:26 2008 @@ -88,8 +88,6 @@ { if (!(findFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { - //MessageBoxW(NULL, findFileData.cFileName, NULL, 0); - /* set the path */ wcscpy(ptr, szDllPath); @@ -124,11 +122,9 @@ HTREEITEM hItem) { TV_ITEM tvItem; - WCHAR buf[256]; tvItem.hItem = hItem; - tvItem.mask = TVIF_PARAM | TVIF_TEXT; - tvItem.pszText = buf; + tvItem.mask = TVIF_PARAM; (void)TreeView_GetItem(pInfo->hBrowseTV, &tvItem); @@ -217,8 +213,10 @@ sizeof(TEST_ITEM)); if (pItem) { - wcsncpy(pItem->szSelectedDll, lpDll, MAX_PATH); - wcsncpy(pItem->szRunString, lpRun, MAX_RUN_CMD); + if (lpDll) + wcsncpy(pItem->szSelectedDll, lpDll, MAX_PATH); + if (lpRun) + wcsncpy(pItem->szRunString, lpRun, MAX_RUN_CMD); } return pItem; @@ -229,6 +227,7 @@ { HTREEITEM hRoot; HIMAGELIST hImgList; + PTEST_ITEM pTestItem; DLLNAME GetTestName; MODULES GetModulesInTest; HMODULE hDll; @@ -250,11 +249,13 @@ hImgList, TVSIL_NORMAL); + pTestItem = BuildTestItemData(L"", L"Full"); + /* insert the root item into the tree */ hRoot = InsertIntoTreeView(pInfo->hBrowseTV, NULL, L"Full", - 0, + pTestItem, IL_MAIN, HAS_CHILD); @@ -272,7 +273,6 @@ LPSTR lpModules, ptr; LPWSTR lpModW; INT numMods; - PTEST_ITEM pTestItem; lpTestName = GetTestName(); @@ -383,14 +383,43 @@ case WM_COMMAND: { - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) + switch (LOWORD(wParam)) { - HeapFree(GetProcessHeap(), 0, pInfo->lpDllList); - pInfo->lpDllList = NULL; - - EndDialog(hDlg, - LOWORD(wParam)); - return TRUE; + case IDOK: + { + TV_ITEM tvItem; + + tvItem.hItem = TreeView_GetSelection(pInfo->hBrowseTV); + tvItem.mask = TVIF_PARAM; + + if (TreeView_GetItem(pInfo->hBrowseTV, &tvItem)) + { + PTEST_ITEM pItem; + + pItem = (PTEST_ITEM)tvItem.lParam; + if (pItem) + CopyMemory(&pInfo->SelectedTest, pItem, sizeof(TEST_ITEM)); + + EndDialog(hDlg, + LOWORD(wParam)); + } + else + { + DisplayMessage(L"Please select an item"); + } + + break; + } + + case IDCANCEL: + { + HeapFree(GetProcessHeap(), 0, pInfo->lpDllList); + pInfo->lpDllList = NULL; + + EndDialog(hDlg, + LOWORD(wParam)); + return TRUE; + } } break; Modified: trunk/rostests/winetests/GUI/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/lang/en-US.… ============================================================================== --- trunk/rostests/winetests/GUI/lang/en-US.rc [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/lang/en-US.rc [iso-8859-1] Fri Jun 20 06:20:26 2008 @@ -29,7 +29,7 @@ CAPTION "Test hierarchy" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - PUSHBUTTON "Select", IDC_SELECT, 202, 7, 50, 14 + PUSHBUTTON "Select", IDOK, 202, 7, 50, 14 + PUSHBUTTON "Close", IDCANCEL, 202, 34, 50, 14 CONTROL "", IDC_TREEVIEW, "SysTreeView32", WS_BORDER | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT, 7, 7, 189, 236 - PUSHBUTTON "Close", IDOK, 202, 34, 50, 14 END Modified: trunk/rostests/winetests/GUI/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/misc.c?rev=… ============================================================================== --- trunk/rostests/winetests/GUI/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/misc.c [iso-8859-1] Fri Jun 20 06:20:26 2008 @@ -208,7 +208,7 @@ LocalFree(lpMsgBuf); } -VOID DisplayString(LPWSTR lpMsg) +VOID DisplayMessage(LPWSTR lpMsg) { MessageBoxW(NULL, lpMsg, L"Note!", MB_ICONEXCLAMATION|MB_OK); } Modified: trunk/rostests/winetests/GUI/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/precomp.h?r… ============================================================================== --- trunk/rostests/winetests/GUI/precomp.h [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/precomp.h [iso-8859-1] Fri Jun 20 06:20:26 2008 @@ -32,7 +32,7 @@ LPWSTR lpDllList; INT numDlls; - PTEST_ITEM SelectedTest; + TEST_ITEM SelectedTest; } MAIN_WND_INFO, *PMAIN_WND_INFO; @@ -46,7 +46,7 @@ /* misc.c */ HIMAGELIST InitImageList(UINT StartResource, UINT EndResource, UINT Width, UINT Height); -VOID DisplayString(LPWSTR lpMsg); +VOID DisplayMessage(LPWSTR lpMsg); VOID DisplayError(INT err); DWORD AnsiToUnicode(LPCSTR lpSrcStr, LPWSTR *lpDstStr);

1 0

[gedmurphy] 34033: - build up test data for each node in the treeview and tag it - traverse the tree recursively and free all data on close
by gedmurphy＠svn.reactos.org 20 Jun '08

20 Jun '08

Author: gedmurphy Date: Fri Jun 20 03:21:49 2008 New Revision: 34033 URL: http://svn.reactos.org/svn/reactos?rev=34033&view=rev Log: - build up test data for each node in the treeview and tag it - traverse the tree recursively and free all data on close Modified: trunk/rostests/winetests/GUI/browsewnd.c trunk/rostests/winetests/GUI/precomp.h Modified: trunk/rostests/winetests/GUI/browsewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/browsewnd.c… ============================================================================== --- trunk/rostests/winetests/GUI/browsewnd.c [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/browsewnd.c [iso-8859-1] Fri Jun 20 03:21:49 2008 @@ -13,6 +13,9 @@ #define IL_MAIN 0 #define IL_TEST 1 +#define HAS_NO_CHILD 0 +#define HAS_CHILD 1 + typedef wchar_t *(__cdecl *DLLNAME)(); typedef int (_cdecl *MODULES)(char **); @@ -102,12 +105,86 @@ return numFiles; } +static BOOL +NodeHasChild(PMAIN_WND_INFO pInfo, + HTREEITEM hItem) +{ + TV_ITEM tvItem; + + tvItem.hItem = hItem; + tvItem.mask = TVIF_CHILDREN; + + (void)TreeView_GetItem(pInfo->hBrowseTV, &tvItem); + + return (tvItem.cChildren == 1); +} + +static VOID +FreeItemTag(PMAIN_WND_INFO pInfo, + HTREEITEM hItem) +{ + TV_ITEM tvItem; + WCHAR buf[256]; + + tvItem.hItem = hItem; + tvItem.mask = TVIF_PARAM | TVIF_TEXT; + tvItem.pszText = buf; + + (void)TreeView_GetItem(pInfo->hBrowseTV, &tvItem); + + HeapFree(GetProcessHeap(), + 0, + (PTEST_ITEM)tvItem.lParam); +} + +static VOID +TraverseTreeView(PMAIN_WND_INFO pInfo, + HTREEITEM hItem) +{ + while (NodeHasChild(pInfo, hItem)) + { + HTREEITEM hChildItem; + + hChildItem = TreeView_GetChild(pInfo->hBrowseTV, + hItem); + + TraverseTreeView(pInfo, + hChildItem); + + hItem = TreeView_GetNextSibling(pInfo->hBrowseTV, + hItem); + } + + if (hItem) + { + /* loop the child items and free the tags */ + while (TRUE) + { + HTREEITEM hOldItem; + + FreeItemTag(pInfo, hItem); + hOldItem = hItem; + hItem = TreeView_GetNextSibling(pInfo->hBrowseTV, + hItem); + if (hItem == NULL) + { + hItem = hOldItem; + break; + } + } + + hItem = TreeView_GetParent(pInfo->hBrowseTV, + hItem); + } +} + static HTREEITEM InsertIntoTreeView(HWND hTreeView, HTREEITEM hRoot, LPWSTR lpLabel, - LPWSTR lpDllPath, - INT Image) + LPARAM Tag, + INT Image, + INT Child) { TV_ITEM tvi; TV_INSERTSTRUCT tvins; @@ -115,19 +192,36 @@ ZeroMemory(&tvi, sizeof(tvi)); ZeroMemory(&tvins, sizeof(tvins)); - tvi.mask = TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE; + tvi.mask = TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_CHILDREN | TVIF_SELECTEDIMAGE; tvi.pszText = lpLabel; tvi.cchTextMax = lstrlen(lpLabel); - tvi.lParam = (LPARAM)lpDllPath; + tvi.lParam = Tag; tvi.iImage = Image; tvi.iSelectedImage = Image; - - //tvi.stateMask = TVIS_OVERLAYMASK; + tvi.cChildren = Child; tvins.item = tvi; tvins.hParent = hRoot; return TreeView_InsertItem(hTreeView, &tvins); +} + +static PTEST_ITEM +BuildTestItemData(LPWSTR lpDll, + LPWSTR lpRun) +{ + PTEST_ITEM pItem; + + pItem = (PTEST_ITEM)HeapAlloc(GetProcessHeap(), + 0, + sizeof(TEST_ITEM)); + if (pItem) + { + wcsncpy(pItem->szSelectedDll, lpDll, MAX_PATH); + wcsncpy(pItem->szRunString, lpRun, MAX_RUN_CMD); + } + + return pItem; } static VOID @@ -160,8 +254,9 @@ hRoot = InsertIntoTreeView(pInfo->hBrowseTV, NULL, L"Full", - NULL, - IL_MAIN); + 0, + IL_MAIN, + HAS_CHILD); for (i = 0; i < pInfo->numDlls; i++) { @@ -177,34 +272,47 @@ LPSTR lpModules, ptr; LPWSTR lpModW; INT numMods; + PTEST_ITEM pTestItem; lpTestName = GetTestName(); + + pTestItem = BuildTestItemData(lpDllPath, lpTestName); hParent = InsertIntoTreeView(pInfo->hBrowseTV, hRoot, lpTestName, - lpDllPath, - IL_TEST); - + pTestItem, + IL_TEST, + HAS_CHILD); if (hParent) { + /* Get the list of modules a dll offers. This is returned as list of + * Ansi null-terminated strings, terminated with an empty string (double null) */ GetModulesInTest = (MODULES)GetProcAddress(hDll, "GetModulesInTest"); if ((numMods = GetModulesInTest(&lpModules))) { ptr = lpModules; while (numMods && *ptr != '\0') { + /* convert the string to unicode */ if (AnsiToUnicode(ptr, &lpModW)) { + WCHAR szRunCmd[MAX_RUN_CMD]; + + _snwprintf(szRunCmd, MAX_RUN_CMD, L"%s:%s", lpTestName, lpModW); + pTestItem = BuildTestItemData(lpDllPath, szRunCmd); + InsertIntoTreeView(pInfo->hBrowseTV, hParent, lpModW, - lpModW, - IL_TEST); + pTestItem, + IL_TEST, + HAS_NO_CHILD); HeapFree(GetProcessHeap(), 0, lpModW); } + /* move onto next string */ while (*(ptr++) != '\0') ; @@ -288,6 +396,15 @@ break; } + case WM_DESTROY: + { + HTREEITEM hItem = TreeView_GetRoot(pInfo->hBrowseTV); + + TraverseTreeView(pInfo, hItem); + + break; + } + HandleDefaultMessage: default: return FALSE; Modified: trunk/rostests/winetests/GUI/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/precomp.h?r… ============================================================================== --- trunk/rostests/winetests/GUI/precomp.h [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/precomp.h [iso-8859-1] Fri Jun 20 03:21:49 2008 @@ -8,6 +8,15 @@ #include "resource.h" extern HINSTANCE hInstance; + +#define MAX_RUN_CMD 256 + +typedef struct _TEST_ITEM +{ + WCHAR szSelectedDll[MAX_PATH]; + WCHAR szRunString[MAX_RUN_CMD]; + +} TEST_ITEM, *PTEST_ITEM; typedef struct _MAIN_WND_INFO { @@ -20,13 +29,10 @@ HICON hSmIcon; HICON hBgIcon; - INT SelectedItem;/* selection number in the list view */ - BOOL bDlgOpen; - BOOL bInMenuLoop; - BOOL bIsUserAnAdmin; - LPWSTR lpDllList; INT numDlls; + + PTEST_ITEM SelectedTest; } MAIN_WND_INFO, *PMAIN_WND_INFO;

1 0

[cfinck] 34032: Put a comment and an #if around the lines I changed in my previous commit, because the ##__VA_ARGS__ syntax was only tested with MSVC and GCC
by cfinck＠svn.reactos.org 19 Jun '08

19 Jun '08

Author: cfinck Date: Thu Jun 19 17:03:22 2008 New Revision: 34032 URL: http://svn.reactos.org/svn/reactos?rev=34032&view=rev Log: Put a comment and an #if around the lines I changed in my previous commit, because the ##__VA_ARGS__ syntax was only tested with MSVC and GCC Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Thu Jun 19 17:03:22 2008 @@ -109,10 +109,13 @@ #define UNIMPLEMENTED DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); - #define ERR_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #define WARN_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #define TRACE_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #define INFO_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + /* The ##__VA_ARGS__ syntax is not a standard and was only tested with MSVC and GCC. If other compilers support them as well, add them to this #if block. */ + #if defined(_MSC_VER) || defined(__GNUC__) + #define ERR_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #define WARN_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #define TRACE_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #define INFO_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #endif #else /* On non-debug builds, we never show these */

1 0

[cfinck] 34031: Reapply Ged's fix, this time correctly :-) Thanks to hackbunny for pointing out that ##__VA_ARGS__ will strip the trailing comma and this works on both GCC and MSVC.
by cfinck＠svn.reactos.org 19 Jun '08

19 Jun '08

Author: cfinck Date: Thu Jun 19 16:57:32 2008 New Revision: 34031 URL: http://svn.reactos.org/svn/reactos?rev=34031&view=rev Log: Reapply Ged's fix, this time correctly :-) Thanks to hackbunny for pointing out that ##__VA_ARGS__ will strip the trailing comma and this works on both GCC and MSVC. Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Thu Jun 19 16:57:32 2008 @@ -109,14 +109,10 @@ #define UNIMPLEMENTED DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); - #define ERR_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ - DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, __VA_ARGS__) - #define WARN_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ - DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, __VA_ARGS__) - #define TRACE_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ - DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, __VA_ARGS__) - #define INFO_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ - DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, __VA_ARGS__) + #define ERR_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #define WARN_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #define TRACE_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #define INFO_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) #else /* On non-debug builds, we never show these */

1 0

[gedmurphy] 34030: revert the debug macros change, the entire codebase isn't ready for it yet
by gedmurphy＠svn.reactos.org 19 Jun '08

19 Jun '08

Author: gedmurphy Date: Thu Jun 19 16:40:08 2008 New Revision: 34030 URL: http://svn.reactos.org/svn/reactos?rev=34030&view=rev Log: revert the debug macros change, the entire codebase isn't ready for it yet Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Thu Jun 19 16:40:08 2008 @@ -109,10 +109,14 @@ #define UNIMPLEMENTED DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); - #define ERR_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, __VA_ARGS__) - #define WARN_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, __VA_ARGS__) - #define TRACE_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, __VA_ARGS__) - #define INFO_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, __VA_ARGS__) + #define ERR_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ + DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, __VA_ARGS__) + #define WARN_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ + DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, __VA_ARGS__) + #define TRACE_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ + DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, __VA_ARGS__) + #define INFO_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ + DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, __VA_ARGS__) #else /* On non-debug builds, we never show these */

1 0

[gedmurphy] 34029: Only call DbgPrintEx once for each debug macro. This stops trace info from being split over 2 lines in some tools, like DebugView.
by gedmurphy＠svn.reactos.org 19 Jun '08

19 Jun '08

Author: gedmurphy Date: Thu Jun 19 15:42:57 2008 New Revision: 34029 URL: http://svn.reactos.org/svn/reactos?rev=34029&view=rev Log: Only call DbgPrintEx once for each debug macro. This stops trace info from being split over 2 lines in some tools, like DebugView. Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Thu Jun 19 15:42:57 2008 @@ -109,14 +109,10 @@ #define UNIMPLEMENTED DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); - #define ERR_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ - DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, __VA_ARGS__) - #define WARN_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ - DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, __VA_ARGS__) - #define TRACE_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ - DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, __VA_ARGS__) - #define INFO_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ - DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, __VA_ARGS__) + #define ERR_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, __VA_ARGS__) + #define WARN_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, __VA_ARGS__) + #define TRACE_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, __VA_ARGS__) + #define INFO_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, __VA_ARGS__) #else /* On non-debug builds, we never show these */

1 0

[mkupfer] 34028: - Template for korean keyboard layout implemented (TODO: kbdko.c needs modifications for korean keyboard layout) - bootdata, hives and usetup modified for korean keyboard layout - See issue #3345 for more details. - Patch from Gabriel Ilardi <gabrielilardi [at] hotmail [dot] it> for timedate settings applied - See issue #3251 for more details.
by mkupfer＠svn.reactos.org 19 Jun '08

19 Jun '08

Author: mkupfer Date: Thu Jun 19 12:58:43 2008 New Revision: 34028 URL: http://svn.reactos.org/svn/reactos?rev=34028&view=rev Log: - Template for korean keyboard layout implemented (TODO: kbdko.c needs modifications for korean keyboard layout) - bootdata, hives and usetup modified for korean keyboard layout - See issue #3345 for more details. - Patch from Gabriel Ilardi <gabrielilardi [at] hotmail [dot] it> for timedate settings applied - See issue #3251 for more details. Added: trunk/reactos/dll/keyboard/kbdko/ trunk/reactos/dll/keyboard/kbdko/kbdko.c (with props) trunk/reactos/dll/keyboard/kbdko/kbdko.def (with props) trunk/reactos/dll/keyboard/kbdko/kbdko.rbuild (with props) trunk/reactos/dll/keyboard/kbdko/kbdko.rc (with props) Modified: trunk/reactos/base/setup/usetup/lang/ko-KR.h trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/dll/keyboard/keyboard.rbuild trunk/reactos/dll/win32/shell32/control.c Modified: trunk/reactos/base/setup/usetup/lang/ko-KR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ko-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ko-KR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ko-KR.h [iso-8859-1] Thu Jun 19 12:58:43 2008 @@ -3,7 +3,8 @@ MUI_LAYOUTS koKRLayouts[] = { - { L"0412", L"E0010412" }, +// { L"0412", L"E0010412" }, + { L"0412", L"00000412" }, { NULL, NULL } }; Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Thu Jun 19 12:58:43 2008 @@ -328,6 +328,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000081a","Layout File",0x00000000,"kbdycl.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000081a","Layout Text",0x00000000,"Serbian (Latin)" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000081a","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5038" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout File",0x00000000,"kbdko.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout Text",0x00000000,"Korean" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5063" ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Adapters" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Jun 19 12:58:43 2008 @@ -212,6 +212,7 @@ dll\keyboard\kbdvntc\kbdvntc.dll 1 dll\keyboard\kbdycc\kbdycc.dll 1 dll\keyboard\kbdycl\kbdycl.dll 1 +dll\keyboard\kbdko\kbdko.dll 1 dll\ntdll\ntdll.dll 1 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Thu Jun 19 12:58:43 2008 @@ -284,6 +284,7 @@ 0000040F = "Icelandic" 00000410 = "Italian" 00000411 = "Japanese" +00000412 = "Korean" 0000043F = "Kazakh" 00000426 = "Latvian" 00000427 = "Lithuanian" @@ -346,6 +347,7 @@ 0000040F = kbdic.dll 00000410 = kbdit.dll 00000411 = kbdja.dll +00000412 = kbdko.dll 0000041C = kbdal.dll 0000041F = kbdtuq.dll 0001041F = kbdtuf.dll Added: trunk/reactos/dll/keyboard/kbdko/kbdko.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdko/kbdko.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdko/kbdko.c (added) +++ trunk/reactos/dll/keyboard/kbdko/kbdko.c [iso-8859-1] Thu Jun 19 12:58:43 2008 @@ -1,0 +1,364 @@ +/* + * ReactOS Korean Keyboard layout + * Copyright (C) 2003 ReactOS + * License: LGPL, see: LGPL.txt + * + * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php + * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html + */ + +/* + * Important Note / TODO: + * This file is a copy of kbdus.c and needs to adapt to korean + * keyboard layout! + */ + +#include <windows.h> +#include <internal/kbd.h> + +#ifdef _M_IA64 +#define ROSDATA static __declspec(allocate(".data")) +#else +#ifdef _MSC_VER +#pragma data_seg(".data") +#define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) +#endif +#endif + +#define VK_EMPTY 0xff /* The non-existent VK */ +#define KSHIFT 0x001 /* Shift modifier */ +#define KCTRL 0x002 /* Ctrl modifier */ +#define KALT 0x004 /* Alt modifier */ +#define KEXT 0x100 /* Extended key code */ +#define KMULTI 0x200 /* Multi-key */ +#define KSPEC 0x400 /* Special key */ +#define KNUMP 0x800 /* Number-pad */ +#define KNUMS 0xc00 /* Special + number pad */ +#define KMEXT 0x300 /* Multi + ext */ + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Y', 'U', + 'I', 'O', 'P', + VK_OEM_4, VK_OEM_6, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_1, VK_OEM_7, VK_OEM_3, + VK_LSHIFT, VK_OEM_5, + /* - 2c - */ + /* Third letters row */ + 'Z', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT, + /* - 37 - */ + /* Bottom Row */ + VK_MULTIPLY, VK_LMENU, VK_SPACE, VK_CAPITAL, + + /* - 3b - */ + /* F-Keys */ + VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, + VK_F7, VK_F8, VK_F9, VK_F10, + /* - 45 - */ + /* Locks */ + VK_NUMLOCK | KMEXT, + VK_SCROLL | KMULTI, + /* - 47 - */ + /* Number-Pad */ + VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* - 54 - */ + /* Presumably PrtSc */ + VK_SNAPSHOT, + /* - 55 - */ + /* Oddities, and the remaining standard F-Keys */ + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* EREOF */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* ZOOM */ + VK_HELP, + /* - 64 - */ + /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ + VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + VK_F21, VK_F22, VK_F23, + /* - 6f - */ + /* Not sure who uses these codes */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, + /* - 72 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */ + VK_EMPTY, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 3, + { 0, 1, 2, 3 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT */ +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + /* Normal vs Shifted */ + /* The numbers */ + { '1', NOCAPS, {'1', '!'} }, + /* Ctrl-2 generates NUL */ + { '3', NOCAPS, {'3', '#'} }, + { '4', NOCAPS, {'4', '$'} }, + { '5', NOCAPS, {'5', '%'} }, + /* Ctrl-6 generates RS */ + { '7', NOCAPS, {'7', '&'} }, + { '8', NOCAPS, {'8', '*'} }, + { '9', NOCAPS, {'9', '('} }, + { '0', NOCAPS, {'0', ')'} }, + + /* Specials */ + /* Ctrl-_ generates US */ + { VK_OEM_PLUS ,NOCAPS, {'=', '+'} }, + { VK_OEM_1 ,NOCAPS, {';', ':'} }, + { VK_OEM_7 ,NOCAPS, {'\'','\"'} }, + { VK_OEM_3 ,NOCAPS, {'`', '~'} }, + { VK_OEM_COMMA ,NOCAPS, {',', '<'} }, + { VK_OEM_PERIOD ,NOCAPS, {'.', '>'} }, + { VK_OEM_2 ,NOCAPS, {'/', '?'} }, + /* Keys that do not have shift states */ + { VK_TAB ,NOCAPS, {'\t','\t'} }, + { VK_ADD ,NOCAPS, {'+', '+'} }, + { VK_SUBTRACT,NOCAPS, {'-', '-'} }, + { VK_MULTIPLY,NOCAPS, {'*', '*'} }, + { VK_DIVIDE ,NOCAPS, {'/', '/'} }, + { VK_ESCAPE ,NOCAPS, {'\x1b','\x1b'} }, + { VK_SPACE ,NOCAPS, {' ', ' '} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* Normal, Shifted, Ctrl */ + /* Legacy (telnet-style) ascii escapes */ + { VK_OEM_4, 0, {'[', '{', 0x1b /* ESC */} }, + { VK_OEM_6, 0, {']', '}', 0x1d /* GS */} }, + { VK_OEM_5, 0, {'\\','|', 0x1c /* FS */} }, + { VK_OEM_102,0,{'\\','|', 0x1c /* FS */} }, + { VK_RETURN,0, {'\r', '\r', '\n'} }, + { 0,0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + /* Normal, Shifted, Ctrl, C-S-x */ + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01, 0x01} }, + { 'B', CAPS, {'b', 'B', 0x02, 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03, 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04, 0x04} }, + { 'E', CAPS, {'e', 'E', 0x05, 0x05} }, + { 'F', CAPS, {'f', 'F', 0x06, 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07, 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08, 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09, 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a, 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b, 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c, 0x0c} }, + { 'M', CAPS, {'m', 'M', 0x0d, 0x0d} }, + { 'N', CAPS, {'n', 'N', 0x0e, 0x0e} }, + { 'O', CAPS, {'o', 'O', 0x0f, 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10, 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11, 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12, 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13, 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14, 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15, 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16, 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17, 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18, 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19, 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a, 0x1a} }, + + /* Legacy Ascii generators */ + { '2', NOCAPS, {'2', '@', WCH_NONE, 0} }, + { '6', NOCAPS, {'6', '^', WCH_NONE, 0x1e /* RS */} }, + { VK_OEM_MINUS, NOCAPS, {'-', '_', WCH_NONE, 0x1f /* US */} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { VK_DECIMAL, 0, {'.'} }, + { VK_BACK, 0, {'\010'} }, + { 0,0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(1,keypad_numbers), + vk_master(2,key_to_chars_2mod), + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x00, L"" }, + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL }, +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Ctrl" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4a, L"Left" }, + { 0x4c, L"Center" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x55, L"Help" }, + { 0x56, L"Left Windows" }, + { 0x5b, L"Right Windows" }, + { 0, NULL }, +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks -- currently implemented by wine code */ + /* English doesn't have any, anyway */ + NULL, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + NULL, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + MAKELONG(0,1), /* Version 1.0 */ + + /* Ligatures -- English doesn't have any */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + Propchange: trunk/reactos/dll/keyboard/kbdko/kbdko.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdko/kbdko.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdko/kbdko.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdko/kbdko.def (added) +++ trunk/reactos/dll/keyboard/kbdko/kbdko.def [iso-8859-1] Thu Jun 19 12:58:43 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdko.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdko/kbdko.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdko/kbdko.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdko/kbdko.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdko/kbdko.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdko/kbdko.rbuild [iso-8859-1] Thu Jun 19 12:58:43 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdko" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdko.dll" allowwarnings="true"> + <importlibrary definition="kbdko.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdko.c</file> + <file>kbdko.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdko/kbdko.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdko/kbdko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdko/kbdko.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdko/kbdko.rc (added) +++ trunk/reactos/dll/keyboard/kbdko/kbdko.rc [iso-8859-1] Thu Jun 19 12:58:43 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Korean Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdko\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdko.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdko/kbdko.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/keyboard/keyboard.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/keyboard.rbui… ============================================================================== --- trunk/reactos/dll/keyboard/keyboard.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/keyboard.rbuild [iso-8859-1] Thu Jun 19 12:58:43 2008 @@ -214,4 +214,7 @@ <directory name="kbdycl"> <xi:include href="kbdycl/kbdycl.rbuild" /> </directory> + <directory name="kbdko"> + <xi:include href="kbdko/kbdko.rbuild" /> + </directory> </group> Modified: trunk/reactos/dll/win32/shell32/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… ============================================================================== --- trunk/reactos/dll/win32/shell32/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/control.c [iso-8859-1] Thu Jun 19 12:58:43 2008 @@ -357,7 +357,7 @@ hMutex = CreateMutex(NULL, FALSE, (LPCTSTR) wszCmd); if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS)) - return NULL; + return; buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); if (!buffer) return; @@ -417,6 +417,7 @@ Control_UnloadApplet(applet); } ReleaseMutex(hMutex); + CloseHandle(hMutex); HeapFree(GetProcessHeap(), 0, buffer); }

1 0

[cfinck] 34027: GCC 4.3.x fixes for cabman and sysreg Also clean up sysreg a bit and put all #include's for standard headers in the .h files. (they were spread around the .cpp and the .h files previously) See issue #3370 for more details.
by cfinck＠svn.reactos.org 19 Jun '08

19 Jun '08

Author: cfinck Date: Thu Jun 19 12:07:38 2008 New Revision: 34027 URL: http://svn.reactos.org/svn/reactos?rev=34027&view=rev Log: GCC 4.3.x fixes for cabman and sysreg Also clean up sysreg a bit and put all #include's for standard headers in the .h files. (they were spread around the .cpp and the .h files previously) See issue #3370 for more details. Modified: trunk/reactos/tools/cabman/dfp.cxx trunk/reactos/tools/sysreg/conf_parser.cpp trunk/reactos/tools/sysreg/conf_parser.h trunk/reactos/tools/sysreg/env_var.cpp trunk/reactos/tools/sysreg/env_var.h trunk/reactos/tools/sysreg/file_reader.cpp trunk/reactos/tools/sysreg/file_reader.h trunk/reactos/tools/sysreg/namedpipe_reader.cpp trunk/reactos/tools/sysreg/namedpipe_reader.h trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/os_support.h trunk/reactos/tools/sysreg/pipe_reader.cpp trunk/reactos/tools/sysreg/pipe_reader.h trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=3… ============================================================================== --- trunk/reactos/tools/cabman/dfp.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/dfp.cxx [iso-8859-1] Thu Jun 19 12:07:38 2008 @@ -1373,8 +1373,8 @@ return; } i = 0; - while ((CurrentChar + i < LineLength) && - (((ch = Line[CurrentChar + i]) >= 'a') && (ch <= 'z')) || + while (((CurrentChar + i < LineLength) && + (((ch = Line[CurrentChar + i]) >= 'a') && (ch <= 'z'))) || ((ch >= 'A') && (ch <= 'Z')) || (ch == '_')) { CurrentString[i] = ch; Modified: trunk/reactos/tools/sysreg/conf_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.c… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/conf_parser.cpp [iso-8859-1] Thu Jun 19 12:07:38 2008 @@ -8,11 +8,6 @@ */ #include "conf_parser.h" -#include <iostream> -#include <sstream> -#include <fstream> -#include <cstdio> -#include <cstdlib> namespace Sysreg_ { Modified: trunk/reactos/tools/sysreg/conf_parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.h… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.h [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/conf_parser.h [iso-8859-1] Thu Jun 19 12:07:38 2008 @@ -12,6 +12,11 @@ #include "user_types.h" #include <map> +#include <iostream> +#include <sstream> +#include <fstream> +#include <cstdio> +#include <cstdlib> namespace Sysreg_ { Modified: trunk/reactos/tools/sysreg/env_var.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/env_var.cpp?r… ============================================================================== --- trunk/reactos/tools/sysreg/env_var.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/env_var.cpp [iso-8859-1] Thu Jun 19 12:07:38 2008 @@ -9,9 +9,6 @@ #include "env_var.h" -#include <iostream> -#include <cstdlib> -#include <cstring> namespace System_ { Modified: trunk/reactos/tools/sysreg/env_var.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/env_var.h?rev… ============================================================================== --- trunk/reactos/tools/sysreg/env_var.h [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/env_var.h [iso-8859-1] Thu Jun 19 12:07:38 2008 @@ -12,7 +12,9 @@ #include "user_types.h" #include <map> - +#include <iostream> +#include <cstdlib> +#include <cstring> namespace System_ { Modified: trunk/reactos/tools/sysreg/file_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/file_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/file_reader.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/file_reader.cpp [iso-8859-1] Thu Jun 19 12:07:38 2008 @@ -8,9 +8,6 @@ */ #include "file_reader.h" -#include <cassert> -#include <cstdio> -#include <cstring> namespace System_ { Modified: trunk/reactos/tools/sysreg/file_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/file_reader.h… ============================================================================== --- trunk/reactos/tools/sysreg/file_reader.h [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/file_reader.h [iso-8859-1] Thu Jun 19 12:07:38 2008 @@ -14,6 +14,10 @@ #include "user_types.h" #include "data_source.h" #include <vector> +#include <cassert> +#include <cstdio> +#include <cstring> + namespace System_ { using std::vector; Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp [iso-8859-1] Thu Jun 19 12:07:38 2008 @@ -10,10 +10,6 @@ #include "namedpipe_reader.h" -#include <iostream> -#include <cassert> -#include <cstring> - namespace System_ { #define MIN(a, b) (((a) < (b)) ? (a) : (b)) Modified: trunk/reactos/tools/sysreg/namedpipe_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.h [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.h [iso-8859-1] Thu Jun 19 12:07:38 2008 @@ -16,8 +16,11 @@ #include "user_types.h" #include "data_source.h" #include <vector> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> +#include <iostream> +#include <cassert> +#include <cstring> #if defined(WIN32) #include <windows.h> @@ -25,8 +28,6 @@ #else #include <unistd.h> #include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> #define NULLVAL 0 #define DWORD unsigned long #define HANDLE long Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/os_support.cpp [iso-8859-1] Thu Jun 19 12:07:38 2008 @@ -8,7 +8,6 @@ */ #include "os_support.h" -#include <cstdlib> namespace System_ { Modified: trunk/reactos/tools/sysreg/os_support.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.h?… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.h [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/os_support.h [iso-8859-1] Thu Jun 19 12:07:38 2008 @@ -22,6 +22,7 @@ #include "user_types.h" #include <ctime> #include <vector> +#include <cstdlib> #ifndef _MSC_VER #include <sys/time.h> Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/pipe_reader.cpp [iso-8859-1] Thu Jun 19 12:07:38 2008 @@ -8,9 +8,6 @@ */ #include "pipe_reader.h" - -#include <iostream> -#include <assert.h> namespace System_ { Modified: trunk/reactos/tools/sysreg/pipe_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.h… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.h [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/pipe_reader.h [iso-8859-1] Thu Jun 19 12:07:38 2008 @@ -15,7 +15,11 @@ #include "user_types.h" #include "data_source.h" #include <cstdio> -//#include <stdlib.h> +#include <iostream> +#include <cassert> +#include <cstdlib> +#include <cstring> +#include <limits.h> namespace System_ { Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp [iso-8859-1] Thu Jun 19 12:07:38 2008 @@ -10,28 +10,6 @@ #include "rosboot_test.h" -#include "pipe_reader.h" -#include "namedpipe_reader.h" -//#include "sym_file.h" -#include "file_reader.h" -#include "os_support.h" -#include "env_var.h" - -#include <iostream> -#include <vector> -#include <fstream> -#include <cassert> -#include <cfloat> -#include <cmath> -#include <csignal> -#include <cstdio> -#include <cstdlib> -#include <cstring> -#include <ctime> -#ifndef __LINUX__ -#include <io.h> -#include <errno.h> -#endif namespace Sysreg_ { Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h [iso-8859-1] Thu Jun 19 12:07:38 2008 @@ -13,7 +13,28 @@ #include "conf_parser.h" #include "os_support.h" #include "user_types.h" +#include "pipe_reader.h" +#include "namedpipe_reader.h" +#include "file_reader.h" +#include "os_support.h" +#include "env_var.h" #include <vector> +#include <iostream> +#include <vector> +#include <fstream> +#include <cassert> +#include <cfloat> +#include <cmath> +#include <csignal> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <ctime> +#ifndef __LINUX__ +#include <io.h> +#include <errno.h> +#endif + #ifdef __LINUX__ #include <unistd.h> #include <sys/types.h>

1 0

[fireball] 34026: - Remove all string msvcrt->ntdll forwards: let's be consistent, either forward everything, or forward only something. I left assembly math functions though, since they are standalone and 100% identical. - As a result, fixed a couple of incorrect functions linkage. - Fixed a name of vsnprintf, so really msvcrt's version is used now, not RTL's one.
by fireball＠svn.reactos.org 19 Jun '08

19 Jun '08

Author: fireball Date: Thu Jun 19 08:08:46 2008 New Revision: 34026 URL: http://svn.reactos.org/svn/reactos?rev=34026&view=rev Log: - Remove all string msvcrt->ntdll forwards: let's be consistent, either forward everything, or forward only something. I left assembly math functions though, since they are standalone and 100% identical. - As a result, fixed a couple of incorrect functions linkage. - Fixed a name of vsnprintf, so really msvcrt's version is used now, not RTL's one. Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/libcntpr.rbuild trunk/reactos/lib/sdk/crt/string/wcs.c Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] Thu Jun 19 08:08:46 2008 @@ -121,9 +121,9 @@ __getmainargs @114 __initenv @115 ; __iob_func @116 - __isascii=ntdll.__isascii @117 - __iscsym=ntdll.__iscsym @118 - __iscsymf=ntdll.__iscsymf @119 + __isascii @117 + __iscsym @118 + __iscsymf @119 __lc_codepage @120 DATA __lc_collate_cp @121 DATA __lc_handle @122 DATA @@ -167,7 +167,7 @@ __setusermatherr @160 __threadhandle @161 __threadid @162 - __toascii=ntdll.__toascii @163 + __toascii @163 __unDName @164 __unDNameEx @165 ; __uncaught_exception @166 @@ -203,7 +203,7 @@ _amsg_exit @196 _assert @197 ; _atodbl @198 - _atoi64=ntdll._atoi64 @199 + _atoi64 @199 _atoldbl @200 _beep @201 _beginthread @202 @@ -291,7 +291,7 @@ _fstati64 @284 _ftime @285 ; _ftime64 @286 - _ftol=ntdll._ftol @287 + _ftol @287 _fullpath @288 _futime @289 ; _futime64 @290 @@ -324,8 +324,8 @@ ; _heapused @317 _heapwalk @318 _hypot @319 - _i64toa=ntdll._i64toa @320 - _i64tow=ntdll._i64tow @321 + _i64toa @320 + _i64tow @321 _initterm @322 ; _inp @323 ; _inpd @324 @@ -363,8 +363,8 @@ _ismbslead @356 _ismbstrail @357 _isnan @358 - _itoa=ntdll._itoa @359 - _itow=ntdll._itow @360 + _itoa @359 + _itow @360 _j0 @361 _j1 @362 _jn @363 @@ -382,8 +382,8 @@ _lsearch @375 _lseek @376 _lseeki64 @377 - _ltoa=ntdll._ltoa @378 - _ltow=ntdll._ltow @379 + _ltoa @378 + _ltow @379 _makepath @380 _mbbtombc @381 _mbbtype @382 @@ -440,8 +440,8 @@ _mbstok @433 _mbstrlen @434 _mbsupr @435 - _memccpy=ntdll._memccpy @436 - _memicmp=ntdll._memicmp @437 + _memccpy @436 + _memicmp @437 _mkdir @438 ; _mkgmtime @439 ; _mkgmtime64 @440 @@ -510,20 +510,20 @@ _spawnve @503 _spawnvp @504 _spawnvpe @505 - _splitpath=ntdll._splitpath @506 + _splitpath @506 _stat @507 _stat64 @508 _stati64 @509 _statusfp @510 - _strcmpi=ntdll._strcmpi @511 + _strcmpi @511 _strdate @512 _strdup @513 _strerror @514 - _stricmp=ntdll._stricmp @515 + _stricmp @515 _stricoll @516 - _strlwr=ntdll._strlwr @517 + _strlwr @517 _strncoll @518 - _strnicmp=ntdll._strnicmp @519 + _strnicmp @519 _strnicoll @520 _strnset @521 _strrev @522 @@ -531,7 +531,7 @@ _strtime @524 ; _strtoi64 @525 _strtoui64=strtoull @526 - _strupr=ntdll._strupr @527 + _strupr @527 _swab @528 _sys_errlist @529 DATA _sys_nerr @530 DATA @@ -540,14 +540,14 @@ _tempnam @533 ; _time64 @534 _timezone @535 DATA - _tolower=ntdll._tolower @536 - _toupper=ntdll._toupper @537 + _tolower @536 + _toupper @537 _tzname @538 DATA _tzset @539 - _ui64toa=ntdll._ui64toa @540 - _ui64tow=ntdll._ui64tow @541 - _ultoa=ntdll._ultoa @542 - _ultow=ntdll._ultow @543 + _ui64toa @540 + _ui64tow @541 + _ultoa @542 + _ultow @543 _umask @544 _ungetch @545 ; _ungetwch @546 @@ -568,18 +568,18 @@ _wcreat @561 _wcsdup @562 ; _wcserror @563 - _wcsicmp=ntdll._wcsicmp @564 + _wcsicmp @564 _wcsicoll @565 - _wcslwr=ntdll._wcslwr @566 + _wcslwr @566 _wcsncoll @567 - _wcsnicmp=ntdll._wcsnicmp @568 + _wcsnicmp @568 _wcsnicoll @569 _wcsnset @570 _wcsrev @571 _wcsset @572 ; _wcstoi64 @573 ; _wcstoui64 @574 - _wcsupr=ntdll._wcsupr @575 + _wcsupr @575 _wctime @576 ; _wctime64 @577 ; _wctype @578 @@ -642,9 +642,9 @@ _wtempnam @635 _wtmpnam @636 ; _wtof @637 - _wtoi=ntdll._wtoi @638 - _wtoi64=ntdll._wtoi64 @639 - _wtol=ntdll._wtol @640 + _wtoi @638 + _wtoi64 @639 + _wtol @640 _wunlink @641 _wutime @642 ; _wutime64 @643 @@ -652,29 +652,29 @@ _y1 @645 _yn @646 abort @647 - abs=ntdll.abs @648 + abs @648 acos @649 asctime @650 asin @651 - atan=ntdll.atan @652 + atan @652 atan2 @653 atexit @654 atof @655 - atoi=ntdll.atoi @656 - atol=ntdll.atol @657 - bsearch=ntdll.bsearch @658 + atoi @656 + atol @657 + bsearch @658 calloc @659 - ceil=ntdll.ceil @660 + ceil @660 clearerr @661 clock @662 - cos=ntdll.cos @663 + cos @663 cosh @664 ctime @665 difftime @666 div @667 exit @668 exp @669 - fabs=ntdll.fabs @670 + fabs @670 fclose @671 feof @672 ferror @673 @@ -684,7 +684,7 @@ fgets @677 fgetwc @678 fgetws @679 - floor=ntdll.floor @680 + floor @680 fmod @681 fopen @682 fprintf @683 @@ -710,60 +710,60 @@ getwc @703 getwchar @704 gmtime @705 - is_wctype=ntdll.iswctype @706 - isalnum=ntdll.isalnum @707 - isalpha=ntdll.isalpha @708 - iscntrl=ntdll.iscntrl @709 - isdigit=ntdll.isdigit @710 - isgraph=ntdll.isgraph @711 + is_wctype @706 + isalnum @707 + isalpha @708 + iscntrl @709 + isdigit @710 + isgraph @711 isleadbyte @712 - islower=ntdll.islower @713 - isprint=ntdll.isprint @714 - ispunct=ntdll.ispunct @715 - isspace=ntdll.isspace @716 - isupper=ntdll.isupper @717 + islower @713 + isprint @714 + ispunct @715 + isspace @716 + isupper @717 iswalnum @718 - iswalpha=ntdll.iswalpha @719 + iswalpha @719 iswascii @720 iswcntrl @721 - iswctype=ntdll.iswctype @722 - iswdigit=ntdll.iswdigit @723 + iswctype @722 + iswdigit @723 iswgraph @724 - iswlower=ntdll.iswlower @725 + iswlower @725 iswprint @726 iswpunct @727 - iswspace=ntdll.iswspace @728 + iswspace @728 iswupper @729 - iswxdigit=ntdll.iswxdigit @730 - isxdigit=ntdll.isxdigit @731 - labs=ntdll.labs @732 + iswxdigit @730 + isxdigit @731 + labs @732 ldexp @733 ldiv @734 localeconv @735 localtime @736 - log=ntdll.log @737 + log @737 log10 @738 longjmp @739 malloc @740 mblen @741 - mbstowcs=ntdll.mbstowcs @742 + mbstowcs @742 mbtowc @743 - memchr=ntdll.memchr @744 - memcmp=ntdll.memcmp @745 - memcpy=ntdll.memcpy @746 - memmove=ntdll.memmove @747 - memset=ntdll.memset @748 + memchr @744 + memcmp @745 + memcpy @746 + memmove @747 + memset @748 mktime @749 modf @750 perror @751 - pow=ntdll.pow @752 + pow @752 printf @753 putc @754 putchar @755 puts @756 putwc=fputwc @757 putwchar=_fputwchar @758 - qsort=ntdll.qsort @759 + qsort @759 raise @760 rand @761 realloc @762 @@ -775,45 +775,45 @@ setlocale @768 setvbuf @769 signal @770 - sin=ntdll.sin @771 + sin @771 sinh @772 sprintf @773 - sqrt=ntdll.sqrt @774 + sqrt @774 srand @775 sscanf @776 - strcat=ntdll.strcat @777 - strchr=ntdll.strchr @778 - strcmp=ntdll.strcmp @779 + strcat @777 + strchr @778 + strcmp @779 strcoll @780 - strcpy=ntdll.strcpy @781 - strcspn=ntdll.strcspn @782 + strcpy @781 + strcspn @782 strerror @783 strftime @784 - strlen=ntdll.strlen @785 - strncat=ntdll.strncat @786 - strncmp=ntdll.strncmp @787 - strncpy=ntdll.strncpy @788 - strpbrk=ntdll.strpbrk @789 - strrchr=ntdll.strrchr @790 - strspn=ntdll.strspn @791 - strstr=ntdll.strstr @792 + strlen @785 + strncat @786 + strncmp @787 + strncpy @788 + strpbrk @789 + strrchr @790 + strspn @791 + strstr @792 strtod @793 strtok @794 - strtol=ntdll.strtol @795 - strtoul=ntdll.strtoul @796 + strtol @795 + strtoul @796 strxfrm @797 swprintf @798 swscanf @799 system @800 - tan=ntdll.tan @801 + tan @801 tanh @802 time @803 tmpfile @804 tmpnam @805 - tolower=ntdll.tolower @806 - toupper=ntdll.toupper @807 - towlower=ntdll.towlower @808 - towupper=ntdll.towupper @809 + tolower @806 + toupper @807 + towlower @808 + towupper @809 ungetc @810 ungetwc @811 vfprintf @812 @@ -822,26 +822,26 @@ vsprintf @815 vswprintf @816 vwprintf @817 - wcscat=ntdll.wcscat @818 - wcschr=ntdll.wcschr @819 - wcscmp=ntdll.wcscmp @820 + wcscat @818 + wcschr @819 + wcscmp @820 wcscoll @821 - wcscpy=ntdll.wcscpy @822 - wcscspn=ntdll.wcscspn @823 + wcscpy @822 + wcscspn @823 wcsftime @824 - wcslen=ntdll.wcslen @825 - wcsncat=ntdll.wcsncat @826 - wcsncmp=ntdll.wcsncmp @827 - wcsncpy=ntdll.wcsncpy @828 + wcslen @825 + wcsncat @826 + wcsncmp @827 + wcsncpy @828 wcspbrk @829 - wcsrchr=ntdll.wcsrchr @830 - wcsspn=ntdll.wcsspn @831 - wcsstr=ntdll.wcsstr @832 + wcsrchr @830 + wcsspn @831 + wcsstr @832 wcstod @833 wcstok @834 - wcstol=ntdll.wcstol @835 - wcstombs=ntdll.wcstombs @836 - wcstoul=ntdll.wcstoul @837 + wcstol @835 + wcstombs @836 + wcstoul @837 wcsxfrm @838 wctomb @839 wprintf @840 Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Thu Jun 19 08:08:46 2008 @@ -190,6 +190,7 @@ <file>memset.c</file> </ifnot> <file>memcmp.c</file> + <file>memccpy.c</file> <file>memicmp.c</file> </directory> @@ -217,6 +218,7 @@ <file>wprocess.c</file> </directory> <directory name="search"> + <file>bsearch.c</file> <file>lfind.c</file> <file>lsearch.c</file> </directory> @@ -262,6 +264,7 @@ <file>makepath.c</file> <file>malloc.c</file> <file>mbtowc.c</file> + <file>mbstowcs.c</file> <file>obsol.c</file> <file>putenv.c</file> <file>rot.c</file> @@ -319,12 +322,18 @@ <file>wcsnlen.c</file> <file>wcsrchr.c</file> </ifnot> + <file>atof.c</file> + <file>atoi.c</file> + <file>atoi64.c</file> <file>atol.c</file> - <file>atof.c</file> <file>ctype.c</file> + <file>itoa.c</file> + <file>itow.c</file> <file>lasttok.c</file> <file>scanf.c</file> + <file>splitp.c</file> <file>strcoll.c</file> + <file>strcspn.c</file> <file>strdup.c</file> <file>strerror.c</file> <file>stricmp.c</file> @@ -334,17 +343,24 @@ <file>strpbrk.c</file> <file>strrev.c</file> <file>strset.c</file> + <file>strspn.c</file> <file>strstr.c</file> <file>strtod.c</file> <file>strtok.c</file> + <file>strtol.c</file> <file>strtoul.c</file> <file>strtoull.c</file> <file>strupr.c</file> <file>strxfrm.c</file> + <file>wcs.c</file> + <file>wcstol.c</file> <file>wcstombs.c</file> + <file>wcstoul.c</file> <file>wctomb.c</file> <file>wsplitp.c</file> - <file>wcs.c</file> + <file>wtoi.c</file> + <file>wtoi64.c</file> + <file>wtol.c</file> </directory> <directory name="sys_stat"> <file>systime.c</file> Modified: trunk/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.rbuil… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Thu Jun 19 08:08:46 2008 @@ -156,6 +156,7 @@ <file>wcstol.c</file> <file>wcstombs_nt.c</file> <file>wcstoul.c</file> + <file>wsplitp.c</file> <file>wtoi64.c</file> <file>wtoi.c</file> <file>wtol.c</file> Modified: trunk/reactos/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] Thu Jun 19 08:08:46 2008 @@ -742,7 +742,7 @@ /********************************************************************* * _vsnprintf (MSVCRT.@) */ -int CDECL vsnprintf( char *str, unsigned int len, +int CDECL _vsnprintf( char *str, unsigned int len, const char *format, va_list valist ) { DWORD sz; @@ -793,7 +793,7 @@ /********************************************************************* * _vsnwsprintf (MSVCRT.@) */ -int CDECL vsnwprintf( wchar_t *str, unsigned int len, +int CDECL _vsnwprintf( wchar_t *str, unsigned int len, const wchar_t *format, va_list valist ) { pf_output out;

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