Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[spetreolle] 49467: [CMAKE] One .acm suffix is enough. Dedicated to AmineKhaldi.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Thu Nov 4 13:29:58 2010 New Revision: 49467 URL: http://svn.reactos.org/svn/reactos?rev=49467&view=rev Log: [CMAKE] One .acm suffix is enough. Dedicated to AmineKhaldi. Modified: branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imaadp3… ============================================================================== --- branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] Thu Nov 4 13:29:58 2010 @@ -11,7 +11,7 @@ endif() set_entrypoint(imaadp32.acm 0) -set_target_properties(imaadp32.acm PROPERTIES SUFFIX ".acm") +set_target_properties(imaadp32.acm PROPERTIES SUFFIX "") target_link_libraries(imaadp32.acm wine)

13 years, 11 months

[fireball] 49466: [APPS] - Damir Aliev: Properly convert encoding in cmdline tools. See issue #3487 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Nov 4 12:28:08 2010 New Revision: 49466 URL: http://svn.reactos.org/svn/reactos?rev=49466&view=rev Log: [APPS] - Damir Aliev: Properly convert encoding in cmdline tools. See issue #3487 for more details. Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c trunk/reactos/base/system/format/format.c Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] Thu Nov 4 12:28:08 2010 @@ -25,6 +25,17 @@ HINSTANCE hInstance; HANDLE ProcessHeap; +int LoadStringAndOem(HINSTANCE hInst, + UINT uID, + LPTSTR szNode, + int Siz +) +{ + TCHAR szTmp[25]; + int res = LoadString(hInst, uID, szTmp, sizeof(szTmp)); + CharToOem(szTmp, szNode); + return(res); +} LPTSTR GetNodeTypeName(UINT NodeType) { @@ -33,27 +44,27 @@ switch (NodeType) { case 1: - if (!LoadString(hInstance, IDS_BCAST, szNode, sizeof(szNode))) + if (!LoadStringAndOem(hInstance, IDS_BCAST, szNode, sizeof(szNode))) return NULL; break; case 2: - if (!LoadString(hInstance, IDS_P2P, szNode, sizeof(szNode))) + if (!LoadStringAndOem(hInstance, IDS_P2P, szNode, sizeof(szNode))) return NULL; break; case 4: - if (!LoadString(hInstance, IDS_MIXED, szNode, sizeof(szNode))) + if (!LoadStringAndOem(hInstance, IDS_MIXED, szNode, sizeof(szNode))) return NULL; break; case 8: - if (!LoadString(hInstance, IDS_HYBRID, szNode, sizeof(szNode))) + if (!LoadStringAndOem(hInstance, IDS_HYBRID, szNode, sizeof(szNode))) return NULL; break; default : - if (!LoadString(hInstance, IDS_UNKNOWN, szNode, sizeof(szNode))) + if (!LoadStringAndOem(hInstance, IDS_UNKNOWN, szNode, sizeof(szNode))) return NULL; break; } @@ -69,42 +80,42 @@ switch (InterfaceType) { case MIB_IF_TYPE_OTHER: - if (!LoadString(hInstance, IDS_OTHER, szIntType, sizeof(szIntType))) + if (!LoadStringAndOem(hInstance, IDS_OTHER, szIntType, sizeof(szIntType))) return NULL; break; case MIB_IF_TYPE_ETHERNET: - if (!LoadString(hInstance, IDS_ETH, szIntType, sizeof(szIntType))) + if (!LoadStringAndOem(hInstance, IDS_ETH, szIntType, sizeof(szIntType))) return NULL; break; case MIB_IF_TYPE_TOKENRING: - if (!LoadString(hInstance, IDS_TOKEN, szIntType, sizeof(szIntType))) + if (!LoadStringAndOem(hInstance, IDS_TOKEN, szIntType, sizeof(szIntType))) return NULL; break; case MIB_IF_TYPE_FDDI: - if (!LoadString(hInstance, IDS_FDDI, szIntType, sizeof(szIntType))) + if (!LoadStringAndOem(hInstance, IDS_FDDI, szIntType, sizeof(szIntType))) return NULL; break; case MIB_IF_TYPE_PPP: - if (!LoadString(hInstance, IDS_PPP, szIntType, sizeof(szIntType))) + if (!LoadStringAndOem(hInstance, IDS_PPP, szIntType, sizeof(szIntType))) return NULL; break; case MIB_IF_TYPE_LOOPBACK: - if (!LoadString(hInstance, IDS_LOOP, szIntType, sizeof(szIntType))) + if (!LoadStringAndOem(hInstance, IDS_LOOP, szIntType, sizeof(szIntType))) return NULL; break; case MIB_IF_TYPE_SLIP: - if (!LoadString(hInstance, IDS_SLIP, szIntType, sizeof(szIntType))) + if (!LoadStringAndOem(hInstance, IDS_SLIP, szIntType, sizeof(szIntType))) return NULL; break; default: - if (!LoadString(hInstance, IDS_UNKNOWN, szIntType, sizeof(szIntType))) + if (!LoadStringAndOem(hInstance, IDS_UNKNOWN, szIntType, sizeof(szIntType))) return NULL; break; } @@ -153,6 +164,7 @@ { HKEY hKey = NULL; LPTSTR ConType = NULL; + LPTSTR ConTypeTmp = NULL; TCHAR Path[256]; LPTSTR PrePath = _T("SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\"); LPTSTR PostPath = _T("\\Connection"); @@ -180,24 +192,34 @@ NULL, &dwDataSize) == ERROR_SUCCESS) { + ConTypeTmp = (LPTSTR)HeapAlloc(ProcessHeap, + 0, + dwDataSize); + ConType = (LPTSTR)HeapAlloc(ProcessHeap, 0, dwDataSize); - if (ConType) + if (ConType && ConTypeTmp) { if(RegQueryValueEx(hKey, _T("Name"), NULL, &dwType, - (PBYTE)ConType, + (PBYTE)ConTypeTmp, &dwDataSize) != ERROR_SUCCESS) { HeapFree(ProcessHeap, 0, ConType); + HeapFree(ProcessHeap, + 0, + ConTypeTmp); + ConType = NULL; } + + if (ConType) CharToOem(ConTypeTmp, ConType); } } } @@ -674,7 +696,7 @@ if (lpUsage == NULL) return; - if (LoadString(hInstance, + if (LoadStringAndOem(hInstance, IDS_USAGE, lpUsage, Size)) Modified: trunk/reactos/base/system/format/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.c [iso-8859-1] (original) +++ trunk/reactos/base/system/format/format.c [iso-8859-1] Thu Nov 4 12:28:08 2010 @@ -48,6 +48,19 @@ }; +int LoadStringAndOem(HINSTANCE hInst, + UINT uID, + LPTSTR szStr, + int Siz +) +{ + TCHAR szTmp[RC_STRING_MAX_SIZE]; + int res = LoadString(hInst, uID, szTmp, sizeof(szTmp)); + CharToOem(szTmp, szStr); + return(res); +} + + //---------------------------------------------------------------------- // // PrintWin32Error @@ -171,7 +184,7 @@ case PROGRESS: percent = (PDWORD) Argument; - LoadString( GetModuleHandle(NULL), STRING_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); _tprintf(szMsg, *percent); break; @@ -184,7 +197,7 @@ status = (PBOOLEAN) Argument; if( *status == FALSE ) { - LoadString( GetModuleHandle(NULL), STRING_FORMAT_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_FORMAT_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); _tprintf("%s", szMsg); Error = TRUE; } @@ -203,7 +216,7 @@ case UNKNOWND: case STRUCTUREPROGRESS: case CLUSTERSIZETOOSMALL: - LoadString( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); _tprintf("%s", szMsg); return FALSE; } @@ -261,7 +274,7 @@ BYTE dummy; BOOLEAN lastestVersion; - LoadString( GetModuleHandle(NULL), STRING_HELP, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_HELP, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); if (!LoadFMIFSEntryPoints()) { _tprintf(szMsg, ProgramName, _T("")); @@ -319,7 +332,7 @@ // Get function pointers // if( !LoadFMIFSEntryPoints()) { - LoadString( GetModuleHandle(NULL), STRING_FMIFS_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_FMIFS_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); _tprintf("%s", szMsg); return -1; } @@ -329,7 +342,7 @@ // if( (badArg = ParseCommandLine( argc, argv ))) { - LoadString( GetModuleHandle(NULL), STRING_UNKNOW_ARG, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_UNKNOW_ARG, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); _tprintf(szMsg, argv[badArg] ); Usage(argv[0]); @@ -341,7 +354,7 @@ // if( !Drive ) { - LoadString( GetModuleHandle(NULL), STRING_DRIVE_PARM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_DRIVE_PARM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); _tprintf(szMsg); Usage( argv[0] ); return -1; @@ -359,7 +372,7 @@ driveType = GetDriveType( RootDirectory ); if( driveType == 0 ) { - LoadString( GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); PrintWin32Error( szMsg, GetLastError()); return -1; } @@ -371,7 +384,7 @@ } if( driveType != DRIVE_FIXED ) { - LoadString( GetModuleHandle(NULL), STRING_INSERT_DISK, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_INSERT_DISK, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); _tprintf(szMsg, RootDirectory[0] ); _fgetts( input, sizeof(input)/2, stdin ); @@ -386,7 +399,7 @@ &serialNumber, &maxComponent, &flags, fileSystem, sizeof(fileSystem)/2)) { - LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); PrintWin32Error( szMsg, GetLastError()); return -1; } @@ -396,11 +409,11 @@ &totalNumberOfBytes, &totalNumberOfFreeBytes )) { - LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); PrintWin32Error( szMsg, GetLastError()); return -1; } - LoadString( GetModuleHandle(NULL), STRING_FILESYSTEM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_FILESYSTEM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); _tprintf(szMsg, fileSystem ); // @@ -412,7 +425,7 @@ while(1 ) { - LoadString( GetModuleHandle(NULL), STRING_LABEL_NAME_EDIT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_LABEL_NAME_EDIT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); _tprintf(szMsg, RootDirectory[0] ); _fgetts( input, sizeof(input)/2, stdin ); input[ _tcslen( input ) - 1] = 0; @@ -421,15 +434,15 @@ break; } - LoadString( GetModuleHandle(NULL), STRING_ERROR_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_ERROR_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); _tprintf("%s", szMsg); } } - LoadString( GetModuleHandle(NULL), STRING_YN_FORMAT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_YN_FORMAT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); _tprintf(szMsg, RootDirectory[0] ); - LoadString( GetModuleHandle(NULL), STRING_YES_NO_FAQ, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_YES_NO_FAQ, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); while( 1 ) { _fgetts( input, sizeof(input)/2, stdin ); @@ -460,7 +473,7 @@ } } else { - LoadString( GetModuleHandle(NULL), STRING_FAST_FMT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_FAST_FMT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); if( totalNumberOfBytes.QuadPart > 1024*1024*10 ) { _tprintf(_T("%s %luM\n"),szMsg, (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024))); @@ -470,7 +483,7 @@ _tprintf(_T("%s %.2fM\n"),szMsg, ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); } - LoadString( GetModuleHandle(NULL), STRING_CREATE_FSYS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_CREATE_FSYS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); _tprintf("%s", szMsg); } @@ -488,7 +501,7 @@ ClusterSize, FormatExCallback ); #endif if( Error ) return -1; - LoadString( GetModuleHandle(NULL), STRING_FMT_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_FMT_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); _tprintf("%s", szMsg); // @@ -503,7 +516,7 @@ if( !EnableVolumeCompression( RootDirectory, TRUE )) { #endif - LoadString( GetModuleHandle(NULL), STRING_VOL_COMPRESS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_VOL_COMPRESS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); _tprintf("%s", szMsg); } } @@ -520,7 +533,7 @@ input[ _tcslen(input)-1] = 0; if( !SetVolumeLabel( RootDirectory, input )) { - LoadString( GetModuleHandle(NULL), STRING_NO_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); PrintWin32Error(szMsg, GetLastError()); return -1; } @@ -531,7 +544,7 @@ &serialNumber, &maxComponent, &flags, fileSystem, sizeof(fileSystem)/2)) { - LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); PrintWin32Error( szMsg, GetLastError()); return -1; } @@ -544,12 +557,12 @@ &totalNumberOfBytes, &totalNumberOfFreeBytes )) { - LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); PrintWin32Error(szMsg, GetLastError()); return -1; } - LoadString( GetModuleHandle(NULL), STRING_FREE_SPACE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_FREE_SPACE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); _tprintf(szMsg, totalNumberOfBytes.QuadPart, totalNumberOfFreeBytes.QuadPart ); // @@ -560,11 +573,11 @@ &serialNumber, &maxComponent, &flags, fileSystem, sizeof(fileSystem)/2)) { - LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); PrintWin32Error( szMsg, GetLastError()); return -1; } - LoadString( GetModuleHandle(NULL), STRING_SERIAL_NUMBER, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + LoadStringAndOem( GetModuleHandle(NULL), STRING_SERIAL_NUMBER, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); _tprintf(szMsg, (unsigned int)(serialNumber >> 16), (unsigned int)(serialNumber & 0xFFFF) );

