Ros-diffs September 2009

ros-diffs@reactos.org

16 participants
270 discussions

[janderwald] 43096: - Rewrite sound scheme handling - Implement changing sound scheme & sound action
by janderwald＠svn.reactos.org 20 Sep '09

20 Sep '09

Author: janderwald Date: Sun Sep 20 17:47:32 2009 New Revision: 43096 URL: http://svn.reactos.org/svn/reactos?rev=43096&view=rev Log: - Rewrite sound scheme handling - Implement changing sound scheme & sound action Modified: trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Sun Sep 20 17:47:32 2009 @@ -16,41 +16,152 @@ #include <stdio.h> #include "mmsys.h" #include "resource.h" +#include <debug.h> + +struct __APP_MAP__; + +typedef struct __LABEL_MAP__ +{ + TCHAR * szName; + TCHAR * szDesc; + TCHAR * szIcon; + struct __APP_MAP__ * AppMap; + struct __LABEL_MAP__ * Next; +}LABEL_MAP, *PLABEL_MAP; + +typedef struct __APP_MAP__ +{ + TCHAR szName[MAX_PATH]; + TCHAR szDesc[MAX_PATH]; + TCHAR szIcon[MAX_PATH]; + + struct __APP_MAP__ *Next; + PLABEL_MAP LabelMap; +}APP_MAP, *PAPP_MAP; typedef struct __LABEL_CONTEXT__ { - TCHAR szName[MAX_PATH]; + PLABEL_MAP LabelMap; + PAPP_MAP AppMap; TCHAR szValue[MAX_PATH]; struct __LABEL_CONTEXT__ *Next; }LABEL_CONTEXT, *PLABEL_CONTEXT; -typedef struct __APP_CONTEXT__ +typedef struct __SOUND_SCHEME_CONTEXT__ { TCHAR szName[MAX_PATH]; TCHAR szDesc[MAX_PATH]; - TCHAR szIcon[MAX_PATH]; PLABEL_CONTEXT LabelContext; - struct __APP_CONTEXT__ * Next; -}APP_CONTEXT, *PAPP_CONTEXT; - - -typedef struct __SOUND_SCHEME_CONTEXT__ -{ - TCHAR szName[MAX_PATH]; - TCHAR szDesc[MAX_PATH]; - PAPP_CONTEXT AppContext; }SOUND_SCHEME_CONTEXT, *PSOUND_SCHEME_CONTEXT; -typedef struct __LABEL_MAP__ -{ - TCHAR * szName; - TCHAR * szDesc; - TCHAR * szIcon; - struct __LABEL_MAP__ * Next; -}LABEL_MAP, *PLABEL_MAP; - static PLABEL_MAP s_Map = NULL; - +static PAPP_MAP s_App = NULL; + +TCHAR szDefault[MAX_PATH]; + + +PLABEL_MAP FindLabel(PAPP_MAP pAppMap, TCHAR * szName) +{ + PLABEL_MAP pMap = s_Map; + + while(pMap) + { + if (!_tcscmp(pMap->szName, szName)) + return pMap; + + pMap = pMap->Next; + + } + + pMap = pAppMap->LabelMap; + + while(pMap) + { + if (!_tcscmp(pMap->szName, szName)) + return pMap; + + pMap = pMap->Next; + + } + + + return NULL; +} + +VOID RemoveLabel(PLABEL_MAP pMap) +{ + PLABEL_MAP pCurMap = s_Map; + + if (pCurMap == pMap) + { + s_Map = s_Map->Next; + return; + } + + + while(pCurMap) + { + if (pCurMap->Next == pMap) + { + pCurMap->Next = pCurMap->Next->Next; + return; + } + pCurMap = pCurMap->Next; + } +} + + + + + + +PAPP_MAP FindApp(TCHAR * szName) +{ + PAPP_MAP pMap = s_App; + + while(pMap) + { + if (!_tcscmp(pMap->szName, szName)) + return pMap; + + pMap = pMap->Next; + + } + return NULL; +} + +PLABEL_CONTEXT FindLabelContext(PSOUND_SCHEME_CONTEXT pSoundScheme, TCHAR * AppName, TCHAR * LabelName) +{ + PLABEL_CONTEXT pLabelContext; + + pLabelContext = pSoundScheme->LabelContext; + + while(pLabelContext) + { + ASSERT(pLabelContext->AppMap); + ASSERT(pLabelContext->LabelMap); + + if(!_tcsicmp(pLabelContext->AppMap->szName, AppName) && !_tcsicmp(pLabelContext->LabelMap->szName, LabelName)) + { + return pLabelContext; + } + pLabelContext = pLabelContext->Next; + } + + pLabelContext = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LABEL_CONTEXT)); + if (!pLabelContext) + return NULL; + + pLabelContext->AppMap = FindApp(AppName); + pLabelContext->LabelMap = FindLabel(pLabelContext->AppMap, LabelName); + ASSERT(pLabelContext->AppMap); + ASSERT(pLabelContext->LabelMap); + pLabelContext->szValue[0] = _T('\0'); + pLabelContext->Next = pSoundScheme->LabelContext; + pSoundScheme->LabelContext = pLabelContext; + + return pLabelContext; +} BOOL LoadEventLabel(HKEY hKey, TCHAR * szSubKey) @@ -163,20 +274,6 @@ RegCloseKey(hSubKey); return (dwCount != 0); } -PLABEL_MAP FindLabel(TCHAR * szName) -{ - PLABEL_MAP pMap = s_Map; - - while(pMap) - { - if (!_tcscmp(pMap->szName, szName)) - return pMap; - - pMap = pMap->Next; - - } - return NULL; -} BOOL AddSoundProfile(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey, BOOL SetDefault) @@ -212,7 +309,6 @@ { _tcscpy(pScheme->szDesc, szValue); _tcscpy(pScheme->szName, szSubKey); - pScheme->AppContext = NULL; } SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pScheme); @@ -232,7 +328,6 @@ HKEY hSubKey; DWORD dwName, dwCurKey, dwResult, dwNumSchemes; TCHAR szName[MAX_PATH]; - TCHAR szDefault[MAX_PATH]; dwName = sizeof(szDefault) / sizeof(TCHAR); if (RegQueryValueEx(hKey, @@ -310,41 +405,25 @@ return pScheme; } } - return FALSE; -} -PAPP_CONTEXT FindAppContext(PSOUND_SCHEME_CONTEXT pScheme, TCHAR * szAppName) -{ - PAPP_CONTEXT pAppContext = pScheme->AppContext; - while(pAppContext) - { - if (!_tcsicmp(pAppContext->szName, szAppName)) - return pScheme->AppContext; - pAppContext = pAppContext->Next; - } - return FALSE; -} - - - + return NULL; +} BOOL -ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName, TCHAR * szAppName) +ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName, TCHAR * szAppName, PAPP_MAP AppMap, PLABEL_MAP LabelMap) { HKEY hSubKey; TCHAR szValue[MAX_PATH]; TCHAR szBuffer[MAX_PATH]; DWORD dwValue; PSOUND_SCHEME_CONTEXT pScheme; - PAPP_CONTEXT pAppContext; PLABEL_CONTEXT pLabelContext; - BOOL Create = FALSE; + BOOL bCurrentProfile, bActiveProfile; + //MessageBox(hwndDlg, szProfile, szLabelName, MB_OK); - if (!_tcsicmp(szProfile, _T(".Current"))) - { - //ignore current settings for now - return TRUE; - } + bCurrentProfile = !_tcsicmp(szProfile, _T(".Current")); + bActiveProfile = !_tcsicmp(szProfile, szDefault); + if (RegOpenKeyEx(hKey, szProfile, @@ -365,64 +444,37 @@ { return FALSE; } - pScheme = FindSoundProfile(hwndDlg, szProfile); + + if (bCurrentProfile) + pScheme = FindSoundProfile(hwndDlg, szDefault); + else + pScheme = FindSoundProfile(hwndDlg, szProfile); + if (!pScheme) { //MessageBox(hwndDlg, szProfile, _T("no profile!!"), MB_OK); return FALSE; } - - pAppContext = FindAppContext(pScheme, szAppName); - if (!pAppContext) - { - pAppContext = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(APP_CONTEXT)); - Create = TRUE; - } - - if (!pAppContext) - { - - //MessageBox(hwndDlg, szAppName, _T("no appcontext"), MB_OK); - return FALSE; - } - pLabelContext = (PLABEL_CONTEXT)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LABEL_CONTEXT)); - if (!pLabelContext) - { - HeapFree(GetProcessHeap(), 0, pLabelContext); - if (Create) - { - HeapFree(GetProcessHeap(), 0, pAppContext); - } - return FALSE; - } + pLabelContext = FindLabelContext(pScheme, AppMap->szName, LabelMap->szName); + dwValue = ExpandEnvironmentStrings(szValue, szBuffer, sizeof(szBuffer) / sizeof(TCHAR)); if (dwValue == 0 || dwValue > (sizeof(szBuffer) / sizeof(TCHAR))) { /* fixme */ - HeapFree(GetProcessHeap(), 0, pLabelContext); - if (Create) - { - HeapFree(GetProcessHeap(), 0, pAppContext); - } - return FALSE; - } - _tcscpy(pLabelContext->szValue, szBuffer); - _tcscpy(pLabelContext->szName, szLabelName); - pLabelContext->Next = pAppContext->LabelContext; - pAppContext->LabelContext = pLabelContext; - - if (Create) - { - _tcscpy(pAppContext->szName, szAppName); - pAppContext->Next = pScheme->AppContext; - pScheme->AppContext = pAppContext; - } + return FALSE; + } + + if (bCurrentProfile) + _tcscpy(pLabelContext->szValue, szBuffer); + else if (!bActiveProfile) + _tcscpy(pLabelContext->szValue, szBuffer); + return TRUE; } DWORD -ImportSoundEntry(HWND hwndDlg, HKEY hKey, TCHAR * szLabelName, TCHAR * szAppName) +ImportSoundEntry(HWND hwndDlg, HKEY hKey, TCHAR * szLabelName, TCHAR * szAppName, PAPP_MAP pAppMap) { HKEY hSubKey; DWORD dwNumProfiles; @@ -430,6 +482,7 @@ DWORD dwResult; DWORD dwProfile; TCHAR szProfile[MAX_PATH]; + PLABEL_MAP pLabel; if (RegOpenKeyEx(hKey, szLabelName, @@ -441,6 +494,13 @@ } //MessageBox(hwndDlg, szLabelName, szAppName, MB_OK); + + pLabel = FindLabel(NULL, szLabelName); + RemoveLabel(pLabel); + + pLabel->AppMap = pAppMap; + pLabel->Next = pAppMap->LabelMap; + pAppMap->LabelMap = pLabel; dwNumProfiles = 0; dwCurKey = 0; @@ -458,7 +518,7 @@ if (dwResult == ERROR_SUCCESS) { - if (ImportSoundLabel(hwndDlg, hSubKey, szProfile, szLabelName, szAppName)) + if (ImportSoundLabel(hwndDlg, hSubKey, szProfile, szLabelName, szAppName, pAppMap, pLabel)) { dwNumProfiles++; } @@ -468,6 +528,7 @@ }while(dwResult == ERROR_SUCCESS); RegCloseKey(hSubKey); + return dwNumProfiles; } @@ -485,8 +546,13 @@ DWORD dwName; TCHAR szName[MAX_PATH]; TCHAR szIcon[MAX_PATH]; + PAPP_MAP AppMap; //MessageBox(hwndDlg, szAppName, _T("Importing...\n"), MB_OK); + + AppMap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(APP_MAP)); + if (!AppMap) + return 0; if (RegOpenKeyEx(hKey, szAppName, @@ -494,7 +560,8 @@ KEY_READ, &hSubKey) != ERROR_SUCCESS) { - return FALSE; + HeapFree(GetProcessHeap(), 0, AppMap); + return 0; } dwDefault = sizeof(szDefault) / sizeof(TCHAR); @@ -506,7 +573,8 @@ &dwDefault) != ERROR_SUCCESS) { RegCloseKey(hSubKey); - return FALSE; + HeapFree(GetProcessHeap(), 0, AppMap); + return 0; } dwDefault = sizeof(szIcon) / sizeof(TCHAR); @@ -519,6 +587,15 @@ { szIcon[0] = _T('\0'); } + + /* initialize app map */ + _tcscpy(AppMap->szName, szAppName); + _tcscpy(AppMap->szDesc, szDefault); + _tcscpy(AppMap->szIcon, szIcon); + + AppMap->Next = s_App; + s_App = AppMap; + dwCurKey = 0; dwNumEntry = 0; @@ -535,38 +612,8 @@ NULL); if (dwResult == ERROR_SUCCESS) { - if (ImportSoundEntry(hwndDlg, hSubKey, szName, szAppName)) + if (ImportSoundEntry(hwndDlg, hSubKey, szName, szAppName, AppMap)) { - LRESULT lCount = SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_GETCOUNT, (WPARAM)0, (LPARAM)0); - if (lCount != CB_ERR) - { - LRESULT lIndex; - LRESULT lResult; - for (lIndex = 0; lIndex < lCount; lIndex++) - { - lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_GETITEMDATA, (WPARAM)lIndex, (LPARAM)0); - if (lResult != CB_ERR) - { - PAPP_CONTEXT pAppContext; - PSOUND_SCHEME_CONTEXT pScheme = (PSOUND_SCHEME_CONTEXT)lResult; - if (!_tcsicmp(pScheme->szName, _T(".None"))) - { - continue; - } - pAppContext = FindAppContext(pScheme, szAppName); - if (pAppContext) - { - _tcscpy(pAppContext->szDesc, szDefault); - _tcscpy(pAppContext->szIcon, szIcon); - } - - } - } - - - } - - dwNumEntry++; } } @@ -712,7 +759,7 @@ { LRESULT lIndex; PSOUND_SCHEME_CONTEXT pScheme; - PAPP_CONTEXT pAppContext; + PAPP_MAP pAppMap; LV_ITEM listItem; LV_COLUMN dummy; HWND hDlgCtrl, hList; @@ -733,11 +780,8 @@ return FALSE; } pScheme = (PSOUND_SCHEME_CONTEXT)lIndex; - pAppContext = pScheme->AppContext; - if (!pAppContext) - { - return FALSE; - } + + _tcscpy(szDefault, pScheme->szName); /* add column for app */ GetClientRect(hList, &rect); @@ -747,42 +791,96 @@ dummy.cx = rect.right - rect.left - GetSystemMetrics(SM_CXVSCROLL); (void)ListView_InsertColumn(hList, 0, &dummy); ItemIndex = 0; - while(pAppContext) - { - PLABEL_CONTEXT pLabelContext = pAppContext->LabelContext; - if (pLabelContext) - { -#if 0 + + pAppMap = s_App; + while(pAppMap) + { + PLABEL_MAP pLabelMap = pAppMap->LabelMap; + while(pLabelMap) + { ZeroMemory(&listItem, sizeof(LV_ITEM)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; - listItem.pszText = pAppContext->szDesc; - listItem.lParam = (LPARAM)pAppContext; + listItem.pszText = pLabelMap->szDesc; + listItem.lParam = (LPARAM)FindLabelContext(pScheme, pAppMap->szName, pLabelMap->szName); listItem.iItem = ItemIndex; listItem.iImage = -1; (void)ListView_InsertItem(hList, &listItem); ItemIndex++; -#endif - while(pLabelContext) - { - PLABEL_MAP pMap = FindLabel(pLabelContext->szName); - if (pMap) - { - ZeroMemory(&listItem, sizeof(LV_ITEM)); - listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; - listItem.pszText = pMap->szDesc; - listItem.lParam = (LPARAM)pLabelContext; - listItem.iItem = ItemIndex; - listItem.iImage = -1; - (void)ListView_InsertItem(hList, &listItem); - ItemIndex++; - } - pLabelContext = pLabelContext->Next; - } - } - pAppContext = pAppContext->Next; + + pLabelMap = pLabelMap->Next; + } + pAppMap = pAppMap->Next; } return TRUE; } + +BOOL +ApplyChanges(HWND hwndDlg) +{ + HKEY hKey, hSubKey; + LRESULT lIndex; + PSOUND_SCHEME_CONTEXT pScheme; + HWND hDlgCtrl; + PLABEL_CONTEXT pLabelContext; + TCHAR Buffer[100]; + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_SOUND_SCHEME); + + lIndex = SendMessage(hDlgCtrl, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + if (lIndex == CB_ERR) + { + return FALSE; + } + + lIndex = SendMessage(hDlgCtrl, CB_GETITEMDATA, (WPARAM)lIndex, (LPARAM)0); + if (lIndex == CB_ERR) + { + return FALSE; + } + pScheme = (PSOUND_SCHEME_CONTEXT)lIndex; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, + _T("AppEvents\\Schemes"), + 0, + KEY_WRITE, + &hKey) != ERROR_SUCCESS) + { + return FALSE; + } + + RegSetValueEx(hKey, NULL, 0, REG_SZ, (LPBYTE)pScheme->szName, (_tcslen(pScheme->szName) +1) * sizeof(TCHAR)); + RegCloseKey(hKey); + + if (RegOpenKeyEx(HKEY_CURRENT_USER, + _T("AppEvents\\Schemes\\Apps"), + 0, + KEY_WRITE, + &hKey) != ERROR_SUCCESS) + { + return FALSE; + } + + pLabelContext = pScheme->LabelContext; + + while(pLabelContext) + { + _stprintf(Buffer, _T("%s\\%s\\.Current"), pLabelContext->AppMap->szName, pLabelContext->LabelMap->szName); + + if (RegOpenKeyEx(hKey, Buffer, 0, KEY_WRITE, &hSubKey) == ERROR_SUCCESS) + { + RegSetValueEx(hSubKey, NULL, 0, REG_EXPAND_SZ, (LPBYTE)pLabelContext->szValue, (_tcslen(pLabelContext->szValue) +1) * sizeof(TCHAR)); + RegCloseKey(hSubKey); + } + + pLabelContext = pLabelContext->Next; + } + RegCloseKey(hKey); + + SetWindowLong(hwndDlg, DWL_MSGRESULT, (LONG)PSNRET_NOERROR); + return TRUE; +} + + /* Sounds property page dialog callback */ INT_PTR CALLBACK @@ -849,6 +947,7 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_SOUND), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSE_SOUND), FALSE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; } @@ -860,7 +959,7 @@ INT SelCount; LVITEM item; LRESULT lIndex; - SelCount = ListView_GetSelectionMark(GetDlgItem(hwndDlg, IDC_SOUND_LIST)); + SelCount = ListView_GetSelectionMark(GetDlgItem(hwndDlg, IDC_SCHEME_LIST)); if (SelCount == -1) { break; @@ -875,14 +974,28 @@ item.iItem = SelCount; if (ListView_GetItem(GetDlgItem(hwndDlg, IDC_SCHEME_LIST), &item)) { - TCHAR szValue[MAX_PATH]; + LRESULT lResult; pLabelContext = (PLABEL_CONTEXT)item.lParam; - SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETLBTEXT, (WPARAM)lIndex, (LPARAM)szValue); - /// - /// should store in current member - /// - _tcscpy(pLabelContext->szValue, szValue); - if (_tcslen(szValue) && lIndex != 0) + + lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETITEMDATA, (WPARAM)lIndex, (LPARAM)0); + if (lResult == CB_ERR || lResult == 0) + { + if (lIndex != pLabelContext->szValue[0]) + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + + pLabelContext->szValue[0] = L'\0'; + break; + } + + if (_tcsicmp(pLabelContext->szValue, (TCHAR*)lResult) || (lIndex != pLabelContext->szValue[0])) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + /// + /// should store in current member + /// + _tcscpy(pLabelContext->szValue, (TCHAR*)lResult); + } + if (_tcslen((TCHAR*)lResult) && lIndex != 0) { EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), TRUE); } @@ -901,10 +1014,19 @@ { LVITEM item; PLABEL_CONTEXT pLabelContext; + LPPSHNOTIFY lppsn; + TCHAR * ptr; + LPNMHDR lpnm = (LPNMHDR)lParam; - TCHAR * ptr; + lppsn = (LPPSHNOTIFY) lParam; + switch(lpnm->code) { + case PSN_APPLY: + { + ApplyChanges(hwndDlg); + break; + } case LVN_ITEMCHANGED: { LPNMLISTVIEW nm = (LPNMLISTVIEW)lParam;

