Ros-diffs May 2010

ros-diffs@reactos.org

21 participants
438 discussions

[gadamopoulos] 47235: [kernel32] -OpenConsoleW: Don't crash when wsName is null

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun May 16 09:03:03 2010 New Revision: 47235 URL: http://svn.reactos.org/svn/reactos?rev=47235&view=rev Log: [kernel32] -OpenConsoleW: Don't crash when wsName is null Modified: trunk/reactos/dll/win32/kernel32/misc/console.c Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] Sun May 16 09:03:03 2010 @@ -993,11 +993,11 @@ ULONG CsrRequest; NTSTATUS Status = STATUS_SUCCESS; - if (0 == _wcsicmp(wsName, L"CONIN$")) + if (wsName && 0 == _wcsicmp(wsName, L"CONIN$")) { CsrRequest = MAKE_CSR_API(GET_INPUT_HANDLE, CSR_NATIVE); } - else if (0 == _wcsicmp(wsName, L"CONOUT$")) + else if (wsName && 0 == _wcsicmp(wsName, L"CONOUT$")) { CsrRequest = MAKE_CSR_API(GET_OUTPUT_HANDLE, CSR_NATIVE); }

14 years, 4 months

[cgutman] 47234: [AFD] - Fix a typo in r47156 - Fixes Firefox regression (bug 5384) - Thanks to mjmartin for testing

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun May 16 07:22:51 2010 New Revision: 47234 URL: http://svn.reactos.org/svn/reactos?rev=47234&view=rev Log: [AFD] - Fix a typo in r47156 - Fixes Firefox regression (bug 5384) - Thanks to mjmartin for testing Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sun May 16 07:22:51 2010 @@ -187,7 +187,7 @@ } } - if( !FCB->Recv.Content ) { + if( FCB->Recv.Content ) { FCB->PollState |= AFD_EVENT_RECEIVE; } else FCB->PollState &= ~AFD_EVENT_RECEIVE;

14 years, 4 months