13 years, 11 months

[fireball] 49465: [REGEDIT] Adam Kachwalla <geekdundee@gmail.com> - "Load Hive..." and "Unload Hive..." menu items implemented - Make address bar case-insensitive - Remove trailing slashes in addre...

by fireball＠svn.reactos.org

Author: fireball Date: Thu Nov 4 12:05:35 2010 New Revision: 49465 URL: http://svn.reactos.org/svn/reactos?rev=49465&view=rev Log: [REGEDIT] Adam Kachwalla <geekdundee(a)gmail.com> - "Load Hive..." and "Unload Hive..." menu items implemented - Make address bar case-insensitive - Remove trailing slashes in address bar when at root keys (e.g. "HKEY_LOCAL_MACHINE\" or "HKEY_CURRENT_USER\") - Address "go" button added - Removed ~8px slack from bottom of the app (not needed and looks better) - Factored out error displaying functions into error.c file. See issue #5711 for more details. Added: trunk/reactos/base/applications/regedit/error.c (with props) Modified: trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/edit.c trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/lang/en-US.rc trunk/reactos/base/applications/regedit/main.h trunk/reactos/base/applications/regedit/regedit.rbuild trunk/reactos/base/applications/regedit/resource.h trunk/reactos/base/applications/regedit/treeview.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] Thu Nov 4 12:05:35 2010 @@ -67,19 +67,21 @@ static void ResizeWnd(ChildWnd* pChildWnd, int cx, int cy) { - HDWP hdwp = BeginDeferWindowPos(2); - RECT rt, rs; - + HDWP hdwp = BeginDeferWindowPos(3); + RECT rt, rs, rb; + const int tHeight = 18; SetRect(&rt, 0, 0, cx, cy); cy = 0; if (hStatusBar != NULL) { GetWindowRect(hStatusBar, &rs); - cy = rs.bottom - rs.top + 8; + cy = rs.bottom - rs.top; } + GetWindowRect(pChildWnd->hAddressBtnWnd, &rb); cx = pChildWnd->nSplitPos + SPLIT_WIDTH/2; - DeferWindowPos(hdwp, pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left, 23, SWP_NOZORDER|SWP_NOACTIVATE); - DeferWindowPos(hdwp, pChildWnd->hTreeWnd, 0, rt.left, rt.top + 25, pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE); - DeferWindowPos(hdwp, pChildWnd->hListWnd, 0, rt.left+cx , rt.top + 25, rt.right-cx, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left - tHeight-2, tHeight, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, pChildWnd->hAddressBtnWnd, 0, rt.right - tHeight, rt.top, tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, pChildWnd->hTreeWnd, 0, rt.left, rt.top + tHeight+2, pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, pChildWnd->hListWnd, 0, rt.left+cx, rt.top + tHeight+2, rt.right-cx, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE); EndDeferWindowPos(hdwp); } @@ -259,7 +261,7 @@ /* Check CLSID key */ if (RegOpenKey(hRootKey, pszKeyPath, &hSubKey) == ERROR_SUCCESS) { - if (QueryStringValue(hSubKey, TEXT("CLSID"), NULL, szBuffer, + if (QueryStringValue(hSubKey, TEXT("CLSID"), NULL, szBuffer, COUNT_OF(szBuffer)) == ERROR_SUCCESS) { lstrcpyn(pszSuggestions, TEXT("HKCR\\CLSID\\"), (int) iSuggestionsLength); @@ -324,29 +326,35 @@ /* load "My Computer" string */ LoadString(hInst, IDS_MY_COMPUTER, buffer, sizeof(buffer)/sizeof(TCHAR)); - g_pChildWnd = pChildWnd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ChildWnd)); + g_pChildWnd = pChildWnd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ChildWnd)); if (!pChildWnd) return 0; _tcsncpy(pChildWnd->szPath, buffer, MAX_PATH); pChildWnd->nSplitPos = 250; pChildWnd->hWnd = hWnd; - pChildWnd->hAddressBarWnd = CreateWindowEx(WS_EX_CLIENTEDGE, _T("Edit"), NULL, WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP, + pChildWnd->hAddressBarWnd = CreateWindowEx(WS_EX_CLIENTEDGE, _T("Edit"), NULL, WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hWnd, (HMENU)0, hInst, 0); + pChildWnd->hAddressBtnWnd = CreateWindowEx(WS_EX_CLIENTEDGE, _T("Button"), _T("Â»"), WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP | BS_DEFPUSHBUTTON, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + hWnd, (HMENU)0, hInst, 0); pChildWnd->hTreeWnd = CreateTreeView(hWnd, pChildWnd->szPath, (HMENU) TREE_WINDOW); pChildWnd->hListWnd = CreateListView(hWnd, (HMENU) LIST_WINDOW/*, pChildWnd->szPath*/); SetFocus(pChildWnd->hTreeWnd); - /* set the address bar font */ - if (pChildWnd->hAddressBarWnd) + /* set the address bar and button font */ + if ((pChildWnd->hAddressBarWnd) && (pChildWnd->hAddressBtnWnd)) { hFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT); SendMessage(pChildWnd->hAddressBarWnd, WM_SETFONT, (WPARAM)hFont, 0); - } - + SendMessage(pChildWnd->hAddressBtnWnd, + WM_SETFONT, + (WPARAM)hFont, + 0); + } /* Subclass the AddressBar */ oldproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_WNDPROC); SetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_USERDATA, (DWORD_PTR)oldproc); @@ -354,7 +362,10 @@ break; } case WM_COMMAND: - if (!_CmdWndProc(hWnd, message, wParam, lParam)) { + if(HIWORD(wParam) == BN_CLICKED){ + PostMessage(pChildWnd->hAddressBarWnd, WM_KEYUP, VK_RETURN, 0); + } + else if (!_CmdWndProc(hWnd, message, wParam, lParam)) { goto def; } break; @@ -477,10 +488,28 @@ rootName = get_root_key_name(hRootKey); fullPath = HeapAlloc(GetProcessHeap(), 0, (_tcslen(rootName) + 1 + _tcslen(keyPath) + 1) * sizeof(TCHAR)); if (fullPath) { - _stprintf(fullPath, _T("%s\\%s"), rootName, keyPath); + /* set (correct) the address bar text */ + if(keyPath[0] != '\0') + _stprintf(fullPath, _T("%s\\%s"), rootName, keyPath); + else + fullPath = _tcscpy(fullPath, rootName); SendMessage(hStatusBar, SB_SETTEXT, 0, (LPARAM)fullPath); SendMessage(pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)fullPath); - HeapFree(GetProcessHeap(), 0, fullPath); + HeapFree(GetProcessHeap(), 0, fullPath); + /* disable hive manipulation items temporarily (enable only if necessary) */ + EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_LOADHIVE, MF_BYCOMMAND | MF_GRAYED); + EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_UNLOADHIVE, MF_BYCOMMAND | MF_GRAYED); + /* compare the strings to see if we should enable/disable the "Load Hive" menus accordingly */ + if (!(_tcsicmp(rootName, TEXT("HKEY_LOCAL_MACHINE")) && + _tcsicmp(rootName, TEXT("HKEY_USERS")))) + { + // enable the unload menu item if at the root + // otherwise enable the load menu item if there is no slash in keyPath (ie. immediate child selected) + if(keyPath[0] == '\0') + EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_LOADHIVE, MF_BYCOMMAND | MF_ENABLED); + else if(!_tcschr(keyPath, _T('\\'))) + EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_UNLOADHIVE, MF_BYCOMMAND | MF_ENABLED); + } { HKEY hKey; Modified: trunk/reactos/base/applications/regedit/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/edit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/edit.c [iso-8859-1] Thu Nov 4 12:05:35 2010 @@ -59,19 +59,10 @@ static void error_code_messagebox(HWND hwnd, DWORD error_code) { - LPTSTR lpMsgBuf; - DWORD status; TCHAR title[256]; - static const TCHAR fallback[] = TEXT("Error displaying error message.\n"); if (!LoadString(hInst, IDS_ERROR, title, COUNT_OF(title))) lstrcpy(title, TEXT("Error")); - status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, error_code, 0, (LPTSTR)&lpMsgBuf, 0, NULL); - if (!status) - lpMsgBuf = (LPTSTR)fallback; - MessageBox(hwnd, lpMsgBuf, title, MB_OK | MB_ICONERROR); - if (lpMsgBuf != fallback) - LocalFree(lpMsgBuf); + ErrorMessageBox(hwnd, title, error_code); } void warning(HWND hwnd, INT resId, ...) Added: trunk/reactos/base/applications/regedit/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/error.c (added) +++ trunk/reactos/base/applications/regedit/error.c [iso-8859-1] Thu Nov 4 12:05:35 2010 @@ -1,0 +1,14 @@ +#include <regedit.h> +void ErrorMessageBox(HWND hWnd, LPCTSTR title, DWORD code) +{ + LPTSTR lpMsgBuf; + DWORD status; + static const TCHAR fallback[] = TEXT("Error displaying error message.\n"); + status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, code, 0, (LPTSTR)&lpMsgBuf, 0, NULL); + if (!status) + lpMsgBuf = (LPTSTR)fallback; + MessageBox(hWnd, lpMsgBuf, title, MB_OK | MB_ICONERROR); + if (lpMsgBuf != fallback) + LocalFree(lpMsgBuf); +} Propchange: trunk/reactos/base/applications/regedit/error.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Thu Nov 4 12:05:35 2010 @@ -282,6 +282,105 @@ return TRUE; } +static INT_PTR CALLBACK LoadHive_KeyNameInHookProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + static LPTSTR sKey = NULL; + static INT sLength = 0; + switch(uMsg) + { + case WM_INITDIALOG: + sKey = (LPTSTR)lParam; + sLength = 128; /* FIXME: Ugly hack! */ + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + if(GetDlgItemText(hWndDlg, IDC_EDIT_KEY, sKey, sLength)) + return EndDialog(hWndDlg, -1); + else + return EndDialog(hWndDlg, 0); + case IDCANCEL: + return EndDialog(hWndDlg, 0); + } + break; + } + return FALSE; +} + +static BOOL LoadHive(HWND hWnd) +{ + OPENFILENAME ofn; + TCHAR Caption[128]; + LPCTSTR pszKeyPath; + TCHAR xPath[128]; + HKEY hRootKey; + TCHAR Filter[1024]; + FILTERPAIR filter; + /* get the item key to load the hive in */ + pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); + /* initialize the "open file" dialog */ + InitOpenFileName(hWnd, &ofn); + /* build the "All Files" filter up */ + filter.DisplayID = IDS_FLT_ALLFILES; + filter.FilterID = IDS_FLT_ALLFILES_FLT; + BuildFilterStrings(Filter, &filter, sizeof(filter)); + ofn.lpstrFilter = Filter; + /* load and set the caption and flags for dialog */ + LoadString(hInst, IDS_LOAD_HIVE, Caption, COUNT_OF(Caption)); + ofn.lpstrTitle = Caption; + ofn.Flags |= OFN_ENABLESIZING; + /* ofn.lCustData = ;*/ + /* now load the hive */ + if (GetOpenFileName(&ofn)) + { + if(DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_LOADHIVE), hWnd, &LoadHive_KeyNameInHookProc, (LPARAM)xPath)) + { + LONG regLoadResult = RegLoadKey(hRootKey, xPath, ofn.lpstrFile); + if(regLoadResult == ERROR_SUCCESS) + { + /* refresh tree and list views */ + RefreshTreeView(g_pChildWnd->hTreeWnd); + pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); + RefreshListView(g_pChildWnd->hListWnd, hRootKey, pszKeyPath); + } + else + { + ErrorMessageBox(hWnd, Caption, regLoadResult); + return FALSE; + } + } + } else { + CheckCommDlgError(hWnd); + } + return TRUE; +} + +static BOOL UnloadHive(HWND hWnd) +{ + TCHAR Caption[128]; + LPCTSTR pszKeyPath; + HKEY hRootKey; + /* get the item key to unload */ + pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); + /* load and set the caption and flags for dialog */ + LoadString(hInst, IDS_UNLOAD_HIVE, Caption, COUNT_OF(Caption)); + /* now unload the hive */ + LONG regUnloadResult = RegUnLoadKey(hRootKey, pszKeyPath); + if(regUnloadResult == ERROR_SUCCESS) + { + /* refresh tree and list views */ + RefreshTreeView(g_pChildWnd->hTreeWnd); + pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); + RefreshListView(g_pChildWnd->hListWnd, hRootKey, pszKeyPath); + } + else + { + ErrorMessageBox(hWnd, Caption, regUnloadResult); + return FALSE; + } + return TRUE; +} + static BOOL ImportRegistryFile(HWND hWnd) { OPENFILENAME ofn; @@ -316,7 +415,6 @@ return TRUE; } - static UINT_PTR CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) { HWND hwndExportAll; @@ -397,7 +495,7 @@ if (GetSaveFileName(&ofn)) { BOOL result; DWORD format; - + if (ofn.nFilterIndex == 1) format = REG_FORMAT_5; else @@ -758,6 +856,12 @@ UNREFERENCED_PARAMETER(message); switch (LOWORD(wParam)) { + case ID_REGISTRY_LOADHIVE: + LoadHive(hWnd); + return TRUE; + case ID_REGISTRY_UNLOADHIVE: + UnloadHive(hWnd); + return TRUE; case ID_REGISTRY_IMPORTREGISTRYFILE: ImportRegistryFile(hWnd); return TRUE; Modified: trunk/reactos/base/applications/regedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] Thu Nov 4 12:05:35 2010 @@ -274,6 +274,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "Imports a text file into the registry" ID_REGISTRY_EXPORTREGISTRYFILE "Exports all or part of the registry to a text file" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Connects to a remote computer's registry" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -330,6 +334,8 @@ IDS_MY_COMPUTER "My Computer" IDS_IMPORT_REG_FILE "Import Registry File" IDS_EXPORT_REG_FILE "Export Registry File" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(invalid DWORD value)" END @@ -391,6 +397,20 @@ CONTROL "S&elected Branch",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11 EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12 END + +// +// Dialog resources +// +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_ADDFAVORITES DIALOGEX DISCARDABLE 0, 0, 186, 46 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/base/applications/regedit/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/main.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/main.h [iso-8859-1] Thu Nov 4 12:05:35 2010 @@ -58,6 +58,7 @@ HWND hTreeWnd; HWND hListWnd; HWND hAddressBarWnd; + HWND hAddressBtnWnd; int nFocusPanel; /* 0: left 1: right */ int nSplitPos; WINDOWPLACEMENT pos; @@ -87,6 +88,9 @@ /* childwnd.c */ extern LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM); + +/* error.c */ +extern void ErrorMessageBox(HWND hWnd, LPCTSTR title, DWORD code); /* find.c */ extern void FindDialog(HWND hWnd); Modified: trunk/reactos/base/applications/regedit/regedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.rbuild [iso-8859-1] Thu Nov 4 12:05:35 2010 @@ -23,6 +23,7 @@ <file>hexedit.c</file> <file>listview.c</file> <file>main.c</file> + <file>error.c</file> <file>regedit.c</file> <file>regproc.c</file> <file>security.c</file> Modified: trunk/reactos/base/applications/regedit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] Thu Nov 4 12:05:35 2010 @@ -137,9 +137,11 @@ #define IDS_ERR_RENVAL_CAPTION 32856 #define IDS_ERR_RENVAL_TOEMPTY 32857 #define IDS_BAD_KEY 32858 - -#define ID_EDIT_NEW_MULTISTRINGVALUE 32860 -#define ID_EDIT_NEW_EXPANDABLESTRINGVALUE 32861 +#define IDS_LOAD_HIVE 32859 +#define IDS_UNLOAD_HIVE 32860 + +#define ID_EDIT_NEW_MULTISTRINGVALUE 32861 +#define ID_EDIT_NEW_EXPANDABLESTRINGVALUE 32862 #define ID_SWITCH_PANELS 32871 #define ID_EDIT_PERMISSIONS 32872 @@ -199,6 +201,8 @@ #define IDC_EXPORT_BRANCH 2009 #define IDC_EXPORT_BRANCH_TEXT 2010 +#define IDD_LOADHIVE 2500 +#define IDC_EDIT_KEY 2501 #define IDC_FAVORITENAME 2011 #define IDC_FAVORITESLIST 2012 Modified: trunk/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] Thu Nov 4 12:05:35 2010 @@ -633,7 +633,7 @@ TVITEM tvi; /* Total no-good hack */ - if (!_tcsncmp(keyPath, _T("My Computer\\"), 12)) + if (!_tcsnicmp(keyPath, _T("My Computer\\"), 12)) keyPath += 12; hRoot = TreeView_GetRoot(hwndTV); @@ -647,17 +647,17 @@ /* Special case for root to expand root key abbreviations */ if (hItem == hRoot) { - if (!_tcscmp(szPathPart, TEXT("HKCR"))) + if (!_tcsicmp(szPathPart, TEXT("HKCR"))) _tcscpy(szPathPart, TEXT("HKEY_CLASSES_ROOT")); - else if (!_tcscmp(szPathPart, TEXT("HKCU"))) + else if (!_tcsicmp(szPathPart, TEXT("HKCU"))) _tcscpy(szPathPart, TEXT("HKEY_CURRENT_USER")); - else if (!_tcscmp(szPathPart, TEXT("HKLM"))) + else if (!_tcsicmp(szPathPart, TEXT("HKLM"))) _tcscpy(szPathPart, TEXT("HKEY_LOCAL_MACHINE")); - else if (!_tcscmp(szPathPart, TEXT("HKU"))) + else if (!_tcsicmp(szPathPart, TEXT("HKU"))) _tcscpy(szPathPart, TEXT("HKEY_USERS")); - else if (!_tcscmp(szPathPart, TEXT("HKCC"))) + else if (!_tcsicmp(szPathPart, TEXT("HKCC"))) _tcscpy(szPathPart, TEXT("HKEY_CURRENT_CONFIG")); - else if (!_tcscmp(szPathPart, TEXT("HKDD"))) + else if (!_tcsicmp(szPathPart, TEXT("HKDD"))) _tcscpy(szPathPart, TEXT("HKEY_DYN_DATA")); } @@ -672,7 +672,7 @@ (void)TreeView_GetItem(hwndTV, &tvi); - if (!_tcscmp(szBuffer, szPathPart)) + if (!_tcsicmp(szBuffer, szPathPart)) break; }