1 0

[cgutman] 43095: - Partial rewrite of dispatch() - Header cleanup - Fix several bugs related to null pointer access and out-of-bounds array access - Found by Amine Khaldi - This should fix the issue with dhcp crashing and hogging tons of cpu time
by cgutman＠svn.reactos.org 20 Sep '09

20 Sep '09

Author: cgutman Date: Sun Sep 20 17:00:08 2009 New Revision: 43095 URL: http://svn.reactos.org/svn/reactos?rev=43095&view=rev Log: - Partial rewrite of dispatch() - Header cleanup - Fix several bugs related to null pointer access and out-of-bounds array access - Found by Amine Khaldi - This should fix the issue with dhcp crashing and hogging tons of cpu time Modified: trunk/reactos/base/services/dhcp/adapter.c trunk/reactos/base/services/dhcp/dhclient.c trunk/reactos/base/services/dhcp/dispatch.c trunk/reactos/base/services/dhcp/include/dhcpd.h trunk/reactos/base/services/dhcp/include/rosdhcp.h trunk/reactos/base/services/dhcp/options.c Modified: trunk/reactos/base/services/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/adapter… ============================================================================== --- trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] Sun Sep 20 17:00:08 2009 @@ -169,10 +169,9 @@ Adapter->DhclientState.state = S_STATIC; Netmask = RegReadString( AdapterKey, NULL, "Subnetmask" ); - if( !Netmask ) Netmask = "255.255.255.0"; Status = AddIPAddress( inet_addr( IPAddress ), - inet_addr( Netmask ), + inet_addr( Netmask ? Netmask : "255.255.255.0" ), Adapter->IfMib.dwIndex, &Adapter->NteContext, &Adapter->NteInstance ); @@ -257,7 +256,7 @@ DH_DbgPrint(MID_TRACE,("Getting adapter %d attributes\n", Table->table[i].dwIndex)); - if (AdapterFindByHardwareAddress(Table->table[i].bPhysAddr, Table->table[i].dwPhysAddrLen)) + if ((Adapter = AdapterFindByHardwareAddress(Table->table[i].bPhysAddr, Table->table[i].dwPhysAddrLen))) { /* This is an existing adapter */ if (InterfaceConnected(Table->table[i])) { Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Sun Sep 20 17:00:08 2009 @@ -1576,8 +1576,10 @@ if (!leaseFile) { /* XXX */ leaseFile = fopen(path_dhclient_db, "w"); - if (!leaseFile) + if (!leaseFile) { error("can't create %s", path_dhclient_db); + return; + } } fprintf(leaseFile, "lease {\n"); @@ -1600,17 +1602,20 @@ lease->options[i].len, 1, 1)); t = gmtime(&lease->renewal); - fprintf(leaseFile, " renew %d %d/%d/%d %02d:%02d:%02d;\n", - t->tm_wday, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, - t->tm_hour, t->tm_min, t->tm_sec); + if (t) + fprintf(leaseFile, " renew %d %d/%d/%d %02d:%02d:%02d;\n", + t->tm_wday, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, + t->tm_hour, t->tm_min, t->tm_sec); t = gmtime(&lease->rebind); - fprintf(leaseFile, " rebind %d %d/%d/%d %02d:%02d:%02d;\n", - t->tm_wday, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, - t->tm_hour, t->tm_min, t->tm_sec); + if (t) + fprintf(leaseFile, " rebind %d %d/%d/%d %02d:%02d:%02d;\n", + t->tm_wday, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, + t->tm_hour, t->tm_min, t->tm_sec); t = gmtime(&lease->expiry); - fprintf(leaseFile, " expire %d %d/%d/%d %02d:%02d:%02d;\n", - t->tm_wday, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, - t->tm_hour, t->tm_min, t->tm_sec); + if (t) + fprintf(leaseFile, " expire %d %d/%d/%d %02d:%02d:%02d;\n", + t->tm_wday, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, + t->tm_hour, t->tm_min, t->tm_sec); fprintf(leaseFile, "}\n"); fflush(leaseFile); } @@ -1765,7 +1770,7 @@ config->defaults[i].data, ip->client-> config->defaults[i].len); - dp[len] = '\0'; + dp[len-1] = '\0'; } } else { dp = ip->client-> Modified: trunk/reactos/base/services/dhcp/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dispatc… ============================================================================== --- trunk/reactos/base/services/dhcp/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dispatch.c [iso-8859-1] Sun Sep 20 17:00:08 2009 @@ -63,11 +63,16 @@ void dispatch(void) { - int count, i, to_msec, nfds, err; + int count, to_msec, err; struct protocol *l; fd_set fds; time_t howlong, cur_time; struct timeval timeval; + + if (!AdapterDiscover()) { + AdapterStop(); + return; + } ApiLock(); @@ -76,17 +81,6 @@ * Call any expired timeouts, and then if there's still * a timeout registered, time out the select call then. */ - another: - if (!AdapterDiscover()) { - AdapterStop(); - break; - } - - for (l = protocols, nfds = 0; l; l = l->next) - nfds++; - - FD_ZERO(&fds); - time(&cur_time); if (timeouts) { @@ -98,7 +92,7 @@ (*(t->func))(t->what); t->next = free_timeouts; free_timeouts = t; - goto another; + continue; } /* @@ -112,49 +106,30 @@ howlong = INT_MAX / 1000; to_msec = howlong * 1000; } else - to_msec = -1; + to_msec = 5000; /* Set up the descriptors to be polled. */ - for (i = 0, l = protocols; l; l = l->next) { - struct interface_info *ip = l->local; - - if (ip && (l->handler != got_one || !ip->dead)) { - FD_SET(l->fd, &fds); - i++; - } - } - - if (i == 0) { - /* Wait for 5 seconds before looking for more interfaces */ - Sleep(5000); - continue; - } else { - /* Wait for a packet or a timeout... XXX */ - timeval.tv_sec = to_msec / 1000; - timeval.tv_usec = (to_msec % 1000) * 1000; - } + FD_ZERO(&fds); + + for (l = protocols; l; l = l->next) + FD_SET(l->fd, &fds); + + /* Wait for a packet or a timeout... XXX */ + timeval.tv_sec = to_msec / 1000; + timeval.tv_usec = to_msec % 1000; ApiUnlock(); - count = select(nfds, &fds, NULL, NULL, &timeval); + if (protocols) + count = select(0, &fds, NULL, NULL, &timeval); + else { + Sleep(to_msec); + count = 0; + } + + ApiLock(); DH_DbgPrint(MID_TRACE,("Select: %d\n", count)); - - /* Review poll output */ - for (i = 0, l = protocols; l; l = l->next) { - struct interface_info *ip = l->local; - - if (ip && (l->handler != got_one || !ip->dead)) { - DH_DbgPrint - (MID_TRACE, - ("set(%d) -> %s\n", - l->fd, FD_ISSET(l->fd, &fds) ? "true" : "false")); - i++; - } - } - - - ApiLock(); /* Not likely to be transitory... */ if (count == SOCKET_ERROR) { @@ -163,7 +138,6 @@ break; } - i = 0; for (l = protocols; l; l = l->next) { struct interface_info *ip; ip = l->local; @@ -173,7 +147,6 @@ DH_DbgPrint(MID_TRACE,("Handling %x\n", l)); (*(l->handler))(l); } - i++; } } } while (1); @@ -269,8 +242,10 @@ q->what = what; } else { q = malloc(sizeof(struct timeout)); - if (!q) + if (!q) { error("Can't allocate timeout structure!"); + return; + } q->func = where; q->what = what; } Modified: trunk/reactos/base/services/dhcp/include/dhcpd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/include… ============================================================================== --- trunk/reactos/base/services/dhcp/include/dhcpd.h [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/include/dhcpd.h [iso-8859-1] Sun Sep 20 17:00:08 2009 @@ -101,7 +101,6 @@ #include <fcntl.h> #include <limits.h> //#include <unistd.h> -#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> Modified: trunk/reactos/base/services/dhcp/include/rosdhcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/include… ============================================================================== --- trunk/reactos/base/services/dhcp/include/rosdhcp.h [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/include/rosdhcp.h [iso-8859-1] Sun Sep 20 17:00:08 2009 @@ -10,7 +10,6 @@ #include <dhcpcsdk.h> #include <stdio.h> #include <io.h> -#include <setjmp.h> #include "stdint.h" #include "predec.h" #include <dhcp/rosdhcp_public.h> Modified: trunk/reactos/base/services/dhcp/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/options… ============================================================================== --- trunk/reactos/base/services/dhcp/options.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/options.c [iso-8859-1] Sun Sep 20 17:00:08 2009 @@ -175,9 +175,11 @@ * for clients, but what the heck... */ t = calloc(1, len + packet->options[code].len + 1); - if (!t) + if (!t) { error("Can't expand storage for option %s.", dhcp_options[code].name); + return; + } memcpy(t, packet->options[code].data, packet->options[code].len); memcpy(t + packet->options[code].len,

