Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[hpoussin] 29270: [FORMATTING] Replace spaces by tabs No code change
by hpoussin＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: hpoussin Date: Fri Sep 28 11:34:30 2007 New Revision: 29270 URL: http://svn.reactos.org/svn/reactos?rev=29270&view=rev Log: [FORMATTING] Replace spaces by tabs No code change Modified: trunk/reactos/base/shell/cmd/cmdinput.c Modified: trunk/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdinput.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdinput.c (original) +++ trunk/reactos/base/shell/cmd/cmdinput.c Fri Sep 28 11:34:30 2007 @@ -137,11 +137,11 @@ WORD wLastKey = 0; TCHAR ch; BOOL bContinue=FALSE;/*is TRUE the second case will not be executed*/ - BOOL bReturn = FALSE; - BOOL bCharInput; - #ifdef FEATURE_4NT_FILENAME_COMPLETION - TCHAR szPath[MAX_PATH]; - #endif + BOOL bReturn = FALSE; + BOOL bCharInput; +#ifdef FEATURE_4NT_FILENAME_COMPLETION + TCHAR szPath[MAX_PATH]; +#endif /* get screen size */ GetScreenSize (&maxx, &maxy); @@ -159,9 +159,9 @@ do { - - bReturn = FALSE; - + + bReturn = FALSE; + ConInKey (&ir); if (ir.Event.KeyEvent.dwControlKeyState & @@ -213,11 +213,7 @@ } - //if (bContinue) - // continue; - - - bCharInput = FALSE; + bCharInput = FALSE; switch (ir.Event.KeyEvent.wVirtualKeyCode) { @@ -367,12 +363,12 @@ } #endif #ifdef FEATURE_4NT_FILENAME_COMPLETION - + /* used to later see if we went down to the next line */ tempscreen = charcount; szPath[0]=_T('\0'); - /* str is the whole things that is on the current line + /* str is the whole things that is on the current line that is and and out. arg 2 is weather it goes back one file or forward one file */ CompleteFilename(str, !(ir.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED), szPath, current); @@ -380,12 +376,11 @@ ClearCommandLine (str, maxlen, orgx, orgy); curx = orgx; cury = orgy; - current = charcount = 0; - //str[0]=_T('\0'); - + current = charcount = 0; + /* Everything is deleted, lets add it back in */ _tcscpy(str,szPath); - + /* Figure out where cusor is going to be after we print it */ charcount = _tcslen (str); current = charcount; @@ -412,17 +407,17 @@ #endif break; - - case _T('M'): - case _T('C'): - /* ^M does the same as return */ - bCharInput = TRUE; - if(!(ir.Event.KeyEvent.dwControlKeyState & - (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))) - { - break; - } - + + case _T('M'): + case _T('C'): + /* ^M does the same as return */ + bCharInput = TRUE; + if(!(ir.Event.KeyEvent.dwControlKeyState & + (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))) + { + break; + } + case VK_RETURN: /* end input, return to main */ #ifdef FEATURE_HISTORY @@ -432,7 +427,7 @@ #endif ConInDummy (); ConOutChar (_T('\n')); - bReturn = TRUE; + bReturn = TRUE; break; case VK_ESCAPE: @@ -515,58 +510,58 @@ } break; - default: - /* This input is just a normal char */ - bCharInput = TRUE; + default: + /* This input is just a normal char */ + bCharInput = TRUE; } #ifdef _UNICODE - ch = ir.Event.KeyEvent.uChar.UnicodeChar; - if (ch >= 32 && (charcount != (maxlen - 2)) && bCharInput) + ch = ir.Event.KeyEvent.uChar.UnicodeChar; + if (ch >= 32 && (charcount != (maxlen - 2)) && bCharInput) #else - ch = ir.Event.KeyEvent.uChar.AsciiChar; - if ((UCHAR)ch >= 32 && (charcount != (maxlen - 2)) && bCharInput) + ch = ir.Event.KeyEvent.uChar.AsciiChar; + if ((UCHAR)ch >= 32 && (charcount != (maxlen - 2)) && bCharInput) #endif /* _UNICODE */ - { - /* insert character into string... */ - if (bInsert && current != charcount) - { - /* If this character insertion will cause screen scrolling, - * adjust the saved origin of the command prompt. */ - tempscreen = _tcslen(str + current) + curx; - if ((tempscreen % maxx) == (maxx - 1) && - (tempscreen / maxx) + cury == (maxy - 1)) - { - orgy--; - cury--; - } - - for (count = charcount; count > current; count--) - str[count] = str[count - 1]; - str[current++] = ch; - if (curx == maxx - 1) - curx = 0, cury++; - else - curx++; - ConOutPrintf (_T("%s"), &str[current - 1]); - SetCursorXY (curx, cury); - charcount++; - } - else - { - if (current == charcount) - charcount++; - str[current++] = ch; - if (GetCursorX () == maxx - 1 && GetCursorY () == maxy - 1) - orgy--, cury--; - if (GetCursorX () == maxx - 1) - curx = 0, cury++; - else - curx++; - ConOutChar (ch); - } - } - + { + /* insert character into string... */ + if (bInsert && current != charcount) + { + /* If this character insertion will cause screen scrolling, + * adjust the saved origin of the command prompt. */ + tempscreen = _tcslen(str + current) + curx; + if ((tempscreen % maxx) == (maxx - 1) && + (tempscreen / maxx) + cury == (maxy - 1)) + { + orgy--; + cury--; + } + + for (count = charcount; count > current; count--) + str[count] = str[count - 1]; + str[current++] = ch; + if (curx == maxx - 1) + curx = 0, cury++; + else + curx++; + ConOutPrintf (_T("%s"), &str[current - 1]); + SetCursorXY (curx, cury); + charcount++; + } + else + { + if (current == charcount) + charcount++; + str[current++] = ch; + if (GetCursorX () == maxx - 1 && GetCursorY () == maxy - 1) + orgy--, cury--; + if (GetCursorX () == maxx - 1) + curx = 0, cury++; + else + curx++; + ConOutChar (ch); + } + } + wLastKey = ir.Event.KeyEvent.wVirtualKeyCode; } while (!bReturn);

1 0

[tkreuzer] 29269: Add 5th parameter to NtUserFindWindowEx
by tkreuzer＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: tkreuzer Date: Fri Sep 28 09:01:27 2007 New Revision: 29269 URL: http://svn.reactos.org/svn/reactos?rev=29269&view=rev Log: Add 5th parameter to NtUserFindWindowEx Modified: trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Fri Sep 28 09:01:27 2007 @@ -728,7 +728,8 @@ Result = NtUserFindWindowEx(hwndParent, hwndChildAfter, pucClassName, - pucWindowName); + pucWindowName, + 0); if (!IS_ATOM(lpszClass) && lpszClass != NULL) RtlFreeUnicodeString(&ucClassName); @@ -774,7 +775,8 @@ return NtUserFindWindowEx(hwndParent, hwndChildAfter, pucClassName, - pucWindowName); + pucWindowName, + 0); } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Fri Sep 28 09:01:27 2007 @@ -902,7 +902,8 @@ HWND hwndParent, HWND hwndChildAfter, PUNICODE_STRING ucClassName, - PUNICODE_STRING ucWindowName + PUNICODE_STRING ucWindowName, + DWORD dwUnknown ); DWORD Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Fri Sep 28 09:01:27 2007 @@ -2464,7 +2464,8 @@ NtUserFindWindowEx(HWND hwndParent, HWND hwndChildAfter, PUNICODE_STRING ucClassName, - PUNICODE_STRING ucWindowName) + PUNICODE_STRING ucWindowName, + DWORD dwUnknown) { PWINDOW_OBJECT Parent, ChildAfter; UNICODE_STRING ClassName = {0}, WindowName = {0}; Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Fri Sep 28 09:01:27 2007 @@ -384,7 +384,7 @@ NtUserExcludeUpdateRgn 2 NtUserFillWindow 4 # NtUserFindExistingCursorIcon 3 Wrong number of param ? -# NtUserFindWindowEx 5 Wrong number of param ? +NtUserFindWindowEx 5 NtUserFlashWindowEx 1 NtUserGetAltTabInfo 6 NtUserGetAncestor 2 @@ -678,7 +678,6 @@ # Wrong number of param ? NtUserEnumDisplayMonitors 5 NtUserFindExistingCursorIcon 4 -NtUserFindWindowEx 4 NtUserGetClassInfo 4 NtUserInitTask 11 NtUserSetCursorIconData 6

1 0

[tkreuzer] 29268: add a DPRINT1, stating that HvpWriteLog doesn't work atm
by tkreuzer＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: tkreuzer Date: Fri Sep 28 08:56:40 2007 New Revision: 29268 URL: http://svn.reactos.org/svn/reactos?rev=29268&view=rev Log: add a DPRINT1, stating that HvpWriteLog doesn't work atm Modified: trunk/reactos/lib/cmlib/hivewrt.c Modified: trunk/reactos/lib/cmlib/hivewrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivewrt.c?rev=29… ============================================================================== --- trunk/reactos/lib/cmlib/hivewrt.c (original) +++ trunk/reactos/lib/cmlib/hivewrt.c Fri Sep 28 08:56:40 2007 @@ -22,10 +22,12 @@ ULONG LastIndex; PVOID BlockPtr; BOOLEAN Success; - return TRUE; - - ASSERT(RegistryHive->ReadOnly == FALSE); - + + DPRINT1("FIXME: HvpWriteLog doesn't do anything atm\n"); + return TRUE; + + ASSERT(RegistryHive->ReadOnly == FALSE); + DPRINT("HvpWriteLog called\n"); if (RegistryHive->HiveHeader->Sequence1 !=