13 years, 11 months

[tkreuzer] 49464: [KERNEL32] Print delphi exception with the Exception code 0xeedfade, we were previously only checking for 0xeedface, maybe an older value.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 4 10:16:14 2010 New Revision: 49464 URL: http://svn.reactos.org/svn/reactos?rev=49464&view=rev Log: [KERNEL32] Print delphi exception with the Exception code 0xeedfade, we were previously only checking for 0xeedface, maybe an older value. Modified: trunk/reactos/dll/win32/kernel32/except/except.c Modified: trunk/reactos/dll/win32/kernel32/except/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/except/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/except/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/except/except.c [iso-8859-1] Thu Nov 4 10:16:14 2010 @@ -413,7 +413,7 @@ } } - if (dwExceptionCode == 0xeedface) + if (dwExceptionCode == 0xeedface || dwExceptionCode == 0xeedfade) { DPRINT1("Delphi Exception at address: %p\n", ExceptionRecord.ExceptionInformation[0]); DPRINT1("Exception-Object: %p\n", ExceptionRecord.ExceptionInformation[1]);

13 years, 11 months

[sir_richard] 49463: [HAL]: Add INIT_FUNCTION where needed. Will save 860KB later.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Thu Nov 4 01:28:09 2010 New Revision: 49463 URL: http://svn.reactos.org/svn/reactos?rev=49463&view=rev Log: [HAL]: Add INIT_FUNCTION where needed. Will save 860KB later. Added: trunk/reactos/hal/halx86/generic/legacy/bus/libpcidata.a (with props) Modified: trunk/reactos/hal/halx86/generic/cmos.c trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c trunk/reactos/hal/halx86/generic/legacy/bus/pcidata.c trunk/reactos/hal/halx86/generic/legacy/bussupp.c trunk/reactos/hal/halx86/generic/legacy/halpcat.c trunk/reactos/hal/halx86/generic/memory.c trunk/reactos/hal/halx86/generic/misc.c trunk/reactos/hal/halx86/generic/timer.c trunk/reactos/hal/halx86/generic/usage.c trunk/reactos/hal/halx86/include/halp.h Modified: trunk/reactos/hal/halx86/generic/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/cmos.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/cmos.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/cmos.c [iso-8859-1] Thu Nov 4 01:28:09 2010 @@ -152,6 +152,7 @@ VOID NTAPI +INIT_FUNCTION HalpInitializeCmos(VOID) { /* Set default century offset byte */ Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Thu Nov 4 01:28:09 2010 @@ -126,6 +126,7 @@ #ifndef _MINIHAL_ VOID +INIT_FUNCTION HalpInitDma(VOID) { /* Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] Thu Nov 4 01:28:09 2010 @@ -20,6 +20,7 @@ VOID NTAPI +INIT_FUNCTION HalpGetParameters(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { PCHAR CommandLine; @@ -45,6 +46,7 @@ */ BOOLEAN NTAPI +INIT_FUNCTION HalInitSystem(IN ULONG BootPhase, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { Added: trunk/reactos/hal/halx86/generic/legacy/bus/libpcidata.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/hal/halx86/generic/legacy/bus/libpcidata.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c [iso-8859-1] Thu Nov 4 01:28:09 2010 @@ -600,6 +600,7 @@ NTSTATUS NTAPI +INIT_FUNCTION HalpSetupPciDeviceForDebugging(IN PVOID LoaderBlock, IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice) { @@ -609,6 +610,7 @@ NTSTATUS NTAPI +INIT_FUNCTION HalpReleasePciDeviceForDebugging(IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice) { DPRINT1("Unimplemented!\n"); @@ -617,6 +619,7 @@ VOID NTAPI +INIT_FUNCTION HalpRegisterPciDebuggingDeviceInfo(VOID) { BOOLEAN Found = FALSE; @@ -853,6 +856,7 @@ PPCI_REGISTRY_INFO_INTERNAL NTAPI +INIT_FUNCTION HalpQueryPciRegistryInfo(VOID) { #ifndef _MINIHAL_ @@ -1085,6 +1089,7 @@ VOID NTAPI +INIT_FUNCTION HalpInitializePciStubs(VOID) { PPCI_REGISTRY_INFO_INTERNAL PciRegistryInfo; Modified: trunk/reactos/hal/halx86/generic/legacy/bus/pcidata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bus/pcidata.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bus/pcidata.c [iso-8859-1] Thu Nov 4 01:28:09 2010 @@ -15,7 +15,7 @@ /* GLOBALS *******************************************************************/ #ifndef _MINIHAL_ -CHAR ClassTable[3922] = +INIT_FUNCTION CHAR ClassTable[3922] = { 0x43, 0x20, 0x30, 0x30, 0x20, 0x20, 0x55, 0x6E, 0x63, 0x6C, 0x61, 0x73, 0x73, 0x69, 0x66, 0x69, 0x65, 0x64, 0x20, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x0D, 0x0A, 0x09, 0x30, 0x30, 0x20, 0x20, @@ -265,7 +265,7 @@ 0x72, 0x00, }; -CHAR VendorTable[642355] = +INIT_FUNCTION CHAR VendorTable[642355] = { 0x30, 0x30, 0x30, 0x30, 0x20, 0x20, 0x47, 0x61, 0x6D, 0x6D, 0x61, 0x67, 0x72, 0x61, 0x70, 0x68, 0x78, 0x2C, 0x20, 0x49, 0x6E, 0x63, 0x2E, 0x20, 0x28, 0x6F, 0x72, 0x20, 0x6D, 0x69, 0x73, 0x73, Modified: trunk/reactos/hal/halx86/generic/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] Thu Nov 4 01:28:09 2010 @@ -65,6 +65,7 @@ VOID NTAPI +INIT_FUNCTION HalpRegisterInternalBusHandlers(VOID) { PBUS_HANDLER Bus; @@ -139,6 +140,7 @@ #ifndef _MINIHAL_ NTSTATUS NTAPI +INIT_FUNCTION HalpMarkChipsetDecode(BOOLEAN OverrideEnable) { NTSTATUS Status; @@ -186,6 +188,7 @@ PBUS_HANDLER NTAPI +INIT_FUNCTION HalpAllocateAndInitPciBusHandler(IN ULONG PciType, IN ULONG BusNo, IN BOOLEAN TestAllocation) @@ -270,6 +273,7 @@ BOOLEAN NTAPI +INIT_FUNCTION HalpIsValidPCIDevice(IN PBUS_HANDLER BusHandler, IN PCI_SLOT_NUMBER Slot) { @@ -331,6 +335,7 @@ NTSTATUS NTAPI +INIT_FUNCTION HalpGetChipHacks(IN USHORT VendorId, IN USHORT DeviceId, IN UCHAR RevisionId, @@ -394,6 +399,7 @@ BOOLEAN NTAPI +INIT_FUNCTION HalpIsRecognizedCard(IN PPCI_REGISTRY_INFO_INTERNAL PciRegistryInfo, IN PPCI_COMMON_CONFIG PciData, IN ULONG Flags) @@ -474,6 +480,7 @@ BOOLEAN NTAPI +INIT_FUNCTION HalpIsIdeDevice(IN PPCI_COMMON_CONFIG PciData) { /* Simple test first */ @@ -526,6 +533,7 @@ BOOLEAN NTAPI +INIT_FUNCTION HalpIsBridgeDevice(IN PPCI_COMMON_CONFIG PciData) { /* Either this is a PCI-to-PCI Bridge, or a CardBUS Bridge */ @@ -539,6 +547,7 @@ BOOLEAN NTAPI +INIT_FUNCTION HalpGetPciBridgeConfig(IN ULONG PciType, IN PUCHAR BusCount) { @@ -591,6 +600,7 @@ VOID NTAPI +INIT_FUNCTION HalpFixupPciSupportedRanges(IN ULONG BusCount) { ULONG i; @@ -653,6 +663,7 @@ VOID NTAPI +INIT_FUNCTION ShowSize(ULONG x) { if (!x) return; @@ -678,6 +689,7 @@ VOID NTAPI +INIT_FUNCTION HalpDebugPciDumpBus(IN ULONG i, IN ULONG j, IN ULONG k, @@ -829,6 +841,7 @@ VOID NTAPI +INIT_FUNCTION HalpInitializePciBus(VOID) { #ifndef _MINIHAL_ @@ -1093,6 +1106,7 @@ VOID NTAPI +INIT_FUNCTION HalpInitBusHandlers(VOID) { /* Register the HAL Bus Handler support */ @@ -1101,6 +1115,7 @@ VOID NTAPI +INIT_FUNCTION HalpRegisterKdSupportFunctions(VOID) { /* Register PCI Device Functions */ Modified: trunk/reactos/hal/halx86/generic/legacy/halpcat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/halpcat.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/halpcat.c [iso-8859-1] Thu Nov 4 01:28:09 2010 @@ -23,6 +23,7 @@ NTSTATUS NTAPI +INIT_FUNCTION HalpSetupAcpiPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { /* There is no ACPI on these HALs */ @@ -31,6 +32,7 @@ VOID NTAPI +INIT_FUNCTION HalpBuildAddressMap(VOID) { /* FIXME: Inherit ROM blocks from the registry */ @@ -42,6 +44,7 @@ BOOLEAN NTAPI +INIT_FUNCTION HalpGetDebugPortTable(VOID) { /* No ACPI */ @@ -50,6 +53,7 @@ ULONG NTAPI +INIT_FUNCTION HalpIs16BitPortDecodeSupported(VOID) { /* Only EISA systems support this */ @@ -58,9 +62,11 @@ NTSTATUS NTAPI +INIT_FUNCTION HaliInitPnpDriver(VOID) { /* On PC-AT, this will interface with the PCI driver */ + //HalpDebugPciBus(); return STATUS_SUCCESS; } @@ -69,6 +75,7 @@ */ VOID NTAPI +INIT_FUNCTION HalReportResourceUsage(VOID) { INTERFACE_TYPE InterfaceType; Modified: trunk/reactos/hal/halx86/generic/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/memory.… ============================================================================== --- trunk/reactos/hal/halx86/generic/memory.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/memory.c [iso-8859-1] Thu Nov 4 01:28:09 2010 @@ -24,7 +24,6 @@ /* PRIVATE FUNCTIONS *********************************************************/ - ULONG NTAPI Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] Thu Nov 4 01:28:09 2010 @@ -24,6 +24,7 @@ #ifndef _MINIHAL_ VOID NTAPI +INIT_FUNCTION HalpReportSerialNumber(VOID) { NTSTATUS Status; @@ -54,6 +55,7 @@ NTSTATUS NTAPI +INIT_FUNCTION HalpMarkAcpiHal(VOID) { NTSTATUS Status; Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] Thu Nov 4 01:28:09 2010 @@ -44,6 +44,7 @@ VOID NTAPI +INIT_FUNCTION HalpInitializeClock(VOID) { PKPRCB Prcb = KeGetCurrentPrcb(); Modified: trunk/reactos/hal/halx86/generic/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/usage.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] Thu Nov 4 01:28:09 2010 @@ -63,6 +63,7 @@ #ifndef _MINIHAL_ VOID NTAPI +INIT_FUNCTION HalpGetResourceSortValue(IN PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor, OUT PULONG Scale, OUT PLARGE_INTEGER Value) @@ -102,6 +103,7 @@ VOID NTAPI +INIT_FUNCTION HalpBuildPartialFromIdt(IN ULONG Entry, IN PCM_PARTIAL_RESOURCE_DESCRIPTOR RawDescriptor, IN PCM_PARTIAL_RESOURCE_DESCRIPTOR TranslatedDescriptor) @@ -139,6 +141,7 @@ VOID NTAPI +INIT_FUNCTION HalpBuildPartialFromAddress(IN INTERFACE_TYPE Interface, IN PADDRESS_USAGE CurrentAddress, IN ULONG Element, @@ -206,6 +209,7 @@ VOID NTAPI +INIT_FUNCTION HalpReportResourceUsage(IN PUNICODE_STRING HalName, IN INTERFACE_TYPE InterfaceType) { @@ -484,6 +488,7 @@ VOID NTAPI +INIT_FUNCTION HalpRegisterVector(IN UCHAR Flags, IN ULONG BusVector, IN ULONG SystemVector, @@ -500,6 +505,7 @@ #ifndef _MINIHAL_ VOID NTAPI +INIT_FUNCTION HalpEnableInterruptHandler(IN UCHAR Flags, IN ULONG BusVector, IN ULONG SystemVector, @@ -522,6 +528,7 @@ VOID NTAPI +INIT_FUNCTION HalpGetNMICrashFlag(VOID) { UNICODE_STRING ValueName; Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Thu Nov 4 01:28:09 2010 @@ -4,6 +4,16 @@ #pragma once +#define PLACE_IN_SECTION(s) __attribute__((section (s))) +#ifdef __GNUC__ +#define INIT_FUNCTION PLACE_IN_SECTION("init") +#define PAGE_LOCKED_FUNCTION PLACE_IN_SECTION("pagelk") +#define PAGE_UNLOCKED_FUNCTION PLACE_IN_SECTION("pagepo") +#else +#define INIT_FUNCTION +#define PAGE_LOCKED_FUNCTION +#define PAGE_UNLOCKED_FUNCTION +#endif #ifdef _MSC_VER #define REGISTERCALL FASTCALL

