Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[ion] 19662: - Fix/take decisions on the minor NDK FIXMEs.

by ion＠svn.reactos.com

- Fix/take decisions on the minor NDK FIXMEs. Modified: trunk/reactos/include/ndk/arch/ketypes.h Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/fixmes.txt Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/lpctypes.h _____ Modified: trunk/reactos/include/ndk/arch/ketypes.h --- trunk/reactos/include/ndk/arch/ketypes.h 2005-11-26 22:12:15 UTC (rev 19661) +++ trunk/reactos/include/ndk/arch/ketypes.h 2005-11-26 22:51:59 UTC (rev 19662) @@ -20,23 +20,6 @@ #define _ARCH_KETYPES_H // -// FIXME: Find a solution to take these out of here! -// -typedef struct _KDPC_DATA -{ - LIST_ENTRY DpcListHead; - ULONG DpcLock; - ULONG DpcQueueDepth; - ULONG DpcCount; -} KDPC_DATA, *PKDPC_DATA; - -typedef struct _PP_LOOKASIDE_LIST -{ - struct _GENERAL_LOOKASIDE *P; - struct _GENERAL_LOOKASIDE *L; -} PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST; - -// // Include the right file for this architecture. // #ifdef _M_IX86 _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-11-26 22:12:15 UTC (rev 19661) +++ trunk/reactos/include/ndk/extypes.h 2005-11-26 22:51:59 UTC (rev 19662) @@ -48,6 +48,11 @@ extern POBJECT_TYPE NTSYSAPI ExTimerType; // +// Exported NT Build Number +// +extern ULONG NTSYSAPI NtBuildNumber; + +// // Invalid Handle Value Constant // #define INVALID_HANDLE_VALUE (HANDLE)-1 @@ -80,11 +85,6 @@ #endif // -// Port Object Access Masks (FIXME: lpctypes.h?) -// -#define PORT_ALL_ACCESS 0x1 - -// // Event Pair Access Masks // #define EVENT_PAIR_ALL_ACCESS 0x1F0000L _____ Modified: trunk/reactos/include/ndk/fixmes.txt --- trunk/reactos/include/ndk/fixmes.txt 2005-11-26 22:12:15 UTC (rev 19661) +++ trunk/reactos/include/ndk/fixmes.txt 2005-11-26 22:51:59 UTC (rev 19662) @@ -23,14 +23,6 @@ |extypes.h - Class 42 (SYSTEM_POWER_INFORMATION causes conflict). |extypes.h - Classes 13, 20, 30, 31, 49, 51, 52, 54+ are undefined. |ntndk.h - Incorrect rounding macro names -| -[MINOR] - Related to location of functions, comments, etc. -|arch/ketypes.h - _KDPC_DATA, PP_LOOKASIDE_LIST shouldn't be there. -|pstypes.h - Check if _PAGEFAULT_HISTORY shouldn't go in mmtypes.h instead. -|lpctypes.h - Consider moving _CLIENT_DIED_MSG to pstypes.h? -|ketypes.h - Consider moving KNODE to mmtypes.h? -|ketypes.h - Consider moving NtBuildNumber to extypes.h? -|extypes.h - consider moving PORT_ALL_ACCESS to lpctypes.h |_______________________________________________________________________ ______________ _____ Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-11-26 22:12:15 UTC (rev 19661) +++ trunk/reactos/include/ndk/ketypes.h 2005-11-26 22:51:59 UTC (rev 19662) @@ -28,7 +28,6 @@ #include <haltypes.h> #include <potypes.h> #include <ifssupp.h> -#include <arch/ketypes.h> #endif // @@ -305,6 +304,41 @@ #else // +// APC Environment Types +// +typedef enum _KAPC_ENVIRONMENT +{ + OriginalApcEnvironment, + AttachedApcEnvironment, + CurrentApcEnvironment +} KAPC_ENVIRONMENT; + +// +// PRCB DPC Data +// +typedef struct _KDPC_DATA +{ + LIST_ENTRY DpcListHead; + ULONG DpcLock; + ULONG DpcQueueDepth; + ULONG DpcCount; +} KDPC_DATA, *PKDPC_DATA; + +// +// Per-Processor Lookaside List +// +typedef struct _PP_LOOKASIDE_LIST +{ + struct _GENERAL_LOOKASIDE *P; + struct _GENERAL_LOOKASIDE *L; +} PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST; + +// +// Architectural Types +// +#include <arch/ketypes.h> + +// // ARC Component Data // typedef struct _CONFIGURATION_COMPONENT_DATA @@ -316,16 +350,6 @@ } CONFIGURATION_COMPONENT_DATA, *PCONFIGURATION_COMPONENT_DATA; // -// APC Environment Types -// -typedef enum _KAPC_ENVIRONMENT -{ - OriginalApcEnvironment, - AttachedApcEnvironment, - CurrentApcEnvironment -} KAPC_ENVIRONMENT; - -// // Kernel Memory Node (FIXME: mmtypes? // typedef struct _KNODE @@ -704,11 +728,6 @@ extern ULONG NTSYSAPI KeIcacheFlushCount; // -// Exported NT Build Number (FIXME: move?) -// -extern ULONG NTSYSAPI NtBuildNumber; - -// // Exported System Service Descriptor Tables // extern KSERVICE_TABLE_DESCRIPTOR NTSYSAPI KeServiceDescriptorTable[SSDT_MAX_ENTRIES]; _____ Modified: trunk/reactos/include/ndk/lpctypes.h --- trunk/reactos/include/ndk/lpctypes.h 2005-11-26 22:12:15 UTC (rev 19661) +++ trunk/reactos/include/ndk/lpctypes.h 2005-11-26 22:51:59 UTC (rev 19662) @@ -31,6 +31,11 @@ #define PORT_MAXIMUM_MESSAGE_LENGTH 256 // +// Port Object Access Masks +// +#define PORT_ALL_ACCESS 0x1 + +// // LPC Message Types // typedef enum _LPC_TYPE