1 0

[janderwald] 43094: - Fix several bugs in printer ' IShellFolder implementation - Partly implement IShellFolder::GetAttributesOf - Implement IShellFolder::GetDisplayNameOf for root pidl - Implement ISF_ControlPanel_fnParseDisplayName to parse display names <spoiler>Gets rid of the annoying message box when clicking on the printer folder in the start menu</spoiler>
by janderwald＠svn.reactos.org 20 Sep '09

20 Sep '09

Author: janderwald Date: Sun Sep 20 06:21:29 2009 New Revision: 43094 URL: http://svn.reactos.org/svn/reactos?rev=43094&view=rev Log: - Fix several bugs in printer ' IShellFolder implementation - Partly implement IShellFolder::GetAttributesOf - Implement IShellFolder::GetDisplayNameOf for root pidl - Implement ISF_ControlPanel_fnParseDisplayName to parse display names <spoiler>Gets rid of the annoying message box when clicking on the printer folder in the start menu</spoiler> Modified: trunk/reactos/dll/win32/shell32/pidl.c trunk/reactos/dll/win32/shell32/pidl.h trunk/reactos/dll/win32/shell32/shfldr_cpanel.c trunk/reactos/dll/win32/shell32/shfldr_printers.c Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] Sun Sep 20 06:21:29 2009 @@ -1654,6 +1654,17 @@ return FALSE; } +BOOL _ILIsPrinter(LPCITEMIDLIST pidl) +{ + REFIID iid = _ILGetGUIDPointer(pidl); + + TRACE("(%p)\n",pidl); + + if (iid) + return IsEqualIID(iid, &CLSID_Printers); + return FALSE; +} + BOOL _ILIsBitBucket(LPCITEMIDLIST pidl) { REFIID iid = _ILGetGUIDPointer(pidl); Modified: trunk/reactos/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] Sun Sep 20 06:21:29 2009 @@ -232,6 +232,7 @@ BOOL _ILIsUnicode (LPCITEMIDLIST pidl); BOOL _ILIsDesktop (LPCITEMIDLIST pidl); BOOL _ILIsMyComputer (LPCITEMIDLIST pidl); +BOOL _ILIsPrinter (LPCITEMIDLIST pidl); BOOL _ILIsMyDocuments (LPCITEMIDLIST pidl); BOOL _ILIsControlPanel (LPCITEMIDLIST pidl); BOOL _ILIsBitBucket (LPCITEMIDLIST pidl); Modified: trunk/reactos/dll/win32/shell32/shfldr_cpanel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_cpanel.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_cpanel.c [iso-8859-1] Sun Sep 20 06:21:29 2009 @@ -204,17 +204,55 @@ DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) { ICPanelImpl *This = (ICPanelImpl *)iface; - - HRESULT hr = E_INVALIDARG; - - FIXME("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", - This, hwndOwner, pbc, lpszDisplayName, debugstr_w(lpszDisplayName), pchEaten, ppidl, pdwAttributes); + WCHAR szElement[MAX_PATH]; + LPCWSTR szNext = NULL; + LPITEMIDLIST pidlTemp = NULL; + HRESULT hr = S_OK; + CLSID clsid; + + TRACE ("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", + This, hwndOwner, pbc, lpszDisplayName, debugstr_w(lpszDisplayName), + pchEaten, ppidl, pdwAttributes); + + if (!lpszDisplayName || !ppidl) + return E_INVALIDARG; *ppidl = 0; + if (pchEaten) - *pchEaten = 0; - - TRACE("(%p)->(-- ret=0x%08x)\n", This, hr); + *pchEaten = 0; /* strange but like the original */ + + if (lpszDisplayName[0] == ':' && lpszDisplayName[1] == ':') + { + szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); + TRACE ("-- element: %s\n", debugstr_w (szElement)); + CLSIDFromString (szElement + 2, &clsid); + pidlTemp = _ILCreateGuid (PT_GUID, &clsid); + } + else if( (pidlTemp = SHELL32_CreatePidlFromBindCtx(pbc, lpszDisplayName)) ) + { + *ppidl = pidlTemp; + return S_OK; + } + + if (SUCCEEDED(hr) && pidlTemp) + { + if (szNext && *szNext) + { + hr = SHELL32_ParseNextElement(iface, hwndOwner, pbc, + &pidlTemp, (LPOLESTR) szNext, pchEaten, pdwAttributes); + } + else + { + if (pdwAttributes && *pdwAttributes) + hr = SHELL32_GetItemAttributes(_IShellFolder_ (This), + pidlTemp, pdwAttributes); + } + } + + *ppidl = pidlTemp; + + TRACE ("(%p)->(-- ret=0x%08x)\n", This, hr); return hr; } Modified: trunk/reactos/dll/win32/shell32/shfldr_printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_p… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_printers.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_printers.c [iso-8859-1] Sun Sep 20 06:21:29 2009 @@ -333,7 +333,7 @@ IsEqualIID (riid, &IID_IShellFolder) || IsEqualIID (riid, &IID_IShellFolder2)) { - *ppvObj = This; + *ppvObj = _IShellFolder_(This); } else if (IsEqualIID (riid, &IID_IPersist) || @@ -609,12 +609,20 @@ static HRESULT WINAPI ISF_Printers_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) { + static const DWORD dwPrintersAttributes = + SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_CANRENAME | SFGAO_CANDELETE; + HRESULT hr = S_OK; IGenericSFImpl *This = (IGenericSFImpl *)iface; FIXME ("(%p)->(cidl=%d apidl=%p mask=0x%08lx): stub\n", This, cidl, apidl, *rgfInOut); - return E_NOTIMPL; + *rgfInOut &= dwPrintersAttributes; + + *rgfInOut &= ~SFGAO_VALIDATE; + + TRACE ("-- result=0x%08x\n", *rgfInOut); + return hr; } /************************************************************************** @@ -669,6 +677,7 @@ static HRESULT WINAPI ISF_Printers_fnGetDisplayNameOf (IShellFolder2 * iface, LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) { + LPWSTR pszName; IGenericSFImpl *This = (IGenericSFImpl *)iface; PIDLPrinterStruct * p; @@ -676,12 +685,34 @@ pdump (pidl); if (!strRet) + { + WARN("no strRet\n"); return E_INVALIDARG; + } + + if (_ILIsPrinter(pidl)) + { + pszName = CoTaskMemAlloc(MAX_PATH * sizeof(WCHAR)); + if (!pszName) + return E_OUTOFMEMORY; + + if (LoadStringW(shell32_hInstance, IDS_PRINTERS, pszName, MAX_PATH)) + { + pszName[MAX_PATH-1] = L'\0'; + strRet->uType = STRRET_WSTR; + strRet->u.pOleStr = pszName; + return S_OK; + } + CoTaskMemFree(pszName); + return E_FAIL; + } p = _ILGetPrinterStruct(pidl); if (!p) + { + WARN("no printer struct\n"); return E_INVALIDARG; - + } strRet->u.pOleStr = SHAlloc(p->offsServer * sizeof(WCHAR)); if (!strRet->u.pOleStr) return E_OUTOFMEMORY;