[mjmartin] 47233: [regedit] - Implement RegFindRecurse, RegFindWalk and helpers to find registry keys. Remove RegNextKey as its no longer used. Other misc fixes. Fixes searching in regedit. Patch by Katayama_Hirofumi.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sun May 16 06:57:24 2010 New Revision: 47233 URL: http://svn.reactos.org/svn/reactos?rev=47233&view=rev Log: [regedit] - Implement RegFindRecurse, RegFindWalk and helpers to find registry keys. Remove RegNextKey as its no longer used. Other misc fixes. Fixes searching in regedit. Patch by Katayama_Hirofumi. Modified: trunk/reactos/base/applications/regedit/find.c trunk/reactos/base/applications/regedit/listview.c trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/base/applications/regedit/regproc.h Modified: trunk/reactos/base/applications/regedit/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/find.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/find.c [iso-8859-1] Sun May 16 06:57:24 2010 @@ -25,13 +25,531 @@ static HWND s_hwndAbortDialog; static BOOL s_bAbort; +static DWORD s_dwFlags; +static TCHAR s_szName[MAX_PATH]; +static DWORD s_cbName; +static const TCHAR s_empty[] = {0}; +static const TCHAR s_backslash[] = {'\\', 0}; + +extern VOID SetValueName(HWND hwndLV, LPCTSTR pszValueName); + +BOOL DoEvents(VOID) +{ + MSG msg; + if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + { + if (msg.message == WM_QUIT) + s_bAbort = TRUE; + if (!IsDialogMessage(s_hwndAbortDialog, &msg)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + return s_bAbort; +} + +static LPTSTR lstrstri(LPCTSTR psz1, LPCTSTR psz2) +{ + INT i, cch1, cch2; + + cch1 = lstrlen(psz1); + cch2 = lstrlen(psz2); + for(i = 0; i <= cch1 - cch2; i++) + { + if (CompareString(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, + psz1 + i, cch2, psz2, cch2) == 2) + return (LPTSTR) (psz1 + i); + } + return NULL; +} + +static BOOL CompareName(LPCTSTR pszName1, LPCTSTR pszName2) +{ + if (s_dwFlags & RSF_WHOLESTRING) + { + if (s_dwFlags & RSF_MATCHCASE) + return lstrcmp(pszName1, pszName2) == 0; + else + return lstrcmpi(pszName1, pszName2) == 0; + } + else + { + if (s_dwFlags & RSF_MATCHCASE) + return _tcsstr(pszName1, pszName2) != NULL; + else + return lstrstri(pszName1, pszName2) != NULL; + } +} + +static BOOL +CompareData( + DWORD dwType, + LPCTSTR psz1, + LPCTSTR psz2) +{ + INT i, cch1 = lstrlen(psz1), cch2 = lstrlen(psz2); + if (dwType == REG_SZ || dwType == REG_EXPAND_SZ) + { + if (s_dwFlags & RSF_WHOLESTRING) + { + if (s_dwFlags & RSF_MATCHCASE) + return 2 == CompareString(LOCALE_SYSTEM_DEFAULT, 0, + psz1, cch1, psz2, cch2); + else + return 2 == CompareString(LOCALE_SYSTEM_DEFAULT, + NORM_IGNORECASE, psz1, cch1, psz2, cch2); + } + + for(i = 0; i <= cch1 - cch2; i++) + { + if (s_dwFlags & RSF_MATCHCASE) + { + if (2 == CompareString(LOCALE_SYSTEM_DEFAULT, 0, + psz1 + i, cch2, psz2, cch2)) + return TRUE; + } + else + { + if (2 == CompareString(LOCALE_SYSTEM_DEFAULT, + NORM_IGNORECASE, psz1 + i, cch2, psz2, cch2)) + return TRUE; + } + } + } + return FALSE; +} + +int compare(const void *x, const void *y) +{ + const LPCTSTR *a = (const LPCTSTR *)x; + const LPCTSTR *b = (const LPCTSTR *)y; + return lstrcmpi(*a, *b); +} + +BOOL RegFindRecurse( + HKEY hKey, + LPCTSTR pszSubKey, + LPCTSTR pszValueName, + LPTSTR *ppszFoundSubKey, + LPTSTR *ppszFoundValueName) +{ + HKEY hSubKey; + LONG lResult; + TCHAR szSubKey[MAX_PATH]; + DWORD i, c, cb, type; + BOOL fPast = FALSE; + LPTSTR *ppszNames = NULL; + LPBYTE pb = NULL; + + if (DoEvents()) + return FALSE; + + lstrcpy(szSubKey, pszSubKey); + hSubKey = NULL; + + lResult = RegOpenKeyEx(hKey, szSubKey, 0, KEY_ALL_ACCESS, &hSubKey); + if (lResult != ERROR_SUCCESS) + return FALSE; + + if (pszValueName == NULL) + pszValueName = s_empty; + + lResult = RegQueryInfoKey(hSubKey, NULL, NULL, NULL, NULL, NULL, NULL, + &c, NULL, NULL, NULL, NULL); + if (lResult != ERROR_SUCCESS) + goto err; + ppszNames = (LPTSTR *) malloc(c * sizeof(LPTSTR)); + if (ppszNames == NULL) + goto err; + ZeroMemory(ppszNames, c * sizeof(LPTSTR)); + + for(i = 0; i < c; i++) + { + if (DoEvents()) + goto err; + + s_cbName = MAX_PATH * sizeof(TCHAR); + lResult = RegEnumValue(hSubKey, i, s_szName, &s_cbName, NULL, NULL, + NULL, &cb); + if (lResult == ERROR_NO_MORE_ITEMS) + { + c = i; + break; + } + if (lResult != ERROR_SUCCESS) + goto err; + if (s_cbName >= MAX_PATH * sizeof(TCHAR)) + continue; + + ppszNames[i] = _tcsdup(s_szName); + } + + qsort(ppszNames, c, sizeof(LPTSTR), compare); + + for(i = 0; i < c; i++) + { + if (DoEvents()) + goto err; + + if (!fPast && lstrcmpi(ppszNames[i], pszValueName) == 0) + { + fPast = TRUE; + continue; + } + if (!fPast) + continue; + + if ((s_dwFlags & RSF_LOOKATVALUES) && + CompareName(ppszNames[i], s_szFindWhat)) + { + *ppszFoundSubKey = _tcsdup(szSubKey); + if (ppszNames[i][0] == 0) + *ppszFoundValueName = NULL; + else + *ppszFoundValueName = _tcsdup(ppszNames[i]); + goto success; + } + + lResult = RegQueryValueEx(hSubKey, ppszNames[i], NULL, &type, + NULL, &cb); + if (lResult != ERROR_SUCCESS) + goto err; + pb = malloc(cb); + if (pb == NULL) + goto err; + lResult = RegQueryValueEx(hSubKey, ppszNames[i], NULL, &type, + pb, &cb); + if (lResult != ERROR_SUCCESS) + goto err; + + if ((s_dwFlags & RSF_LOOKATDATA) && + CompareData(type, (LPTSTR) pb, s_szFindWhat)) + { + *ppszFoundSubKey = _tcsdup(szSubKey); + if (ppszNames[i][0] == 0) + *ppszFoundValueName = NULL; + else + *ppszFoundValueName = _tcsdup(ppszNames[i]); + goto success; + } + free(pb); + pb = NULL; + } + + if (ppszNames != NULL) + { + for(i = 0; i < c; i++) + free(ppszNames[i]); + free(ppszNames); + } + ppszNames = NULL; + + lResult = RegQueryInfoKey(hSubKey, NULL, NULL, NULL, &c, NULL, NULL, + NULL, NULL, NULL, NULL, NULL); + if (lResult != ERROR_SUCCESS) + goto err; + ppszNames = (LPTSTR *) malloc(c * sizeof(LPTSTR)); + if (ppszNames == NULL) + goto err; + ZeroMemory(ppszNames, c * sizeof(LPTSTR)); + + for(i = 0; i < c; i++) + { + if (DoEvents()) + goto err; + + s_cbName = MAX_PATH * sizeof(TCHAR); + lResult = RegEnumKeyEx(hSubKey, i, s_szName, &s_cbName, NULL, NULL, + NULL, NULL); + if (lResult == ERROR_NO_MORE_ITEMS) + { + c = i; + break; + } + if (lResult != ERROR_SUCCESS) + goto err; + if (s_cbName >= MAX_PATH * sizeof(TCHAR)) + continue; + + ppszNames[i] = _tcsdup(s_szName); + } + + qsort(ppszNames, c, sizeof(LPTSTR), compare); + + for(i = 0; i < c; i++) + { + if (DoEvents()) + goto err; + + if ((s_dwFlags & RSF_LOOKATKEYS) && + CompareName(ppszNames[i], s_szFindWhat)) + { + *ppszFoundSubKey = malloc( + (lstrlen(szSubKey) + lstrlen(ppszNames[i]) + 2) * + sizeof(TCHAR)); + if (*ppszFoundSubKey == NULL) + goto err; + if (szSubKey[0]) + { + lstrcpy(*ppszFoundSubKey, szSubKey); + lstrcatW(*ppszFoundSubKey, s_backslash); + } + else + **ppszFoundSubKey = 0; + lstrcatW(*ppszFoundSubKey, ppszNames[i]); + *ppszFoundValueName = NULL; + goto success; + } + + if (RegFindRecurse(hSubKey, ppszNames[i], NULL, ppszFoundSubKey, + ppszFoundValueName)) + { + LPTSTR psz = *ppszFoundSubKey; + *ppszFoundSubKey = malloc( + (lstrlen(szSubKey) + lstrlen(psz) + 2) * sizeof(TCHAR)); + if (*ppszFoundSubKey == NULL) + goto err; + if (szSubKey[0]) + { + lstrcpy(*ppszFoundSubKey, szSubKey); + lstrcatW(*ppszFoundSubKey, s_backslash); + } + else + **ppszFoundSubKey = 0; + lstrcatW(*ppszFoundSubKey, psz); + free(psz); + goto success; + } + } + +err: + if (ppszNames != NULL) + { + for(i = 0; i < c; i++) + free(ppszNames[i]); + free(ppszNames); + } + free(pb); + RegCloseKey(hSubKey); + return FALSE; + +success: + if (ppszNames != NULL) + { + for(i = 0; i < c; i++) + free(ppszNames[i]); + free(ppszNames); + } + RegCloseKey(hSubKey); + return TRUE; +} + +BOOL RegFindWalk( + HKEY * phKey, + LPCTSTR pszSubKey, + LPCTSTR pszValueName, + LPTSTR *ppszFoundSubKey, + LPTSTR *ppszFoundValueName) +{ + LONG lResult; + DWORD i, c; + HKEY hBaseKey, hSubKey; + TCHAR szKeyName[MAX_PATH]; + TCHAR szSubKey[MAX_PATH]; + LPTSTR pch; + BOOL fPast; + LPTSTR *ppszNames = NULL; + + hBaseKey = *phKey; + if (RegFindRecurse(hBaseKey, pszSubKey, pszValueName, ppszFoundSubKey, + ppszFoundValueName)) + return TRUE; + + if (lstrlen(pszSubKey) >= MAX_PATH) + return FALSE; + + lstrcpy(szSubKey, pszSubKey); + while(szSubKey[0] != 0) + { + if (DoEvents()) + return FALSE; + + pch = _tcsrchr(szSubKey, _T('\\')); + if (pch == NULL) + { + lstrcpy(szKeyName, szSubKey); + szSubKey[0] = 0; + hSubKey = hBaseKey; + } + else + { + lstrcpyn(szKeyName, pch + 1, MAX_PATH); + *pch = 0; + lResult = RegOpenKeyEx(hBaseKey, szSubKey, 0, KEY_ALL_ACCESS, + &hSubKey); + if (lResult != ERROR_SUCCESS) + return FALSE; + } + + lResult = RegQueryInfoKey(hSubKey, NULL, NULL, NULL, &c, NULL, NULL, + NULL, NULL, NULL, NULL, NULL); + if (lResult != ERROR_SUCCESS) + goto err; + + ppszNames = (LPTSTR *) malloc(c * sizeof(LPTSTR)); + if (ppszNames == NULL) + goto err; + ZeroMemory(ppszNames, c * sizeof(LPTSTR)); + + for(i = 0; i < c; i++) + { + if (DoEvents()) + goto err; + + s_cbName = MAX_PATH * sizeof(TCHAR); + lResult = RegEnumKeyExW(hSubKey, i, s_szName, &s_cbName, + NULL, NULL, NULL, NULL); + if (lResult == ERROR_NO_MORE_ITEMS) + { + c = i; + break; + } + if (lResult != ERROR_SUCCESS) + break; + ppszNames[i] = _tcsdup(s_szName); + } + + qsort(ppszNames, c, sizeof(LPTSTR), compare); + + fPast = FALSE; + for(i = 0; i < c; i++) + { + if (DoEvents()) + goto err; + + if (!fPast && lstrcmpi(ppszNames[i], szKeyName) == 0) + { + fPast = TRUE; + continue; + } + if (!fPast) + continue; + + if ((s_dwFlags & RSF_LOOKATKEYS) && + CompareName(ppszNames[i], s_szFindWhat)) + { + *ppszFoundSubKey = malloc( + (lstrlen(szSubKey) + lstrlen(ppszNames[i]) + 2) * + sizeof(TCHAR)); + if (*ppszFoundSubKey == NULL) + goto err; + if (szSubKey[0]) + { + lstrcpy(*ppszFoundSubKey, szSubKey); + lstrcatW(*ppszFoundSubKey, s_backslash); + } + else + **ppszFoundSubKey = 0; + lstrcatW(*ppszFoundSubKey, ppszNames[i]); + *ppszFoundValueName = NULL; + goto success; + } + + if (RegFindRecurse(hSubKey, ppszNames[i], NULL, + ppszFoundSubKey, ppszFoundValueName)) + { + LPTSTR psz = *ppszFoundSubKey; + *ppszFoundSubKey = malloc( + (lstrlen(szSubKey) + lstrlen(psz) + 2) * + sizeof(TCHAR)); + if (*ppszFoundSubKey == NULL) + goto err; + if (szSubKey[0]) + { + lstrcpy(*ppszFoundSubKey, szSubKey); + lstrcatW(*ppszFoundSubKey, s_backslash); + } + else + **ppszFoundSubKey = 0; + lstrcatW(*ppszFoundSubKey, psz); + free(psz); + goto success; + } + } + if (ppszNames != NULL) + { + for(i = 0; i < c; i++) + free(ppszNames[i]); + free(ppszNames); + } + ppszNames = NULL; + + if (hBaseKey != hSubKey) + RegCloseKey(hSubKey); + } + + if (*phKey == HKEY_CLASSES_ROOT) + { + *phKey = HKEY_CURRENT_USER; + if (RegFindRecurse(*phKey, s_empty, NULL, ppszFoundSubKey, + ppszFoundValueName)) + return TRUE; + } + + if (*phKey == HKEY_CURRENT_USER) + { + *phKey = HKEY_LOCAL_MACHINE; + if (RegFindRecurse(*phKey, s_empty, NULL, ppszFoundSubKey, + ppszFoundValueName)) + goto success; + } + + if (*phKey == HKEY_LOCAL_MACHINE) + { + *phKey = HKEY_USERS; + if (RegFindRecurse(*phKey, s_empty, NULL, ppszFoundSubKey, + ppszFoundValueName)) + goto success; + } + + if (*phKey == HKEY_USERS) + { + *phKey = HKEY_CURRENT_CONFIG; + if (RegFindRecurse(*phKey, s_empty, NULL, ppszFoundSubKey, + ppszFoundValueName)) + goto success; + } + +err: + if (ppszNames != NULL) + { + for(i = 0; i < c; i++) + free(ppszNames[i]); + free(ppszNames); + } + if (hBaseKey != hSubKey) + RegCloseKey(hSubKey); + return FALSE; + +success: + if (ppszNames != NULL) + { + for(i = 0; i < c; i++) + free(ppszNames[i]); + free(ppszNames); + } + if (hBaseKey != hSubKey) + RegCloseKey(hSubKey); + return TRUE; +} static DWORD GetFindFlags(void) { HKEY hKey; - DWORD dwFlags = RSF_LOOKATKEYS; DWORD dwType, dwValue, cbData; + DWORD dwFlags = RSF_LOOKATKEYS | RSF_LOOKATVALUES | RSF_LOOKATDATA; if (RegOpenKey(HKEY_CURRENT_USER, g_szGeneralRegKey, &hKey) == ERROR_SUCCESS) { @@ -102,45 +620,48 @@ return 0; } -static BOOL RegSearchProc(LPVOID lpParam) -{ - MSG msg; - UNREFERENCED_PARAMETER(lpParam); - - if (s_hwndAbortDialog && PeekMessage(&msg, s_hwndAbortDialog, 0, 0, PM_REMOVE)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - return s_bAbort; -} - BOOL FindNext(HWND hWnd) { HKEY hKeyRoot; - LPCTSTR pszFindWhat; LPCTSTR pszKeyPath; - DWORD dwFlags; - LONG lResult; - TCHAR szSubKey[512]; - TCHAR szError[512]; - TCHAR szTitle[64]; + BOOL fSuccess; TCHAR szFullKey[512]; - - pszFindWhat = s_szFindWhat; - dwFlags = GetFindFlags() & ~(RSF_LOOKATVALUES | RSF_LOOKATDATA); + LPCTSTR pszValueName; + LPTSTR pszFoundSubKey, pszFoundValueName; + + s_dwFlags = GetFindFlags(); pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); - lstrcpyn(szSubKey, pszKeyPath, sizeof(szSubKey) / sizeof(szSubKey[0])); + if (pszKeyPath == NULL) + { + hKeyRoot = HKEY_CLASSES_ROOT; + pszKeyPath = s_empty; + } /* Create abort find dialog */ - s_hwndAbortDialog = CreateDialog(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_FINDING), hWnd, AbortFindDialogProc); + s_hwndAbortDialog = CreateDialog(GetModuleHandle(NULL), + MAKEINTRESOURCE(IDD_FINDING), hWnd, AbortFindDialogProc); if (s_hwndAbortDialog) + { ShowWindow(s_hwndAbortDialog, SW_SHOW); + UpdateWindow(s_hwndAbortDialog); + } s_bAbort = FALSE; - lResult = RegSearch(hKeyRoot, szSubKey, sizeof(szSubKey) / sizeof(szSubKey[0]), - pszFindWhat, 0, dwFlags, RegSearchProc, NULL); + pszValueName = GetValueName(g_pChildWnd->hListWnd, -1); + + EnableWindow(hFrameWnd, FALSE); + EnableWindow(g_pChildWnd->hTreeWnd, FALSE); + EnableWindow(g_pChildWnd->hListWnd, FALSE); + EnableWindow(g_pChildWnd->hAddressBarWnd, FALSE); + + fSuccess = RegFindWalk(&hKeyRoot, pszKeyPath, pszValueName, + &pszFoundSubKey, &pszFoundValueName); + + EnableWindow(hFrameWnd, TRUE); + EnableWindow(g_pChildWnd->hTreeWnd, TRUE); + EnableWindow(g_pChildWnd->hListWnd, TRUE); + EnableWindow(g_pChildWnd->hAddressBarWnd, TRUE); if (s_hwndAbortDialog) { @@ -148,25 +669,15 @@ s_hwndAbortDialog = NULL; } - /* Did the user click "Cancel"? If so, exit without displaying an error message */ - if (lResult == ERROR_OPERATION_ABORTED) - return FALSE; - - if (lResult != ERROR_SUCCESS) - { - LoadString(NULL, IDS_APP_TITLE, szTitle, sizeof(szTitle) / sizeof(szTitle[0])); - - if ((lResult != ERROR_NO_MORE_ITEMS) || !LoadString(NULL, IDS_FINISHEDFIND, szError, sizeof(szError) / sizeof(szError[0]))) - { - FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, lResult, 0, - szError, sizeof(szError) / sizeof(szError[0]), NULL); - } - MessageBox(hWnd, szError, szTitle, MB_OK); - return FALSE; - } - - RegKeyGetName(szFullKey, sizeof(szFullKey) / sizeof(szFullKey[0]), hKeyRoot, szSubKey); - SelectNode(g_pChildWnd->hTreeWnd, szFullKey); + if (fSuccess) + { + RegKeyGetName(szFullKey, COUNT_OF(szFullKey), hKeyRoot, pszFoundSubKey); + SelectNode(g_pChildWnd->hTreeWnd, szFullKey); + SetValueName(g_pChildWnd->hListWnd, pszFoundValueName); + free(pszFoundSubKey); + free(pszFoundValueName); + SetFocus(g_pChildWnd->hListWnd); + } return TRUE; } @@ -183,26 +694,17 @@ case WM_INITDIALOG: dwFlags = GetFindFlags(); - /* Looking at values is not yet implemented */ hControl = GetDlgItem(hDlg, IDC_LOOKAT_KEYS); if (hControl) SendMessage(hControl, BM_SETCHECK, (dwFlags & RSF_LOOKATKEYS) ? TRUE : FALSE, 0); - /* Looking at values is not yet implemented */ hControl = GetDlgItem(hDlg, IDC_LOOKAT_VALUES); if (hControl) - { - lStyle = GetWindowLongPtr(hControl, GWL_STYLE); - SetWindowLongPtr(hControl, GWL_STYLE, lStyle | WS_DISABLED); - } - - /* Looking at data is not yet implemented */ + SendMessage(hControl, BM_SETCHECK, (dwFlags & RSF_LOOKATVALUES) ? TRUE : FALSE, 0); + hControl = GetDlgItem(hDlg, IDC_LOOKAT_DATA); if (hControl) - { - lStyle = GetWindowLongPtr(hControl, GWL_STYLE); - SetWindowLongPtr(hControl, GWL_STYLE, lStyle | WS_DISABLED); - } + SendMessage(hControl, BM_SETCHECK, (dwFlags & RSF_LOOKATDATA) ? TRUE : FALSE, 0); /* Match whole string */ hControl = GetDlgItem(hDlg, IDC_MATCHSTRING); Modified: trunk/reactos/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] Sun May 16 06:57:24 2010 @@ -27,6 +27,7 @@ int Image_String = 0; int Image_Bin = 0; +INT iListViewSelect = -1; typedef struct tagLINE_INFO { @@ -74,6 +75,29 @@ return NULL; return lineinfo->name; +} + +VOID SetValueName(HWND hwndLV, LPCTSTR pszValueName) +{ + INT i, c; + LV_FINDINFO fi; + + c = ListView_GetItemCount(hwndLV); + for(i = 0; i < c; i++) + { + ListView_SetItemState(hwndLV, i, 0, LVIS_FOCUSED | LVIS_SELECTED); + } + if (pszValueName == NULL) + i = 0; + else + { + fi.flags = LVFI_STRING; + fi.psz = pszValueName; + i = ListView_FindItem(hwndLV, -1, &fi); + } + ListView_SetItemState(hwndLV, i, LVIS_FOCUSED | LVIS_SELECTED, + LVIS_FOCUSED | LVIS_SELECTED); + iListViewSelect = i; } BOOL IsDefaultValue(HWND hwndLV, int i) @@ -497,6 +521,7 @@ DWORD val_count; HKEY hNewKey; LONG errCode; + INT i, c; BOOL AddedDefault = FALSE; if (!hwndLV) return FALSE; @@ -552,7 +577,15 @@ { AddEntryToList(hwndLV, _T(""), REG_SZ, NULL, 0, 0, FALSE); } - (void)ListView_SortItems(hwndLV, CompareFunc, (WPARAM)hwndLV); + ListView_SortItems(hwndLV, CompareFunc, (WPARAM)hwndLV); + c = ListView_GetItemCount(hwndLV); + for(i = 0; i < c; i++) + { + ListView_SetItemState(hwndLV, i, 0, LVIS_FOCUSED | LVIS_SELECTED); + } + ListView_SetItemState(hwndLV, iListViewSelect, + LVIS_FOCUSED | LVIS_SELECTED, + LVIS_FOCUSED | LVIS_SELECTED); RegCloseKey(hNewKey); SendMessage(hwndLV, WM_SETREDRAW, TRUE, 0); Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regproc.c [iso-8859-1] Sun May 16 06:57:24 2010 @@ -1498,147 +1498,6 @@ } /****************************************************************************** - * Searching - */ - -static LONG RegNextKey(HKEY hKey, LPTSTR lpSubKey, size_t iSubKeyLength) -{ - LONG lResult; - LPTSTR s; - LPCTSTR pszOriginalKey; - TCHAR szKeyName[256]; - HKEY hSubKey, hBaseKey; - DWORD dwIndex = 0; - DWORD cbName; - FILETIME ft; - BOOL bFoundKey = FALSE; - - /* Try accessing a subkey */ - if (RegOpenKeyEx(hKey, lpSubKey, 0, KEY_ALL_ACCESS, &hSubKey) == ERROR_SUCCESS) - { - cbName = (DWORD) iSubKeyLength - _tcslen(lpSubKey) - 1; - lResult = RegEnumKeyEx(hSubKey, 0, lpSubKey + _tcslen(lpSubKey) + 1, - &cbName, NULL, NULL, NULL, &ft); - RegCloseKey(hSubKey); - - if (lResult == ERROR_SUCCESS) - { - lpSubKey[_tcslen(lpSubKey)] = '\\'; - bFoundKey = TRUE; - } - } - - if (!bFoundKey) - { - /* Go up and find the next sibling key */ - do - { - s = _tcsrchr(lpSubKey, TEXT('\\')); - if (s) - { - *s = '\0'; - pszOriginalKey = s + 1; - - hBaseKey = NULL; - RegOpenKeyEx(hKey, lpSubKey, 0, KEY_ALL_ACCESS, &hBaseKey); - } - else - { - pszOriginalKey = lpSubKey; - hBaseKey = hKey; - } - - if (hBaseKey) - { - dwIndex = 0; - do - { - lResult = RegEnumKey(hBaseKey, dwIndex++, szKeyName, sizeof(szKeyName) / sizeof(szKeyName[0])); - } - while((lResult == ERROR_SUCCESS) && _tcscmp(szKeyName, pszOriginalKey)); - - if (lResult == ERROR_SUCCESS) - { - lResult = RegEnumKey(hBaseKey, dwIndex++, szKeyName, sizeof(szKeyName) / sizeof(szKeyName[0])); - if (lResult == ERROR_SUCCESS) - { - bFoundKey = TRUE; - _sntprintf(lpSubKey + _tcslen(lpSubKey), iSubKeyLength - _tcslen(lpSubKey), _T("\\%s"), szKeyName); - } - } - RegCloseKey(hBaseKey); - } - } - while(!bFoundKey); - } - return bFoundKey ? ERROR_SUCCESS : ERROR_NO_MORE_ITEMS; -} - -static BOOL RegSearchCompare(LPCTSTR s1, LPCTSTR s2, DWORD dwSearchFlags) -{ - BOOL bResult; - if (dwSearchFlags & RSF_WHOLESTRING) - { - if (dwSearchFlags & RSF_MATCHCASE) - bResult = !_tcscmp(s1, s2); - else - bResult = !_tcsicmp(s1, s2); - } - else - { - if (dwSearchFlags & RSF_MATCHCASE) - bResult = (_tcsstr(s1, s2) != NULL); - else - { - /* My kingdom for _tcsistr() */ - bResult = FALSE; - while(*s1) - { - if (!_tcsnicmp(s1, s2, _tcslen(s2))) - { - bResult = TRUE; - break; - } - s1++; - } - } - } - return bResult; -} - -LONG RegSearch(HKEY hKey, LPTSTR lpSubKey, size_t iSubKeyLength, - LPCTSTR pszSearchString, DWORD dwValueIndex, - DWORD dwSearchFlags, BOOL (*pfnCallback)(LPVOID), LPVOID lpParam) -{ - LONG lResult; - LPCTSTR s; - - UNREFERENCED_PARAMETER(dwValueIndex); - - if (dwSearchFlags & (RSF_LOOKATVALUES | RSF_LOOKATDATA)) - return ERROR_CALL_NOT_IMPLEMENTED; /* NYI */ - - do - { - if (pfnCallback) - { - if (pfnCallback(lpParam)) - return ERROR_OPERATION_ABORTED; - } - - lResult = RegNextKey(hKey, lpSubKey, iSubKeyLength); - if (lResult != ERROR_SUCCESS) - return lResult; - - s = _tcsrchr(lpSubKey, TEXT('\\')); - s = s ? s + 1 : lpSubKey; - } - while(!(dwSearchFlags & RSF_LOOKATKEYS) || !RegSearchCompare(s, pszSearchString, dwSearchFlags)); - - return ERROR_SUCCESS; -} - -/****************************************************************************** * Key naming and parsing */ Modified: trunk/reactos/base/applications/regedit/regproc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regproc.h [iso-8859-1] Sun May 16 06:57:24 2010 @@ -92,10 +92,6 @@ #define RSF_LOOKATDATA 0x00000008 #define RSF_MATCHCASE 0x00010000 -LONG RegSearch(HKEY hKey, LPTSTR lpSubKey, size_t iSubKeyLength, - LPCTSTR pszSearchString, DWORD dwValueIndex, - DWORD dwSearchFlags, BOOL (*pfnCallback)(LPVOID), LPVOID lpParam); - BOOL RegKeyGetName(LPTSTR pszDest, size_t iDestLength, HKEY hRootKey, LPCTSTR lpSubKey); /* EOF */