19 years

[chorns] 19661: Fix dependencies that cause trouble

by chorns＠svn.reactos.com

Fix dependencies that cause trouble Modified: trunk/reactos/tools/rbuild/rbuild.mak _____ Modified: trunk/reactos/tools/rbuild/rbuild.mak --- trunk/reactos/tools/rbuild/rbuild.mak 2005-11-26 21:15:35 UTC (rev 19660) +++ trunk/reactos/tools/rbuild/rbuild.mak 2005-11-26 22:12:15 UTC (rev 19661) @@ -258,9 +258,9 @@ .PHONY: rbuild rbuild: $(RBUILD_TARGET) -$(RBUILD_TARGET): $(RBUILD_OBJECTS) $(INFLIB_HOST_TARGET) | $(RBUILD_OUT) +$(RBUILD_TARGET): $(RBUILD_OBJECTS) $(INFLIB_HOST_OBJECTS) | $(RBUILD_OUT) $(ECHO_LD) - ${host_gpp} $(RBUILD_OBJECTS) $(INFLIB_HOST_TARGET) $(RBUILD_HOST_LFLAGS) -o $@ + ${host_gpp} $(RBUILD_OBJECTS) $(INFLIB_HOST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@ $(RBUILD_INT_)global.o: $(RBUILD_BASE_)global.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) @@ -398,9 +398,9 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(INFLIB_HOST_TARGET) $(RBUILD_HEADERS) | $(RBUILD_OUT) +$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(INFLIB_HOST_OBJECTS) $(RBUILD_HEADERS) | $(RBUILD_OUT) $(ECHO_LD) - ${host_gpp} $(RBUILD_TEST_OBJECTS) $(INFLIB_HOST_TARGET) $(RBUILD_HOST_LFLAGS) -o $@ + ${host_gpp} $(RBUILD_TEST_OBJECTS) $(INFLIB_HOST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@ $(RBUILD_TESTS_INT_)cdfiletest.o: $(RBUILD_TESTS_BASE_)cdfiletest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) $(ECHO_CC)

19 years

[weiden] 19660: fixed difference in signedness warning

by weiden＠svn.reactos.com