1 0

[cgutman] 43093: - Remove a DbgPrint that was forgotten
by cgutman＠svn.reactos.org 20 Sep '09

20 Sep '09

Author: cgutman Date: Sun Sep 20 03:58:06 2009 New Revision: 43093 URL: http://svn.reactos.org/svn/reactos?rev=43093&view=rev Log: - Remove a DbgPrint that was forgotten Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Sun Sep 20 03:58:06 2009 @@ -114,8 +114,6 @@ if (NCE->EventCount % ARP_RATE == 0) NBSendSolicit(NCE); if (NCE->EventTimer - NCE->EventCount == 0) { - DbgPrint("Marking NCE stale: %s\n", A2S(&NCE->Address)); - NCE->State |= NUD_STALE; NCE->EventCount = 0;

1 0

[cgutman] 43092: - Fix GetIpNetTable - Arp -a will now show a complete list of ARP information
by cgutman＠svn.reactos.org 20 Sep '09

20 Sep '09

Author: cgutman Date: Sun Sep 20 03:37:40 2009 New Revision: 43092 URL: http://svn.reactos.org/svn/reactos?rev=43092&view=rev Log: - Fix GetIpNetTable - Arp -a will now show a complete list of ARP information Modified: trunk/reactos/dll/win32/iphlpapi/ifenum.h trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c trunk/reactos/lib/drivers/ip/network/neighbor.c Modified: trunk/reactos/dll/win32/iphlpapi/ifenum.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ifenum.… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ifenum.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/ifenum.h [iso-8859-1] Sun Sep 20 03:37:40 2009 @@ -147,4 +147,6 @@ /* Inserts a route into the route table. */ DWORD createIpForwardEntryOS(PMIB_IPFORWARDROW pRoute); +BOOL isLoopback( HANDLE tcpFile, TDIEntityID *loop_maybe ); + #endif /* ndef WINE_IFENUM_H_ */ Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ifenum_… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] Sun Sep 20 03:37:40 2009 @@ -315,7 +315,7 @@ if_maybe->tei_entity == IF_ENTITY; } -static BOOL isLoopback( HANDLE tcpFile, TDIEntityID *loop_maybe ) { +BOOL isLoopback( HANDLE tcpFile, TDIEntityID *loop_maybe ) { IFEntrySafelySized entryInfo; NTSTATUS status; Modified: trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ipstats… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c [iso-8859-1] Sun Sep 20 03:37:40 2009 @@ -539,7 +539,8 @@ for( i = 0; i < numEntities; i++ ) { if( isInterface( &entitySet[i] ) && - hasArp( tcpFile, &entitySet[i] ) ) { + hasArp( tcpFile, &entitySet[i] ) && + !isLoopback( tcpFile, &entitySet[i] ) ) { status = tdiGetSetOfThings( tcpFile, INFO_CLASS_PROTOCOL, @@ -571,7 +572,7 @@ DWORD numEntities, returnSize; TDIEntityID *entitySet; HANDLE tcpFile; - int i, row = 0, totalNumber; + int i, totalNumber, TmpIdx, CurrIdx = 0; NTSTATUS status; PMIB_IPNETTABLE IpArpTable = NULL; PMIB_IPNETROW AdapterArpTable = NULL; @@ -598,8 +599,9 @@ status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities ); for( i = 0; i < numEntities; i++ ) { - if( isIpEntity( tcpFile, &entitySet[i] ) && - hasArp( tcpFile, &entitySet[i] ) ) { + if( isInterface( &entitySet[i] ) && + hasArp( tcpFile, &entitySet[i] ) && + !isLoopback( tcpFile, &entitySet[i] ) ) { status = tdiGetSetOfThings( tcpFile, INFO_CLASS_PROTOCOL, @@ -613,8 +615,8 @@ &returnSize ); if( status == STATUS_SUCCESS ) { - for( row = 0; row < returnSize; row++ ) - IpArpTable->table[row] = AdapterArpTable[row]; + for( TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++ ) + IpArpTable->table[CurrIdx] = AdapterArpTable[TmpIdx]; } if( AdapterArpTable ) tdiFreeThingSet( AdapterArpTable ); @@ -624,7 +626,7 @@ closeTcpFile( tcpFile ); tdiFreeThingSet( entitySet ); - IpArpTable->dwNumEntries = row; + IpArpTable->dwNumEntries = CurrIdx; return IpArpTable; } Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Sun Sep 20 03:37:40 2009 @@ -490,7 +490,8 @@ for( CurNCE = NeighborCache[i].Cache; CurNCE; CurNCE = CurNCE->Next ) { - if( CurNCE->Interface == Interface ) { + if( CurNCE->Interface == Interface && + !AddrIsEqual( &CurNCE->Address, &CurNCE->Interface->Unicast ) ) { if( ArpTable ) { ArpTable[Size].Index = Interface->Index; ArpTable[Size].AddrSize = CurNCE->LinkAddressLength;