1 0

[tkreuzer] 29267: free memory before returning on failure. Thanks to Yaron Aharonson (yaron.aharonson@gmail.com) for spotting this. See issue #2694 for more details.
by tkreuzer＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: tkreuzer Date: Fri Sep 28 08:17:13 2007 New Revision: 29267 URL: http://svn.reactos.org/svn/reactos?rev=29267&view=rev Log: free memory before returning on failure. Thanks to Yaron Aharonson (yaron.aharonson(a)gmail.com) for spotting this. See issue #2694 for more details. Modified: trunk/reactos/lib/cmlib/hivewrt.c Modified: trunk/reactos/lib/cmlib/hivewrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivewrt.c?rev=29… ============================================================================== --- trunk/reactos/lib/cmlib/hivewrt.c (original) +++ trunk/reactos/lib/cmlib/hivewrt.c Fri Sep 28 08:17:13 2007 @@ -62,12 +62,12 @@ /* Write hive block and block bitmap */ Success = RegistryHive->FileWrite(RegistryHive, HV_TYPE_LOG, 0, Buffer, BufferSize); - if (!Success) - { - return FALSE; - } - RegistryHive->Free(Buffer); + + if (!Success) + { + return FALSE; + } /* Write dirty blocks */ FileOffset = BufferSize;

1 0

[weiden] 29266: Allow changing the display refresh frequency
by weiden＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: weiden Date: Fri Sep 28 08:07:26 2007 New Revision: 29266 URL: http://svn.reactos.org/svn/reactos?rev=29266&view=rev Log: Allow changing the display refresh frequency Modified: trunk/reactos/dll/win32/shellext/deskmon/deskmon.c trunk/reactos/dll/win32/shellext/deskmon/deskmon.h trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc trunk/reactos/dll/win32/shellext/deskmon/resource.h Modified: trunk/reactos/dll/win32/shellext/deskmon/deskmon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/deskmon.c (original) +++ trunk/reactos/dll/win32/shellext/deskmon/deskmon.c Fri Sep 28 08:07:26 2007 @@ -85,6 +85,144 @@ } static VOID +UpdatePruningControls(PDESKMONITOR This) +{ + EnableWindow(GetDlgItem(This->hwndDlg, + IDC_PRUNINGCHECK), + This->bModesPruned && !This->bKeyIsReadOnly); + CheckDlgButton(This->hwndDlg, + IDC_PRUNINGCHECK, + (This->bModesPruned && This->bPruningOn) ? BST_CHECKED : BST_UNCHECKED); +} + +static VOID +GetPruningSettings(PDESKMONITOR This) +{ + BOOL bModesPruned = FALSE, bKeyIsReadOnly = FALSE, bPruningOn = FALSE; + + if (This->DeskExtInterface != NULL) + { + This->DeskExtInterface->GetPruningMode(This->DeskExtInterface->Context, + &bModesPruned, + &bKeyIsReadOnly, + &bPruningOn); + } + + /* Check the boolean values against zero before assigning it to the bitfields! */ + This->bModesPruned = (bModesPruned != FALSE); + This->bKeyIsReadOnly = (bKeyIsReadOnly != FALSE); + This->bPruningOn = (bPruningOn != FALSE); + + UpdatePruningControls(This); +} + +static VOID +UpdateRefreshFrequencyList(PDESKMONITOR This) +{ + PDEVMODEW lpCurrentMode, lpMode; + TCHAR szBuffer[64]; + DWORD dwIndex; + INT i; + BOOL bHasDef = FALSE; + BOOL bAdded = FALSE; + + /* Fill the refresh rate combo box */ + SendDlgItemMessage(This->hwndDlg, + IDC_REFRESHRATE, + CB_RESETCONTENT, + 0, + 0); + + lpCurrentMode = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); + dwIndex = 0; + + do + { + lpMode = This->DeskExtInterface->EnumAllModes(This->DeskExtInterface->Context, + dwIndex++); + if (lpMode != NULL && + lpMode->dmBitsPerPel == lpCurrentMode->dmBitsPerPel && + lpMode->dmPelsWidth == lpCurrentMode->dmPelsWidth && + lpMode->dmPelsHeight == lpCurrentMode->dmPelsHeight) + { + /* We're only interested in refresh rates for the current resolution and color depth */ + + if (lpMode->dmDisplayFrequency <= 1) + { + /* Default hardware frequency */ + if (bHasDef) + continue; + + bHasDef = TRUE; + + if (!LoadString(hInstance, + IDS_USEDEFFRQUENCY, + szBuffer, + sizeof(szBuffer) / sizeof(szBuffer[0]))) + { + szBuffer[0] = TEXT('\0'); + } + } + else + { + TCHAR szFmt[64]; + + if (!LoadString(hInstance, + IDS_FREQFMT, + szFmt, + sizeof(szFmt) / sizeof(szFmt[0]))) + { + szFmt[0] = TEXT('\0'); + } + + _sntprintf(szBuffer, + sizeof(szBuffer) / sizeof(szBuffer[0]), + szFmt, + lpMode->dmDisplayFrequency); + } + + i = (INT)SendDlgItemMessage(This->hwndDlg, + IDC_REFRESHRATE, + CB_ADDSTRING, + 0, + (LPARAM)szBuffer); + if (i >= 0) + { + bAdded = TRUE; + + SendDlgItemMessage(This->hwndDlg, + IDC_REFRESHRATE, + CB_SETITEMDATA, + (WPARAM)i, + (LPARAM)lpMode); + + if (lpMode->dmDisplayFrequency == lpCurrentMode->dmDisplayFrequency) + { + SendDlgItemMessage(This->hwndDlg, + IDC_REFRESHRATE, + CB_SETCURSEL, + (WPARAM)i, + 0); + } + } + } + + } while (lpMode != NULL); + + EnableWindow(GetDlgItem(This->hwndDlg, + IDS_MONITORSETTINGSGROUP), + bAdded); + EnableWindow(GetDlgItem(This->hwndDlg, + IDS_REFRESHRATELABEL), + bAdded); + EnableWindow(GetDlgItem(This->hwndDlg, + IDC_REFRESHRATE), + bAdded); + + GetPruningSettings(This); +} + +static VOID InitMonitorDialog(PDESKMONITOR This) { PDESKMONINFO pmi, pminext, *pmilink; @@ -92,10 +230,6 @@ BOOL bRet; INT i; DWORD dwIndex; - PDEVMODEW lpCurrentMode, lpMode; - TCHAR szBuffer[64]; - BOOL bHasDef = FALSE; - BOOL bAdded = FALSE; /* Free all allocated monitors */ pmi = This->Monitors; @@ -155,6 +289,8 @@ else This->lpDevModeOnInit = NULL; + This->lpSelDevMode = This->lpDevModeOnInit; + /* Setup the UI depending on how many monitors are attached */ if (This->dwMonitorCount == 0) { @@ -226,102 +362,72 @@ IDC_MONITORLIST), (This->dwMonitorCount > 1 ? SW_SHOW : SW_HIDE)); - /* Fill the refresh rate combo box */ - SendDlgItemMessage(This->hwndDlg, - IDC_REFRESHRATE, - CB_RESETCONTENT, - 0, - 0); - - lpCurrentMode = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); - dwIndex = 0; - - do - { - lpMode = This->DeskExtInterface->EnumAllModes(This->DeskExtInterface->Context, - dwIndex++); - if (lpMode != NULL && - lpMode->dmBitsPerPel == lpCurrentMode->dmBitsPerPel && - lpMode->dmPelsWidth == lpCurrentMode->dmPelsWidth && - lpMode->dmPelsHeight == lpCurrentMode->dmPelsHeight) - { - /* We're only interested in refresh rates for the current resolution and color depth */ - - if (lpMode->dmDisplayFrequency <= 1) - { - /* Default hardware frequency */ - if (bHasDef) - continue; - - bHasDef = TRUE; - - if (!LoadString(hInstance, - IDS_USEDEFFRQUENCY, - szBuffer, - sizeof(szBuffer) / sizeof(szBuffer[0]))) - { - szBuffer[0] = TEXT('\0'); - } + UpdateRefreshFrequencyList(This); + UpdateMonitorSelection(This); +} + +static VOID +UpdatePruningSelection(PDESKMONITOR This) +{ + BOOL bPruningOn; + + if (This->DeskExtInterface != NULL && This->bModesPruned && !This->bKeyIsReadOnly) + { + bPruningOn = IsDlgButtonChecked(This->hwndDlg, + IDC_PRUNINGCHECK) != BST_UNCHECKED; + + if (bPruningOn != This->bPruningOn) + { + /* Tell desk.cpl to turn on/off pruning mode */ + This->bPruningOn = bPruningOn; + This->DeskExtInterface->SetPruningMode(This->DeskExtInterface->Context, + bPruningOn); + + /* Fill the refresh rate combobox again, we now receive a filtered + or unfiltered device mode list from desk.cpl (depending on whether + pruning is active or not) */ + UpdateRefreshFrequencyList(This); + + (void)PropSheet_Changed(GetParent(This->hwndDlg), + This->hwndDlg); + } + } +} + +static VOID +UpdateRefreshRateSelection(PDESKMONITOR This) +{ + PDEVMODEW lpCurrentDevMode; + INT i; + + if (This->DeskExtInterface != NULL) + { + i = (INT)SendDlgItemMessage(This->hwndDlg, + IDC_REFRESHRATE, + CB_GETCURSEL, + 0, + 0); + if (i >= 0) + { + lpCurrentDevMode = This->lpSelDevMode; + This->lpSelDevMode = (PDEVMODEW)SendDlgItemMessage(This->hwndDlg, + IDC_REFRESHRATE, + CB_GETITEMDATA, + (WPARAM)i, + 0); + + if (This->lpSelDevMode != NULL && This->lpSelDevMode != lpCurrentDevMode) + { + This->DeskExtInterface->SetCurrentMode(This->DeskExtInterface->Context, + This->lpSelDevMode); + + UpdateRefreshFrequencyList(This); + + (void)PropSheet_Changed(GetParent(This->hwndDlg), + This->hwndDlg); } - else - { - TCHAR szFmt[64]; - - if (!LoadString(hInstance, - IDS_FREQFMT, - szFmt, - sizeof(szFmt) / sizeof(szFmt[0]))) - { - szFmt[0] = TEXT('\0'); - } - - _sntprintf(szBuffer, - sizeof(szBuffer) / sizeof(szBuffer[0]), - szFmt, - lpMode->dmDisplayFrequency); - } - - i = (INT)SendDlgItemMessage(This->hwndDlg, - IDC_REFRESHRATE, - CB_ADDSTRING, - 0, - (LPARAM)szBuffer); - if (i >= 0) - { - bAdded = TRUE; - - SendDlgItemMessage(This->hwndDlg, - IDC_REFRESHRATE, - CB_SETITEMDATA, - (WPARAM)lpMode, - 0); - - if (lpMode->dmDisplayFrequency == lpCurrentMode->dmDisplayFrequency) - { - SendDlgItemMessage(This->hwndDlg, - IDC_REFRESHRATE, - CB_SETCURSEL, - (WPARAM)i, - 0); - } - } - } - - } while (lpMode != NULL); - - EnableWindow(GetDlgItem(This->hwndDlg, - IDS_MONITORSETTINGSGROUP), - bAdded); - EnableWindow(GetDlgItem(This->hwndDlg, - IDS_REFRESHRATELABEL), - bAdded); - EnableWindow(GetDlgItem(This->hwndDlg, - IDC_REFRESHRATE), - bAdded); - - /* FIXME: Update pruning mode controls */ - - UpdateMonitorSelection(This); + } + } } static LONG @@ -338,6 +444,7 @@ { /* Save the new mode */ This->lpDevModeOnInit = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); + This->lpSelDevMode = This->lpDevModeOnInit; return PSNRET_NOERROR; } else if (lChangeRet == DISP_CHANGE_RESTART) @@ -401,6 +508,16 @@ case IDC_MONITORLIST: if (HIWORD(wParam) == LBN_SELCHANGE) UpdateMonitorSelection(This); + break; + + case IDC_PRUNINGCHECK: + if (HIWORD(wParam) == BN_CLICKED) + UpdatePruningSelection(This); + break; + + case IDC_REFRESHRATE: + if (HIWORD(wParam) == CBN_SELCHANGE) + UpdateRefreshRateSelection(This); break; } break; @@ -422,6 +539,10 @@ case PSN_RESET: ResetMonitorChanges(This); break; + + case PSN_SETACTIVE: + UpdateRefreshFrequencyList(This); + break; } break; } Modified: trunk/reactos/dll/win32/shellext/deskmon/deskmon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/deskmon.h (original) +++ trunk/reactos/dll/win32/shellext/deskmon/deskmon.h Fri Sep 28 08:07:26 2007 @@ -21,7 +21,19 @@ DWORD dwMonitorCount; PDESKMONINFO Monitors; PDESKMONINFO SelMonitor; + PDEVMODEW lpSelDevMode; PDEVMODEW lpDevModeOnInit; + union + { + DWORD dwFlags; + struct + { + DWORD bModesPruned : 1; + DWORD bKeyIsReadOnly : 1; + DWORD bPruningOn : 1; + }; + }; + } DESKMONITOR, *PDESKMONITOR; extern LONG dll_refs; Modified: trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc Fri Sep 28 08:07:26 2007 @@ -9,9 +9,10 @@ LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&Properties", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED - GROUPBOX "Monitor settings", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 47 + GROUPBOX "Monitor settings", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 LTEXT "&Screen refresh rate:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT + AUTOCHECKBOX "&Hide modes that this monitor can\'t display", IDC_PRUNINGCHECK, 13, 106, 225, 10 END STRINGTABLE Modified: trunk/reactos/dll/win32/shellext/deskmon/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/resource.h (original) +++ trunk/reactos/dll/win32/shellext/deskmon/resource.h Fri Sep 28 08:07:26 2007 @@ -9,6 +9,7 @@ #define IDS_MONITORSETTINGSGROUP 204 #define IDS_REFRESHRATELABEL 205 #define IDC_REFRESHRATE 206 +#define IDC_PRUNINGCHECK 207 #define IDS_USEDEFFRQUENCY 101 #define IDS_FREQFMT 102