13 years, 11 months

[tkreuzer] 49462: [SPEC2PDEF] This tool will make me rich. Dedicated to Amine and Richard.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 4 00:54:04 2010 New Revision: 49462 URL: http://svn.reactos.org/svn/reactos?rev=49462&view=rev Log: [SPEC2PDEF] This tool will make me rich. Dedicated to Amine and Richard. Added: branches/cmake-bringup/tools/spec2pdef/ (with props) branches/cmake-bringup/tools/spec2pdef/spec2pdef.c (with props) Propchange: branches/cmake-bringup/tools/spec2pdef/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Nov 4 00:54:04 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/cmake-bringup/tools/spec2pdef/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/cmake-bringup/tools/spec2pdef/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/cmake-bringup/tools/spec2pdef/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/cmake-bringup/tools/spec2pdef/spec2pdef.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2pdef/s… ============================================================================== --- branches/cmake-bringup/tools/spec2pdef/spec2pdef.c (added) +++ branches/cmake-bringup/tools/spec2pdef/spec2pdef.c [iso-8859-1] Thu Nov 4 00:54:04 2010 @@ -1,0 +1,348 @@ +#include <stdio.h> +#include <stdlib.h> +#include <ctype.h> + +enum +{ + CC_STDCALL, + CC_CDECL, + CC_FASTCALL, + CC_EXTERN, +}; + +char* astrCallingConventions[] = +{ + "STDCALL", + "CDECL", + "FASTCALL", + "EXTERN" +}; + +int +_strcmpx(const char *string1, const char *string2) +{ + while (*string2) + { + if (*string1 != *string2) return (*string1 - *string2); + string1++; + string2++; + } + return 0; +} + +char * +NextLine(char *pc) +{ + /* Skip until the next line or EOF */ + while (*pc != '\n' && *pc != '\r' && *pc != 0) pc++; + if (*pc++ == '\r') pc++; + return pc; +} + +char * +NextToken(char *pc) +{ + /* Skip string */ + while (isprint(*pc) && !isspace(*pc)) pc++; + + /* Skip white spaces */ + while (*pc == ' ' || *pc == '\t') pc++; + + return pc; +} + +typedef struct +{ + char *pcName; + int nNameLength; + char *pcRedirection; + int nRedirectionLength; + int nCallingConvention; + int nOrdinal; + int nStackBytes; +} EXPORT; + +int +ParseLine(char* pcLine, int nLine, EXPORT *pexp) +{ + char *pcCurrent; + + //fprintf(stderr, "info: line %d, pcLine:'%.30s'\n", nLine, pcLine); + + pcCurrent = pcLine; + + /* skip white spaces */ + while (*pcCurrent == ' ') pcCurrent++; + + /* Check for line break */ + if (*pcCurrent == '\n' || *pcCurrent == '\r' || *pcCurrent == 0) return 0; + + /* Check for comment */ + if (*pcCurrent == '#' || *pcCurrent == ';') return 0; + + /* Now we should get either an ordinal or @ */ + if (*pcCurrent == '@') pexp->nOrdinal = -1; + else pexp->nOrdinal = atol(pcCurrent); + + /* Go to next token */ + pcCurrent = NextToken(pcCurrent); + + //fprintf(stderr, "info: Token:'%.10s'\n", pcCurrent); + + /* Now we should get the calling convention */ + if (_strcmpx(pcCurrent, "stdcall ") == 0) + { + pexp->nCallingConvention = CC_STDCALL; + } + else if (_strcmpx(pcCurrent, "cdecl ") == 0) + { + pexp->nCallingConvention = CC_CDECL; + } + else if (_strcmpx(pcCurrent, "fastcall ") == 0 || + _strcmpx(pcCurrent, "FASTCALL ") == 0) + { + pexp->nCallingConvention = CC_FASTCALL; + } + else if (_strcmpx(pcCurrent, "extern ") == 0) + { + pexp->nCallingConvention = CC_EXTERN; + } + else + { + fprintf(stderr, "error: line %d, expected cc, got (%p) %d\n", nLine, pcCurrent, *pcCurrent); + return -1; + } + + //fprintf(stderr, "info: nCallingConvention: %d\n", pexp->nCallingConvention); + + /* Go to next token */ + pcCurrent = NextToken(pcCurrent); + + /* Handle option */ + while (*pcCurrent == '-') + { + fprintf(stderr, "info: got option: '%.10s'\n", pcCurrent); + // FIXME: handle options + + /* Go to next token */ + pcCurrent = NextToken(pcCurrent); + } + + //fprintf(stderr, "info: Name:'%.10s'\n", pcCurrent); + + /* Get name */ + pexp->pcName = pcCurrent; + while (isprint(*pcCurrent) && *pcCurrent != '(') pcCurrent++; + pexp->nNameLength = pcCurrent - pexp->pcName; + + /* Handle parameters */ + pexp->nStackBytes = 0; + if (pexp->nCallingConvention != CC_EXTERN) + { + //fprintf(stderr, "info: options:'%.10s'\n", pcCurrent); + + /* Syntax check */ + if (*pcCurrent++ != '(') + { + fprintf(stderr, "error: line %d, expected '('\n", nLine); + return -1; + } + + pexp->nStackBytes = 0; + while (isalpha(*pcCurrent)) + { + if (_strcmpx(pcCurrent, "long") == 0) + pexp->nStackBytes += 4; + else if (_strcmpx(pcCurrent, "double") == 0) + pexp->nStackBytes += 8; + else if (_strcmpx(pcCurrent, "ptr") == 0 || + _strcmpx(pcCurrent, "str") == 0 || + _strcmpx(pcCurrent, "wstr") == 0) + pexp->nStackBytes += sizeof(void*); + else + fprintf(stderr, "error: line %d, expected type, got: %.10s\n", nLine, pcCurrent); + + /* Go to next parameter */ + while (isalpha(*pcCurrent)) pcCurrent++; + while (isspace(*pcCurrent)) pcCurrent++; + } + + /* Check syntax */ + if (*pcCurrent++ != ')') + { + fprintf(stderr, "error: line %d, expected ')'\n", nLine); + return -1; + } + + /* Skip white spaces */ + while (*pcCurrent == ' ' || *pcCurrent == '\t') pcCurrent++; + } + + /* Get optional redirection */ + if (isprint(*pcCurrent)) + { + pexp->pcRedirection = pcCurrent; + while (isprint(*pcCurrent) && !isspace(*pcCurrent)) pcCurrent++; + pexp->nRedirectionLength = pcCurrent - pexp->pcRedirection; + } + else + { + pexp->pcRedirection = 0; + pexp->nRedirectionLength = 0; + } + + return 1; +} + +int +OutputLine_def(FILE *fileDest, EXPORT *exp) +{ + fprintf(fileDest, " "); + if (exp->nCallingConvention == CC_FASTCALL) fprintf(fileDest, "@"); + fprintf(fileDest, "%.*s", exp->nNameLength, exp->pcName); + + if (exp->nCallingConvention == CC_STDCALL || + exp->nCallingConvention == CC_FASTCALL) + { + fprintf(fileDest, "@%d", exp->nStackBytes); + } + + if (exp->pcRedirection) + { + if (exp->nCallingConvention == CC_FASTCALL) fprintf(fileDest, "@"); + fprintf(fileDest, "=%.*s", exp->nRedirectionLength, exp->pcRedirection); + if (exp->nCallingConvention == CC_STDCALL || + exp->nCallingConvention == CC_FASTCALL) + { + fprintf(fileDest, "@%d", exp->nStackBytes); + } + } + + if (exp->nOrdinal != -1) + { + fprintf(fileDest, " @%d", exp->nOrdinal); + } + + if (exp->nCallingConvention == CC_EXTERN) + { + fprintf(fileDest, " DATA"); + } + + fprintf(fileDest, "\n"); + + return 1; +} + +int +OutputLine(FILE *fileDest, EXPORT *exp) +{ + fprintf(fileDest, "_NAME(%.*s,%s,%d)", + exp->nNameLength, exp->pcName, + astrCallingConventions[exp->nCallingConvention], + exp->nStackBytes); + + if (exp->pcRedirection) + { + fprintf(fileDest, "= _NAME(%.*s,%s,%d)", + exp->nRedirectionLength, exp->pcRedirection, + astrCallingConventions[exp->nCallingConvention], + exp->nStackBytes); + } + + if (exp->nOrdinal != -1) + { + fprintf(fileDest, " @%d", exp->nOrdinal); + } + + if (exp->nCallingConvention == CC_EXTERN) + { + fprintf(fileDest, " DATA"); + } + + fprintf(fileDest, "\n"); + + return 1; +} + +void +OutputHeader(FILE *file) +{ + fprintf(file, + "; File generated automatically, do not edit!\n\n" + "LIBRARY ntoskrnl.exe\n\n" + "EXPORTS\n" + "#define FOOL(x) x\n" + "#ifdef _MSC_VER\n" + "#define _NAME_STDCALL(name, stackbytes) name\n" + "#define _NAME_FASTCALL(name, stackbytes) name\n" + "#define _NAME_CDECL(name, stackbytes) name\n" + "#else\n" + "#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes\n" + "#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes\n" + "#define _NAME_CDECL(name, stackbytes) FOOL(name)\n" + "#endif\n" + "#define _NAME_EXTERN(name, stackbytes) name\n" + "#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes)\n"); +} + + +int main(int argc, char *argv[]) +{ + size_t nFileSize; + char *pszSource, *pcLine; + int nLine, result; + FILE *fileSource, *fileDest; + EXPORT exp; + + /* Open input file argv[1] */ + fileSource = fopen(argv[1], "r"); + if (!fileSource) + { + fprintf(stderr, "error: could not open file %s ", argv[1]); + return -1; + } + + /* Get file size */ + fseek(fileSource, 0, SEEK_END); + nFileSize = ftell(fileSource); + rewind(fileSource); + + /* Allocate memory buffer */ + pszSource = malloc(nFileSize + 1); + if (!pszSource) return -1; + + /* Load input file into memory */ + nFileSize = fread(pszSource, 1, nFileSize, fileSource); + + /* Zero terminate the source */ + pszSource[nFileSize] = '\0'; + + // open output file argv[2] + fileDest = fopen(argv[2], "w"); + if (!fileDest) + { + fprintf(stderr, "error: could not open output file %s ", argv[2]); + return -1; + } + + OutputHeader(fileDest); + + pcLine = pszSource; + for (nLine = 1; *pcLine != 0; pcLine = NextLine(pcLine), nLine++) + { + /* Parse the spec file line */ + result = ParseLine(pcLine, nLine, &exp); + + if (result == 1) + { + OutputLine(fileDest, &exp); + } + else if (result == -1) break; + + + } + + fclose(fileDest); + fclose(fileSource); + return 0; +} Propchange: branches/cmake-bringup/tools/spec2pdef/spec2pdef.c ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 11 months