fixed difference in signedness warning Modified: trunk/reactos/lib/inflib/infhostget.c _____ Modified: trunk/reactos/lib/inflib/infhostget.c --- trunk/reactos/lib/inflib/infhostget.c 2005-11-26 20:22:45 UTC (rev 19659) +++ trunk/reactos/lib/inflib/infhostget.c 2005-11-26 21:15:35 UTC (rev 19660) @@ -142,7 +142,7 @@ { INFSTATUS Status; - Status = InfpGetIntField(Context, FieldIndex, IntegerValue); + Status = InfpGetIntField(Context, FieldIndex, (PLONG)IntegerValue); if (INF_SUCCESS(Status)) { return 0;

19 years

[sgasiorek] 19659: - fixed removing keys from menu

by sgasiorek＠svn.reactos.com

- fixed removing keys from menu - changed RegDeleteKeyRecursive to SHDeleteKey (based on wine regedit code) Modified: trunk/reactos/subsys/system/regedit/En.rc Modified: trunk/reactos/subsys/system/regedit/childwnd.c Modified: trunk/reactos/subsys/system/regedit/edit.c Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/main.h Modified: trunk/reactos/subsys/system/regedit/regedit.xml Modified: trunk/reactos/subsys/system/regedit/regproc.c Modified: trunk/reactos/subsys/system/regedit/resource.h Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/En.rc --- trunk/reactos/subsys/system/regedit/En.rc 2005-11-26 20:18:49 UTC (rev 19658) +++ trunk/reactos/subsys/system/regedit/En.rc 2005-11-26 20:22:45 UTC (rev 19659) @@ -282,6 +282,7 @@ BEGIN IDS_ERROR "Error" IDS_WARNING "Warning" + IDS_BAD_KEY "Can't query key '%s'" IDS_BAD_VALUE "Can't query value '%s'" IDS_UNSUPPORTED_TYPE "Can't edit keys of this type (%ld)" IDS_TOO_BIG_VALUE "Value is too big (%ld)" _____ Modified: trunk/reactos/subsys/system/regedit/childwnd.c --- trunk/reactos/subsys/system/regedit/childwnd.c 2005-11-26 20:18:49 UTC (rev 19658) +++ trunk/reactos/subsys/system/regedit/childwnd.c 2005-11-26 20:22:45 UTC (rev 19659) @@ -108,8 +108,6 @@ HTREEITEM hSelection; HKEY hRootKey; LPCTSTR keyPath, s; - TCHAR szConfirmTitle[256]; - TCHAR szConfirmText[256]; WORD wID = LOWORD(wParam); switch (wID) { @@ -134,16 +132,12 @@ hSelection = TreeView_GetSelection(pChildWnd->hTreeWnd); keyPath = GetItemPath(pChildWnd->hTreeWnd, hSelection, &hRootKey); - LoadString(hInst, IDS_QUERY_DELETE_KEY_CONFIRM, szConfirmTitle, sizeof(szConfirmTitle) / sizeof(szConfirmTitle[0])); - LoadString(hInst, IDS_QUERY_DELETE_KEY_ONE, szConfirmText, sizeof(szConfirmText) / sizeof(szConfirmText[0])); - - if (MessageBox(pChildWnd->hWnd, szConfirmText, szConfirmTitle, MB_YESNO) == IDYES) + if (keyPath == 0 || *keyPath == 0) { - if (RegDeleteKeyRecursive(hRootKey, keyPath) == ERROR_SUCCESS) - TreeView_DeleteItem(pChildWnd->hTreeWnd, hSelection); - else - RefreshTreeItem(pChildWnd->hTreeWnd, hSelection); /* If delete failed; refresh to see partial results */ - } + MessageBeep(MB_ICONHAND); + } else + if (DeleteKey(hWnd, hRootKey, keyPath)) + DeleteNode(g_pChildWnd->hTreeWnd, 0); break; case ID_TREE_EXPORT: ExportRegistryFile(pChildWnd->hTreeWnd); _____ Modified: trunk/reactos/subsys/system/regedit/edit.c --- trunk/reactos/subsys/system/regedit/edit.c 2005-11-26 20:18:49 UTC (rev 19658) +++ trunk/reactos/subsys/system/regedit/edit.c 2005-11-26 20:22:45 UTC (rev 19659) @@ -29,6 +29,7 @@ #include <stdio.h> #include <shellapi.h> #include <ctype.h> +#include <shlwapi.h> #include "main.h" #include "regproc.h" @@ -50,7 +51,6 @@ static DWORD valueDataLen; static EDIT_MODE dwordEditMode = EDIT_MODE_HEX; - void error(HWND hwnd, INT resId, ...) { va_list ap; @@ -74,6 +74,23 @@ MessageBox(hwnd, errstr, title, MB_OK | MB_ICONERROR); } +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); +} + void warning(HWND hwnd, INT resId, ...) { va_list ap; @@ -697,3 +714,34 @@ return result; } + +BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath) +{ + TCHAR msg[128], caption[128]; + BOOL result = FALSE; + LONG lRet; + HKEY hKey; + + lRet = RegOpenKeyEx(hKeyRoot, keyPath, 0, KEY_READ|KEY_SET_VALUE, &hKey); + if (lRet != ERROR_SUCCESS) { + error_code_messagebox(hwnd, lRet); + return FALSE; + } + + LoadString(hInst, IDS_QUERY_DELETE_KEY_CONFIRM, caption, sizeof(caption)/sizeof(TCHAR)); + LoadString(hInst, IDS_QUERY_DELETE_KEY_ONE, msg, sizeof(msg)/sizeof(TCHAR)); + + if (MessageBox(g_pChildWnd->hWnd, msg, caption, MB_ICONQUESTION | MB_YESNO) != IDYES) + goto done; + + lRet = SHDeleteKey(hKeyRoot, keyPath); + if (lRet != ERROR_SUCCESS) { + error(hwnd, IDS_BAD_KEY, keyPath); + goto done; + } + result = TRUE; + +done: + RegCloseKey(hKey); + return result; +} _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-11-26 20:18:49 UTC (rev 19658) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-11-26 20:22:45 UTC (rev 19659) @@ -905,36 +905,48 @@ break; case ID_EDIT_DELETE: { - UINT nSelected = ListView_GetSelectedCount(g_pChildWnd->hListWnd); - if(nSelected >= 1) + if (GetFocus() == g_pChildWnd->hListWnd) { - TCHAR msg[128], caption[128]; - LoadString(hInst, IDS_QUERY_DELETE_CONFIRM, caption, sizeof(caption)/sizeof(TCHAR)); - LoadString(hInst, (nSelected == 1 ? IDS_QUERY_DELETE_ONE : IDS_QUERY_DELETE_MORE), msg, sizeof(msg)/sizeof(TCHAR)); - if(MessageBox(g_pChildWnd->hWnd, msg, caption, MB_ICONQUESTION | MB_YESNO) == IDYES) + UINT nSelected = ListView_GetSelectedCount(g_pChildWnd->hListWnd); + if(nSelected >= 1) { - int ni, errs; + TCHAR msg[128], caption[128]; + LoadString(hInst, IDS_QUERY_DELETE_CONFIRM, caption, sizeof(caption)/sizeof(TCHAR)); + LoadString(hInst, (nSelected == 1 ? IDS_QUERY_DELETE_ONE : IDS_QUERY_DELETE_MORE), msg, sizeof(msg)/sizeof(TCHAR)); + if(MessageBox(g_pChildWnd->hWnd, msg, caption, MB_ICONQUESTION | MB_YESNO) == IDYES) + { + int ni, errs; - item = -1; - errs = 0; - while((ni = ListView_GetNextItem(g_pChildWnd->hListWnd, item, LVNI_SELECTED)) > -1) - { - valueName = GetValueName(g_pChildWnd->hListWnd, item); - if(RegDeleteValue(hKey, valueName) != ERROR_SUCCESS) + item = -1; + errs = 0; + while((ni = ListView_GetNextItem(g_pChildWnd->hListWnd, item, LVNI_SELECTED)) > -1) { - errs++; + valueName = GetValueName(g_pChildWnd->hListWnd, item); + if(RegDeleteValue(hKey, valueName) != ERROR_SUCCESS) + { + errs++; + } + item = ni; } - item = ni; - } - RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath); - if(errs > 0) - { - LoadString(hInst, IDS_ERR_DELVAL_CAPTION, caption, sizeof(caption)/sizeof(TCHAR)); - LoadString(hInst, IDS_ERR_DELETEVALUE, msg, sizeof(msg)/sizeof(TCHAR)); - MessageBox(g_pChildWnd->hWnd, msg, caption, MB_ICONSTOP); + RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath); + if(errs > 0) + { + LoadString(hInst, IDS_ERR_DELVAL_CAPTION, caption, sizeof(caption)/sizeof(TCHAR)); + LoadString(hInst, IDS_ERR_DELETEVALUE, msg, sizeof(msg)/sizeof(TCHAR)); + MessageBox(g_pChildWnd->hWnd, msg, caption, MB_ICONSTOP); + } } } + } else + if (GetFocus() == g_pChildWnd->hTreeWnd) + { + if (keyPath == 0 || *keyPath == 0) + { + MessageBeep(MB_ICONHAND); + } else + if (DeleteKey(hWnd, hKeyRoot, keyPath)) + DeleteNode(g_pChildWnd->hTreeWnd, 0); } break; case ID_EDIT_NEW_STRINGVALUE: _____ Modified: trunk/reactos/subsys/system/regedit/main.h --- trunk/reactos/subsys/system/regedit/main.h 2005-11-26 20:18:49 UTC (rev 19658) +++ trunk/reactos/subsys/system/regedit/main.h 2005-11-26 20:22:45 UTC (rev 19659) @@ -105,6 +105,7 @@ extern BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem); extern BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEW* pnmtv); extern LPCTSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey); +extern BOOL DeleteNode(HWND hwndTV, HTREEITEM hItem); extern HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPTSTR name); extern HWND StartKeyRename(HWND hwndTV); extern BOOL CreateNewKey(HWND hwndTV, HTREEITEM hItem); @@ -115,5 +116,6 @@ /* edit.c */ extern BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCTSTR valueName, BOOL EditBin); +extern BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath); #endif /* __MAIN_H__ */ _____ Modified: trunk/reactos/subsys/system/regedit/regedit.xml --- trunk/reactos/subsys/system/regedit/regedit.xml 2005-11-26 20:18:49 UTC (rev 19658) +++ trunk/reactos/subsys/system/regedit/regedit.xml 2005-11-26 20:22:45 UTC (rev 19659) @@ -15,6 +15,7 @@ <library>shell32</library> <library>comctl32</library> <library>comdlg32</library> + <library>shlwapi</library> <file>about.c</file> <file>childwnd.c</file> <file>edit.c</file> _____ Modified: trunk/reactos/subsys/system/regedit/regproc.c --- trunk/reactos/subsys/system/regedit/regproc.c 2005-11-26 20:18:49 UTC (rev 19658) +++ trunk/reactos/subsys/system/regedit/regproc.c 2005-11-26 20:22:45 UTC (rev 19659) @@ -30,6 +30,7 @@ #include <assert.h> #include <tchar.h> #include <malloc.h> +#include <shlwapi.h> #include "regproc.h" #define REG_VAL_BUF_SIZE 4096 @@ -1503,33 +1504,6 @@ return app_name; } -LONG RegDeleteKeyRecursive(HKEY hKey, LPCTSTR lpSubKey) -{ - LONG lResult; - HKEY hSubKey = NULL; - DWORD dwIndex, cbName; - TCHAR szSubKey[256]; - FILETIME ft; - - lResult = RegOpenKeyEx(hKey, lpSubKey, 0, KEY_ALL_ACCESS, &hSubKey); - if (lResult == ERROR_SUCCESS) - { - dwIndex = 0; - do - { - cbName = sizeof(szSubKey) / sizeof(szSubKey[0]); - lResult = RegEnumKeyEx(hSubKey, dwIndex++, szSubKey, &cbName, NULL, NULL, NULL, &ft); - if (lResult == ERROR_SUCCESS) - RegDeleteKeyRecursive(hSubKey, szSubKey); - } - while(lResult == ERROR_SUCCESS); - - RegCloseKey(hSubKey); - } - - return RegDeleteKey(hKey, lpSubKey); -} - LONG RegCopyKey(HKEY hDestKey, LPCTSTR lpDestSubKey, HKEY hSrcKey, LPCTSTR lpSrcSubKey) { LONG lResult; @@ -1597,7 +1571,7 @@ if (hDestSubKey) RegCloseKey(hDestSubKey); if (lResult != ERROR_SUCCESS) - RegDeleteKeyRecursive(hDestKey, lpDestSubKey); + SHDeleteKey(hDestKey, lpDestSubKey); return lResult; } @@ -1611,7 +1585,7 @@ lResult = RegCopyKey(hDestKey, lpDestSubKey, hSrcKey, lpSrcSubKey); if (lResult == ERROR_SUCCESS) - RegDeleteKeyRecursive(hSrcKey, lpSrcSubKey); + SHDeleteKey(hSrcKey, lpSrcSubKey); return lResult; } _____ Modified: trunk/reactos/subsys/system/regedit/resource.h --- trunk/reactos/subsys/system/regedit/resource.h 2005-11-26 20:18:49 UTC (rev 19658) +++ trunk/reactos/subsys/system/regedit/resource.h 2005-11-26 20:22:45 UTC (rev 19659) @@ -129,6 +129,7 @@ #define IDS_ERR_DELETEVALUE 32855 #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 _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2005-11-26 20:18:49 UTC (rev 19658) +++ trunk/reactos/subsys/system/regedit/treeview.c 2005-11-26 20:22:45 UTC (rev 19659) @@ -107,6 +107,13 @@ return pathBuffer; } +BOOL DeleteNode(HWND hwndTV, HTREEITEM hItem) +{ + if (!hItem) hItem = TreeView_GetSelection(hwndTV); + if (!hItem) return FALSE; + return TreeView_DeleteItem(hwndTV, hItem); +} + /* Add an entry to the tree. Only give hKey for root nodes (HKEY_ constants) */ static HTREEITEM AddEntryToTree(HWND hwndTV, HTREEITEM hParent, LPTSTR label, HKEY hKey, DWORD dwChildren) {

19 years

[chorns] 19658: Speed up compilation of win32k (again)

by chorns＠svn.reactos.com

Speed up compilation of win32k (again) Modified: trunk/reactos/subsys/win32k/include/win32k.h _____ Modified: trunk/reactos/subsys/win32k/include/win32k.h --- trunk/reactos/subsys/win32k/include/win32k.h 2005-11-26 20:05:14 UTC (rev 19657) +++ trunk/reactos/subsys/win32k/include/win32k.h 2005-11-26 20:18:49 UTC (rev 19658) @@ -7,7 +7,8 @@ */ /* INCLUDES ******************************************************************/ - +#ifndef __WIN32K_H +#define __WIN32K_H /* Internal Win32k Headers */ #include <include/ntuser.h> #include <include/win32.h> @@ -61,4 +62,4 @@ #include <eng/objects.h> #include <eng/misc.h> #include <dib/dib.h> -/* EOF */ +#endif /* __WIN32K_H */

19 years

[chorns] 19657: Speed up compilation of taskmgr

by chorns＠svn.reactos.com

Speed up compilation of taskmgr Modified: trunk/reactos/subsys/system/taskmgr/precomp.h Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.xml _____ Modified: trunk/reactos/subsys/system/taskmgr/precomp.h --- trunk/reactos/subsys/system/taskmgr/precomp.h 2005-11-26 19:53:55 UTC (rev 19656) +++ trunk/reactos/subsys/system/taskmgr/precomp.h 2005-11-26 20:05:14 UTC (rev 19657) @@ -1,3 +1,5 @@ +#ifndef __PRECOMP_H +#define __PRECOMP_H #define _CRT_SECURE_NO_DEPRECATE #define WIN32_NO_STATUS @@ -31,3 +33,4 @@ #include "priority.h" #include "run.h" #include "trayicon.h" +#endif /* __PRECOMP_H */ _____ Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.xml --- trunk/reactos/subsys/system/taskmgr/taskmgr.xml 2005-11-26 19:53:55 UTC (rev 19656) +++ trunk/reactos/subsys/system/taskmgr/taskmgr.xml 2005-11-26 20:05:14 UTC (rev 19657) @@ -9,24 +9,26 @@ <library>gdi32</library> <library>comctl32</library> <pch>precomp.h</pch> - <file>about.c</file> - <file>affinity.c</file> - <file>applpage.c</file> - <file>column.c</file> - <file>dbgchnl.c</file> - <file>debug.c</file> - <file>endproc.c</file> - <file>font.c</file> - <file>graph.c</file> - <file>optnmenu.c</file> - <file>perfdata.c</file> - <file>perfpage.c</file> - <file>priority.c</file> - <file>procpage.c</file> - <file>proclist.c</file> - <file>run.c</file> - <file>trayicon.c</file> - <file>taskmgr.c</file> - <file>graphctl.c</file> + <compilationunit name="unit.c"> + <file>about.c</file> + <file>affinity.c</file> + <file>applpage.c</file> + <file>column.c</file> + <file>dbgchnl.c</file> + <file>debug.c</file> + <file>endproc.c</file> + <file>font.c</file> + <file>graph.c</file> + <file>optnmenu.c</file> + <file>perfdata.c</file> + <file>perfpage.c</file> + <file>priority.c</file> + <file>procpage.c</file> + <file>proclist.c</file> + <file>run.c</file> + <file>trayicon.c</file> + <file>taskmgr.c</file> + <file>graphctl.c</file> + </compilationunit> <file>taskmgr.rc</file> </module>

19 years

[chorns] 19656: Speed up compilation of usetup

by chorns＠svn.reactos.com

Speed up compilation of usetup Modified: trunk/reactos/subsys/system/usetup/usetup.xml _____ Modified: trunk/reactos/subsys/system/usetup/usetup.xml --- trunk/reactos/subsys/system/usetup/usetup.xml 2005-11-26 19:43:36 UTC (rev 19655) +++ trunk/reactos/subsys/system/usetup/usetup.xml 2005-11-26 19:53:55 UTC (rev 19656) @@ -13,21 +13,23 @@ <library>vfatlib</library> <library>ntdll</library> <pch>usetup.h</pch> - <file>bootsup.c</file> - <file>cabinet.c</file> - <file>console.c</file> - <file>drivesup.c</file> - <file>filequeue.c</file> - <file>filesup.c</file> - <file>format.c</file> - <file>fslist.c</file> - <file>genlist.c</file> - <file>inicache.c</file> - <file>keytrans.c</file> - <file>partlist.c</file> - <file>progress.c</file> - <file>registry.c</file> - <file>settings.c</file> - <file>usetup.c</file> + <compilationunit name="unit.c"> + <file>bootsup.c</file> + <file>cabinet.c</file> + <file>console.c</file> + <file>drivesup.c</file> + <file>filequeue.c</file> + <file>filesup.c</file> + <file>format.c</file> + <file>fslist.c</file> + <file>genlist.c</file> + <file>inicache.c</file> + <file>keytrans.c</file> + <file>partlist.c</file> + <file>progress.c</file> + <file>registry.c</file> + <file>settings.c</file> + <file>usetup.c</file> + </compilationunit> <file>usetup.rc</file> </module>

19 years

[chorns] 19655: Speed up compilation of smss

by chorns＠svn.reactos.com

Speed up compilation of smss Modified: trunk/reactos/subsys/smss/smss.xml _____ Modified: trunk/reactos/subsys/smss/smss.xml --- trunk/reactos/subsys/smss/smss.xml 2005-11-26 19:25:14 UTC (rev 19654) +++ trunk/reactos/subsys/smss/smss.xml 2005-11-26 19:43:36 UTC (rev 19655) @@ -7,24 +7,26 @@ <library>ntdll</library> <linkerflag>-lgcc</linkerflag> <pch>smss.h</pch> - <file>client.c</file> - <file>debug.c</file> - <file>init.c</file> - <file>initdosdev.c</file> - <file>initenv.c</file> - <file>initheap.c</file> - <file>initmv.c</file> - <file>initobdir.c</file> - <file>initpage.c</file> - <file>initreg.c</file> - <file>initrun.c</file> - <file>initss.c</file> - <file>initwkdll.c</file> - <file>print.c</file> - <file>smapi.c</file> - <file>smapicomp.c</file> - <file>smapiexec.c</file> - <file>smapiquery.c</file> - <file>smss.c</file> + <compilationunit name="unit.c"> + <file>client.c</file> + <file>debug.c</file> + <file>init.c</file> + <file>initdosdev.c</file> + <file>initenv.c</file> + <file>initheap.c</file> + <file>initmv.c</file> + <file>initobdir.c</file> + <file>initpage.c</file> + <file>initreg.c</file> + <file>initrun.c</file> + <file>initss.c</file> + <file>initwkdll.c</file> + <file>print.c</file> + <file>smapi.c</file> + <file>smapicomp.c</file> + <file>smapiexec.c</file> + <file>smapiquery.c</file> + <file>smss.c</file> + </compilationunit> <file>smss.rc</file> </module>

19 years

[chorns] 19654: Speed up compilation of win32k.sys

by chorns＠svn.reactos.com

Speed up compilation of win32k.sys Modified: trunk/reactos/subsys/win32k/win32k.xml _____ Modified: trunk/reactos/subsys/win32k/win32k.xml --- trunk/reactos/subsys/win32k/win32k.xml 2005-11-26 18:54:28 UTC (rev 19653) +++ trunk/reactos/subsys/win32k/win32k.xml 2005-11-26 19:25:14 UTC (rev 19654) @@ -23,30 +23,32 @@ <file>dib.c</file> </directory> <directory name="eng"> - <file>bitblt.c</file> - <file>brush.c</file> - <file>clip.c</file> - <file>copybits.c</file> - <file>debug.c</file> - <file>device.c</file> - <file>driverobj.c</file> - <file>error.c</file> - <file>event.c</file> - <file>float.c</file> - <file>gradient.c</file> - <file>lineto.c</file> - <file>mem.c</file> - <file>misc.c</file> - <file>mouse.c</file> - <file>paint.c</file> - <file>palette.c</file> - <file>perfcnt.c</file> - <file>semaphor.c</file> - <file>sort.c</file> - <file>surface.c</file> - <file>transblt.c</file> - <file>window.c</file> - <file>xlate.c</file> + <compilationunit name="eng.c"> + <file>bitblt.c</file> + <file>brush.c</file> + <file>clip.c</file> + <file>copybits.c</file> + <file>debug.c</file> + <file>device.c</file> + <file>driverobj.c</file> + <file>error.c</file> + <file>event.c</file> + <file>float.c</file> + <file>gradient.c</file> + <file>lineto.c</file> + <file>mem.c</file> + <file>misc.c</file> + <file>mouse.c</file> + <file>paint.c</file> + <file>palette.c</file> + <file>perfcnt.c</file> + <file>semaphor.c</file> + <file>sort.c</file> + <file>surface.c</file> + <file>transblt.c</file> + <file>window.c</file> + <file>xlate.c</file> + </compilationunit> </directory> <directory name="ldr"> <file>loader.c</file> @@ -55,81 +57,91 @@ <file>dllmain.c</file> </directory> <directory name="misc"> - <file>driver.c</file> - <file>error.c</file> - <file>math.c</file> - <file>copy.c</file> + <compilationunit name="misc.c"> + <file>driver.c</file> + <file>error.c</file> + <file>math.c</file> + <file>copy.c</file> + </compilationunit> </directory> <directory name="ntddraw"> - <file>ddraw.c</file> - <file>stubs.c</file> + <compilationunit name="ntddraw.c"> + <file>ddraw.c</file> + <file>stubs.c</file> + </compilationunit> </directory> <directory name="ntuser"> - <file>accelerator.c</file> - <file>callback.c</file> - <file>caret.c</file> - <file>class.c</file> - <file>clipboard.c</file> - <file>csr.c</file> - <file>cursoricon.c</file> - <file>desktop.c</file> - <file>focus.c</file> - <file>guicheck.c</file> - <file>hook.c</file> - <file>hotkey.c</file> - <file>input.c</file> - <file>keyboard.c</file> - <file>menu.c</file> - <file>message.c</file> - <file>metric.c</file> - <file>misc.c</file> - <file>monitor.c</file> - <file>msgqueue.c</file> - <file>ntuser.c</file> - <file>painting.c</file> - <file>prop.c</file> - <file>scrollbar.c</file> - <file>session.c</file> - <file>stubs.c</file> - <file>timer.c</file> - <file>useratom.c</file> - <file>vis.c</file> - <file>windc.c</file> - <file>window.c</file> - <file>winpos.c</file> - <file>winsta.c</file> - <file>object.c</file> - <file>ssec.c</file> + <compilationunit name="ntuser.c"> + <file>accelerator.c</file> + <file>callback.c</file> + <file>caret.c</file> + <file>class.c</file> + <file>clipboard.c</file> + <file>csr.c</file> + <file>cursoricon.c</file> + <file>desktop.c</file> + <file>focus.c</file> + <file>guicheck.c</file> + <file>hook.c</file> + <file>hotkey.c</file> + <file>input.c</file> + <file>keyboard.c</file> + <file>menu.c</file> + <file>message.c</file> + <file>metric.c</file> + <file>misc.c</file> + <file>monitor.c</file> + <file>msgqueue.c</file> + <file>ntuser.c</file> + <file>painting.c</file> + <file>prop.c</file> + <file>scrollbar.c</file> + <file>session.c</file> + <file>stubs.c</file> + <file>timer.c</file> + <file>useratom.c</file> + <file>vis.c</file> + <file>windc.c</file> + <file>window.c</file> + <file>winpos.c</file> + <file>winsta.c</file> + <file>object.c</file> + <file>ssec.c</file> + </compilationunit> </directory> <directory name="objects"> - <file>bezier.c</file> - <file>bitmaps.c</file> - <file>brush.c</file> - <file>cliprgn.c</file> - <file>color.c</file> - <file>coord.c</file> - <file>dc.c</file> - <file>dib.c</file> - <file>fillshap.c</file> - <file>gdiobj.c</file> - <file>icm.c</file> - <file>line.c</file> - <file>metafile.c</file> - <file>paint.c</file> - <file>palette.c</file> - <file>path.c</file> - <file>pen.c</file> - <file>polyfill.c</file> - <file>print.c</file> - <file>rect.c</file> - <file>region.c</file> - <file>stockobj.c</file> - <file>text.c</file> - <file>wingl.c</file> + <compilationunit name="objects.c"> + <file>bezier.c</file> + <file>bitmaps.c</file> + <file>brush.c</file> + <file>cliprgn.c</file> + <file>color.c</file> + <file>coord.c</file> + <file>dc.c</file> + <file>dib.c</file> + <file>fillshap.c</file> + <file>gdiobj.c</file> + <file>icm.c</file> + <file>line.c</file> + <file>metafile.c</file> + <file>paint.c</file> + <file>palette.c</file> + <file>path.c</file> + <file>pen.c</file> + <file>polyfill.c</file> + <file>print.c</file> + <file>rect.c</file> + <file>region.c</file> + <file>stockobj.c</file> + <file>text.c</file> + <file>wingl.c</file> + </compilationunit> </directory> <directory name="stubs"> - <file>stubs.c</file> - <file>xpstubs.c</file> + <compilationunit name="stubs.c"> + <file>stubs.c</file> + <file>xpstubs.c</file> + </compilationunit> </directory> </module> <module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" allowwarnings="true">

19 years

[chorns] 19653: Include regtests.h only once

by chorns＠svn.reactos.com

Include regtests.h only once Modified: trunk/reactos/regtests/shared/regtests.h _____ Modified: trunk/reactos/regtests/shared/regtests.h --- trunk/reactos/regtests/shared/regtests.h 2005-11-26 18:53:26 UTC (rev 19652) +++ trunk/reactos/regtests/shared/regtests.h 2005-11-26 18:54:28 UTC (rev 19653) @@ -6,6 +6,8 @@ * UPDATE HISTORY: * 06-07-2003 CSH Created */ +#ifndef __REGTESTS_H +#define __REGTESTS_H #include <stdio.h> #include <string.h> @@ -378,3 +380,5 @@ api->MockFunctionAddress = NULL; } } + +#endif /* __REGTESTS_H */

19 years

← Newer
1
...
11
12
13
14
15
16
17
...
88
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 2005