1 0

[tkreuzer] 29265: win32k compatibility update - NtUserCreateWindowEx: add 15th parameter - NtUserCreateWindowStation: add 7th parameter - rename NtUserDestroyCursorIcon to NtUserDestroyCursor - rename NtUserSetCursorIconContents to NtUserSetCursorContents - implement about 50 NtUser stubs
by tkreuzer＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: tkreuzer Date: Fri Sep 28 05:49:06 2007 New Revision: 29265 URL: http://svn.reactos.org/svn/reactos?rev=29265&view=rev Log: win32k compatibility update - NtUserCreateWindowEx: add 15th parameter - NtUserCreateWindowStation: add 7th parameter - rename NtUserDestroyCursorIcon to NtUserDestroyCursor - rename NtUserSetCursorIconContents to NtUserSetCursorContents - implement about 50 NtUser stubs Modified: trunk/reactos/dll/win32/user32/misc/winsta.c trunk/reactos/dll/win32/user32/windows/cursor.c trunk/reactos/dll/win32/user32/windows/icon.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/misc/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/wins… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/winsta.c (original) +++ trunk/reactos/dll/win32/user32/misc/winsta.c Fri Sep 28 05:49:06 2007 @@ -73,7 +73,7 @@ return NtUserCreateWindowStation(&WindowStationName, dwDesiredAccess, - lpsa, 0, 0, 0); + lpsa, 0, 0, 0, 0); } /* Modified: trunk/reactos/dll/win32/user32/windows/cursor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/cursor.c (original) +++ trunk/reactos/dll/win32/user32/windows/cursor.c Fri Sep 28 05:49:06 2007 @@ -153,7 +153,7 @@ BOOL STDCALL DestroyCursor(HCURSOR hCursor) { - return (BOOL)NtUserDestroyCursorIcon((HANDLE)hCursor, 0); + return (BOOL)NtUserDestroyCursor((HANDLE)hCursor, 0); } Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c Fri Sep 28 05:49:06 2007 @@ -351,7 +351,7 @@ DestroyIcon( HICON hIcon) { - return (BOOL)NtUserDestroyCursorIcon((HANDLE)hIcon, 0); + return (BOOL)NtUserDestroyCursor((HANDLE)hIcon, 0); } Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Fri Sep 28 05:49:06 2007 @@ -241,7 +241,8 @@ hInstance, lpParam, SW_SHOW, - FALSE); + FALSE, + 0); #if 0 DbgPrint("[window] NtUserCreateWindowEx() == %d\n", Handle); Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Fri Sep 28 05:49:06 2007 @@ -93,6 +93,21 @@ DWORD NTAPI +NtUserAssociateInputContext( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + +DWORD +NTAPI +NtUserBuildHimcList( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4); + +DWORD +NTAPI NtUserBuildMenuItemList( HMENU hMenu, PVOID Buffer, @@ -101,10 +116,26 @@ DWORD NTAPI +NtUserCalcMenuBar( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5); + +DWORD +NTAPI NtUserCheckMenuItem( HMENU hmenu, UINT uIDCheckItem, UINT uCheck); + +DWORD +NTAPI +NtUserCtxDisplayIOCtl( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); BOOL NTAPI @@ -528,6 +559,12 @@ DWORD dwflags, LPVOID lParam); +DWORD +STDCALL +NtUserCheckImeHotKey( + DWORD dwUnknown1, + DWORD dwUnknown2); + HWND NTAPI NtUserChildWindowFromPointEx(HWND Parent, LONG x, @@ -552,6 +589,13 @@ NTAPI NtUserCloseWindowStation( HWINSTA hWinSta); + +DWORD +NTAPI +NtUserConsoleControl( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); DWORD NTAPI @@ -598,6 +642,11 @@ ACCESS_MASK dwDesiredAccess, LPSECURITY_ATTRIBUTES lpSecurity, HWINSTA hWindowStation); + +DWORD +NTAPI +NtUserCreateInputContext( + DWORD dwUnknown1); DWORD NTAPI @@ -623,7 +672,8 @@ HINSTANCE hInstance, LPVOID lpParam, DWORD dwShowMode, - BOOL bUnicodeWindow); + BOOL bUnicodeWindow, + DWORD dwUnknown); HWINSTA NTAPI @@ -633,7 +683,8 @@ LPSECURITY_ATTRIBUTES lpSecurity, DWORD Unknown3, DWORD Unknown4, - DWORD Unknown5); + DWORD Unknown5, + DWORD Unknown6); DWORD NTAPI @@ -677,12 +728,22 @@ BOOL NTAPI -NtUserDestroyCursorIcon( +NtUserDestroyCursor( HANDLE Handle, DWORD Unknown); +DWORD +NTAPI +NtUserDestroyInputContext( + DWORD dwUnknown1); + BOOLEAN NTAPI NtUserDestroyWindow(HWND Wnd); + +DWORD +NTAPI +NtUserDisableThreadIme( + DWORD dwUnknown1); typedef struct tagNTUSERDISPATCHMESSAGEINFO { @@ -862,11 +923,21 @@ HWND NTAPI NtUserGetAncestor(HWND hWnd, UINT Flags); +DWORD +NTAPI +NtUserGetAppImeLevel( + DWORD dwUnknown1); DWORD NTAPI NtUserGetAsyncKeyState( DWORD Unknown0); + +DWORD +NTAPI +NtUserGetAtomName( + DWORD dwUnknown1, + DWORD dwUnknown2); UINT NTAPI @@ -1007,11 +1078,35 @@ DWORD NTAPI +NtUserGetIconInfo( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5, + DWORD dwUnknown6); + +DWORD +NTAPI +NtUserGetIconSize( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4); + +DWORD +NTAPI NtUserGetImeHotKey( DWORD Unknown0, DWORD Unknown1, DWORD Unknown2, DWORD Unknown3); + +DWORD +NTAPI +NtUserGetImeInfoEx( + DWORD dwUnknown1, + DWORD dwUnknown2); DWORD NTAPI @@ -1059,6 +1154,14 @@ NTAPI NtUserGetLastInputInfo( PLASTINPUTINFO plii); + +DWORD +NTAPI +NtUserGetLayeredWindowAttributes( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4); DWORD NTAPI @@ -1117,6 +1220,44 @@ NTAPI NtUserGetProcessWindowStation(VOID); +DWORD +NTAPI +NtUserGetRawInputBuffer( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + +DWORD +NTAPI +NtUserGetRawInputData( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5); + +DWORD +NTAPI +NtUserGetRawInputDeviceInfo( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4); + +DWORD +NTAPI +NtUserGetRawInputDeviceList( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + +DWORD +NTAPI +NtUserGetRegisteredRawInputDevices( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + BOOL NTAPI NtUserGetScrollBarInfo( @@ -1182,9 +1323,23 @@ DWORD NTAPI +NtUserHardErrorControl( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + +DWORD +NTAPI NtUserImpersonateDdeClientWindow( DWORD Unknown0, DWORD Unknown1); + +DWORD +NTAPI +NtUserInitialize( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); DWORD NTAPI @@ -1216,6 +1371,19 @@ LPWSTR lpString, INT nMaxCount); +BOOL +NTAPI +NtUserInvalidateRect( + HWND hWnd, + CONST RECT *lpRect, + BOOL bErase); + +BOOL +NTAPI +NtUserInvalidateRgn( + HWND hWnd, + HRGN hRgn, + BOOL bErase); BOOL NTAPI @@ -1281,6 +1449,13 @@ DWORD Unknown5, DWORD Unknown6); +DWORD +NTAPI +NtUserMinMaximize( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + BOOL NTAPI NtUserGetMinMaxInfo( @@ -1343,6 +1518,14 @@ DWORD NTAPI +NtUserNotifyProcessCreate( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4); + +DWORD +NTAPI NtUserNotifyWinEvent( DWORD Unknown0, DWORD Unknown1, @@ -1379,6 +1562,16 @@ NTAPI NtUserPaintDesktop( HDC hDC); + +DWORD +NTAPI +NtUserPaintMenuBar( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5, + DWORD dwUnknown6); BOOL NTAPI @@ -1407,6 +1600,35 @@ DWORD NTAPI +NtUserPrintWindow( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + +DWORD +NTAPI +NtUserProcessConnect( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + +DWORD +NTAPI +NtUserQueryInformationThread( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5); + +DWORD +NTAPI +NtUserQueryInputContext( + DWORD dwUnknown1, + DWORD dwUnknown2); + +DWORD +NTAPI NtUserQuerySendMessage( DWORD Unknown0); @@ -1428,6 +1650,16 @@ HWND hWnd, DWORD Index); +DWORD +NTAPI +NtUserRealInternalGetMessage( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5, + DWORD dwUnknown6); + UINT NTAPI NtUserRealizePalette(HDC hDC); @@ -1438,6 +1670,12 @@ DWORD Unknown0, DWORD Unknown1, DWORD Unknown2); + +DWORD +NTAPI +NtUserRealWaitMessageEx( + DWORD dwUnknown1, + DWORD dwUnknown2); BOOL NTAPI @@ -1449,19 +1687,29 @@ UINT flags ); -BOOL -NTAPI -NtUserInvalidateRect( - HWND hWnd, - CONST RECT *lpRect, - BOOL bErase); - -BOOL -NTAPI -NtUserInvalidateRgn( - HWND hWnd, - HRGN hRgn, - BOOL bErase); +HWINSTA +NTAPI +NtUserRegisterClassExWOW( + CONST WNDCLASSEXW* lpwcx, + BOOL bUnicodeClass, + WNDPROC wpExtra, + DWORD dwUnknown4, + DWORD dwUnknown5, + DWORD dwUnknown6, + DWORD dwUnknown7); + +DWORD +NTAPI +NtUserRegisterRawInputDevices( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + +DWORD +NTAPI +NtUserRegisterUserApiHook( + DWORD dwUnknown1, + DWORD dwUnknown2); /* FIXME: These flag constans aren't what Windows uses. */ #define REGISTERCLASS_ANSI 2 @@ -1489,7 +1737,6 @@ UINT fsModifiers, UINT vk); - BOOL NTAPI NtUserGetLastInputInfo( @@ -1503,8 +1750,39 @@ UINT NTAPI NtUserRegisterWindowMessage(PUNICODE_STRING MessageName); +DWORD +NTAPI +NtUserRemoteConnect( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + +DWORD +NTAPI +NtUserRemoteRedrawRectangle( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4); + +DWORD +NTAPI +NtUserRemoteRedrawScreen(VOID); + +DWORD +NTAPI +NtUserRemoteStopScreenUpdates(VOID); + HANDLE NTAPI NtUserRemoveProp(HWND hWnd, ATOM Atom); + +DWORD +NTAPI +NtUserResolveDesktop( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4); DWORD NTAPI @@ -1573,7 +1851,7 @@ UINT uFlags, UINT uTimeout, ULONG_PTR *uResult, - PNTUSERSENDMESSAGEINFO Info); + PNTUSERSENDMESSAGEINFO Info); BOOL NTAPI @@ -1585,11 +1863,19 @@ HWND NTAPI NtUserSetActiveWindow(HWND Wnd); + HWND NTAPI NtUserGetActiveWindow(VOID); +DWORD +NTAPI +NtUserSetAppImeLevel( + DWORD dwUnknown1, + DWORD dwUnknown2); + HWND NTAPI NtUserSetCapture(HWND Wnd); + HWND NTAPI NtUserGetCapture(VOID); @@ -1599,7 +1885,6 @@ INT Offset, ULONG_PTR dwNewLong, BOOL Ansi ); - DWORD NTAPI @@ -1641,7 +1926,7 @@ BOOL NTAPI -NtUserSetCursorIconContents( +NtUserSetCursorContents( HANDLE Handle, PICONINFO IconInfo); @@ -1677,9 +1962,30 @@ DWORD NTAPI +NtUserSetImeInfoEx( + DWORD dwUnknown1); + +DWORD +NTAPI NtUserSetImeOwnerWindow( DWORD Unknown0, DWORD Unknown1); + +DWORD +NTAPI +NtUserSetInformationProcess( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4); + +DWORD +NTAPI +NtUserSetInformationThread( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4); DWORD NTAPI @@ -1787,6 +2093,12 @@ UINT uElapse, TIMERPROC lpTimerFunc ); + +DWORD +NTAPI +NtUserSetThreadLayoutHandles( + DWORD dwUnknown1, + DWORD dwUnknown2); UINT_PTR NTAPI @@ -1902,6 +2214,10 @@ HWND hWnd, LONG nCmdShow); +DWORD +NTAPI +NtUserSoundSentry(VOID); + BOOL NTAPI NtUserSwitchDesktop( @@ -1915,7 +2231,12 @@ PVOID pvParam, UINT fWinIni); -int +DWORD +NTAPI +NtUserTestForInteractiveUser( + DWORD dwUnknown1); + +INT NTAPI NtUserToUnicodeEx( UINT wVirtKey, @@ -1977,6 +2298,10 @@ DWORD NTAPI +NtUserUnregisterUserApiHook(VOID); + +DWORD +NTAPI NtUserUpdateInputContext( DWORD Unknown0, DWORD Unknown1, @@ -2020,6 +2345,19 @@ NtUserValidateHandleSecure( HANDLE hHdl, BOOL Restricted); + +BOOL +NTAPI +NtUserValidateRect( + HWND hWnd, + CONST RECT *lpRect); + +DWORD +NTAPI +NtUserValidateTimerCallback( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Fri Sep 28 05:49:06 2007 @@ -911,7 +911,7 @@ */ BOOL STDCALL -NtUserDestroyCursorIcon( +NtUserDestroyCursor( HANDLE hCurIcon, DWORD Unknown) { @@ -1101,7 +1101,7 @@ */ BOOL STDCALL -NtUserSetCursorIconContents( +NtUserSetCursorContents( HANDLE hCurIcon, PICONINFO IconInfo) { @@ -1112,7 +1112,7 @@ BOOL Ret = FALSE; DECLARE_RETURN(BOOL); - DPRINT("Enter NtUserSetCursorIconContents\n"); + DPRINT("Enter NtUserSetCursorContents\n"); UserEnterExclusive(); WinSta = IntGetWinStaObj(); @@ -1164,7 +1164,7 @@ RETURN( Ret); CLEANUP: - DPRINT("Leave NtUserSetCursorIconContents, ret=%i\n",_ret_); + DPRINT("Leave NtUserSetCursorContents, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Fri Sep 28 05:49:06 2007 @@ -14,6 +14,17 @@ #include <debug.h> DWORD +NTAPI +NtUserAssociateInputContext( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED + return 0; +} + +DWORD STDCALL NtUserAttachThreadInput( DWORD Unknown0, @@ -40,6 +51,18 @@ UNIMPLEMENTED return 0; +} + +DWORD +NTAPI +NtUserBuildHimcList( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UNIMPLEMENTED; + return 0; } DWORD @@ -683,4 +706,524 @@ return 0; } + +DWORD +STDCALL +NtUserCheckImeHotKey( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserConsoleControl( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserCreateInputContext( + DWORD dwUnknown1) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserDestroyInputContext( + DWORD dwUnknown1) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserDisableThreadIme( + DWORD dwUnknown1) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetAppImeLevel( + DWORD dwUnknown1) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetAtomName( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetIconInfo( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5, + DWORD dwUnknown6) +{ + UNIMPLEMENTED; + return 0; +} + +/* for hints how the prototype might be, see + http://forum.grafika.cz/read.php?23,1816012,1816139,quote=1 + http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634c… */ +DWORD +NTAPI +NtUserGetIconSize( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetImeInfoEx( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetRawInputBuffer( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetRawInputData( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetRawInputDeviceInfo( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetRawInputDeviceList( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetRegisteredRawInputDevices( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserHardErrorControl( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserInitialize( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserMinMaximize( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserNotifyProcessCreate( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserPrintWindow( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserProcessConnect( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserQueryInformationThread( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserQueryInputContext( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserRealInternalGetMessage( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5, + DWORD dwUnknown6) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserRealWaitMessageEx( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return 0; +} + +/* http://www.reactos.org/pipermail/ros-kernel/2003-November/000589.html */ +HWINSTA +NTAPI +NtUserRegisterClassExWOW( + CONST WNDCLASSEXW* lpwcx, + BOOL bUnicodeClass, + WNDPROC wpExtra, + DWORD dwUnknown4, + DWORD dwUnknown5, + DWORD dwUnknown6, + DWORD dwUnknown7) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserRegisterUserApiHook( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserRegisterRawInputDevices( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserResolveDesktop( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserSetAppImeLevel( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserSetImeInfoEx( + DWORD dwUnknown1) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserSetInformationProcess( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserSetInformationThread( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserSetThreadLayoutHandles( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserSoundSentry(VOID) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserTestForInteractiveUser( + DWORD dwUnknown1) +{ + UNIMPLEMENTED; + return 0; +} + +/* http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634c… */ +DWORD +NTAPI +NtUserCalcMenuBar( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserPaintMenuBar( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5, + DWORD dwUnknown6) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserUnregisterUserApiHook(VOID) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetLayeredWindowAttributes( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UNIMPLEMENTED; + return 0; +} + +/* ValidateRect gets redirected to NtUserValidateRect: + http://blog.csdn.net/ntdll/archive/2005/10/19/509299.aspx */ +BOOL +NTAPI +NtUserValidateRect( + HWND hWnd, + CONST RECT *lpRect) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserValidateTimerCallback( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserRemoteConnect( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserRemoteRedrawRectangle( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserRemoteRedrawScreen(VOID) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserRemoteStopScreenUpdates(VOID) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserCtxDisplayIOCtl( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Fri Sep 28 05:49:06 2007 @@ -2087,7 +2087,8 @@ HINSTANCE hInstance, LPVOID lpParam, DWORD dwShowMode, - BOOL bUnicodeWindow) + BOOL bUnicodeWindow, + DWORD dwUnknown) { NTSTATUS Status; UNICODE_STRING WindowName; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Fri Sep 28 05:49:06 2007 @@ -377,7 +377,8 @@ LPSECURITY_ATTRIBUTES lpSecurity, DWORD Unknown3, DWORD Unknown4, - DWORD Unknown5) + DWORD Unknown5, + DWORD Unknown6) { PSYSTEM_CURSORINFO CurInfo; UNICODE_STRING WindowStationName; Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Fri Sep 28 05:49:06 2007 @@ -312,12 +312,12 @@ NtGdiWidenPath 1 NtUserActivateKeyboardLayout 2 NtUserAlterWindowStyle 3 -# NtUserAssociateInputContext 3 +NtUserAssociateInputContext 3 NtUserAttachThreadInput 3 NtUserBeginPaint 2 NtUserBitBltSysBmp 8 NtUserBlockInput 1 -# NtUserBuildHimcList 4 +NtUserBuildHimcList 4 NtUserBuildHwndList 7 NtUserBuildNameList 4 NtUserBuildPropList 4 @@ -333,24 +333,24 @@ NtUserCallTwoParam 3 NtUserChangeClipboardChain 2 NtUserChangeDisplaySettings 5 -# NtUserCheckImeHotKey 2 +NtUserCheckImeHotKey 2 NtUserCheckMenuItem 3 NtUserChildWindowFromPointEx 4 NtUserClipCursor 1 NtUserCloseClipboard 0 NtUserCloseDesktop 1 NtUserCloseWindowStation 1 -# NtUserConsoleControl 3 +NtUserConsoleControl 3 NtUserConvertMemHandle 2 NtUserCopyAcceleratorTable 3 NtUserCountClipboardFormats 0 NtUserCreateAcceleratorTable 2 NtUserCreateCaret 4 NtUserCreateDesktop 5 -# NtUserCreateInputContext 1 +NtUserCreateInputContext 1 NtUserCreateLocalMemHandle 4 -# NtUserCreateWindowEx 15 Wrong number of param ? -# NtUserCreateWindowStation 7 Wrong number of param ? +NtUserCreateWindowEx 15 +NtUserCreateWindowStation 7 NtUserDdeGetQualityOfService 3 NtUserDdeInitialize 5 NtUserDdeSetQualityOfService 3 @@ -358,11 +358,11 @@ NtUserDefSetText 2 NtUserDeleteMenu 3 NtUserDestroyAcceleratorTable 1 -# NtUserDestroyCursor 2 -# NtUserDestroyInputContext 1 +NtUserDestroyCursor 2 +NtUserDestroyInputContext 1 NtUserDestroyMenu 1 NtUserDestroyWindow 1 -# NtUserDisableThreadIme 1 +NtUserDisableThreadIme 1 NtUserDispatchMessage 1 NtUserDragDetect 3 NtUserDragObject 5 @@ -388,9 +388,9 @@ NtUserFlashWindowEx 1 NtUserGetAltTabInfo 6 NtUserGetAncestor 2 -# NtUserGetAppImeLevel 1 +NtUserGetAppImeLevel 1 NtUserGetAsyncKeyState 1 -# NtUserGetAtomName 2 +NtUserGetAtomName 2 NtUserGetCaretBlinkTime 0 NtUserGetCaretPos 1 # NtUserGetClassInfo 5 Wrong number of param ? @@ -413,10 +413,10 @@ NtUserGetForegroundWindow 0 NtUserGetGuiResources 2 NtUserGetGUIThreadInfo 2 -# NtUserGetIconInfo 6 -# NtUserGetIconSize 4 +NtUserGetIconInfo 6 +NtUserGetIconSize 4 NtUserGetImeHotKey 4 -# NtUserGetImeInfoEx 2 +NtUserGetImeInfoEx 2 NtUserGetInternalWindowPos 3 NtUserGetKeyboardLayoutList 2 NtUserGetKeyboardLayoutName 1 @@ -433,11 +433,11 @@ NtUserGetOpenClipboardWindow 0 NtUserGetPriorityClipboardFormat 2 NtUserGetProcessWindowStation 0 -# NtUserGetRawInputBuffer 3 -# NtUserGetRawInputData 5 -# NtUserGetRawInputDeviceInfo 4 -# NtUserGetRawInputDeviceList 3 -# NtUserGetRegisteredRawInputDevices 3 +NtUserGetRawInputBuffer 3 +NtUserGetRawInputData 5 +NtUserGetRawInputDeviceInfo 4 +NtUserGetRawInputDeviceList 3 +NtUserGetRegisteredRawInputDevices 3 NtUserGetScrollBarInfo 3 NtUserGetSystemMenu 2 NtUserGetThreadDesktop 2 @@ -448,11 +448,11 @@ NtUserGetWindowDC 1 NtUserGetWindowPlacement 2 NtUserGetWOWClass 2 -# NtUserHardErrorControl 3 +NtUserHardErrorControl 3 NtUserHideCaret 1 NtUserHiliteMenuItem 4 NtUserImpersonateDdeClientWindow 2 -# NtUserInitialize 3 +NtUserInitialize 3 NtUserInitializeClientPfnArrays 4 # NtUserInitTask 12 Wrong number of param ? NtUserInternalGetWindowText 3 @@ -467,13 +467,13 @@ NtUserMapVirtualKeyEx 4 NtUserMenuItemFromPoint 4 NtUserMessageCall 7 -# NtUserMinMaximize 3 +NtUserMinMaximize 3 NtUserMNDragLeave 0 NtUserMNDragOver 2 NtUserModifyUserStartupInfoFlags 2 NtUserMoveWindow 6 NtUserNotifyIMEStatus 3 -# NtUserNotifyProcessCreate 4 +NtUserNotifyProcessCreate 4 NtUserNotifyWinEvent 4 NtUserOpenClipboard 2 NtUserOpenDesktop 3 @@ -483,26 +483,26 @@ NtUserPeekMessage 5 NtUserPostMessage 4 NtUserPostThreadMessage 4 -# NtUserPrintWindow 3 -# NtUserProcessConnect 3 -# NtUserQueryInformationThread 5 -# NtUserQueryInputContext 2 +NtUserPrintWindow 3 +NtUserProcessConnect 3 +NtUserQueryInformationThread 5 +NtUserQueryInputContext 2 NtUserQuerySendMessage 1 NtUserQueryUserCounters 5 NtUserQueryWindow 2 NtUserRealChildWindowFromPoint 3 -# NtUserRealInternalGetMessage 6 -# NtUserRealWaitMessageEx 2 +NtUserRealInternalGetMessage 6 +NtUserRealWaitMessageEx 2 NtUserRedrawWindow 4 -# NtUserRegisterClassExWOW 7 -# NtUserRegisterUserApiHook 2 +NtUserRegisterClassExWOW 7 +NtUserRegisterUserApiHook 2 NtUserRegisterHotKey 4 -# NtUserRegisterRawInputDevices 3 +NtUserRegisterRawInputDevices 3 NtUserRegisterTasklist 1 NtUserRegisterWindowMessage 1 NtUserRemoveMenu 3 NtUserRemoveProp 2 -# NtUserResolveDesktop 4 +NtUserResolveDesktop 4 NtUserResolveDesktopForWOW 1 NtUserSBGetParms 4 NtUserScrollDC 7 @@ -510,7 +510,7 @@ NtUserSelectPalette 3 NtUserSendInput 3 NtUserSetActiveWindow 1 -# NtUserSetAppImeLevel 2 +NtUserSetAppImeLevel 2 NtUserSetCapture 1 NtUserSetClassLong 4 NtUserSetClassWord 3 @@ -518,15 +518,15 @@ NtUserSetClipboardViewer 1 NtUserSetConsoleReserveKeys 2 NtUserSetCursor 1 -# NtUserSetCursorContents 2 +NtUserSetCursorContents 2 # NtUserSetCursorIconData 4 Wrong number of param ? NtUserSetDbgTag 2 NtUserSetFocus 1 NtUserSetImeHotKey 5 -# NtUserSetImeInfoEx 1 +NtUserSetImeInfoEx 1 NtUserSetImeOwnerWindow 2 -# NtUserSetInformationProcess 4 -# NtUserSetInformationThread 4 +NtUserSetInformationProcess 4 +NtUserSetInformationThread 4 NtUserSetInternalWindowPos 4 NtUserSetKeyboardState 1 NtUserSetLogonNotifyWindow 1 @@ -546,7 +546,7 @@ NtUserSetSystemMenu 2 NtUserSetSystemTimer 4 NtUserSetThreadDesktop 1 -# NtUserSetThreadLayoutHandles 2 +NtUserSetThreadLayoutHandles 2 NtUserSetThreadState 2 NtUserSetTimer 4 NtUserSetWindowFNID 2 @@ -563,17 +563,17 @@ NtUserShowScrollBar 3 NtUserShowWindow 2 NtUserShowWindowAsync 2 -# NtUserSoundSentry 0 +NtUserSoundSentry 0 NtUserSwitchDesktop 1 NtUserSystemParametersInfo 4 -# NtUserTestForInteractiveUser 1 +NtUserTestForInteractiveUser 1 NtUserThunkedMenuInfo 2 NtUserThunkedMenuItemInfo 6 NtUserToUnicodeEx 7 NtUserTrackMouseEvent 1 NtUserTrackPopupMenuEx 6 -# NtUserCalcMenuBar 5 -# NtUserPaintMenuBar 6 +NtUserCalcMenuBar 5 +NtUserPaintMenuBar 6 NtUserTranslateAccelerator 3 NtUserTranslateMessage 2 NtUserUnhookWindowsHookEx 1 @@ -581,18 +581,18 @@ NtUserUnloadKeyboardLayout 1 NtUserUnlockWindowStation 1 # NtUserUnregisterClass 3 Wrong number of param ? -# NtUserUnregisterUserApiHook 0 +NtUserUnregisterUserApiHook 0 NtUserUnregisterHotKey 2 NtUserUpdateInputContext 3 NtUserUpdateInstance 3 NtUserUpdateLayeredWindow 9 -# NtUserGetLayeredWindowAttributes 4 +NtUserGetLayeredWindowAttributes 4 NtUserSetLayeredWindowAttributes 4 NtUserUpdatePerUserSystemParameters 2 NtUserUserHandleGrantAccess 3 NtUserValidateHandleSecure 2 -# NtUserValidateRect 2 -# NtUserValidateTimerCallback 3 +NtUserValidateRect 2 +NtUserValidateTimerCallback 3 NtUserVkKeyScanEx 3 NtUserWaitForInputIdle 3 NtUserWaitForMsgAndEvent 1 @@ -600,11 +600,11 @@ NtUserWin32PoolAllocationStats 6 NtUserWindowFromPoint 2 NtUserYieldTask 0 -# NtUserRemoteConnect 3 -# NtUserRemoteRedrawRectangle 4 -# NtUserRemoteRedrawScreen 0 -# NtUserRemoteStopScreenUpdates 0 -# NtUserCtxDisplayIOCtl 3 +NtUserRemoteConnect 3 +NtUserRemoteRedrawRectangle 4 +NtUserRemoteRedrawScreen 0 +NtUserRemoteStopScreenUpdates 0 +NtUserCtxDisplayIOCtl 3 NtGdiEngAssociateSurface 3 NtGdiEngCreateBitmap 6 NtGdiEngCreateDeviceSurface 4 @@ -676,8 +676,6 @@ # # # Wrong number of param ? -NtUserCreateWindowEx 14 -NtUserCreateWindowStation 6 NtUserEnumDisplayMonitors 5 NtUserFindExistingCursorIcon 4 NtUserFindWindowEx 4 @@ -709,7 +707,6 @@ NtGdiUpdateICMRegKey 4 NtUserBuildMenuItemList 4 NtUserCreateCursorIconHandle 2 -NtUserDestroyCursorIcon 2 NtUserEnumClipboardFormats 1 NtUserGetActiveWindow 0 NtUserGetCapture 0 @@ -740,7 +737,6 @@ NtUserSendMessageCallback 6 NtUserSendMessageTimeout 8 NtUserSendNotifyMessage 4 -NtUserSetCursorIconContents 2 NtUserSetScrollBarInfo 3 NtUserGetDesktopWindow 0 NtGdiAddFontResource 2