[jgardou] 49461: [WINE/CONFIG] MSVC has no sys/time.h [DDK] Directly include <wingdi.h> [UNICODE] Fix build on msvc All tools now build with msvc.

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Nov 3 18:15:51 2010 New Revision: 49461 URL: http://svn.reactos.org/svn/reactos?rev=49461&view=rev Log: [WINE/CONFIG] MSVC has no sys/time.h [DDK] Directly include <wingdi.h> [UNICODE] Fix build on msvc All tools now build with msvc. Modified: branches/cmake-bringup/include/reactos/wine/config.h branches/cmake-bringup/include/reactos/wine/ddk/imm.h branches/cmake-bringup/tools/unicode/string.c Modified: branches/cmake-bringup/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/config.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/config.h [iso-8859-1] Wed Nov 3 18:15:51 2010 @@ -777,7 +777,9 @@ /* #undef HAVE_SYS_TIMES_H */ /* Define to 1 if you have the <sys/time.h> header file. */ -#define HAVE_SYS_TIME_H 1 +#ifndef _MSC_VER + #define HAVE_SYS_TIME_H 1 +#endif /* Define to 1 if you have the <sys/types.h> header file. */ #define HAVE_SYS_TYPES_H 1 Modified: branches/cmake-bringup/include/reactos/wine/ddk/imm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/ddk/imm.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/ddk/imm.h [iso-8859-1] Wed Nov 3 18:15:51 2010 @@ -2,7 +2,7 @@ #ifndef _WINE_IMM_H_ #define _WINE_IMM_H_ -#include <psdk/wingdi.h> +#include <wingdi.h> #ifdef WINE_NO_UNICODE_MACROS # define WINELIB_NAME_AW(func) \ Modified: branches/cmake-bringup/tools/unicode/string.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/unicode/str… ============================================================================== --- branches/cmake-bringup/tools/unicode/string.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/unicode/string.c [iso-8859-1] Wed Nov 3 18:15:51 2010 @@ -23,7 +23,9 @@ #include <stdio.h> #include <string.h> -#define WINE_UNICODE_INLINE /* nothing */ +#ifndef _MSC_VER + #define WINE_UNICODE_INLINE /* nothing */ +#endif #include "wine/unicode.h" int strcmpiW( const WCHAR *str1, const WCHAR *str2 )