1 0

[dreimer] 43091: See? This is the reason for Beta Versions. - Fixed the "GCC not found" bug in AMD64 Build Processes. - Fixed something cosmetical in the look on startup of rosbe.
by dreimer＠svn.reactos.org 20 Sep '09

20 Sep '09

Author: dreimer Date: Sun Sep 20 03:10:23 2009 New Revision: 43091 URL: http://svn.reactos.org/svn/reactos?rev=43091&view=rev Log: See? This is the reason for Beta Versions. - Fixed the "GCC not found" bug in AMD64 Build Processes. - Fixed something cosmetical in the look on startup of rosbe. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Sun Sep 20 03:10:23 2009 @@ -20,7 +20,7 @@ $global:_ROSBE_PREFIX = $null } -$ENV:PATH = "$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" +$ENV:PATH = "$_ROSBE_HOST_MINGWPATH\bin;$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" $TARGETGCC = "$global:_ROSBE_PREFIX" + "gcc" & $TARGETGCC -v 2> gcctvers.tmp $global:_ROSBE_TARGET_GCCVERSION = (select-string -path .\gcctvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Sun Sep 20 03:10:23 2009 @@ -87,7 +87,7 @@ cls echo ******************************************************************************* echo * * -echo * ReactOS Build Environment %_ROSBE_VERSION% * +echo * ReactOS Build Environment %_ROSBE_VERSION% * echo * * echo ******************************************************************************* echo. Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Sun Sep 20 03:10:23 2009 @@ -27,7 +27,7 @@ set _ROSBE_PREFIX=%ROS_PREFIX%- ) -set PATH=%_ROSBE_TARGET_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% +set PATH=%_ROSBE_HOST_MINGWPATH%\bin;%_ROSBE_TARGET_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% for /f "usebackq tokens=3" %%i in (`"%_ROSBE_PREFIX%gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_TARGET_GCCVERSION=%%i for /f "usebackq tokens=2" %%i in (`"%_ROSBE_PREFIX%gcc -v 2>&1 | find "Target""`) do set _ROSBE_TARGET_GCCTARGET=%%i