1 0

[cwittich] 29264: fix some bugs
by cwittich＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: cwittich Date: Fri Sep 28 04:12:59 2007 New Revision: 29264 URL: http://svn.reactos.org/svn/reactos?rev=29264&view=rev Log: fix some bugs Modified: trunk/reactos/dll/win32/shellext/devcpux/processor.c Modified: trunk/reactos/dll/win32/shellext/devcpux/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/devcpux… ============================================================================== --- trunk/reactos/dll/win32/shellext/devcpux/processor.c (original) +++ trunk/reactos/dll/win32/shellext/devcpux/processor.c Fri Sep 28 04:12:59 2007 @@ -20,17 +20,17 @@ APIENTRY DllMain (HANDLE hInstance, DWORD dwReason, LPVOID lpReserved) { - switch (dwReason) - { + switch (dwReason) + { case DLL_THREAD_ATTACH: case DLL_THREAD_DETACH: - case DLL_PROCESS_ATTACH: - case DLL_PROCESS_DETACH: - break; - } + case DLL_PROCESS_ATTACH: + case DLL_PROCESS_DETACH: + break; + } g_hInstance = (HINSTANCE) hInstance; - return TRUE; + return TRUE; } @@ -54,10 +54,10 @@ PropSheetPage.pfnDlgProc = ProcessorDlgProc; hPropSheetPage = CreatePropertySheetPage(&PropSheetPage); - if(hPropSheetPage) + if(!hPropSheetPage) return FALSE; - if(!(*fAddFunc)(hPropSheetPage, lParam)) { + if(!(fAddFunc)(hPropSheetPage, lParam)) { DestroyPropertySheetPage (hPropSheetPage); return FALSE; } @@ -88,7 +88,7 @@ BOOL bFirst = TRUE; SYSTEM_INFO SystemInfo; PROCESSOR_POWER_INFORMATION PowerInfo; - + if (IsProcessorFeaturePresent(PF_MMX_INSTRUCTIONS_AVAILABLE)) AddFeature(szFeatures, L"MMX", &bFirst); if (IsProcessorFeaturePresent(PF_XMMI_INSTRUCTIONS_AVAILABLE))