13 years, 11 months

[jgardou] 49460: [CMAKE] cmake doesn't like braces

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Nov 3 16:59:50 2010 New Revision: 49460 URL: http://svn.reactos.org/svn/reactos?rev=49460&view=rev Log: [CMAKE] cmake doesn't like braces Modified: branches/cmake-bringup/cmake/Modules/Platform/Windows-cl.cmake Modified: branches/cmake-bringup/cmake/Modules/Platform/Windows-cl.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/Modules/Pla… ============================================================================== --- branches/cmake-bringup/cmake/Modules/Platform/Windows-cl.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/cmake/Modules/Platform/Windows-cl.cmake [iso-8859-1] Wed Nov 3 16:59:50 2010 @@ -207,7 +207,7 @@ SET(CMAKE_BUILD_TYPE_INIT Debug) - IF($ENV{DDKBUILDENV} OR (NOT CMAKE_CROSSCOMPILING)) + IF(ENV{DDKBUILDENV} OR NOT CMAKE_CROSSCOMPILING) SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od") SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MD /Zi /Ob0 /Od") ELSE()

13 years, 11 months

[jgardou] 49459: [CMAKE] allow to specify build tools directory with -DREACTOS_BUILD_TOOLS_DIR=Y:\you\path So now you're able to use multiple compilers with one tree without too much worry.

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Nov 3 12:57:03 2010 New Revision: 49459 URL: http://svn.reactos.org/svn/reactos?rev=49459&view=rev Log: [CMAKE] allow to specify build tools directory with -DREACTOS_BUILD_TOOLS_DIR=Y:\you\path So now you're able to use multiple compilers with one tree without too much worry. Modified: branches/cmake-bringup/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Wed Nov 3 12:57:03 2010 @@ -65,7 +65,11 @@ # Activate language support for resource files enable_language(RC) -set(IMPORT_EXECUTABLES "${REACTOS_SOURCE_DIR}/build/ImportExecutables.cmake" CACHE FILEPATH "Host executables") +if(NOT DEFINED REACTOS_BUILD_TOOLS_DIR) + set(REACTOS_BUILD_TOOLS_DIR ${REACTOS_SOURCE_DIR}/build) +endif() + +set(IMPORT_EXECUTABLES "${REACTOS_BUILD_TOOLS_DIR}/ImportExecutables.cmake" CACHE FILEPATH "Host executables") include(${IMPORT_EXECUTABLES}) add_definitions(-DDBG=${DBG} -DKDBG=${KDBG})