1 0

[jimtabor] 43090: - Update Edit wine tests.
by jimtabor＠svn.reactos.org 19 Sep '09

19 Sep '09

Author: jimtabor Date: Sun Sep 20 01:37:32 2009 New Revision: 43090 URL: http://svn.reactos.org/svn/reactos?rev=43090&view=rev Log: - Update Edit wine tests. Modified: trunk/rostests/winetests/user32/edit.c Modified: trunk/rostests/winetests/user32/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/edit.c?r… ============================================================================== --- trunk/rostests/winetests/user32/edit.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/edit.c [iso-8859-1] Sun Sep 20 01:37:32 2009 @@ -28,6 +28,7 @@ #define ES_COMBO 0x200 #endif +#define ID_EDITTESTDBUTTON 0x123 #define ID_EDITTEST2 99 #define MAXLEN 200 @@ -1817,9 +1818,9 @@ /* more tests for WM_KEYDOWN + WM_CHAR */ r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 6); - todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 7); - todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 8); ok(444 == r, "Expected %d, got %d\n", 444, r); @@ -1841,9 +1842,9 @@ /* tests for WM_KEYDOWN + WM_CHAR */ r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 6); - todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 7); - todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 8); ok(444 == r, "Expected %d, got %d\n", 444, r); @@ -1891,7 +1892,7 @@ /* tests for WM_KEYDOWN + WM_CHAR */ r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 6); - todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 7); ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 8); @@ -2079,6 +2080,184 @@ DestroyWindow (hwEdit); DeleteObject(hfont); +} + +struct dialog_mode_messages +{ + int wm_getdefid, wm_close, wm_command, wm_nextdlgctl; +}; + +static struct dialog_mode_messages dm_messages; + +static void zero_dm_messages(void) +{ + dm_messages.wm_command = 0; + dm_messages.wm_close = 0; + dm_messages.wm_getdefid = 0; + dm_messages.wm_nextdlgctl = 0; +} + +#define test_dm_messages(wmcommand, wmclose, wmgetdefid, wmnextdlgctl) \ + ok(dm_messages.wm_command == wmcommand, "expected %d WM_COMMAND messages, " \ + "got %d\n", wmcommand, dm_messages.wm_command); \ + ok(dm_messages.wm_close == wmclose, "expected %d WM_CLOSE messages, " \ + "got %d\n", wmclose, dm_messages.wm_close); \ + ok(dm_messages.wm_getdefid == wmgetdefid, "expected %d WM_GETDIFID messages, " \ + "got %d\n", wmgetdefid, dm_messages.wm_getdefid);\ + ok(dm_messages.wm_nextdlgctl == wmnextdlgctl, "expected %d WM_NEXTDLGCTL messages, " \ + "got %d\n", wmnextdlgctl, dm_messages.wm_nextdlgctl) + +static LRESULT CALLBACK dialog_mode_wnd_proc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) +{ + switch (iMsg) + { + case WM_COMMAND: + dm_messages.wm_command++; + break; + case DM_GETDEFID: + dm_messages.wm_getdefid++; + return MAKELONG(ID_EDITTESTDBUTTON, DC_HASDEFID); + case WM_NEXTDLGCTL: + dm_messages.wm_nextdlgctl++; + break; + case WM_CLOSE: + dm_messages.wm_close++; + break; + } + + return DefWindowProc(hwnd, iMsg, wParam, lParam); +} + +static void test_dialogmode(void) +{ + HWND hwEdit, hwParent, hwButton; + MSG msg= {0}; + int len, r; + hwEdit = create_child_editcontrol(ES_MULTILINE, 0); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessage(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(11 == len, "expected 11, got %d\n", len); + + r = SendMessage(hwEdit, WM_GETDLGCODE, (WPARAM)NULL, (LPARAM)NULL); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessage(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(13 == len, "expected 13, got %d\n", len); + + r = SendMessage(hwEdit, WM_GETDLGCODE, (WPARAM)NULL, (LPARAM)&msg); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessage(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(13 == len, "expected 13, got %d\n", len); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessage(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(13 == len, "expected 13, got %d\n", len); + + destroy_child_editcontrol(hwEdit); + + hwEdit = create_editcontrol(ES_MULTILINE, 0); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessage(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(11 == len, "expected 11, got %d\n", len); + + msg.hwnd = hwEdit; + msg.message = WM_KEYDOWN; + msg.wParam = VK_BACK; + msg.lParam = 0xe0001; + r = SendMessage(hwEdit, WM_GETDLGCODE, VK_BACK, (LPARAM)&msg); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessage(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(11 == len, "expected 11, got %d\n", len); + + DestroyWindow(hwEdit); + + hwEdit = create_child_editcontrol(0, 0); + hwParent = GetParent(hwEdit); + SetWindowLongPtr(hwParent, GWLP_WNDPROC, (LONG_PTR)dialog_mode_wnd_proc); + + zero_dm_messages(); + r = SendMessage(hwEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessage(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + msg.hwnd = hwEdit; + msg.message = WM_KEYDOWN; + msg.wParam = VK_TAB; + msg.lParam = 0xf0001; + r = SendMessage(hwEdit, WM_GETDLGCODE, VK_TAB, (LPARAM)&msg); + ok(0x89 == r, "expected 0x89, got 0x%x\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessage(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + destroy_child_editcontrol(hwEdit); + + hwEdit = create_child_editcontrol(ES_MULTILINE, 0); + hwParent = GetParent(hwEdit); + SetWindowLongPtr(hwParent, GWLP_WNDPROC, (LONG_PTR)dialog_mode_wnd_proc); + + r = SendMessage(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + msg.hwnd = hwEdit; + msg.message = WM_KEYDOWN; + msg.wParam = VK_ESCAPE; + msg.lParam = 0x10001; + r = SendMessage(hwEdit, WM_GETDLGCODE, VK_ESCAPE, (LPARAM)&msg); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessage(hwEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessage(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 1); + zero_dm_messages(); + + r = SendMessage(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 1, 0); + zero_dm_messages(); + + hwButton = CreateWindow("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON, + 100, 100, 50, 20, hwParent, (HMENU)ID_EDITTESTDBUTTON, hinst, NULL); + ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError()); + + r = SendMessage(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 1, 1); + zero_dm_messages(); + + DestroyWindow(hwButton); + destroy_child_editcontrol(hwEdit); } START_TEST(edit) @@ -2105,6 +2284,7 @@ test_singleline_wantreturn_edit_dialog(); test_child_edit_wmkeydown(); test_fontsize(); + test_dialogmode(); UnregisterWindowClasses(); }