1 0

[tkreuzer] 29263: add another small test for AddFontResource
by tkreuzer＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: tkreuzer Date: Fri Sep 28 02:32:09 2007 New Revision: 29263 URL: http://svn.reactos.org/svn/reactos?rev=29263&view=rev Log: add another small test for AddFontResource Modified: trunk/rostests/apitests/gdi32api/tests/AddFontResourceEx.c Modified: trunk/rostests/apitests/gdi32api/tests/AddFontResourceEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/A… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/AddFontResourceEx.c (original) +++ trunk/rostests/apitests/gdi32api/tests/AddFontResourceEx.c Fri Sep 28 02:32:09 2007 @@ -1,12 +1,14 @@ +#define STAMP_DESIGNVECTOR (0x8000000 + 'd' + ('v' << 8)) INT Test_AddFontResourceEx(PTESTINFO pti) { WCHAR szFileName[MAX_PATH]; + GetEnvironmentVariableW(L"systemroot", szFileName, MAX_PATH); - wcscat(szFileName, L"\\Fonts\\cour.ttf"); + /* Test flags = 0 */ SetLastError(ERROR_SUCCESS); TEST(AddFontResourceExW(szFileName, 0, 0) != 0); TEST(GetLastError() == ERROR_SUCCESS); @@ -15,5 +17,9 @@ TEST(AddFontResourceExW(szFileName, 256, 0) == 0); TEST(GetLastError() == ERROR_INVALID_PARAMETER); + /* Test invalid pointer as last parameter */ + TEST(AddFontResourceExW(szFileName, 0, (void*)-1) != 0); + + return APISTATUS_NORMAL; }