14 years, 4 months

[tkreuzer] 47232: [KERNEL32] - SwitchToFiber: instead of doing a ret to the return address on the stack (which wouldn't work for a newly created fiber) store the returnaddress in the Eip field old fiber context and do a jmp to the Eip of the new fiber. - BasepInitializeContext: set the Eip member of the Context to BaseFiberStartup for fibers CreateFiberEx: initialize the fiber context, instead of an unused context on the stack. - BaseFiberStartup: Use GetCurrentFiber, not GetFiberData to get the

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 16 02:30:11 2010 New Revision: 47232 URL: http://svn.reactos.org/svn/reactos?rev=47232&view=rev Log: [KERNEL32] - SwitchToFiber: instead of doing a ret to the return address on the stack (which wouldn't work for a newly created fiber) store the returnaddress in the Eip field old fiber context and do a jmp to the Eip of the new fiber. - BasepInitializeContext: set the Eip member of the Context to BaseFiberStartup for fibers CreateFiberEx: initialize the fiber context, instead of an unused context on the stack. - BaseFiberStartup: Use GetCurrentFiber, not GetFiberData to get the current fiber. Fixes kernel32_wintest fiber Modified: trunk/reactos/dll/win32/kernel32/misc/utils.c trunk/reactos/dll/win32/kernel32/thread/fiber.c trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S Modified: trunk/reactos/dll/win32/kernel32/misc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ut… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] Sun May 16 02:30:11 2010 @@ -364,7 +364,7 @@ } else if (ContextType == 2) /* For Fibers */ { - //Context->Eip = (ULONG)BaseFiberStartup; + Context->Eip = (ULONG)BaseFiberStartup; } else /* For first thread in a Process */ { Modified: trunk/reactos/dll/win32/kernel32/thread/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/fiber.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/fiber.c [iso-8859-1] Sun May 16 02:30:11 2010 @@ -146,9 +146,8 @@ PFIBER pfCurFiber; NTSTATUS nErrCode; INITIAL_TEB usFiberInitialTeb; - CONTEXT ctxFiberContext; PVOID ActivationContextStack = NULL; - DPRINT1("Creating Fiber\n"); + DPRINT("Creating Fiber\n"); #ifdef SXS_SUPPORT_ENABLED /* Allocate the Activation Context Stack */ @@ -203,7 +202,7 @@ } /* initialize the context for the fiber */ - BasepInitializeContext(&ctxFiberContext, + BasepInitializeContext(&pfCurFiber->Context, lpParameter, lpStartAddress, usFiberInitialTeb.StackBase, @@ -253,10 +252,10 @@ BaseFiberStartup(VOID) { #ifdef _M_IX86 - PFIBER Fiber = GetFiberData(); + PFIBER Fiber = GetCurrentFiber(); /* Call the Thread Startup Routine */ - DPRINT1("Starting Fiber\n"); + DPRINT("Starting Fiber\n"); BaseThreadStartup((LPTHREAD_START_ROUTINE)Fiber->Context.Eax, (LPVOID)Fiber->Context.Ebx); #else Modified: trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S [iso-8859-1] Sun May 16 02:30:11 2010 @@ -24,7 +24,11 @@ mov [eax+FIBER_CONTEXT_ESI], esi mov [eax+FIBER_CONTEXT_EDI], edi mov [eax+FIBER_CONTEXT_EBP], ebp - + + /* Save the return address */ + mov ebx, [esp] + mov [eax+FIBER_CONTEXT_EIP], ebx + /* Check if we're to save FPU State */ cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL | CONTEXT_FLOATING_POINT jnz NoFpuStateSave @@ -115,7 +119,7 @@ mov eax, [ecx+FIBER_FLS_DATA] mov [edx+TEB_FLS_DATA], eax - /* Return */ - ret 4 - + /* Jump to new fiber */ + jmp [ecx+FIBER_CONTEXT_EIP] + /* EOF */

14 years, 4 months

[tkreuzer] 47231: [NDK] Add FIBER_CONTEXT_EIP constant

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 16 02:24:07 2010 New Revision: 47231 URL: http://svn.reactos.org/svn/reactos?rev=47231&view=rev Log: [NDK] Add FIBER_CONTEXT_EIP constant Modified: trunk/reactos/include/ndk/i386/asm.h Modified: trunk/reactos/include/ndk/i386/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/asm.h?rev… ============================================================================== --- trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] Sun May 16 02:24:07 2010 @@ -478,6 +478,7 @@ #define FIBER_CONTEXT_ESI FIBER_CONTEXT + CONTEXT_ESI #define FIBER_CONTEXT_EDI FIBER_CONTEXT + CONTEXT_EDI #define FIBER_CONTEXT_EBP FIBER_CONTEXT + CONTEXT_EBP +#define FIBER_CONTEXT_EIP FIBER_CONTEXT + CONTEXT_EIP #define FIBER_CONTEXT_ESP FIBER_CONTEXT + CONTEXT_ESP #define FIBER_CONTEXT_DR6 FIBER_CONTEXT + CONTEXT_DR6 #define FIBER_CONTEXT_FLOAT_SAVE_STATUS_WORD FIBER_CONTEXT + CONTEXT_FLOAT_SAVE_STATUS_WORD

14 years, 4 months

[akhaldi] 47230: [PSDK] - Bring back TOKEN_STATISTICS alignment inclusions.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun May 16 00:50:07 2010 New Revision: 47230 URL: http://svn.reactos.org/svn/reactos?rev=47230&view=rev Log: [PSDK] - Bring back TOKEN_STATISTICS alignment inclusions. Modified: branches/header-work/include/psdk/winnt.h Modified: branches/header-work/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winnt.… ============================================================================== --- branches/header-work/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/winnt.h [iso-8859-1] Sun May 16 00:50:07 2010 @@ -3110,6 +3110,7 @@ TokenImpersonation } TOKEN_TYPE,*PTOKEN_TYPE; +#include <pshpack4.h> typedef struct _TOKEN_STATISTICS { LUID TokenId; LUID AuthenticationId; @@ -3122,6 +3123,7 @@ DWORD PrivilegeCount; LUID ModifiedId; } TOKEN_STATISTICS, *PTOKEN_STATISTICS; +#include <poppack.h> typedef struct _TOKEN_USER { SID_AND_ATTRIBUTES User;

14 years, 4 months

[spetreolle] 47229: Remove incorrect reference to winsock.h.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun May 16 00:44:31 2010 New Revision: 47229 URL: http://svn.reactos.org/svn/reactos?rev=47229&view=rev Log: Remove incorrect reference to winsock.h. Modified: trunk/rosapps/applications/net/netreg/netreg.cpp Modified: trunk/rosapps/applications/net/netreg/netreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/netreg/ne… ============================================================================== --- trunk/rosapps/applications/net/netreg/netreg.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/net/netreg/netreg.cpp [iso-8859-1] Sun May 16 00:44:31 2010 @@ -8,7 +8,6 @@ * 01-17-2005 arty -- initial */ #include <windows.h> -#include <winsock.h> #include <stdlib.h> #include <stdio.h> #include <map>

14 years, 4 months

[jgardou] 47228: sync with trunk r47227

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun May 16 00:30:01 2010 New Revision: 47228 URL: http://svn.reactos.org/svn/reactos?rev=47228&view=rev Log: sync with trunk r47227 Added: branches/reactos-yarotows/base/applications/cacls/lang/ja-JP.rc - copied unchanged from r47227, trunk/reactos/base/applications/cacls/lang/ja-JP.rc branches/reactos-yarotows/base/applications/rapps/lang/it-IT.rc - copied unchanged from r47227, trunk/reactos/base/applications/rapps/lang/it-IT.rc Removed: branches/reactos-yarotows/tools/rbuild/backend/codeblocks/ Modified: branches/reactos-yarotows/ (props changed) branches/reactos-yarotows/Makefile branches/reactos-yarotows/base/applications/cacls/rsrc.rc branches/reactos-yarotows/base/applications/rapps/rapps/firefox3.txt branches/reactos-yarotows/base/applications/rapps/rapps/mirandaim.txt branches/reactos-yarotows/base/applications/rapps/rapps/openttd.txt branches/reactos-yarotows/base/applications/rapps/rapps/opera.txt branches/reactos-yarotows/base/applications/rapps/rapps/scummvm.txt branches/reactos-yarotows/base/applications/rapps/rsrc.rc branches/reactos-yarotows/base/setup/usetup/lang/it-IT.h branches/reactos-yarotows/base/system/winlogon/environment.c branches/reactos-yarotows/base/system/winlogon/sas.c branches/reactos-yarotows/base/system/winlogon/winlogon.h branches/reactos-yarotows/boot/bootdata/packages/reactos.dff branches/reactos-yarotows/boot/freeldr/freeldr/fs/iso.c branches/reactos-yarotows/boot/freeldr/freeldr/setupldr.rbuild branches/reactos-yarotows/dll/cpl/appwiz/lang/cs-CZ.rc branches/reactos-yarotows/dll/cpl/console/colors.c branches/reactos-yarotows/dll/cpl/console/layout.c branches/reactos-yarotows/dll/cpl/input/settings.c branches/reactos-yarotows/dll/cpl/sysdm/lang/cs-CZ.rc branches/reactos-yarotows/dll/cpl/sysdm/lang/it-IT.rc branches/reactos-yarotows/dll/cpl/usrmgr/groups.c branches/reactos-yarotows/dll/cpl/usrmgr/users.c branches/reactos-yarotows/dll/win32/advapi32/reg/reg.c branches/reactos-yarotows/dll/win32/gdi32/misc/wingl.c branches/reactos-yarotows/dll/win32/iphlpapi/iphlpapi_main.c branches/reactos-yarotows/dll/win32/iphlpapi/iphlpapi_private.h branches/reactos-yarotows/dll/win32/kernel32/lang/bg-BG.mc branches/reactos-yarotows/dll/win32/kernel32/lang/de-DE.mc branches/reactos-yarotows/dll/win32/kernel32/lang/pl-PL.mc branches/reactos-yarotows/dll/win32/kernel32/lang/ru-RU.mc branches/reactos-yarotows/dll/win32/kernel32/misc/console.c branches/reactos-yarotows/dll/win32/msgina/lang/bg-BG.rc branches/reactos-yarotows/dll/win32/msgina/lang/cs-CZ.rc branches/reactos-yarotows/dll/win32/msgina/lang/de-DE.rc branches/reactos-yarotows/dll/win32/msgina/lang/en-US.rc branches/reactos-yarotows/dll/win32/msgina/lang/es-ES.rc branches/reactos-yarotows/dll/win32/msgina/lang/fr-FR.rc branches/reactos-yarotows/dll/win32/msgina/lang/id-ID.rc branches/reactos-yarotows/dll/win32/msgina/lang/it-IT.rc branches/reactos-yarotows/dll/win32/msgina/lang/ja-JP.rc branches/reactos-yarotows/dll/win32/msgina/lang/no-NO.rc branches/reactos-yarotows/dll/win32/msgina/lang/pl-PL.rc branches/reactos-yarotows/dll/win32/msgina/lang/ro-RO.rc branches/reactos-yarotows/dll/win32/msgina/lang/ru-RU.rc branches/reactos-yarotows/dll/win32/msgina/lang/sk-SK.rc branches/reactos-yarotows/dll/win32/msgina/lang/uk-UA.rc branches/reactos-yarotows/dll/win32/msgina/msgina.c branches/reactos-yarotows/dll/win32/netshell/lang/it-IT.rc branches/reactos-yarotows/dll/win32/opengl32/opengl32.c branches/reactos-yarotows/dll/win32/opengl32/opengl32.h branches/reactos-yarotows/dll/win32/opengl32/wgl.c branches/reactos-yarotows/dll/win32/shell32/lang/cs-CZ.rc branches/reactos-yarotows/dll/win32/shell32/lang/it-IT.rc branches/reactos-yarotows/dll/win32/shell32/shfldr_cpanel.c branches/reactos-yarotows/dll/win32/shell32/shlview.c branches/reactos-yarotows/dll/win32/userenv/environment.c branches/reactos-yarotows/drivers/network/afd/afd/read.c branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/devmgr.c branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/devmgr.h branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/ehci.c branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/uhci.c branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_dmus.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_topology.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_wavert.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/registry.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/service_group.cpp branches/reactos-yarotows/drivers/wdm/audio/sysaudio/control.c branches/reactos-yarotows/drivers/wdm/audio/sysaudio/deviface.c branches/reactos-yarotows/drivers/wdm/audio/sysaudio/main.c branches/reactos-yarotows/drivers/wdm/audio/sysaudio/pin.c branches/reactos-yarotows/drivers/wdm/audio/sysaudio/sysaudio.h branches/reactos-yarotows/hal/hal.pspec branches/reactos-yarotows/hal/halx86/generic/bus/pcibus.c branches/reactos-yarotows/include/reactos/subsys/csrss/csrss.h branches/reactos-yarotows/lib/newinflib/infhostgen.c branches/reactos-yarotows/lib/newinflib/infhostrtl.c branches/reactos-yarotows/media/inf/cpu.inf branches/reactos-yarotows/media/inf/ports.inf branches/reactos-yarotows/ntoskrnl/ex/init.c branches/reactos-yarotows/ntoskrnl/include/internal/i386/mm.h branches/reactos-yarotows/ntoskrnl/kd/kdinit.c branches/reactos-yarotows/ntoskrnl/kdbg/kdb.c branches/reactos-yarotows/ntoskrnl/ke/i386/traphdlr.c branches/reactos-yarotows/ntoskrnl/mm/ARM3/arm/init.c branches/reactos-yarotows/ntoskrnl/mm/ARM3/contmem.c branches/reactos-yarotows/ntoskrnl/mm/ARM3/i386/init.c branches/reactos-yarotows/ntoskrnl/mm/ARM3/miarm.h branches/reactos-yarotows/ntoskrnl/mm/ARM3/mminit.c branches/reactos-yarotows/ntoskrnl/mm/ARM3/pagfault.c branches/reactos-yarotows/ntoskrnl/mm/ARM3/pfnlist.c branches/reactos-yarotows/ntoskrnl/mm/ARM3/pool.c branches/reactos-yarotows/ntoskrnl/mm/ARM3/procsup.c branches/reactos-yarotows/ntoskrnl/mm/freelist.c branches/reactos-yarotows/ntoskrnl/mm/mmfault.c branches/reactos-yarotows/ntoskrnl/mm/mminit.c branches/reactos-yarotows/subsystems/win32/csrss/include/conio.h branches/reactos-yarotows/subsystems/win32/csrss/win32csr/conio.c branches/reactos-yarotows/subsystems/win32/csrss/win32csr/dllmain.c branches/reactos-yarotows/subsystems/win32/csrss/win32csr/guiconsole.c branches/reactos-yarotows/subsystems/win32/csrss/win32csr/guiconsole.h branches/reactos-yarotows/subsystems/win32/csrss/win32csr/harderror.c branches/reactos-yarotows/subsystems/win32/csrss/win32csr/tuiconsole.c branches/reactos-yarotows/subsystems/win32/win32k/eng/device.c branches/reactos-yarotows/subsystems/win32/win32k/include/timer.h branches/reactos-yarotows/subsystems/win32/win32k/main/dllmain.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/caret.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/focus.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/keyboard.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/message.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/msgqueue.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/timer.c branches/reactos-yarotows/tools/mkhive/mkhive.c branches/reactos-yarotows/tools/mkhive/registry.c branches/reactos-yarotows/tools/mkhive/registry.h branches/reactos-yarotows/tools/rbuild/rbuild.mak branches/reactos-yarotows/tools/rbuild/rbuild.vcproj [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/reactos-yarotows/Makefile URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/Makefile?rev=4… Modified: branches/reactos-yarotows/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/setup/use… Modified: branches/reactos-yarotows/base/system/winlogon/environment.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/system/wi… Modified: branches/reactos-yarotows/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/system/wi… Modified: branches/reactos-yarotows/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/system/wi… Modified: branches/reactos-yarotows/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/bootdata/… Modified: branches/reactos-yarotows/boot/freeldr/freeldr/fs/iso.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/freeldr/f… Modified: branches/reactos-yarotows/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/freeldr/f… Modified: branches/reactos-yarotows/dll/cpl/appwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/appwiz… Modified: branches/reactos-yarotows/dll/cpl/console/colors.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/consol… Modified: branches/reactos-yarotows/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/consol… Modified: branches/reactos-yarotows/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/input/… Modified: branches/reactos-yarotows/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/sysdm/… Modified: branches/reactos-yarotows/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/sysdm/… Modified: branches/reactos-yarotows/dll/cpl/usrmgr/groups.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/usrmgr… Modified: branches/reactos-yarotows/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/usrmgr… Modified: branches/reactos-yarotows/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/adva… Modified: branches/reactos-yarotows/dll/win32/gdi32/misc/wingl.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/gdi3… Modified: branches/reactos-yarotows/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/iphl… Modified: branches/reactos-yarotows/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/iphl… Modified: branches/reactos-yarotows/dll/win32/kernel32/lang/bg-BG.mc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/lang/de-DE.mc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/lang/pl-PL.mc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/lang/ru-RU.mc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/netshell/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/nets… Modified: branches/reactos-yarotows/dll/win32/opengl32/opengl32.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/open… Modified: branches/reactos-yarotows/dll/win32/opengl32/opengl32.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/open… Modified: branches/reactos-yarotows/dll/win32/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/open… Modified: branches/reactos-yarotows/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/shel… Modified: branches/reactos-yarotows/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/shel… Modified: branches/reactos-yarotows/dll/win32/shell32/shfldr_cpanel.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/shel… Modified: branches/reactos-yarotows/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/shel… Modified: branches/reactos-yarotows/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… Modified: branches/reactos-yarotows/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/networ… Modified: branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/devmgr.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/usb/nt… Modified: branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/devmgr.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/usb/nt… Modified: branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/usb/nt… Modified: branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/usb/nt… Modified: branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/usb/nt… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_dmus.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_topology.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_wavert.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/registry.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/service_group.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/sysaudio/deviface.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/sysaudio/sysaudio.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/hal/hal.pspec URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/hal/hal.pspec?… Modified: branches/reactos-yarotows/hal/halx86/generic/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/hal/halx86/gen… Modified: branches/reactos-yarotows/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Modified: branches/reactos-yarotows/lib/newinflib/infhostgen.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/newinflib/… Modified: branches/reactos-yarotows/lib/newinflib/infhostrtl.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/newinflib/… Modified: branches/reactos-yarotows/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/media/inf/cpu.… Modified: branches/reactos-yarotows/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/media/inf/port… Modified: branches/reactos-yarotows/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/ex/in… Modified: branches/reactos-yarotows/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/inclu… Modified: branches/reactos-yarotows/ntoskrnl/kd/kdinit.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/kd/kd… Modified: branches/reactos-yarotows/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/kdbg/… Modified: branches/reactos-yarotows/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/ke/i3… Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/contmem.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… Modified: branches/reactos-yarotows/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/fr… Modified: branches/reactos-yarotows/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/mm… Modified: branches/reactos-yarotows/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/mm… Modified: branches/reactos-yarotows/subsystems/win32/csrss/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/guiconsole.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/harderror.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/tools/mkhive/mkhive.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/tools/mkhive/m… Modified: branches/reactos-yarotows/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/tools/mkhive/r… Modified: branches/reactos-yarotows/tools/mkhive/registry.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/tools/mkhive/r… Modified: branches/reactos-yarotows/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/tools/rbuild/r… Modified: branches/reactos-yarotows/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/tools/rbuild/r…

14 years, 4 months

[cwittich] 47227: [RBUILD] delete outdated codeblocks backend (codeblocks does not support all features needed to build ros) See issue #5381 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat May 15 22:37:24 2010 New Revision: 47227 URL: http://svn.reactos.org/svn/reactos?rev=47227&view=rev Log: [RBUILD] delete outdated codeblocks backend (codeblocks does not support all features needed to build ros) See issue #5381 for more details. Removed: trunk/reactos/tools/rbuild/backend/codeblocks/ Modified: trunk/reactos/Makefile trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/tools/rbuild/rbuild.mak trunk/reactos/tools/rbuild/rbuild.vcproj Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=47227&r1=4722… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Sat May 15 22:37:24 2010 @@ -472,11 +472,6 @@ $(ECHO_RGENSTAT) $(Q)$(RGENSTAT_TARGET) apistatus.lst apistatus.xml -.PHONY: cb -cb: $(ROS_BUILDENGINE) - $(ECHO_RBUILD) - $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) cb - .PHONY: msbuild msbuild: $(ROS_BUILDENGINE) $(ECHO_RBUILD) Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sat May 15 22:37:24 2010 @@ -4841,15 +4841,7 @@ return RtlNtStatusToDosError(Status); } - if (lpValueName != NULL) - { - RtlInitUnicodeString(&ValueName, - lpValueName); - } - else - { - RtlInitUnicodeString(&ValueName, L""); - } + RtlInitUnicodeString(&ValueName, lpValueName); pValueName = &ValueName; if (is_string(dwType) && (cbData != 0)) Modified: trunk/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.mak?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.mak [iso-8859-1] Sat May 15 22:37:24 2010 @@ -84,24 +84,6 @@ ${mkdir} $@ endif -RBUILD_CODEBLOCKS_BASE = $(RBUILD_BACKEND_BASE_)codeblocks -RBUILD_CODEBLOCKS_BASE_ = $(RBUILD_CODEBLOCKS_BASE)$(SEP) -RBUILD_CODEBLOCKS_INT = $(INTERMEDIATE_)$(RBUILD_CODEBLOCKS_BASE) -RBUILD_CODEBLOCKS_INT_ = $(RBUILD_CODEBLOCKS_INT)$(SEP) -RBUILD_CODEBLOCKS_OUT = $(OUTPUT_)$(RBUILD_CODEBLOCKS_BASE) -RBUILD_CODEBLOCKS_OUT_ = $(RBUILD_CODEBLOCKS_OUT)$(SEP) - -$(RBUILD_CODEBLOCKS_INT): | $(RBUILD_BACKEND_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(RBUILD_CODEBLOCKS_OUT): | $(RBUILD_BACKEND_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - - RBUILD_MSBUILD_BASE = $(RBUILD_BACKEND_BASE_)msbuild RBUILD_MSBUILD_BASE_ = $(RBUILD_MSBUILD_BASE)$(SEP) RBUILD_MSBUILD_INT = $(INTERMEDIATE_)$(RBUILD_MSBUILD_BASE) @@ -184,10 +166,6 @@ mstools_detection.cpp \ proxymakefile.cpp \ rule.cpp \ - ) - -RBUILD_BACKEND_CODEBLOCKS_BASE_SOURCES = $(addprefix $(RBUILD_CODEBLOCKS_BASE_), \ - codeblocks.cpp \ ) RBUILD_BACKEND_DEPMAP_BASE_SOURCES = $(addprefix $(RBUILD_DEPMAP_BASE_), \ @@ -215,7 +193,6 @@ RBUILD_BACKEND_SOURCES = \ $(RBUILD_BACKEND_MINGW_BASE_SOURCES) \ $(RBUILD_BACKEND_MSVC_BASE_SOURCES) \ - $(RBUILD_BACKEND_CODEBLOCKS_BASE_SOURCES) \ $(RBUILD_BACKEND_DEPMAP_BASE_SOURCES) \ $(RBUILD_BACKEND_VREPORT_BASE_SOURCES) \ $(RBUILD_BACKEND_MSBUILD_BASE_SOURCES) \ @@ -257,9 +234,6 @@ RBUILD_BACKEND_MSVCCPP_HEADERS = \ msvc.h -RBUILD_BACKEND_CODEBLOCKS_HEADERS = \ - codeblocks.h - RBUILD_BACKEND_DEPMAP_HEADERS = \ dependencymap.h @@ -278,7 +252,6 @@ backend.h \ $(addprefix msvc$(SEP), $(RBUILD_BACKEND_MSVC_HEADERS)) \ $(addprefix mingw$(SEP), $(RBUILD_BACKEND_MINGW_HEADERS)) \ - $(addprefix codeblocks$(SEP), $(RBUILD_BACKEND_CODEBLOCKS_HEADERS)) \ $(addprefix msbuild$(SEP), $(RBUILD_BACKEND_MSBUILD_HEADERS)) \ $(addprefix versionreport$(SEP), $(RBUILD_BACKEND_VREPORT_HEADERS)) \ $(addprefix dependencymap$(SEP), $(RBUILD_BACKEND_DEPMAP_HEADERS)) @@ -470,10 +443,6 @@ $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_CODEBLOCKS_INT_)codeblocks.o: $(RBUILD_CODEBLOCKS_BASE_)codeblocks.cpp $(RBUILD_HEADERS) | $(RBUILD_CODEBLOCKS_INT) - $(ECHO_HOSTCC) - ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ - $(RBUILD_DEPMAP_INT_)dependencymap.o: $(RBUILD_DEPMAP_BASE_)dependencymap.cpp $(RBUILD_HEADERS) | $(RBUILD_DEPMAP_INT) $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ Modified: trunk/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.vcproj… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.vcproj [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.vcproj [iso-8859-1] Sat May 15 22:37:24 2010 @@ -444,18 +444,6 @@ </File> </Filter> <Filter - Name="codeblocks" - > - <File - RelativePath=".\backend\codeblocks\codeblocks.cpp" - > - </File> - <File - RelativePath=".\backend\codeblocks\codeblocks.h" - > - </File> - </Filter> - <Filter Name="dependencymap" > <File

14 years, 4 months

[mjmartin] 47226: [win32k] - Change the first parameter type from HWND to PWINDOW_OBJECT for IntKillTimer as it makes more sense. Activate IntSetTimer, already done by James. - Add flag TMRF_DELETEPENDING. Destroy timers when this flag is set in ProcessTimers to allow any timers that have expired to have the WM_SYSTIMER/WM_TIMER messages posted to message queue before being destroyed. - Fix error in FindTimer, it was always returning a Timer and it needed to return NULL if the specified timer di

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sat May 15 21:40:33 2010 New Revision: 47226 URL: http://svn.reactos.org/svn/reactos?rev=47226&view=rev Log: [win32k] - Change the first parameter type from HWND to PWINDOW_OBJECT for IntKillTimer as it makes more sense. Activate IntSetTimer, already done by James. - Add flag TMRF_DELETEPENDING. Destroy timers when this flag is set in ProcessTimers to allow any timers that have expired to have the WM_SYSTIMER/WM_TIMER messages posted to message queue before being destroyed. - Fix error in FindTimer, it was always returning a Timer and it needed to return NULL if the specified timer did not exist. - Fix error in PostTimerMessages, need to handle cases where the Window object is NULL which occurs when requesting messages for any window belonging to the thread. - In co_IntPeekMessage, simply call PostTimerMessages to have WM_SYSTIMER/WM_TIMER messages posted for expired timers. Remove call to old timer message handling. - TODO: Code using the old timer implementation needs removed. - Fixes bugs #2393, #3634, #2835. Commit dedicated to JT and Mr. Roboto. Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/caret.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] Sat May 15 21:40:33 2010 @@ -23,12 +23,14 @@ #define TMRF_ONESHOT 0x0010 #define TMRF_WAITING 0x0020 #define TMRF_TIFROMWND 0x0040 +#define TMRF_DELETEPENDING 0x8000 extern PKTIMER MasterTimer; NTSTATUS FASTCALL InitTimerImpl(VOID); -BOOL FASTCALL IntKillTimer(HWND Wnd, UINT_PTR IDEvent, BOOL SystemTimer); -UINT_PTR FASTCALL IntSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, BOOL SystemTimer); +BOOL FASTCALL DestroyTimersForThread(PTHREADINFO pti); +BOOL FASTCALL IntKillTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, BOOL SystemTimer); +UINT_PTR FASTCALL IntSetTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, INT Type); PTIMER FASTCALL FindSystemTimer(PMSG); BOOL FASTCALL ValidateTimerCallback(PTHREADINFO,PWINDOW_OBJECT,WPARAM,LPARAM); VOID CALLBACK SystemTimerProc(HWND,UINT,UINT_PTR,DWORD); Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sat May 15 21:40:33 2010 @@ -290,6 +290,8 @@ Win32Thread->TIF_flags |= TIF_INCLEANUP; DceFreeThreadDCE(Win32Thread); HOOK_DestroyThreadHooks(Thread); + /* Cleanup timers */ + DestroyTimersForThread(Win32Thread); UnregisterThreadHotKeys(Thread); /* what if this co_ func crash in umode? what will clean us up then? */ co_DestroyThreadWindows(Thread); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] Sat May 15 21:40:33 2010 @@ -189,7 +189,7 @@ ThreadQueue->CaretInfo->Pos.x = X; ThreadQueue->CaretInfo->Pos.y = Y; co_IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); - IntSetTimer(ThreadQueue->CaretInfo->hWnd, IDCARETTIMER, IntGetCaretBlinkTime(), NULL, TRUE); + IntSetTimer(UserGetWindowObject(ThreadQueue->CaretInfo->hWnd), IDCARETTIMER, IntGetCaretBlinkTime(), NULL, TMRF_SYSTEM); } return TRUE; } @@ -302,7 +302,7 @@ { co_IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); } - IntSetTimer(ThreadQueue->CaretInfo->hWnd, IDCARETTIMER, IntGetCaretBlinkTime(), NULL, TRUE); + IntSetTimer(UserGetWindowObject(ThreadQueue->CaretInfo->hWnd), IDCARETTIMER, IntGetCaretBlinkTime(), NULL, TMRF_SYSTEM); } return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat May 15 21:40:33 2010 @@ -880,23 +880,8 @@ goto MsgExit; } - if (ThreadQueue->WakeMask & QS_TIMER) - if (PostTimerMessages(Window)) // If there are timers ready, - goto CheckMessages; // go back and process them. - - // LOL! Polling Timer Queue? How much time is spent doing this? - /* Check for WM_(SYS)TIMER messages */ - Present = MsqGetTimerMessage( ThreadQueue, - Window, - MsgFilterMin, - MsgFilterMax, - &Msg->Msg, - RemoveMessages); - if (Present) - { - Msg->FreeLParam = FALSE; - goto MessageFound; - } + if (PostTimerMessages(Window)) + goto CheckMessages; if(Present) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Sat May 15 21:40:33 2010 @@ -57,7 +57,7 @@ { Ret = UserCreateObject(gHandleTable, NULL, &Handle, otTimer, sizeof(TIMER)); if (Ret) InsertTailList(&FirstpTmr->ptmrList, &Ret->ptmrList); - } + } return Ret; } @@ -68,8 +68,8 @@ { if (pTmr) { - RemoveEntryList(&pTmr->ptmrList); - UserDeleteObject( UserHMGetHandle(pTmr), otTimer); + /* Set the flag, it will be removed when ready */ + pTmr->flags |= TMRF_DELETEPENDING; return TRUE; } return FALSE; @@ -83,7 +83,7 @@ BOOL Distroy) { PLIST_ENTRY pLE; - PTIMER pTmr = FirstpTmr; + PTIMER pTmr = FirstpTmr, RetTmr = NULL; KeEnterCriticalRegion(); do { @@ -96,8 +96,8 @@ if (Distroy) { RemoveTimer(pTmr); - pTmr = (PTIMER)1; // We are here to remove the timer. } + RetTmr = pTmr; break; } @@ -106,7 +106,7 @@ } while (pTmr != FirstpTmr); KeLeaveCriticalRegion(); - return pTmr; + return RetTmr; } PTIMER @@ -162,15 +162,15 @@ return TRUE; } -// Rename it to IntSetTimer after move. UINT_PTR FASTCALL -InternalSetTimer( PWINDOW_OBJECT Window, +IntSetTimer( PWINDOW_OBJECT Window, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, INT Type) { PTIMER pTmr; + UINT Ret= IDEvent; LARGE_INTEGER DueTime; DueTime.QuadPart = (LONGLONG)(-10000000); @@ -195,6 +195,24 @@ { DPRINT("Adjusting uElapse\n"); Elapse = 10; + } + + if ((Window == NULL) && (!(Type & TMRF_SYSTEM))) + { + IntLockWindowlessTimerBitmap(); + IDEvent = RtlFindClearBitsAndSet(&WindowLessTimersBitMap, 1, HintIndex); + + if (IDEvent == (UINT_PTR) -1) + { + IntUnlockWindowlessTimerBitmap(); + DPRINT1("Unable to find a free window-less timer id\n"); + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + return 0; + } + + HintIndex = ++IDEvent; + IntUnlockWindowlessTimerBitmap(); + Ret = IDEvent; } pTmr = FindTimer(Window, IDEvent, Type, FALSE); @@ -215,18 +233,23 @@ pTmr->pWnd = Window; pTmr->cmsCountdown = Elapse; pTmr->cmsRate = Elapse; - pTmr->flags = Type|TMRF_INIT; // Set timer to Init mode. pTmr->pfn = TimerFunc; pTmr->nID = IDEvent; - - InsertTailList(&FirstpTmr->ptmrList, &pTmr->ptmrList); + pTmr->flags = Type|TMRF_INIT; // Set timer to Init mode. + } + + pTmr->cmsCountdown = Elapse; + pTmr->cmsRate = Elapse; + if (pTmr->flags & TMRF_DELETEPENDING) + { + pTmr->flags &= ~TMRF_DELETEPENDING; } // Start the timer thread! - KeSetTimer(MasterTimer, DueTime, NULL); - - if (!pTmr->nID) return 1; - return pTmr->nID; + if (pTmr == FirstpTmr) + KeSetTimer(MasterTimer, DueTime, NULL); + + return Ret; } // @@ -248,7 +271,7 @@ { // Need to start gdi syncro timers then start timer with Hang App proc // that calles Idle process so the screen savers will know to run...... - InternalSetTimer(NULL, 0, 1000, SystemTimerProc, TMRF_RIT); + IntSetTimer(NULL, 0, 1000, SystemTimerProc, TMRF_RIT); } UINT_PTR @@ -256,14 +279,14 @@ SystemTimerSet( PWINDOW_OBJECT Window, UINT_PTR nIDEvent, UINT uElapse, - TIMERPROC lpTimerFunc) + TIMERPROC lpTimerFunc) { if (Window && Window->pti->pEThread->ThreadsProcess != PsGetCurrentProcess()) { SetLastWin32Error(ERROR_ACCESS_DENIED); return 0; } - return InternalSetTimer( Window, nIDEvent, uElapse, lpTimerFunc, TMRF_SYSTEM); + return IntSetTimer( Window, nIDEvent, uElapse, lpTimerFunc, TMRF_SYSTEM); } BOOL @@ -279,28 +302,23 @@ if (!pTmr) return FALSE; - if (Window && ((ULONG_PTR)Window != 1)) - { - if (!Window->Wnd) return FALSE; - } - pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; KeEnterCriticalRegion(); + do { if ( (pTmr->flags & TMRF_READY) && (pTmr->pti == pti) && - (pTmr->pWnd == Window)) + ((pTmr->pWnd == Window) || (Window == NULL) ) ) { - ASSERT((ULONG_PTR)Window != 1); - Msg.hwnd = Window->hSelf; + Msg.hwnd = (pTmr->pWnd) ? pTmr->pWnd->hSelf : 0; Msg.message = (pTmr->flags & TMRF_SYSTEM) ? WM_SYSTIMER : WM_TIMER; Msg.wParam = (WPARAM) pTmr->nID; Msg.lParam = (LPARAM) pTmr->pfn; - MsqPostMessage(ThreadQueue, &Msg, FALSE, QS_POSTMESSAGE); - + + MsqPostMessage(ThreadQueue, &Msg, FALSE, QS_TIMER); pTmr->flags &= ~TMRF_READY; ThreadQueue->WakeMask = ~QS_TIMER; Hit = TRUE; @@ -309,6 +327,7 @@ pLE = pTmr->ptmrList.Flink; pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); } while (pTmr != FirstpTmr); + KeLeaveCriticalRegion(); return Hit; @@ -330,7 +349,7 @@ KeQueryTickCount(&TickCount); Time = MsqCalculateMessageTime(&TickCount); - DueTime.QuadPart = (LONGLONG)(-10000000); + DueTime.QuadPart = (LONGLONG)(-1000000); do { @@ -341,8 +360,10 @@ continue; } - if (pTmr->flags & TMRF_INIT) + if (pTmr->flags & TMRF_INIT) + { pTmr->flags &= ~TMRF_INIT; // Skip this run. + } else { if (pTmr->cmsCountdown < 0) @@ -363,16 +384,35 @@ // Set thread message queue for this timer. if (pTmr->pti->MessageQueue) { // Wakeup thread - pTmr->pti->MessageQueue->WakeMask |= QS_TIMER; - KeSetEvent(pTmr->pti->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); + if (pTmr->pti->MessageQueue->WakeMask & QS_POSTMESSAGE) + KeSetEvent(pTmr->pti->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); } } } - pTmr->cmsCountdown = pTmr->cmsRate; + if (pTmr->flags & TMRF_DELETEPENDING) + { + DPRINT("Removing Timer %x from List\n", pTmr); + + /* FIXME: Fix this!!!! */ +/* + if (!pTmr->pWnd) + { + DPRINT1("Clearing Bits for WindowLess Timer\n"); + IntLockWindowlessTimerBitmap(); + RtlSetBits(&WindowLessTimersBitMap, pTmr->nID, 1); + IntUnlockWindowlessTimerBitmap(); + } +*/ + RemoveEntryList(&pTmr->ptmrList); + UserDeleteObject( UserHMGetHandle(pTmr), otTimer); + } + else + pTmr->cmsCountdown = pTmr->cmsRate; } else pTmr->cmsCountdown -= Time - TimeLast; } + pLE = pTmr->ptmrList.Flink; pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); } while (pTmr != FirstpTmr); @@ -391,7 +431,7 @@ // // UINT_PTR FASTCALL -IntSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, BOOL SystemTimer) +InternalSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, BOOL SystemTimer) { PWINDOW_OBJECT Window; UINT_PTR Ret = 0; @@ -477,17 +517,66 @@ return 0; } - +if (Ret == 0) ASSERT(FALSE); return Ret; } - BOOL FASTCALL -IntKillTimer(HWND Wnd, UINT_PTR IDEvent, BOOL SystemTimer) +DestroyTimersForThread(PTHREADINFO pti) +{ + PLIST_ENTRY pLE; + PTIMER pTmr = FirstpTmr; + BOOL TimersRemoved = FALSE; + + if (FirstpTmr == NULL) + return FALSE; + + KeEnterCriticalRegion(); + + do + { + if ((pTmr) && (pTmr->pti == pti)) + { + pTmr->flags &= ~TMRF_READY; + pTmr->flags |= TMRF_DELETEPENDING; + TimersRemoved = TRUE; + } + pLE = pTmr->ptmrList.Flink; + pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); + } while (pTmr != FirstpTmr); + + KeLeaveCriticalRegion(); + + return TimersRemoved; +} + + +BOOL FASTCALL +IntKillTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, BOOL SystemTimer) +{ + PTIMER pTmr = NULL; + DPRINT("IntKillTimer Window %x id %p systemtimer %s\n", + Window, IDEvent, SystemTimer ? "TRUE" : "FALSE"); + + if (IDEvent == 0) + return FALSE; + + pTmr = FindTimer(Window, IDEvent, SystemTimer ? TMRF_SYSTEM : 0, TRUE); + return pTmr ? TRUE : FALSE; +} + + +// +// +// Old Kill Timer +// +// +BOOL FASTCALL +InternalKillTimer(HWND Wnd, UINT_PTR IDEvent, BOOL SystemTimer) { PTHREADINFO pti; PWINDOW_OBJECT Window = NULL; - + DPRINT("IntKillTimer wnd %x id %p systemtimer %s\n", Wnd, IDEvent, SystemTimer ? "TRUE" : "FALSE"); @@ -495,7 +584,7 @@ if (Wnd) { Window = UserGetWindowObject(Wnd); - + if (! MsqKillTimer(pti->MessageQueue, Wnd, IDEvent, SystemTimer ? WM_SYSTIMER : WM_TIMER)) { @@ -574,7 +663,7 @@ DPRINT("Enter NtUserSetTimer\n"); UserEnterExclusive(); - RETURN(IntSetTimer(hWnd, nIDEvent, uElapse, lpTimerFunc, FALSE)); + RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, lpTimerFunc, 0)); CLEANUP: DPRINT("Leave NtUserSetTimer, ret=%i\n", _ret_); @@ -591,12 +680,15 @@ UINT_PTR uIDEvent ) { + PWINDOW_OBJECT Window; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserKillTimer\n"); UserEnterExclusive(); - RETURN(IntKillTimer(hWnd, uIDEvent, FALSE)); + Window = UserGetWindowObject(hWnd); + + RETURN(IntKillTimer(Window, uIDEvent, FALSE)); CLEANUP: DPRINT("Leave NtUserKillTimer, ret=%i\n", _ret_); @@ -620,7 +712,7 @@ UserEnterExclusive(); // This is wrong, lpTimerFunc is NULL! - RETURN(IntSetTimer(hWnd, nIDEvent, uElapse, lpTimerFunc, TRUE)); + RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, lpTimerFunc, TMRF_SYSTEM)); CLEANUP: DPRINT("Leave NtUserSetSystemTimer, ret=%i\n", _ret_);

14 years, 4 months

← Newer
1
...
25
26
27
28
29
30
31
...
44
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 May 2010