1 0

[jimtabor] 43089: - Wine sync up to 1.1.29 Edit controls.
by jimtabor＠svn.reactos.org 19 Sep '09

19 Sep '09

Author: jimtabor Date: Sun Sep 20 01:31:17 2009 New Revision: 43089 URL: http://svn.reactos.org/svn/reactos?rev=43089&view=rev Log: - Wine sync up to 1.1.29 Edit controls. Modified: trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Sun Sep 20 01:31:17 2009 @@ -68,6 +68,8 @@ #define EF_USE_SOFTBRK 0x0100 /* Enable soft breaks in text. */ #define EF_APP_HAS_HANDLE 0x0200 /* Set when an app sends EM_[G|S]ETHANDLE. We are in sole control of the text buffer if this is clear. */ +#define EF_DIALOGMODE 0x0400 /* Indicates that we are inside a dialog window */ + typedef enum { END_0 = 0, /* line ends with terminating '\0' character */ @@ -3201,29 +3203,7 @@ */ static BOOL EDIT_IsInsideDialog(EDITSTATE *es) { -#ifdef __REACTOS__ - if (es->hwndParent && es->hwndParent != GetDesktopWindow()) - { - if (GetClassLongPtrW (es->hwndParent, GCW_ATOM) == (DWORD)MAKEINTATOM(32770)) - return TRUE; - } - return FALSE; -#else - WND *pParent; - BOOL r = FALSE; - - if (es->hwndParent) - { - pParent = WIN_GetPtr(es->hwndParent); - if (pParent && pParent != WND_OTHER_PROCESS && pParent != WND_DESKTOP) - { - if (pParent->flags & WIN_ISDIALOG) - r = TRUE; - WIN_ReleasePtr(pParent); - } - } - return r; -#endif + return (es->flags & EF_DIALOGMODE); } @@ -3679,32 +3659,32 @@ /* If the edit doesn't want the return send a message to the default object */ if(!(es->style & ES_MULTILINE) || !(es->style & ES_WANTRETURN)) { - HWND hwndParent; DWORD dw; - if (!EDIT_IsInsideDialog(es)) return 1; + if (!EDIT_IsInsideDialog(es)) break; if (control) break; - hwndParent = GetParent(es->hwndSelf); - dw = SendMessageW( hwndParent, DM_GETDEFID, 0, 0 ); - if (HIWORD(dw) == DC_HASDEFID) - { - SendMessageW( hwndParent, WM_COMMAND, - MAKEWPARAM( LOWORD(dw), BN_CLICKED ), - (LPARAM)GetDlgItem( hwndParent, LOWORD(dw) ) ); - } - else - SendMessageW( hwndParent, WM_COMMAND, IDOK, (LPARAM)GetDlgItem( hwndParent, IDOK ) ); + dw = SendMessageW( es->hwndParent, DM_GETDEFID, 0, 0 ); + if (HIWORD(dw) == DC_HASDEFID) + { + HWND hwDefCtrl = GetDlgItem(es->hwndParent, LOWORD(dw)); + if (hwDefCtrl) + { + SendMessageW(es->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, (LPARAM)TRUE); + PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0); + } + } } break; case VK_ESCAPE: - if (!(es->style & ES_MULTILINE)) - SendMessageW(GetParent(es->hwndSelf), WM_COMMAND, IDCANCEL, (LPARAM)GetDlgItem( GetParent(es->hwndSelf), IDCANCEL ) ); + if (!(es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es)) + PostMessageW(es->hwndParent, WM_CLOSE, 0, 0); break; case VK_TAB: - SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0); + if ((es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es)) + SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0); break; } - return 0; + return TRUE; } @@ -5232,27 +5212,21 @@ if (es->style & ES_MULTILINE) result |= DLGC_WANTALLKEYS; - if (lParam && (((LPMSG)lParam)->message == WM_KEYDOWN)) - { - int vk = (int)((LPMSG)lParam)->wParam; - - if (es->hwndListBox) - { - if (vk == VK_RETURN || vk == VK_ESCAPE) - if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) - result |= DLGC_WANTMESSAGE; - } - else - { - switch (vk) - { - case VK_ESCAPE: - SendMessageW(GetParent(hwnd), WM_CLOSE, 0, 0); - break; - default: - break; - } - } + if (lParam) + { + es->flags|=EF_DIALOGMODE; + + if (((LPMSG)lParam)->message == WM_KEYDOWN) + { + int vk = (int)((LPMSG)lParam)->wParam; + + if (es->hwndListBox) + { + if (vk == VK_RETURN || vk == VK_ESCAPE) + if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) + result |= DLGC_WANTMESSAGE; + } + } } break; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 20 01:31:17 2009 @@ -231,7 +231,7 @@ User32 - reactos/dll/win32/user32/controls/button.c # Synced to Wine-1_1_22 reactos/dll/win32/user32/controls/combo.c # Synced to Wine-1_1_22 - reactos/dll/win32/user32/controls/edit.c # Synced to Wine-1_1_22 + reactos/dll/win32/user32/controls/edit.c # Synced to Wine-1_1_29 reactos/dll/win32/user32/controls/icontitle.c # Synced to Wine-1_1_13 reactos/dll/win32/user32/controls/listbox.c # Synced to Wine-1_1_22 reactos/dll/win32/user32/controls/scrollbar.c # Forked

1 0

[jimtabor] 43088: - Header cleanup +1.
by jimtabor＠svn.reactos.org 19 Sep '09

19 Sep '09

Author: jimtabor Date: Sun Sep 20 00:21:12 2009 New Revision: 43088 URL: http://svn.reactos.org/svn/reactos?rev=43088&view=rev Log: - Header cleanup +1. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Sun Sep 20 00:21:12 2009 @@ -1,23 +1,4 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * $Id$ - * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Window painting function

1 0

[jimtabor] 43087: - Header cleanup.
by jimtabor＠svn.reactos.org 19 Sep '09

19 Sep '09

Author: jimtabor Date: Sun Sep 20 00:20:43 2009 New Revision: 43087 URL: http://svn.reactos.org/svn/reactos?rev=43087&view=rev Log: - Header cleanup. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] Sun Sep 20 00:20:43 2009 @@ -1,23 +1,4 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Scrollbars

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
27
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2009