1 0

[tkreuzer] 29262: remove gdihv.cbp
by tkreuzer＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: tkreuzer Date: Fri Sep 28 02:30:25 2007 New Revision: 29262 URL: http://svn.reactos.org/svn/reactos?rev=29262&view=rev Log: remove gdihv.cbp Removed: trunk/rosapps/devutils/gdihv/gdihv.cbp Removed: trunk/rosapps/devutils/gdihv/gdihv.cbp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/gdihv.cbp?r… ============================================================================== --- trunk/rosapps/devutils/gdihv/gdihv.cbp (original) +++ trunk/rosapps/devutils/gdihv/gdihv.cbp (removed) @@ -1,120 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<CodeBlocks_project_file> - <FileVersion major="1" minor="5" /> - <Project> - <Option title="gdihv" /> - <Option pch_mode="2" /> - <Option default_target="" /> - <Option compiler="gcc" /> - <Build> - <Target title="Debug"> - <Option output="..\..\..\..\output-i386\modules\rosapps\devutils\gdihv\gdihv.exe" /> - <Option working_dir="..\..\..\..\output-i386\modules\rosapps\devutils\gdihv" /> - <Option object_output="..\..\..\..\obj-i386\modules\rosapps\devutils\gdihv" /> - <Option type="0" /> - <Option compiler="gcc" /> - <Compiler> - <Add option="-g" /> - <Add option="-D__USE_W32API" /> - <Add option="-D_WIN32_IE=0x0501" /> - <Add option="-D_WIN32_WINNT=0x0501" /> - <Add directory="..\..\..\..\include" /> - <Add directory="..\..\..\..\include\crt" /> - <Add directory="..\..\..\..\include\psdk" /> - <Add directory="..\..\..\..\include\ndk" /> - <Add directory="..\..\..\..\include\ddk" /> - </Compiler> - <Linker> - <Add library="user32" /> - <Add library="kernel32" /> - <Add library="comctl32" /> - <Add library="psapi" /> - </Linker> - </Target> - </Build> - <Compiler> - <Add option="-Wall" /> - </Compiler> - <Linker> - <Add library="gdi32" /> - <Add library="user32" /> - <Add library="kernel32" /> - </Linker> - <Unit filename="gdi.h"> - <Option compilerVar="CPP" /> - <Option compile="0" /> - <Option link="0" /> - <Option virtualFolder="header\" /> - <Option target="Debug" /> - </Unit> - <Unit filename="gdihv.c"> - <Option compilerVar="CC" /> - <Option virtualFolder="source\" /> - <Option target="Debug" /> - </Unit> - <Unit filename="gdihv.h"> - <Option compilerVar="CPP" /> - <Option compile="0" /> - <Option link="0" /> - <Option virtualFolder="header\" /> - <Option target="Debug" /> - </Unit> - <Unit filename="gdihv.rbuild"> - <Option compilerVar="CPP" /> - <Option compile="0" /> - <Option link="0" /> - <Option virtualFolder="header\" /> - <Option target="Debug" /> - </Unit> - <Unit filename="gdihv.rc"> - <Option compilerVar="WINDRES" /> - <Option virtualFolder="resources\" /> - <Option objectName="gdihv.res" /> - <Option target="Debug" /> - </Unit> - <Unit filename="handlelist.c"> - <Option compilerVar="CC" /> - <Option virtualFolder="source\" /> - <Option target="Debug" /> - </Unit> - <Unit filename="handlelist.h"> - <Option compilerVar="CPP" /> - <Option compile="0" /> - <Option link="0" /> - <Option virtualFolder="header\" /> - <Option target="Debug" /> - </Unit> - <Unit filename="mainwnd.c"> - <Option compilerVar="CC" /> - <Option virtualFolder="source\" /> - <Option target="Debug" /> - </Unit> - <Unit filename="mainwnd.h"> - <Option compilerVar="CPP" /> - <Option compile="0" /> - <Option link="0" /> - <Option virtualFolder="header\" /> - <Option target="Debug" /> - </Unit> - <Unit filename="proclist.c"> - <Option compilerVar="CC" /> - <Option virtualFolder="source\" /> - <Option target="Debug" /> - </Unit> - <Unit filename="proclist.h"> - <Option compilerVar="CPP" /> - <Option compile="0" /> - <Option link="0" /> - <Option virtualFolder="header\" /> - <Option target="Debug" /> - </Unit> - <Unit filename="resource.h"> - <Option compilerVar="CPP" /> - <Option compile="0" /> - <Option link="0" /> - <Option virtualFolder="header\" /> - <Option target="Debug" /> - </Unit> - <Extensions /> - </Project> -</CodeBlocks_project_file>