13 years, 11 months

[tkreuzer] 49458: [WIN32K] - Make InitVideo return NTSTATUS and properly handle failure - Silence a DPRINT, improve a DPRINT

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 3 12:20:07 2010 New Revision: 49458 URL: http://svn.reactos.org/svn/reactos?rev=49458&view=rev Log: [WIN32K] - Make InitVideo return NTSTATUS and properly handle failure - Silence a DPRINT, improve a DPRINT Modified: trunk/reactos/subsystems/win32/win32k/eng/device.c trunk/reactos/subsystems/win32/win32k/ntuser/display.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c Modified: trunk/reactos/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] Wed Nov 3 12:20:07 2010 @@ -52,7 +52,7 @@ PDEVMODEW pdm, pdmEnd; PLDEVOBJ pldev; - DPRINT1("EngpRegisterGraphicsDevice(%S)\n", pustrDeviceName->Buffer); + DPRINT("EngpRegisterGraphicsDevice(%wZ)\n", pustrDeviceName); /* Allocate a GRAPHICS_DEVICE structure */ pGraphicsDevice = ExAllocatePoolWithTag(PagedPool, @@ -71,7 +71,7 @@ &pDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT1("Could not open driver, 0x%lx\n", Status); + DPRINT1("Could not open driver %wZ, 0x%lx\n", pustrDeviceName, Status); ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); return NULL; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Wed Nov 3 12:20:07 2010 @@ -147,10 +147,9 @@ return pGraphicsDevice; } -BOOL -InitVideo( - PUNICODE_STRING pustrRegPath, - FLONG flags) +NTSTATUS +NTAPI +InitVideo() { ULONG iDevNum, iVGACompatible = -1, ulMaxObjectNumber = 0; WCHAR awcDeviceName[20]; @@ -160,8 +159,9 @@ ULONG cbValue; HKEY hkey; - DPRINT1("----------------------------- InitVideo() -------------------------------\n"); - + DPRINT("----------------------------- InitVideo() -------------------------------\n"); + + /* Open the key for the boot command line */ Status = RegOpenKey(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Control", &hkey); if (NT_SUCCESS(Status)) { @@ -185,7 +185,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Could not open device registry key!\n"); - ASSERT(FALSE); + return Status; } /* Read the name of the VGA adapter */ @@ -220,7 +220,9 @@ continue; } + /* Initialize the driver for this device */ pGraphicsDevice = InitDisplayDriver(awcDeviceName, awcBuffer); + if (!pGraphicsDevice) continue; /* Check if this is the VGA adapter */ if (iDevNum == iVGACompatible) @@ -235,7 +237,15 @@ gpPrimaryGraphicsDevice = pGraphicsDevice; } + /* Close the device map registry key */ ZwClose(hkey); + + /* Check if we had any success */ + if (!gpPrimaryGraphicsDevice) + { + DPRINT1("No usable display driver was found.\n"); + return STATUS_UNSUCCESSFUL; + } if (gbBaseVideo) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Wed Nov 3 12:20:07 2010 @@ -82,8 +82,9 @@ return STATUS_SUCCESS; } -BOOL -InitVideo(ULONG); +NTSTATUS +NTAPI +InitVideo(); NTSTATUS NTAPI @@ -91,11 +92,16 @@ HANDLE hPowerRequestEvent, HANDLE hMediaRequestEvent) { + NTSTATUS Status; + // Set W32PF_Flags |= (W32PF_READSCREENACCESSGRANTED | W32PF_IOWINSTA) // Create Object Directory,,, Looks like create workstation. "\\Windows\\WindowStations" // Create Event for Diconnect Desktop. - InitVideo(0); -// Initialize Video. + + /* Initialize Video. */ + Status = InitVideo(); + if (!NT_SUCCESS(Status)) return Status; + // { // DrvInitConsole. // DrvChangeDisplaySettings.

13 years, 11 months

← Newer
1
...
39
40
41
42
43
44
45
...
50
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 2010