1 0

[tkreuzer] 29261: gdihv: - add base type mask - change my email - add deleted entries - full row selection
by tkreuzer＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: tkreuzer Date: Fri Sep 28 02:29:26 2007 New Revision: 29261 URL: http://svn.reactos.org/svn/reactos?rev=29261&view=rev Log: gdihv: - add base type mask - change my email - add deleted entries - full row selection Modified: trunk/rosapps/devutils/gdihv/gdi.h trunk/rosapps/devutils/gdihv/gdihv.c trunk/rosapps/devutils/gdihv/gdihv.rc trunk/rosapps/devutils/gdihv/handlelist.c trunk/rosapps/devutils/gdihv/mainwnd.c trunk/rosapps/devutils/gdihv/mainwnd.h trunk/rosapps/devutils/gdihv/proclist.c Modified: trunk/rosapps/devutils/gdihv/gdi.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/gdi.h?rev=2… ============================================================================== --- trunk/rosapps/devutils/gdihv/gdi.h (original) +++ trunk/rosapps/devutils/gdihv/gdi.h Fri Sep 28 02:29:26 2007 @@ -9,12 +9,13 @@ typedef PGDI_TABLE_ENTRY (CALLBACK * GDIQUERYPROC) (void); /* GDI handle table can hold 0x4000 handles */ -#define GDI_HANDLE_COUNT 0x4000 +#define GDI_HANDLE_COUNT 0x10000 #define GDI_GLOBAL_PROCESS (0x0) /* Handle Masks and shifts */ #define GDI_HANDLE_INDEX_MASK (GDI_HANDLE_COUNT - 1) #define GDI_HANDLE_TYPE_MASK 0x007f0000 +#define GDI_HANDLE_BASETYPE_MASK 0x001f0000 #define GDI_HANDLE_STOCK_MASK 0x00800000 #define GDI_HANDLE_REUSE_MASK 0xff000000 #define GDI_HANDLE_REUSECNT_SHIFT 24 Modified: trunk/rosapps/devutils/gdihv/gdihv.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/gdihv.c?rev… ============================================================================== --- trunk/rosapps/devutils/gdihv/gdihv.c (original) +++ trunk/rosapps/devutils/gdihv/gdihv.c Fri Sep 28 02:29:26 2007 @@ -3,7 +3,7 @@ * * gdihv.c * - * Copyright (C) 2007 Timo Kreuzer <timo <dot> kreuzer <at> web.de> + * Copyright (C) 2007 Timo Kreuzer <timo <dot> kreuzer <at> reactos <dot> org> * * 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 Modified: trunk/rosapps/devutils/gdihv/gdihv.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/gdihv.rc?re… ============================================================================== --- trunk/rosapps/devutils/gdihv/gdihv.rc (original) +++ trunk/rosapps/devutils/gdihv/gdihv.rc Fri Sep 28 02:29:26 2007 @@ -14,5 +14,3 @@ PUSHBUTTON "Refresh processes", IDC_REFRESHPROCESS, 50, 230, 80, 14, WS_CLIPSIBLINGS | WS_TABSTOP END - - Modified: trunk/rosapps/devutils/gdihv/handlelist.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/handlelist.… ============================================================================== --- trunk/rosapps/devutils/gdihv/handlelist.c (original) +++ trunk/rosapps/devutils/gdihv/handlelist.c Fri Sep 28 02:29:26 2007 @@ -3,7 +3,7 @@ * * handlelist.c * - * Copyright (C) 2007 Timo Kreuzer <timo <dot> kreuzer <at> web.de> + * Copyright (C) 2007 Timo Kreuzer <timo <dot> kreuzer <at> reactos <dot> org> * * 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 @@ -71,7 +71,7 @@ INT i, index; HANDLE handle; PGDI_TABLE_ENTRY pEntry; - LV_ITEM item; + LVITEM item; TCHAR strText[80]; TCHAR* str2; @@ -82,13 +82,17 @@ for (i = 0; i<= GDI_HANDLE_COUNT; i++) { pEntry = &GdiHandleTable[i]; - if (pEntry->KernelData) + if ( ((ProcessId != (HANDLE)1) && ((pEntry->Type & GDI_HANDLE_BASETYPE_MASK) != 0)) || + ((ProcessId == (HANDLE)1) && ((pEntry->Type & GDI_HANDLE_BASETYPE_MASK) == 0)) ) { - if (ProcessId == (HANDLE)-1 || ProcessId == pEntry->ProcessId) + if (ProcessId == (HANDLE)1 || + ProcessId == (HANDLE)((ULONG)pEntry->ProcessId & 0xfffc)) { + handle = GDI_HANDLE_CREATE(i, pEntry->Type); index = ListView_GetItemCount(hHandleListCtrl); item.iItem = index; item.iSubItem = 0; + item.lParam = (LPARAM)handle; wsprintf(strText, L"%d", index); (void)ListView_InsertItem(hHandleListCtrl, &item); @@ -96,7 +100,6 @@ wsprintf(strText, L"%d", i); ListView_SetItemText(hHandleListCtrl, index, 1, strText); - handle = GDI_HANDLE_CREATE(i, pEntry->Type); wsprintf(strText, L"%#08x", handle); ListView_SetItemText(hHandleListCtrl, index, 2, strText); Modified: trunk/rosapps/devutils/gdihv/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/mainwnd.c?r… ============================================================================== --- trunk/rosapps/devutils/gdihv/mainwnd.c (original) +++ trunk/rosapps/devutils/gdihv/mainwnd.c Fri Sep 28 02:29:26 2007 @@ -3,7 +3,7 @@ * * mainwnd.c * - * Copyright (C) 2007 Timo Kreuzer <timo <dot> kreuzer <at> web.de> + * Copyright (C) 2007 Timo Kreuzer <timo <dot> kreuzer <at> reactos <dot> org> * * 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 @@ -24,6 +24,59 @@ INT g_Separator; + +static LRESULT +MainWindow_OnSize(HWND hMainWnd) +{ + HWND hProcessListctrl, hHandleListCtrl, hProcessRefresh, hHandleRefresh; + RECT rect; + + hProcessListctrl = GetDlgItem(hMainWnd, IDC_PROCESSLIST); + hHandleListCtrl = GetDlgItem(hMainWnd, IDC_HANDLELIST); + hProcessRefresh = GetDlgItem(hMainWnd, IDC_REFRESHPROCESS); + hHandleRefresh = GetDlgItem(hMainWnd, IDC_REFRESHHANDLE); + + GetClientRect(hMainWnd, &rect); + +//g_Separator = (rect.right / 2); + MoveWindow(hProcessListctrl, 5, 5, g_Separator - 5, rect.bottom - 40, TRUE); + MoveWindow(hHandleListCtrl, g_Separator + 5, 5, rect.right - g_Separator - 5, rect.bottom - 40, TRUE); + MoveWindow(hProcessRefresh, g_Separator - 90, rect.bottom - 30, 90, 25, TRUE); + MoveWindow(hHandleRefresh, rect.right - 90, rect.bottom - 30, 90, 25, TRUE); + + return 0; +} + + +static LRESULT +MainWnd_OnNotify(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ + LPNMHDR pnmh = (LPNMHDR)lParam; + + switch(pnmh->code) + { + case LVN_ITEMCHANGED: + { + LPNMLISTVIEW pnmlv = (LPNMLISTVIEW)pnmh; + if ((wParam == IDC_PROCESSLIST) + && (pnmlv->uNewState & LVIS_SELECTED) + && !(pnmlv->uOldState & LVIS_SELECTED)) + { + LV_ITEM item; + memset(&item, 0, sizeof(LV_ITEM)); + item.mask = LVIF_PARAM; + item.iItem = pnmlv->iItem; + (void)ListView_GetItem(GetDlgItem(hWnd, IDC_PROCESSLIST), &item); + HandleList_Update(GetDlgItem(hWnd, IDC_HANDLELIST), (HANDLE)item.lParam); + return TRUE; + } + break; + } + } + + return 0; +} + INT_PTR CALLBACK MainWindow_WndProc(HWND hMainWnd, UINT message, WPARAM wParam, LPARAM lParam) { @@ -34,6 +87,8 @@ RECT rect; SendMessage(hMainWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_MAIN))); + (void)ListView_SetExtendedListViewStyle(GetDlgItem(hMainWnd, IDC_PROCESSLIST), LVS_EX_FULLROWSELECT); + (void)ListView_SetExtendedListViewStyle(GetDlgItem(hMainWnd, IDC_HANDLELIST), LVS_EX_FULLROWSELECT); GetClientRect(hMainWnd, &rect); g_Separator = (rect.right / 2); HandleList_Create(GetDlgItem(hMainWnd, IDC_HANDLELIST)); @@ -43,10 +98,8 @@ break; } case WM_SIZE: - { - MainWindow_OnSize(hMainWnd); - break; - } + return MainWindow_OnSize(hMainWnd); + case WM_COMMAND: { switch (LOWORD(wParam)) @@ -80,23 +133,10 @@ } break; } + case WM_NOTIFY: - { - if (((LPNMLISTVIEW)lParam)->hdr.code == LVN_ITEMCHANGED - && (wParam == IDC_PROCESSLIST) - && (((LPNMLISTVIEW)lParam)->uNewState & LVIS_SELECTED) - && !(((LPNMLISTVIEW)lParam)->uOldState & LVIS_SELECTED)) - { - LV_ITEM item; - memset(&item, 0, sizeof(LV_ITEM)); - item.mask = LVIF_PARAM; - item.iItem = ((LPNMLISTVIEW)lParam)->iItem; - (void)ListView_GetItem(GetDlgItem(hMainWnd, IDC_PROCESSLIST), &item); - HandleList_Update(GetDlgItem(hMainWnd, IDC_HANDLELIST), (HANDLE)item.lParam); - return TRUE; - break; - } - } + return MainWnd_OnNotify(hMainWnd, wParam, lParam); + default: { return FALSE; @@ -105,23 +145,3 @@ return TRUE; } -VOID -MainWindow_OnSize(HWND hMainWnd) -{ - HWND hProcessListctrl, hHandleListCtrl, hProcessRefresh, hHandleRefresh; - RECT rect; - - hProcessListctrl = GetDlgItem(hMainWnd, IDC_PROCESSLIST); - hHandleListCtrl = GetDlgItem(hMainWnd, IDC_HANDLELIST); - hProcessRefresh = GetDlgItem(hMainWnd, IDC_REFRESHPROCESS); - hHandleRefresh = GetDlgItem(hMainWnd, IDC_REFRESHHANDLE); - - GetClientRect(hMainWnd, &rect); - -//g_Separator = (rect.right / 2); - MoveWindow(hProcessListctrl, 5, 5, g_Separator - 5, rect.bottom - 40, TRUE); - MoveWindow(hHandleListCtrl, g_Separator + 5, 5, rect.right - g_Separator - 5, rect.bottom - 40, TRUE); - MoveWindow(hProcessRefresh, g_Separator - 90, rect.bottom - 30, 90, 25, TRUE); - MoveWindow(hHandleRefresh, rect.right - 90, rect.bottom - 30, 90, 25, TRUE); - return; -} Modified: trunk/rosapps/devutils/gdihv/mainwnd.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/mainwnd.h?r… ============================================================================== --- trunk/rosapps/devutils/gdihv/mainwnd.h (original) +++ trunk/rosapps/devutils/gdihv/mainwnd.h Fri Sep 28 02:29:26 2007 @@ -1,3 +1,2 @@ INT_PTR CALLBACK MainWindow_WndProc(HWND, UINT, WPARAM, LPARAM); -VOID MainWindow_OnSize(HWND hMainWnd); Modified: trunk/rosapps/devutils/gdihv/proclist.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/proclist.c?… ============================================================================== --- trunk/rosapps/devutils/gdihv/proclist.c (original) +++ trunk/rosapps/devutils/gdihv/proclist.c Fri Sep 28 02:29:26 2007 @@ -3,7 +3,7 @@ * * proclist.c * - * Copyright (C) 2007 Timo Kreuzer <timo <dot> kreuzer <at> web.de> + * Copyright (C) 2007 Timo Kreuzer <timo <dot> kreuzer <at> reactos <dot> org> * * 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 @@ -44,7 +44,8 @@ ProcessList_Update(HWND hListCtrl) { LV_ITEM item; - DWORD ProcessIds[1024], BytesReturned, cProcesses; + DWORD ProcessIds[1024], BytesReturned; + UINT cProcesses; HANDLE hProcess; WCHAR strText[MAX_PATH] = L"<unknown>"; INT i; @@ -63,12 +64,21 @@ wsprintf(strText, L"%#08x", 0); ListView_SetItemText(hListCtrl, 0, 1, strText); + /* Insert "deleted" */ + item.iItem = 1; + item.lParam = 1; + item.pszText = L"<deleted>"; + (void)ListView_InsertItem(hListCtrl, &item); + item.pszText = strText; + wsprintf(strText, L"%#08x",1); + ListView_SetItemText(hListCtrl, 1, 1, strText); + if (!EnumProcesses(ProcessIds, sizeof(ProcessIds), &BytesReturned )) { return; } cProcesses = BytesReturned / sizeof(DWORD); - if (cProcesses == 0) + if (cProcesses <= 1) { return; } @@ -80,7 +90,7 @@ hProcess = 0; /* FIXME: HACK: ROS crashes when using OpenProcess with PROCESS_VM_READ */ -// hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, ProcessIds[i]); + hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, ProcessIds[i]); if (hProcess) { GetModuleBaseName(hProcess, NULL, (LPWSTR)strText, MAX_PATH );

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
59
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 2007