Ros-diffs April 2011

ros-diffs@reactos.org

19 participants
296 discussions

[janderwald] 51292: [SNDVOL32] - Fix more subtle bugs: - Check with long line name if the current connection is activated when adding lines to dialog or when adding lines to the preferences dialog ...

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Apr 9 10:36:25 2011 New Revision: 51292 URL: http://svn.reactos.org/svn/reactos?rev=51292&view=rev Log: [SNDVOL32] - Fix more subtle bugs: - Check with long line name if the current connection is activated when adding lines to dialog or when adding lines to the preferences dialog - Use the temporary preferences context when writing the line settings - Don't destroy the mixer when the preferences dialog is closed. the new mixer will be used for the application when the preferences are changed - Pass the current selected line to the preferences dialog Modified: trunk/reactos/base/applications/sndvol32/dialog.c trunk/reactos/base/applications/sndvol32/sndvol32.c trunk/reactos/base/applications/sndvol32/sndvol32.h Modified: trunk/reactos/base/applications/sndvol32/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/dialog.c [iso-8859-1] Sat Apr 9 10:36:25 2011 @@ -340,7 +340,7 @@ if (Line->cControls != 0) { /* get line name */ - if (SndMixerGetLineName(PrefContext->MixerWindow->Mixer, PrefContext->SelectedLine, LineName, MIXER_LONG_NAME_CHARS, FALSE) == -1) + if (SndMixerGetLineName(PrefContext->MixerWindow->Mixer, PrefContext->SelectedLine, LineName, MIXER_LONG_NAME_CHARS, TRUE) == -1) { /* failed to get line name */ LineName[0] = L'\0'; Modified: trunk/reactos/base/applications/sndvol32/sndvol32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] Sat Apr 9 10:36:25 2011 @@ -199,7 +199,7 @@ PrefContext->SelectedLine, LineName, MIXER_LONG_NAME_CHARS, - FALSE) == -1) + TRUE) == -1) { LineName[0] = TEXT('\0'); } @@ -340,7 +340,7 @@ static VOID -WriteLineSettings(PREFERENCES_CONTEXT Context, HWND hwndDlg) +WriteLineSettings(PPREFERENCES_CONTEXT Context, HWND hwndDlg) { HWND hwndControls; INT Count, Index; @@ -358,7 +358,7 @@ /* sanity check */ assert(Count); - if (SndMixerGetLineName(Preferences.MixerWindow->Mixer, Preferences.SelectedLine, DestinationName, MIXER_LONG_NAME_CHARS, TRUE) == -1) + if (SndMixerGetLineName(Context->Mixer, Context->SelectedLine, DestinationName, MIXER_LONG_NAME_CHARS, TRUE) == -1) { /* failed to get destination line name */ return; @@ -395,7 +395,7 @@ } /* now write the line config */ - WriteLineConfig(Preferences.DeviceName, DestinationName, LineStates, sizeof(SNDVOL_REG_LINESTATE) * Count); + WriteLineConfig(Context->DeviceName, DestinationName, LineStates, sizeof(SNDVOL_REG_LINESTATE) * Count); /* free line states */ HeapFree(GetProcessHeap(), 0, LineStates); @@ -509,7 +509,7 @@ case IDOK: { /* write line settings */ - WriteLineSettings(Preferences, hwndDlg); + WriteLineSettings(Context, hwndDlg); /* fall through */ } @@ -564,19 +564,8 @@ /* update all controls */ UpdatePrefDlgControls(Context, - (DWORD)-1); + (DWORD)Context->SelectedLine); return TRUE; - } - - case WM_DESTROY: - { - Context = GetDialogData(hwndDlg, - PREFERENCES_CONTEXT); - if (Context->Mixer != NULL) - { - SndMixerDestroy(Context->Mixer); - } - break; } case WM_CLOSE: @@ -789,16 +778,17 @@ { case IDC_PROPERTIES: { - PREFERENCES_CONTEXT Preferences; - - Preferences.MixerWindow = MixerWindow; - Preferences.Mixer = NULL; + PREFERENCES_CONTEXT Pref; + + Pref.MixerWindow = MixerWindow; + Pref.Mixer = NULL; + Pref.SelectedLine = Preferences.SelectedLine; if (DialogBoxParam(hAppInstance, MAKEINTRESOURCE(IDD_PREFERENCES), hwnd, DlgPreferencesProc, - (LPARAM)&Preferences) == IDOK) + (LPARAM)&Pref) == IDOK) { /* update window */ TCHAR szProduct[MAXPNAMELEN]; @@ -820,11 +810,17 @@ /* destroy old status bar */ DestroyWindow(MixerWindow->hStatusBar); + /* update details */ + Preferences.SelectedLine = Pref.SelectedLine; + + /* destroy old mixer */ + SndMixerDestroy(Preferences.MixerWindow->Mixer); + + /* use new selected mixer */ + Preferences.MixerWindow->Mixer = Pref.Mixer; + /* rebuild dialog controls */ - if (RebuildMixerWindowControls(&Preferences)) - { - DPRINT("Rebuilding mixer window controls failed!\n"); - } + RebuildMixerWindowControls(&Preferences); /* create status window */ MixerWindow->hStatusBar = CreateStatusWindow(WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS, Modified: trunk/reactos/base/applications/sndvol32/sndvol32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sndvol32.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/sndvol32.h [iso-8859-1] Sat Apr 9 10:36:25 2011 @@ -31,8 +31,7 @@ #define SZ_APP_CLASS TEXT("Volume Control") ULONG DbgPrint(PCH , ...); -#define DPRINT -//DbgPrint("SNDVOL32: %s:%i: ", __FILE__, __LINE__); DbgPrint +#define DPRINT DbgPrint("SNDVOL32: %s:%i: ", __FILE__, __LINE__); DbgPrint /*

13 years, 12 months

[mjmartin] 51291: [Win32k] - Only call hooks and check if Win32Thread is in cleanup if the windows procedure is being called. - Set DispatchingListEntry.Flink to NULL. The real fix for bug 5580. Th...

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sat Apr 9 07:19:31 2011 New Revision: 51291 URL: http://svn.reactos.org/svn/reactos?rev=51291&view=rev Log: [Win32k] - Only call hooks and check if Win32Thread is in cleanup if the windows procedure is being called. - Set DispatchingListEntry.Flink to NULL. The real fix for bug 5580. This bug may be the cause of other crashes experienced by users just before loading desktop. Found by rafalh. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat Apr 9 07:19:31 2011 @@ -1403,17 +1403,8 @@ Win32Thread = PsGetCurrentThreadWin32Thread(); - IntCallWndProc( Window, hWnd, Msg, wParam, lParam); - if (Win32Thread == NULL) { - ASSERT(FALSE); - RETURN(FALSE); - } - - if (Win32Thread->TIF_flags & TIF_INCLEANUP) - { - /* Never send messages to exiting threads */ RETURN(FALSE); } @@ -1437,6 +1428,15 @@ /* If this is not a callback and it can be sent now, then send it. */ if ((Window->head.pti->MessageQueue == Win32Thread->MessageQueue) && (CompletionCallback == NULL)) { + if (Win32Thread->TIF_flags & TIF_INCLEANUP) + { + UnpackParam(lParamPacked, Msg, wParam, lParam, FALSE); + /* Never send messages to exiting threads */ + RETURN(FALSE); + } + + IntCallWndProc( Window, hWnd, Msg, wParam, lParam); + ObReferenceObject(Win32Thread->pEThread); Result = (ULONG_PTR)co_IntCallWindowProc( Window->lpfnWndProc, !Window->Unicode, @@ -1450,9 +1450,11 @@ *uResult = Result; } ObDereferenceObject(Win32Thread->pEThread); - } - - IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); + + IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); + } + + if ((Window->head.pti->MessageQueue == Win32Thread->MessageQueue) && (CompletionCallback == NULL)) { @@ -1479,7 +1481,8 @@ Message->QS_Flags = 0; Message->SenderQueue = NULL; // mjmartin, you are right! This is null. Message->CallBackSenderQueue = Win32Thread->MessageQueue; - + Message->DispatchingListEntry.Flink = NULL; + IntReferenceMessageQueue(Window->head.pti->MessageQueue); Message->CompletionCallback = CompletionCallback; Message->CompletionCallbackContext = CompletionCallbackContext;

13 years, 12 months

[jimtabor] 51290: [Win32k] - Added more missed mouse injection flag and extra data being passed in and from set cursor position. Wine mouse low level hook msg tests now see it and check the validit...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Apr 9 07:08:17 2011 New Revision: 51290 URL: http://svn.reactos.org/svn/reactos?rev=51290&view=rev Log: [Win32k] - Added more missed mouse injection flag and extra data being passed in and from set cursor position. Wine mouse low level hook msg tests now see it and check the validity of the hook message. Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] Sat Apr 9 07:08:17 2011 @@ -69,7 +69,7 @@ INT cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags); PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon); -BOOL UserSetCursorPos( INT x, INT y); +BOOL UserSetCursorPos( INT x, INT y, DWORD flags, ULONG_PTR dwExtraInfo); int UserShowCursor(BOOL bShow); 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sat Apr 9 07:08:17 2011 @@ -159,7 +159,7 @@ return OldCursor; } -BOOL UserSetCursorPos( INT x, INT y) +BOOL UserSetCursorPos( INT x, INT y, DWORD flags, ULONG_PTR dwExtraInfo) { PWND DesktopWindow; PSYSTEM_CURSORINFO CurInfo; @@ -199,7 +199,7 @@ Msg.wParam = CurInfo->ButtonsDown; Msg.lParam = MAKELPARAM(x, y); Msg.pt = pt; - co_MsqInsertMouseMessage(&Msg, 0, 0); + co_MsqInsertMouseMessage(&Msg, flags, dwExtraInfo); /* 1. Store the new cursor position */ gpsi->ptCursor = pt; @@ -677,7 +677,7 @@ { CurInfo->bClipped = TRUE; RECTL_bIntersectRect(&CurInfo->rcClip, prcl, &DesktopWindow->rcWindow); - UserSetCursorPos(gpsi->ptCursor.x, gpsi->ptCursor.y); + UserSetCursorPos(gpsi->ptCursor.x, gpsi->ptCursor.y, 0, 0); } else { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sat Apr 9 07:08:17 2011 @@ -1138,7 +1138,7 @@ if(mi->dwFlags & MOUSEEVENTF_MOVE) { - UserSetCursorPos(MousePos.x, MousePos.y); + UserSetCursorPos(MousePos.x, MousePos.y, Injected, mi->dwExtraInfo); } if(mi->dwFlags & MOUSEEVENTF_LEFTDOWN) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sat Apr 9 07:08:17 2011 @@ -294,7 +294,7 @@ MouseHistoryOfMoves[gcur_count].x = Msg->pt.x; MouseHistoryOfMoves[gcur_count].y = Msg->pt.y; MouseHistoryOfMoves[gcur_count].time = Msg->time; - MouseHistoryOfMoves[gcur_count].dwExtraInfo = 0; // need to be passed from IntMouseInput mi.dwExtraInfo. + MouseHistoryOfMoves[gcur_count].dwExtraInfo = dwExtraInfo; if (gcur_count++ == 64) gcur_count = 0; // 0 - 63 is 64, FIFO forwards. } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Sat Apr 9 07:08:17 2011 @@ -473,7 +473,7 @@ RETURN( (DWORD_PTR)co_IntRegisterLogonProcess((HANDLE)Param1, (BOOL)Param2)); case TWOPARAM_ROUTINE_SETCURSORPOS: - RETURN( (DWORD_PTR)UserSetCursorPos((int)Param1, (int)Param2)); + RETURN( (DWORD_PTR)UserSetCursorPos((int)Param1, (int)Param2, 0, 0)); case TWOPARAM_ROUTINE_UNHOOKWINDOWSHOOK: RETURN( IntUnhookWindowsHook((int)Param1, (HOOKPROC)Param2));

13 years, 12 months

[spetreolle] 51289: [SNDVOL32] Redraw window with correct size. Window height was growing after changing preferences.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Apr 8 23:18:20 2011 New Revision: 51289 URL: http://svn.reactos.org/svn/reactos?rev=51289&view=rev Log: [SNDVOL32] Redraw window with correct size. Window height was growing after changing preferences. Modified: trunk/reactos/base/applications/sndvol32/dialog.c Modified: trunk/reactos/base/applications/sndvol32/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/dialog.c [iso-8859-1] Fri Apr 8 23:18:20 2011 @@ -130,11 +130,11 @@ } /* now create the window */ - hwnd = CreateWindowExW(DialogItem->dwExtendedStyle, - ClassName, - WindowName, - DialogItem->style, - rect.left, + hwnd = CreateWindowExW(DialogItem->dwExtendedStyle, + ClassName, + WindowName, + DialogItem->style, + rect.left, rect.top, rect.right, rect.bottom, @@ -187,7 +187,7 @@ Offset++; } - /* check if there is additional data */ + /* check if there is additional data */ if (*Offset == 0) { /* no additional data */ @@ -323,8 +323,8 @@ BOOL CALLBACK EnumConnectionsCallback( - PSND_MIXER Mixer, - DWORD LineID, + PSND_MIXER Mixer, + DWORD LineID, LPMIXERLINE Line, PVOID Context) { @@ -439,7 +439,7 @@ GetWindowRect(PrefContext->MixerWindow->hWnd, &rect); /* now move the window */ - MoveWindow(PrefContext->MixerWindow->hWnd, rect.left, rect.top, (PrefContext->Count * DIALOG_VOLUME_SIZE), rect.bottom, TRUE); + MoveWindow(PrefContext->MixerWindow->hWnd, rect.left, rect.top, (PrefContext->Count * DIALOG_VOLUME_SIZE), rect.bottom - rect.top, TRUE); } } }

13 years, 12 months

[spetreolle] 51288: [SNDVOL32] Update french translation.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Apr 8 22:40:12 2011 New Revision: 51288 URL: http://svn.reactos.org/svn/reactos?rev=51288&view=rev Log: [SNDVOL32] Update french translation. Modified: trunk/reactos/base/applications/sndvol32/lang/fr-FR.rc Modified: trunk/reactos/base/applications/sndvol32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/fr-FR.rc [iso-8859-1] Fri Apr 8 22:40:12 2011 @@ -42,3 +42,16 @@ PUSHBUTTON "Annuler", IDCANCEL, 168,226,50,14 END +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +{ + LTEXT "Volume principal", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Muet", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +}

13 years, 12 months

[janderwald] 51287: [SNDVOL32] - Fix mute switch control style

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Apr 8 22:17:18 2011 New Revision: 51287 URL: http://svn.reactos.org/svn/reactos?rev=51287&view=rev Log: [SNDVOL32] - Fix mute switch control style Modified: trunk/reactos/base/applications/sndvol32/lang/en-US.rc Modified: trunk/reactos/base/applications/sndvol32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/en-US.rc [iso-8859-1] Fri Apr 8 22:17:18 2011 @@ -52,6 +52,6 @@ LTEXT "Volume", -1, 4, 100, 77, 108 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 - CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 }

13 years, 12 months

[janderwald] 51286: [SNDVOL32] - Always write line states configuration values in one step - Fixes the problem when old line state settings were not present - Advantage is that it is faster and snd...

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Apr 8 22:04:41 2011 New Revision: 51286 URL: http://svn.reactos.org/svn/reactos?rev=51286&view=rev Log: [SNDVOL32] - Always write line states configuration values in one step - Fixes the problem when old line state settings were not present - Advantage is that it is faster and sndvol32 now works in ReactOS Modified: trunk/reactos/base/applications/sndvol32/misc.c trunk/reactos/base/applications/sndvol32/sndvol32.c trunk/reactos/base/applications/sndvol32/sndvol32.h Modified: trunk/reactos/base/applications/sndvol32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/misc.c [iso-8859-1] Fri Apr 8 22:04:41 2011 @@ -160,8 +160,43 @@ BOOL WriteLineConfig(IN LPTSTR szDeviceName, IN LPTSTR szLineName, - IN LPTSTR szControlName, - IN DWORD Flags) + IN PSNDVOL_REG_LINESTATE LineState, + IN DWORD cbSize) +{ + HKEY hLineKey; + TCHAR szDevRegKey[MAX_PATH]; + BOOL Ret = FALSE; + + _stprintf(szDevRegKey, + TEXT("%s\\%s"), + szDeviceName, + szLineName); + + if (RegCreateKeyEx(hAppSettingsKey, + szDevRegKey, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_READ | KEY_WRITE, + NULL, + &hLineKey, + NULL) == ERROR_SUCCESS) + { + /* now update line states */ + RegSetValueEx(hLineKey, LineStatesValue, 0, REG_BINARY, (const BYTE*)LineState, cbSize); + Ret = TRUE; + + RegCloseKey(hLineKey); + } + + return Ret; +} + +BOOL +ReadLineConfig(IN LPTSTR szDeviceName, + IN LPTSTR szLineName, + IN LPTSTR szControlName, + OUT DWORD *Flags) { HKEY hLineKey; DWORD Type; @@ -221,16 +256,10 @@ if (!_tcscmp(szControlName, LineStates[i].LineName)) { - LineStates[i].Flags = Flags; + *Flags = LineStates[i].Flags; Ret = TRUE; break; } - } - - /* now update line states */ - if (Ret) - { - RegSetValueEx(hLineKey, LineStatesValue, 0, REG_BINARY, (const BYTE*)LineStates, Size); } } @@ -242,89 +271,4 @@ } return Ret; - - - - -} - -BOOL -ReadLineConfig(IN LPTSTR szDeviceName, - IN LPTSTR szLineName, - IN LPTSTR szControlName, - OUT DWORD *Flags) -{ - HKEY hLineKey; - DWORD Type; - DWORD i, Size = 0; - PSNDVOL_REG_LINESTATE LineStates = NULL; - TCHAR szDevRegKey[MAX_PATH]; - BOOL Ret = FALSE; - - _stprintf(szDevRegKey, - TEXT("%s\\%s"), - szDeviceName, - szLineName); - - if (RegCreateKeyEx(hAppSettingsKey, - szDevRegKey, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_READ | KEY_WRITE, - NULL, - &hLineKey, - NULL) == ERROR_SUCCESS) - { - if (RegQueryValueEx(hLineKey, - LineStatesValue, - NULL, - &Type, - NULL, - &Size) != ERROR_SUCCESS || - Type != REG_BINARY || - Size == 0 || (Size % sizeof(SNDVOL_REG_LINESTATE) != 0)) - { - goto ExitClose; - } - - LineStates = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - Size); - - if (LineStates != NULL) - { - if (RegQueryValueEx(hLineKey, - LineStatesValue, - NULL, - &Type, - (LPBYTE)LineStates, - &Size) != ERROR_SUCCESS || - Type != REG_BINARY || - Size == 0 || (Size % sizeof(SNDVOL_REG_LINESTATE) != 0)) - { - goto ExitClose; - } - - /* try to find the control */ - for (i = 0; i < Size / sizeof(SNDVOL_REG_LINESTATE); i++) - { - if (!_tcscmp(szControlName, - LineStates[i].LineName)) - { - *Flags = LineStates[i].Flags; - Ret = TRUE; - break; - } - } - } - -ExitClose: - HeapFree(GetProcessHeap(), - 0, - LineStates); - RegCloseKey(hLineKey); - } - - return Ret; -} +} Modified: trunk/reactos/base/applications/sndvol32/sndvol32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] Fri Apr 8 22:04:41 2011 @@ -347,6 +347,7 @@ WCHAR LineName[MIXER_LONG_NAME_CHARS]; WCHAR DestinationName[MIXER_LONG_NAME_CHARS]; DWORD Flags; + PSNDVOL_REG_LINESTATE LineStates; /* get list view */ hwndControls = GetDlgItem(hwndDlg, IDC_CONTROLS); @@ -364,6 +365,14 @@ } /* allocate line states array */ + LineStates = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SNDVOL_REG_LINESTATE) * Count); + if (LineStates == NULL) + { + /* failed to allocate line states array */ + return; + } + + for(Index = 0; Index < Count; Index++) { /* set to empty */ @@ -378,11 +387,18 @@ /* get check state */ Flags = (ListView_GetCheckState(hwndControls, Index) == 0 ? 0x4 : 0); - /* write configuration */ - WriteLineConfig(Preferences.DeviceName, DestinationName, LineName, Flags); - } - - + /* copy line name */ + wcscpy(LineStates[Index].LineName, LineName); + + /* store flags */ + LineStates[Index].Flags = Flags; + } + + /* now write the line config */ + WriteLineConfig(Preferences.DeviceName, DestinationName, LineStates, sizeof(SNDVOL_REG_LINESTATE) * Count); + + /* free line states */ + HeapFree(GetProcessHeap(), 0, LineStates); } static INT_PTR CALLBACK Modified: trunk/reactos/base/applications/sndvol32/sndvol32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sndvol32.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/sndvol32.h [iso-8859-1] Fri Apr 8 22:04:41 2011 @@ -160,7 +160,7 @@ BOOL WriteLineConfig(IN LPTSTR szDeviceName, IN LPTSTR szLineName, - IN LPTSTR szControlName, - IN DWORD Flags); + IN PSNDVOL_REG_LINESTATE LineState, + IN DWORD cbSize); #endif /* __SNDVOL32_H */

13 years, 12 months

[osiejka] 51285: [DOSKEY] - Polish translation by Adam "Saibman" Stachowicz [SNDREC32] - Polish translation by Adam "Saibman" Stachowicz [SNDVOL32] - Polish translation update by me [TRANSLATION] -...

by osiejka＠svn.reactos.org

Author: osiejka Date: Fri Apr 8 21:57:32 2011 New Revision: 51285 URL: http://svn.reactos.org/svn/reactos?rev=51285&view=rev Log: [DOSKEY] - Polish translation by Adam "Saibman" Stachowicz [SNDREC32] - Polish translation by Adam "Saibman" Stachowicz [SNDVOL32] - Polish translation update by me [TRANSLATION] - Polish translation fixes (spelling, typos, grammar) and updates on multiple modules by Adam "Saibman" Stachowicz, few small corrections by me. See issue #6087 for more details. Added: trunk/reactos/base/applications/cmdutils/doskey/lang/pl-PL.rc (with props) trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc (with props) Modified: trunk/reactos/base/applications/cacls/lang/pl-PL.rc trunk/reactos/base/applications/calc/lang/pl-PL.rc trunk/reactos/base/applications/cmdutils/find/lang/pl-PL.rc trunk/reactos/base/applications/cmdutils/more/lang/pl-PL.rc trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc trunk/reactos/base/applications/findstr/lang/pl-PL.rc trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc trunk/reactos/base/applications/logoff/lang/pl-PL.rc trunk/reactos/base/applications/mmc/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc trunk/reactos/base/applications/mstsc/lang/pl-PL.rc trunk/reactos/base/applications/network/ipconfig/lang/pl-PL.rc trunk/reactos/base/applications/notepad/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/applications/regedit/lang/pl-PL.rc trunk/reactos/base/applications/sndvol32/lang/pl-PL.rc trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc trunk/reactos/base/shell/explorer/explorer-pl.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Modified: trunk/reactos/base/applications/cacls/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -2,7 +2,7 @@ * translated by TestamenT * testament(a)users.sourceforge.net * https://sourceforge.net/projects/reactospl - * + * updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (Apr, 2011) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -13,7 +13,7 @@ IDS_HELP, "Poka¿ lub modyfikuj listê kontroli dostêpu (Access Control List) plików\n\n\ CACLS nazwa pliku [/T] [/E] [/C] [/G u¿ytkownik:dostêp [...]] [/R u¿ytkownik [...]]\n\ [/P u¿ytkownik:dostêp [...]] [/D u¿ytkownik [...]]\n\ - filename Poka¿ ACL.\n\ + nazwa pliku Poka¿ ACL.\n\ /T Zmiana ACL okrelonych plików w\n\ aktualnym katalogu i wszystkich podkatalogach.\n\ /E Umo¿liwia edycjê listy ACL zamiast jej zamiany.\n\ Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -3,6 +3,7 @@ * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; + * updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (Apr, 2011) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -234,7 +235,7 @@ IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Calculator" +CAPTION "Kalkulator ReactOS" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN @@ -252,7 +253,7 @@ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17 CONTROL "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17 - CONTROL "Back",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | + CONTROL "Wstecz",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24, 40,17 RTEXT "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE, Added: trunk/reactos/base/applications/cmdutils/doskey/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/lang/pl-PL.rc (added) +++ trunk/reactos/base/applications/cmdutils/doskey/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -1,0 +1,34 @@ +/* + * translated by Saibamen - Adam Stachowicz (Apr,2011) + * Use ReactOS forum PM, IRC or saibamenppl at gmail.com to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_HELP, "Zarz¹dza ustawieniami linii komend, historii i makr.\n\ +\n\ +DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=rozmiar]\n\ + [/REINSTALL] [/MACROS[:exe | :ALL]] [/MACROFILE=plik] [macroname=[tekst]]\n\ +\n\ + /INSERT W³¹cza tryb wstawiania tekstu.\n\ + /OVERSTRIKE Wy³¹cza tryb nadpisywania tekstu.\n\ + /EXENAME=exename Ustawia nazwê programu do przegl¹dania/zmiany historii\n\ + i makra. Domylnie jest to cmd.exe.\n\ + /HISTORY Wywietla historiê komend.\n\ + /LISTSIZE=rozmiar Ustawia iloæ wywietlanych komend dla buforu historii.\n\ + /REINSTALL Czyci historiê komend.\n\ + /MACROS Wywietla definicje makro.\n\ + /MACROS:exename Wywietla definicje makro dla okrelonego programu.\n\ + /MACROS:ALL Wywietla definicje makro dla wszystkich programów.\n\ + /MACROFILE=plik £aduje definicje makro z pliku.\n\ + macroname Nazwa dla tworzonego makro.\n\ + tekst Okrela zastêpczy tekst dla makro.\n" + +IDS_INVALID_MACRO_DEF, "Nieprawid³owa definicja makro: %s\n" + +END Propchange: trunk/reactos/base/applications/cmdutils/doskey/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/cmdutils/doskey/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/base/applications/cmdutils/find/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/find/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -15,7 +15,7 @@ /C Oblicza w ilu liniach pojawi³ siê szukany ci¹g znaków\n\ /I Ignoruje wielkoæ liter\n\ /N Numeruje wywietlane linie, zaczynaj¹c od 1\n\ - /V Wywietla te linie które nie zawieraj¹ szukanego ci¹gu znaków" + /V Wywietla te linie, które nie zawieraj¹ szukanego ci¹gu znaków" IDS_NO_SUCH_FILE, "FIND: %s: Plik nie zosta³ znaleziony\n" Modified: trunk/reactos/base/applications/cmdutils/more/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -15,7 +15,7 @@ MORE [Napêd:][cie¿ka]Nazwa pliku\n\n\ [Napêd:][cie¿ka]Nazwa pliku Plik, którego zawartoæ ma byæ wywietlona.\n\ Polecenie\t\t Polecenie, którego wynik ma byæ wywietlony.\n\n\ - Po wywietleniu ""-- Kontynuuj --"" mo¿esz nacisn¹æ dowolny klawisz by przejæ na nastêpn¹ stronê.\n" + Po wywietleniu ""-- Kontynuuj --"" mo¿esz nacisn¹æ dowolny klawisz, aby przejæ na nastêpn¹ stronê.\n" IDS_CONTINUE, " -- Kontynuuj (100%) -- " IDS_FILE_ACCESS, "Brak dostêpu do pliku: %s." Modified: trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -70,7 +70,7 @@ [/U] Kopiuje tylko pliki, które ju¿ istniej¹ w miejscu docelowym\n\ [/R] Zastêpuje pliki tylko do odczytu\n\ [/H] Kopiuje równie¿ pliki ukryte i systemowe\n\ -[/C] Kontynuuje nawet je¿eli podczas kopiowania wystêpi³y b³êdy\n\ +[/C] Kontynuuje nawet je¿eli podczas kopiowania wyst¹pi³y b³êdy\n\ [/A] Kopiuje tylko pliki z atrybutem archiwalny\n\ [/M] Kopiuje tylko pliki z atrybutem archiwalny i usuwa ten atrybut\n\ [/D | /D:m-d-y] Kopiuje tylko nowe pliki lub te zmodifikowane po podanej dacie.\n\ Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -1,5 +1,6 @@ /* * translated by Caemyr - Olaf Siejka (Apr,2008) + * updated by Saibamen - Adam Stachowicz (Apr, 2011) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl @@ -25,7 +26,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Ten program dostarcza szczegó³owych danych o komponentach ReactX i sterownikach, zainstalowanych na twoim systemie..", -1, 10, 10, 443, 17 + LTEXT "Ten program dostarcza szczegó³owe dane o komponentach ReactX i sterownikach, zainstalowanych na twoim systemie..", -1, 10, 10, 443, 17 LTEXT "Jeli wiesz ju¿, gdzie tkwi b³¹d, kliknij na odpowiedni¹ zak³adkê. W innym wypadku mo¿esz przejæ przez wszystkie zak³adki przyciskiem Nastêpna", -1, 10, 30, 443, 25 GROUPBOX "Informacje o systemie", -1, 10, 55, 443, 130, SS_RIGHT LTEXT "Data i czas:", -1, 70, 70, 80, 10, SS_RIGHT @@ -138,7 +139,7 @@ LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 GROUPBOX "ReactX-", -1, 10, 115, 450, 60 CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 - RTEXT "Przyspiesznie sprzêtowe\nPoziom:", -1, 20, 135, 90, 20 + RTEXT "Przyspieszenie sprzêtowe\nPoziom:", -1, 20, 135, 90, 20 PUSHBUTTON "Testuj DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14 GROUPBOX "Uwagi", -1, 10, 180, 450, 40 EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP Modified: trunk/reactos/base/applications/findstr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/findstr/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -15,7 +15,7 @@ /C Oblicza w ilu liniach pojawi³ siê szukany ci¹g znaków\n\ /I Ignoruje wielkoæ liter\n\ /N Numeruje wywietlane linie, zaczynaj¹c od 1\n\ - /V Wywietla te linie które nie zawieraj¹ szukanego ci¹gu znaków" + /V Wywietla te linie, które nie zawieraj¹ szukanego ci¹gu znaków" IDS_NO_SUCH_FILE, "FIND: %s: Plik nie zosta³ znaleziony\n" Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -3,6 +3,7 @@ * testament(a)users.sourceforge.net * https://sourceforge.net/projects/reactospl * updated by Caemyr (olaf_siejka(a)o2.pl), Nov, 2008 + * updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (Apr, 2011) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -53,7 +54,7 @@ STRINGTABLE BEGIN IDS_SOL_NAME "Pasjans" - IDS_SOL_ABOUT "Solitaire by J. Brown\n\nCardLib version 1.0." + IDS_SOL_ABOUT "Pasjans by J. Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Zakoñczyæ aktualn¹ grê?" IDS_SOL_WIN "Gratulacje, wygra³e!" IDS_SOL_DEAL "Nowe rozdanie?" @@ -76,7 +77,7 @@ POPUP "Pomo&c" BEGIN MENUITEM "&Spis treci\tF1", IDM_HELP_CONTENTS - MENUITEM "Solit&aire - informacje", IDM_HELP_ABOUT + MENUITEM "Pasj&ans - informacje", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/logoff/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/logoff/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -14,7 +14,7 @@ /v\t\tWywietla informacjê o wykonanej czynnoci.\n\ /?\t\tWywietla niniejsz¹ pomoc.\n\n" -IDS_LOGOFF_REMOTE, "Przeywanie sesji na maszynie zdalnej." +IDS_LOGOFF_REMOTE, "Przerywanie sesji na maszynie zdalnej." IDS_LOGOFF_LOCAL, "Przerywanie niniejszej sesji na maszynie lokalnej." IDS_ILLEGAL_PARAM, "Nieprawid³owy parametr\n" Modified: trunk/reactos/base/applications/mmc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -14,7 +14,7 @@ MENUITEM "Za&koñcz\tAlt+F4", ID_FILE_EXIT END - POPUP "&Help" + POPUP "&Pomoc" BEGIN MENUITEM "Konsola Zarz¹dzania ReactOS - i&nformacje...", ID_HELP_ABOUT END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -97,7 +97,7 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Podgl¹d zdarzeñ" - IDC_EVENTSTRINGIDNOTFOUND "Opis zdarzenia dla danego numeru ID: ( %lu ) nie zosta³ odnaleziony w ródle: ( %s ). Ten komputer mo¿e nie miec wystarczaj¹cych informacji w rejestrze albo bibliotek DLL by wywietliæ wiadomoci z komputera zdalnego." + IDC_EVENTSTRINGIDNOTFOUND "Opis zdarzenia dla danego numeru ID: ( %lu ) nie zosta³ odnaleziony w ródle: ( %s ). Ten komputer mo¿e nie miec wystarczaj¹cych informacji w rejestrze albo bibliotek DLL, aby wywietliæ wiadomoci z komputera zdalnego." IDC_EVENTLOG_ERROR_TYPE "B³¹d" IDC_EVENTLOG_WARNING_TYPE "Ostrze¿enie" IDC_EVENTLOG_INFORMATION_TYPE "Informacja" Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -68,7 +68,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE Modified: trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -4,7 +4,7 @@ * https://sourceforge.net/projects/reactospl * * updated by Caemyr - Olaf Siejka (Jan, 2008) - * updated by Saibamen - Adam Stachowicz (Mar, 2011) + * updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (Apr, 2011) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -77,7 +77,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Mened¿er Us³ug v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 135, 26 + LTEXT "Mened¿er Us³ug v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 135, 26 PUSHBUTTON "Zamknij", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -224,7 +224,7 @@ IDS_CREATE_SUCCESS "Us³uga utworzona pomylnie" IDS_DELETE_SUCCESS "Us³uga skasowana pomylnie" IDS_CREATE_REQ "Pola oznaczone gwiazdkami\ns¹ obowi¹zkowe" - IDS_DELETE_STOP "Musisz rêcznie zatrzymaæ us³ugê przed usuwaniem!" + IDS_DELETE_STOP "Musisz rêcznie zatrzymaæ us³ugê przed usuniêciem!" END STRINGTABLE DISCARDABLE @@ -287,7 +287,7 @@ IDS_HINT_SYS_MOVE " Przesuñ to okno." IDS_HINT_SYS_SIZE " Zmienia wielkoæ tego okna." IDS_HINT_SYS_MINIMIZE " Ukryj to okno do ikony." - IDS_HINT_SYS_MAXIMIZE " Rozwiñ to okno na pe³en ekran." + IDS_HINT_SYS_MAXIMIZE " Rozwiñ to okno na pe³ny ekran." IDS_HINT_SYS_CLOSE " Zamknij to okno." END Modified: trunk/reactos/base/applications/mstsc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -3,6 +3,7 @@ * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; + * updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (Apr, 2011) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -22,7 +23,7 @@ PUSHBUTTON "Zapisz jako...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "Otwórz...",IDC_OPEN,177,139,50,14 ICON "", IDC_CONNICON, 16,114,20,20 - LTEXT "Zapisz obecne po³¹czenie albo otwórz istniej¹cy ju¿ plik z ustawieniami",IDC_STATIC,50,115,172,20 + LTEXT "Zapisz obecne po³¹czenie albo otwórz ju¿ istniej¹cy plik z ustawieniami",IDC_STATIC,50,115,172,20 END IDD_DISPLAY DIALOGEX 0, 0, 242, 175 @@ -33,7 +34,7 @@ GROUPBOX "Liczba kolorów",IDC_STATIC,7,83,228,85 ICON "", IDC_REMICON, 15,19,20,20 ICON "", IDC_COLORSICON, 15,98,20,20 - LTEXT "Ustaw rozmiar twojego pulpitu zdalnego. Przesuñ suwak do koñca w prawo by uruchomiæ pulpit na pe³nym ekranie",IDC_STATIC,53,22,175,21 + LTEXT "Ustaw rozmiar twojego pulpitu zdalnego. Przesuñ suwak do koñca w prawo, aby uruchomiæ pulpit na pe³nym ekranie",IDC_STATIC,53,22,175,21 CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 @@ -45,7 +46,7 @@ IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Remote Desktop Connection" +CAPTION "Po³¹czenie pulpitu zdalnego" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Po³¹cz",IDOK,147,245,50,14 Modified: trunk/reactos/base/applications/network/ipconfig/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -64,7 +64,7 @@ \n \ Przyk³ady:\n \ > ipconfig ... Pokazuje informacje.\n \ - > ipconfig /all ... Pokazuje informacje szczegó³owe.\n \ + > ipconfig /all ... Pokazuje szczegó³owe informacje.\n \ > ipconfig /renew ... Odnawia wszystkie karty.\n \ > ipconfig /renew EL* ... Odnawia ka¿de po³¹czenie o nazwie\n \ zaczynaj¹cej siê od EL\n \ Modified: trunk/reactos/base/applications/notepad/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -153,10 +153,10 @@ IDD_ABOUTBOX DIALOGEX DISCARDABLE 22,16,284,170 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Notatnik" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notatnik v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ", +CAPTION "Notatnik ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Notatnik ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ", -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39 CONTROL " ", -1,"Static",0x50000000,8,48,272,11 @@ -209,5 +209,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -STRING_LINE_COLUMN, "Line %d, column %d" -END +STRING_LINE_COLUMN, "Linia %d, kolumna %d" +END Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -1,4 +1,5 @@ // * translated by Caemyr - Olaf Siejka (Aug, 2009) +// * updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (Apr, 2011) LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -41,7 +42,7 @@ POPUP "popup" BEGIN MENUITEM "&Instaluj", ID_INSTALL - MENUITEM "&odinstaluj", ID_UNINSTALL + MENUITEM "&Odinstaluj", ID_UNINSTALL MENUITEM "&Modyfikuj", ID_MODIFY MENUITEM SEPARATOR MENUITEM "&Usuñ z rejestru", ID_REGREMOVE @@ -78,7 +79,7 @@ BEGIN LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35 - AUTORADIOBUTTON "&Zainstaluj z dysku (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP + AUTORADIOBUTTON "&Zainstaluj z dysku (CD lub DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "&Pobierz i zainstaluj", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 @@ -100,7 +101,7 @@ CAPTION "O programie" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + LTEXT "Mened¿er aplikacji ReactOS\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 PUSHBUTTON "Zamknij", IDOK, 133, 46, 50, 14 ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 END @@ -180,15 +181,15 @@ IDS_MODIFY "Modyfikuj" IDS_APPS_COUNT "Licznik aplikacji: %d" IDS_WELCOME_TITLE "Witamy w Mened¿erze aplikacji ReactOS!\n\n" - IDS_WELCOME_TEXT "Z listy po lewej wybierz kategoriê, a nastêpnie aplikacjê by j¹ zainstalowaæ lub odinstalowaæ.\nStrona projektu ReactOS: " + IDS_WELCOME_TEXT "Z listy po lewej wybierz kategoriê, a nastêpnie aplikacjê, by j¹ zainstalowaæ lub odinstalowaæ.\nStrona projektu ReactOS: " IDS_WELCOME_URL "http://www.reactos.org" IDS_INSTALLED "Zainstalowane" IDS_AVAILABLEFORINST "Dostêpne" IDS_UPDATES "Uaktualnienia" IDS_APPLICATIONS "Aplikacje" - IDS_CHOOSE_FOLDER_TEXT "Wybierz katalog w którym bêda zapisywane pobrane programy:" + IDS_CHOOSE_FOLDER_TEXT "Wybierz katalog, w którym bêda zapisywane pobrane programy:" IDS_CHOOSE_FOLDER_ERROR "Wybra³e nieistniej¹cy katalog! Czy chcesz utworzyæ nowy?" - IDS_USER_NOT_ADMIN "Musisz mieæ uprawnienia administratora aby uruchomiæ ""ReactOS Applications Manager""!" + IDS_USER_NOT_ADMIN "Musisz mieæ uprawnienia administratora, aby uruchomiæ ""Mened¿er aplikacji ReactOS""!" IDS_APP_REG_REMOVE "Czy na pewno chcesz usun¹æ wpis tego programu z rejestru?" IDS_INFORMATION "Informacja" IDS_UNABLE_TO_REMOVE "Nie mo¿na by³o usun¹æ wpisu z rejestru!" Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -7,6 +7,8 @@ * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; + * + * updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (Apr, 2011) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -169,12 +171,12 @@ END POPUP "" BEGIN - MENUITEM "C&ut", ID_HEXEDIT_CUT - MENUITEM "&Copy", ID_HEXEDIT_COPY - MENUITEM "&Paste", ID_HEXEDIT_PASTE - MENUITEM "&Delete", ID_HEXEDIT_DELETE - MENUITEM SEPARATOR - MENUITEM "Select &All", ID_HEXEDIT_SELECT_ALL + MENUITEM "W&ytnij", ID_HEXEDIT_CUT + MENUITEM "&Kopiuj", ID_HEXEDIT_COPY + MENUITEM "&Wklej", ID_HEXEDIT_PASTE + MENUITEM "&Usuñ", ID_HEXEDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "Zaznacz &ca³oæ", ID_HEXEDIT_SELECT_ALL END END @@ -184,13 +186,13 @@ */ IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Load Hive" +CAPTION "£aduj drzewo" FONT 8, "Ms Shell Dlg" { - LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + LTEXT "&Klucz:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 89, 17, 50, 14 } IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 @@ -292,9 +294,9 @@ ID_REGISTRY_EXPORTREGISTRYFILE "Eksportuje ca³oæ lub czêæ rejestru do pliku" ID_REGISTRY_LOADHIVE - "Loads a hive file into the registry" + "£aduje plik Drzewa do rejestru" ID_REGISTRY_UNLOADHIVE - "Unloads a hive from the registry" + "Wy³adowuje Drzewo z rejestru" ID_REGISTRY_CONNECTNETWORKREGISTRY "Po³¹czenie z rejestrem zdalnego komputera" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -351,8 +353,8 @@ IDS_MY_COMPUTER "Mój komputer" IDS_IMPORT_REG_FILE "Importuj plik rejestru" IDS_EXPORT_REG_FILE "Eksportuj plik rejestru" - IDS_LOAD_HIVE "Load Hive" - IDS_UNLOAD_HIVE "Unload Hive" + IDS_LOAD_HIVE "£aduj Drzewo" + IDS_UNLOAD_HIVE "Wy³aduj Drzewo" IDS_INVALID_DWORD "(niew³aciwa wartoæ DWORD)" END Added: trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc (added) +++ trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -1,0 +1,61 @@ +/* + * translated by Saibamen - Adam Stachowicz (Apr,2011) + * Use ReactOS forum PM, IRC or saibamenppl at gmail.com to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDC_REACTOS_SNDREC32 ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Informacje o reactOS_sndrec32" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 + LTEXT "ReactOS_sndrec32, wersja 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX + LTEXT "Copyright (C) 2009",IDC_STATIC,55,25,114,8 + DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP +END + +IDR_MENU1 MENU +BEGIN + POPUP "Plik" + BEGIN + MENUITEM "Nowy", ID_NEW + MENUITEM "Otwórz...", ID_FILE_OPEN + MENUITEM "Zapisz", ID_FILE_SAVE, GRAYED + MENUITEM "Zapisz jako...", ID_FILE_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "Wyjcie", ID_EXIT + END + MENUITEM "todo1", 0 + MENUITEM "todo2", 0 + POPUP "?" + BEGIN + MENUITEM "O programie...", ID__ABOUT + END +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Rejestrator dwiêku" + IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" +END + +STRINGTABLE +BEGIN + IDS_STRPOS "Pozycja: %.2f s" + IDS_STRDUR "D³ugoæ: %.2f s" + IDS_STRBUF "Bufor: %.2f kb" + IDS_STRFMT "%.1f kHz %u bits" + IDS_STRMONO "mono" + IDS_STRSTEREO "stereo" + IDS_STRCHAN "%s" +END Propchange: trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/base/applications/sndvol32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -2,6 +2,7 @@ * translated by TestamenT * testament(a)users.sourceforge.net * https://sourceforge.net/projects/reactospl + * Update by Caemyr - Olaf Siejka (Apr, 2011) * */ @@ -48,3 +49,17 @@ PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "Anuluj", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +{ + LTEXT "Kana³ g³ówny", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balans", -1, 4, 35, 80, 42 + LTEXT "G³onoæ", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Wycisz", IDC_LINE_SWITCH, 4, 190, 90, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +} Modified: trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -123,7 +123,7 @@ IDS_PROPERTIES "W³a&ciwoci" IDS_OPEN_ALL_USERS "&Otwórz - wszyscy u¿ytkownicy" IDS_EXPLORE_ALL_USERS "&Eksploruj - wszyscy u¿ytkownicy" - IDS_STARTUP_ERROR "System nie mo¿e uruchomiæ eksploratora poniewa¿ rejestr jest niedostêpny lub uszkodzony." + IDS_STARTUP_ERROR "System nie mo¿e uruchomiæ eksploratora, poniewa¿ rejestr jest niedostêpny lub uszkodzony." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer/explorer-pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-pl.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -383,7 +383,7 @@ IDS_TASKBAR "Pasek zadañ" IDS_NAMECOLUMN "Nazwa" IDS_PATHCOLUMN "cie¿ka" - IDS_MENUCOLUMN "Menu path" + IDS_MENUCOLUMN "cie¿ka menu" END #endif // Polish (PL) resources Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -221,7 +221,7 @@ IDS_COLOR_4BIT "16 kolorów" IDS_COLOR_8BIT "256 kolorów" IDS_COLOR_16BIT "High Color (16 Bitów)" - IDS_COLOR_24BIT "True Color (24 Bitów)" + IDS_COLOR_24BIT "True Color (24 Bity)" IDS_COLOR_32BIT "True Color (32 Bity)" IDS_PIXEL "%lux%lu pikseli" END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Fri Apr 8 21:57:32 2011 @@ -21,6 +21,7 @@ * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; + * updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (Apr, 2011) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -445,10 +446,10 @@ PUSHBUTTON "&Nie", IDNO, 150, 122, 60, 14 PUSHBUTTON "Anuluj", IDCANCEL, 215, 122, 60, 14 ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Ten katalog ju¿ zawiera plik o nazwie '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX - LTEXT "Ten katalog ju¿ zawiera plik tylko do odczytu, o nazwie '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX - LTEXT "Ten katalog ju¿ zawiera plik systemowy o nazwie '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX - LTEXT "Czy chcia³by zast¹piæ istniej¹cy plik?", -1, 44, 35, 228, 10, SS_NOPREFIX + LTEXT "Ten katalog zawiera ju¿ plik o nazwie '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX + LTEXT "Ten katalog zawiera ju¿ plik tylko do odczytu, o nazwie '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX + LTEXT "Ten katalog zawiera ju¿ plik systemowy o nazwie '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX + LTEXT "Czy chcesz zast¹piæ istniej¹cy plik?", -1, 44, 35, 228, 10, SS_NOPREFIX LTEXT "(data i rozmiar nieznane)", 12302, 79, 51, 198, 20, SS_NOPREFIX ICON "", 12300, 50, 49, 21, 20, SS_REALSIZECONTROL LTEXT "nowym plikiem?", -1, 44, 75, 228, 10, SS_NOPREFIX @@ -541,9 +542,9 @@ FONT 8, "MS Shell Dlg" BEGIN ICON 8240, -1, 6, 6, 21, 20, SS_REALSIZECONTROL | WS_GROUP - LTEXT "Co chcesz by komputer zrobi³?", -1, 39, 7, 167, 10 + LTEXT "Co chcesz, aby zrobi³ komputer?", -1, 39, 7, 167, 10 COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL - LTEXT "Zachowuje sesje, utrzymuj¹c komputer w ruchu na ma³ym stopniu zasilania, z danymi wci¹¿ w pamiêci. Komputer wróci do normalnego trybu pracy przy poruszeniu myszki albo naciniêciu klawisza.", 8225, 39, 40, 167, 37 + LTEXT "Zachowuje sesjê, podtrzymuje komputer na niskim poziomie poboru energii. Komputer wróci do normalnego trybu po poruszeniu myszk¹ lub naciniêciu klawisza. Dane znajduj¹ce siê w pamiêci zostan¹ zachowane.", 8225, 39, 40, 167, 37 DEFPUSHBUTTON "OK", 1, 7, 82, 60, 14, WS_GROUP PUSHBUTTON "Anuluj", IDCANCEL, 75, 82, 60, 14 PUSHBUTTON "&Pomoc", IDHELP, 144, 82, 60, 14 @@ -660,9 +661,9 @@ IDS_TRASHFOLDER_TEXT "Czy jeste pewien, ¿e chcesz umieciæ folder '%1' i ca³¹ jego zawartoæ w koszu" IDS_TRASHMULTIPLE_TEXT "Elementów: %1 - czy na pewno chcesz je umieciæ w Koszu?" IDS_CANTTRASH_TEXT "Nie mogê przenieæ elementu '%1' do Kosza. Czy chcesz go zamiast tego usun¹æ?" - IDS_OVERWRITEFILE_TEXT "Ten folder ju¿ zawiera plik o nazwie '%1'.\n\nCzy chcesz go zast¹piæ?" + IDS_OVERWRITEFILE_TEXT "Ten folder zawiera ju¿ plik o nazwie '%1'.\n\nCzy chcesz go zast¹piæ?" IDS_OVERWRITEFILE_CAPTION "Potwierd zast¹pienie pliku" - IDS_OVERWRITEFOLDER_TEXT "Ten folder ju¿ zawiera folder o nazwie '%1'.\n\n"\ + IDS_OVERWRITEFOLDER_TEXT "Ten folder zawiera ju¿ katalog o nazwie '%1'.\n\n"\ "Je¿eli w docelowym folderze wyst¹pi¹ pliki o takich samych nazwach jak\n"\ "w wybranym folderze, to zostan¹ one zast¹pione. Czy chcesz mimo to przenieæ\n"\ "lub skopiowaæ folder?" @@ -765,5 +766,5 @@ IDS_DEFAULT_CLUSTER_SIZE "Domylny rozmiar jednostki alokacji" IDS_COPY_OF "Kopia" - IDS_SHLEXEC_NOASSOC "¯aden program nie jest skonfigurowane by otwieraæ pliki tego typu." -END + IDS_SHLEXEC_NOASSOC "¯aden program nie jest skonfigurowany, by otwieraæ pliki tego typu." +END

13 years, 12 months

[janderwald] 51284: [SNDVOL32] - Add english resources for sndvol32 - Enjoy ; )

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Apr 8 21:09:07 2011 New Revision: 51284 URL: http://svn.reactos.org/svn/reactos?rev=51284&view=rev Log: [SNDVOL32] - Add english resources for sndvol32 - Enjoy ;) Modified: trunk/reactos/base/applications/sndvol32/lang/en-US.rc Modified: trunk/reactos/base/applications/sndvol32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/en-US.rc [iso-8859-1] Fri Apr 8 21:09:07 2011 @@ -41,3 +41,17 @@ PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "Cancel", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +{ + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +}

13 years, 12 months

[jimtabor] 51283: [User32|Win32k] - Fix TrackMouseEvent! Keyboard and Mouse pass all the right flags. Update to accelerator code. Fixed recursion in global hooks. Hack-implement GetMouseMovePointsE...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Apr 8 19:29:15 2011 New Revision: 51283 URL: http://svn.reactos.org/svn/reactos?rev=51283&view=rev Log: [User32|Win32k] - Fix TrackMouseEvent! Keyboard and Mouse pass all the right flags. Update to accelerator code. Fixed recursion in global hooks. Hack-implement GetMouseMovePointsEx due to slack time and boredom, it passes the input tests but does nothing. Pass all the test_TrackMouseEvent!!! test_accelerators and test_menu_messages work too, so far no hangs. Modified: trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/user32.pspec trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/subsystems/win32/win32k/include/cursoricon.h trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/include/timer.h trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -112,19 +112,6 @@ /* Critical Section*/ extern RTL_CRITICAL_SECTION User32Crit; -typedef struct _USER32_TRACKINGLIST { - TRACKMOUSEEVENT tme; - POINT pos; /* center of hover rectangle */ - UINT_PTR timer; -} USER32_TRACKINGLIST,*PUSER32_TRACKINGLIST; - -typedef struct _USER32_THREAD_DATA -{ - USER32_TRACKINGLIST tracking_info; /* TrackMouseEvent stuff */ -} USER32_THREAD_DATA, *PUSER32_THREAD_DATA; - -PUSER32_THREAD_DATA User32GetThreadData(VOID); - /* FIXME: Belongs to some header. */ BOOL WINAPI GdiDllInitialize(HANDLE, DWORD, LPVOID); void InitStockObjects(void); Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -16,13 +16,6 @@ BOOL gfServerProcess = FALSE; WCHAR szAppInit[KEY_LENGTH]; - -PUSER32_THREAD_DATA -User32GetThreadData() -{ - return ((PUSER32_THREAD_DATA)TlsGetValue(User32TlsIndex)); -} - BOOL GetDllList() @@ -192,25 +185,12 @@ BOOL InitThread(VOID) { - PUSER32_THREAD_DATA ThreadData; - - ThreadData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(USER32_THREAD_DATA)); - if (ThreadData == NULL) - return FALSE; - if (!TlsSetValue(User32TlsIndex, ThreadData)) - return FALSE; return TRUE; } VOID CleanupThread(VOID) { - PUSER32_THREAD_DATA ThreadData; - - ThreadData = (PUSER32_THREAD_DATA)TlsGetValue(User32TlsIndex); - HeapFree(GetProcessHeap(), HEAP_ZERO_MEMORY, ThreadData); - TlsSetValue(User32TlsIndex, 0); } BOOL Modified: trunk/reactos/dll/win32/user32/user32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.ps… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -690,7 +690,7 @@ @ stdcall ToAsciiEx(long long ptr ptr long long) @ stdcall ToUnicode(long long ptr ptr long long) @ stdcall ToUnicodeEx(long long ptr ptr long long long) -@ stdcall TrackMouseEvent(ptr) ; Direct call NtUserTrackMouseEvent +@ stdcall TrackMouseEvent(ptr) NtUserTrackMouseEvent @ stdcall TrackPopupMenu(long long long long long long ptr) @ stdcall TrackPopupMenuEx(long long long long long ptr) ; Direct call NtUserTrackPopupMenuEx @ stdcall TranslateAccelerator(long long ptr) TranslateAcceleratorA Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -530,242 +530,4 @@ NtUserSendInput(1, &Input, sizeof(INPUT)); } - -/*********************************************************************** - * get_key_state - */ -static WORD get_key_state(void) -{ - WORD ret = 0; - - if (GetSystemMetrics( SM_SWAPBUTTON )) - { - if (GetAsyncKeyState(VK_RBUTTON) & 0x80) ret |= MK_LBUTTON; - if (GetAsyncKeyState(VK_LBUTTON) & 0x80) ret |= MK_RBUTTON; - } - else - { - if (GetAsyncKeyState(VK_LBUTTON) & 0x80) ret |= MK_LBUTTON; - if (GetAsyncKeyState(VK_RBUTTON) & 0x80) ret |= MK_RBUTTON; - } - if (GetAsyncKeyState(VK_MBUTTON) & 0x80) ret |= MK_MBUTTON; - if (GetAsyncKeyState(VK_SHIFT) & 0x80) ret |= MK_SHIFT; - if (GetAsyncKeyState(VK_CONTROL) & 0x80) ret |= MK_CONTROL; - if (GetAsyncKeyState(VK_XBUTTON1) & 0x80) ret |= MK_XBUTTON1; - if (GetAsyncKeyState(VK_XBUTTON2) & 0x80) ret |= MK_XBUTTON2; - return ret; -} - -static void CALLBACK TrackMouseEventProc(HWND hwndUnused, UINT uMsg, UINT_PTR idEvent, - DWORD dwTime) -{ - POINT pos; - POINT posClient; - HWND hwnd; - INT hoverwidth = 0, hoverheight = 0; - RECT client; - PUSER32_TRACKINGLIST ptracking_info; - - ptracking_info = & User32GetThreadData()->tracking_info; - - GetCursorPos(&pos); - hwnd = WindowFromPoint(pos); - - SystemParametersInfoW(SPI_GETMOUSEHOVERWIDTH, 0, &hoverwidth, 0); - SystemParametersInfoW(SPI_GETMOUSEHOVERHEIGHT, 0, &hoverheight, 0); - - /* see if this tracking event is looking for TME_LEAVE and that the */ - /* mouse has left the window */ - if (ptracking_info->tme.dwFlags & TME_LEAVE) - { - if (ptracking_info->tme.hwndTrack != hwnd) - { - if (ptracking_info->tme.dwFlags & TME_NONCLIENT) - { - PostMessageW(ptracking_info->tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); - } - else - { - PostMessageW(ptracking_info->tme.hwndTrack, WM_MOUSELEAVE, 0, 0); - } - - /* remove the TME_LEAVE flag */ - ptracking_info->tme.dwFlags &= ~TME_LEAVE; - } - else - { - GetClientRect(hwnd, &client); - MapWindowPoints(hwnd, NULL, (LPPOINT)&client, 2); - if (PtInRect(&client, pos)) - { - if (ptracking_info->tme.dwFlags & TME_NONCLIENT) - { - PostMessageW(ptracking_info->tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); - /* remove the TME_LEAVE flag */ - ptracking_info->tme.dwFlags &= ~TME_LEAVE; - } - } - else - { - if (!(ptracking_info->tme.dwFlags & TME_NONCLIENT)) - { - PostMessageW(ptracking_info->tme.hwndTrack, WM_MOUSELEAVE, 0, 0); - /* remove the TME_LEAVE flag */ - ptracking_info->tme.dwFlags &= ~TME_LEAVE; - } - } - } - } - - /* see if we are tracking hovering for this hwnd */ - if (ptracking_info->tme.dwFlags & TME_HOVER) - { - /* has the cursor moved outside the rectangle centered around pos? */ - if ((abs(pos.x - ptracking_info->pos.x) > (hoverwidth / 2.0)) || - (abs(pos.y - ptracking_info->pos.y) > (hoverheight / 2.0))) - { - /* record this new position as the current position and reset */ - /* the iHoverTime variable to 0 */ - ptracking_info->pos = pos; - } - else - { - posClient.x = pos.x; - posClient.y = pos.y; - ScreenToClient(hwnd, &posClient); - - if (ptracking_info->tme.dwFlags & TME_NONCLIENT) - { - PostMessageW(ptracking_info->tme.hwndTrack, WM_NCMOUSEHOVER, - get_key_state(), MAKELPARAM( posClient.x, posClient.y )); - } - else - { - PostMessageW(ptracking_info->tme.hwndTrack, WM_MOUSEHOVER, - get_key_state(), MAKELPARAM( posClient.x, posClient.y )); - } - - /* stop tracking mouse hover */ - ptracking_info->tme.dwFlags &= ~TME_HOVER; - } - } - - /* stop the timer if the tracking list is empty */ - if (!(ptracking_info->tme.dwFlags & (TME_HOVER | TME_LEAVE))) - { - KillTimer(0, ptracking_info->timer); - RtlZeroMemory(ptracking_info,sizeof(USER32_TRACKINGLIST)); - } -} - - -/*********************************************************************** - * TrackMouseEvent [USER32] - * - * Requests notification of mouse events - * - * During mouse tracking WM_MOUSEHOVER or WM_MOUSELEAVE events are posted - * to the hwnd specified in the ptme structure. After the event message - * is posted to the hwnd, the entry in the queue is removed. - * - * If the current hwnd isn't ptme->hwndTrack the TME_HOVER flag is completely - * ignored. The TME_LEAVE flag results in a WM_MOUSELEAVE message being posted - * immediately and the TME_LEAVE flag being ignored. - * - * PARAMS - * ptme [I,O] pointer to TRACKMOUSEEVENT information structure. - * - * RETURNS - * Success: non-zero - * Failure: zero - * - */ -/* - * @implemented - */ -BOOL -WINAPI -TrackMouseEvent( - LPTRACKMOUSEEVENT ptme) -{ - HWND hwnd; - POINT pos; - DWORD hover_time; - PUSER32_TRACKINGLIST ptracking_info; - - TRACE("%lx, %lx, %p, %lx\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime); - - if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) { - WARN("wrong TRACKMOUSEEVENT size from app\n"); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - ptracking_info = & User32GetThreadData()->tracking_info; - - /* fill the TRACKMOUSEEVENT struct with the current tracking for the given hwnd */ - if (ptme->dwFlags & TME_QUERY ) - { - *ptme = ptracking_info->tme; - ptme->cbSize = sizeof(TRACKMOUSEEVENT); - - return TRUE; /* return here, TME_QUERY is retrieving information */ - } - - if (!IsWindow(ptme->hwndTrack)) - { - SetLastError(ERROR_INVALID_WINDOW_HANDLE); - return FALSE; - } - - hover_time = ptme->dwHoverTime; - - /* if HOVER_DEFAULT was specified replace this with the systems current value */ - if (hover_time == HOVER_DEFAULT || hover_time == 0) - { - SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0); - } - - GetCursorPos(&pos); - hwnd = WindowFromPoint(pos); - - if (ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)) - { - FIXME("Unknown flag(s) %08lx\n", ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)); - } - - if (ptme->dwFlags & TME_CANCEL) - { - if (ptracking_info->tme.hwndTrack == ptme->hwndTrack) - { - ptracking_info->tme.dwFlags &= ~(ptme->dwFlags & ~TME_CANCEL); - - /* if we aren't tracking on hover or leave remove this entry */ - if (!(ptracking_info->tme.dwFlags & (TME_HOVER | TME_LEAVE))) - { - KillTimer(0, ptracking_info->timer); - RtlZeroMemory(ptracking_info,sizeof(USER32_TRACKINGLIST)); - } - } - } else { - if (ptme->hwndTrack == hwnd) - { - /* Adding new mouse event to the tracking list */ - ptracking_info->tme = *ptme; - ptracking_info->tme.dwHoverTime = hover_time; - - /* Initialize HoverInfo variables even if not hover tracking */ - ptracking_info->pos = pos; - - if (!ptracking_info->timer) - { - ptracking_info->timer = SetTimer(0, 0, hover_time, TrackMouseEventProc); - } - } - } - - return TRUE; - -} - /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -69,7 +69,7 @@ INT cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags); PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon); -BOOL UserSetCursorPos( INT x, INT y, BOOL SendMouseMoveMsg); +BOOL UserSetCursorPos( INT x, INT y); int UserShowCursor(BOOL bShow); Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -9,6 +9,7 @@ LIST_ENTRY ListEntry; /* Pointer to the associated window station. */ struct _WINSTATION_OBJECT *rpwinstaParent; + DWORD dwDTFlags; PWND spwndForeground; PWND spwndTray; PWND spwndMessage; @@ -27,11 +28,19 @@ /* Pointer to the active queue. */ PVOID ActiveMessageQueue; /* Handle of the desktop window. */ - HANDLE DesktopWindow; + HWND DesktopWindow; /* Thread blocking input */ PVOID BlockInputThread; LIST_ENTRY ShellHookWindows; } DESKTOP, *PDESKTOP; + +// Desktop flags +#define DF_TME_HOVER 0x00000400 +#define DF_TME_LEAVE 0x00000800 +#define DF_DESTROYED 0x00008000 +#define DF_DESKWNDDESTROYED 0x00010000 +#define DF_DYING 0x00020000 + extern PDESKTOP InputDesktop; extern HDESK InputDesktopHandle; @@ -125,6 +134,7 @@ BOOL IntDeRegisterShellHookWindow(HWND hWnd); VOID co_IntShellHookNotify(WPARAM Message, LPARAM lParam); HDC FASTCALL UserGetDesktopDC(ULONG,BOOL,BOOL); +BOOL FASTCALL IntPaintDesktop(HDC hDC); #define IntIsActiveDesktop(Desktop) \ ((Desktop)->rpwinstaParent->ActiveDesktop == (Desktop)) Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -42,8 +42,8 @@ PKBL W32kGetDefaultKeyLayout(VOID); VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyLayout, BYTE Prefix); BOOL FASTCALL IntBlockInput(PTHREADINFO W32Thread, BOOL BlockIt); -BOOL FASTCALL IntMouseInput(MOUSEINPUT *mi); -BOOL FASTCALL IntKeyboardInput(KEYBDINPUT *ki); +BOOL FASTCALL IntMouseInput(MOUSEINPUT *mi, BOOL Injected); +BOOL FASTCALL IntKeyboardInput(KEYBDINPUT *ki, BOOL Injected); BOOL UserInitDefaultKeyboardLayout(VOID); PKBL UserHklToKbl(HKL hKl); Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -242,7 +242,7 @@ VOID FASTCALL MsqPostHotKeyMessage(PVOID Thread, HWND hWnd, WPARAM wParam, LPARAM lParam); VOID FASTCALL -co_MsqInsertMouseMessage(MSG* Msg); +co_MsqInsertMouseMessage(MSG* Msg, DWORD flags, ULONG_PTR dwExtraInfo); BOOL FASTCALL MsqIsClkLck(LPMSG Msg, BOOL Remove); BOOL FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -24,6 +24,12 @@ #define TMRF_WAITING 0x0020 #define TMRF_TIFROMWND 0x0040 +#define ID_EVENT_SYSTIMER_MOUSEHOVER (-6) +#define ID_EVENT_SYSTIMER_FLASHWIN (-8) +#define ID_EVENT_SYSTIMER_TRACKWIN (-9) +#define ID_EVENT_SYSTIMER_ANIMATEDFADE (-10) +#define ID_EVENT_SYSTIMER_INVALIDATEDCES (-11) + extern PKTIMER MasterTimer; INIT_FUNCTION Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -1,27 +1,8 @@ /* - * 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., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* $Id$ - * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * PURPOSE: Window classes - * FILE: subsys/win32k/ntuser/class.c + * PURPOSE: Window accelerator + * FILE: subsystems/win32/win32k/ntuser/accelerator.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISION HISTORY: * 06-06-2001 CSH Created @@ -105,9 +86,13 @@ WORD key, WORD cmd) { + INT mask = 0; UINT mesg = 0; + HWND hWnd; ASSERT_REFS_CO(Window); + + hWnd = Window->head.h; DPRINT("IntTranslateAccelerator(hwnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x)\n", Window->head.h, message, wParam, lParam, fVirt, key, cmd); @@ -117,37 +102,33 @@ return FALSE; } - if (message == WM_CHAR) - { - if (!(fVirt & FALT) && !(fVirt & FVIRTKEY)) - { - DPRINT("found accel for WM_CHAR: ('%c')\n", wParam & 0xff); + DPRINT("NtUserGetKeyState(VK_SHIFT) = 0x%x\n", + UserGetKeyState(VK_SHIFT)); + DPRINT("NtUserGetKeyState(VK_CONTROL) = 0x%x\n", + UserGetKeyState(VK_CONTROL)); + DPRINT("NtUserGetKeyState(VK_MENU) = 0x%x\n", + UserGetKeyState(VK_MENU)); + + if (UserGetKeyState(VK_CONTROL) & 0x8000) mask |= FCONTROL; + if (UserGetKeyState(VK_MENU) & 0x8000) mask |= FALT; + if (UserGetKeyState(VK_SHIFT) & 0x8000) mask |= FSHIFT; + + if (message == WM_CHAR || message == WM_SYSCHAR) + { + if ( !(fVirt & FVIRTKEY) && (mask & FALT) == (fVirt & FALT) ) + { + DPRINT("found accel for WM_CHAR: ('%c')\n", LOWORD(wParam) & 0xff); goto found; } } else { - if ((fVirt & FVIRTKEY) > 0) - { - INT mask = 0; + if (fVirt & FVIRTKEY) + { DPRINT("found accel for virt_key %04x (scan %04x)\n", - wParam, 0xff & HIWORD(lParam)); - - DPRINT("NtUserGetKeyState(VK_SHIFT) = 0x%x\n", - UserGetKeyState(VK_SHIFT)); - DPRINT("NtUserGetKeyState(VK_CONTROL) = 0x%x\n", - UserGetKeyState(VK_CONTROL)); - DPRINT("NtUserGetKeyState(VK_MENU) = 0x%x\n", - UserGetKeyState(VK_MENU)); - - if (UserGetKeyState(VK_SHIFT) & 0x8000) - mask |= FSHIFT; - if (UserGetKeyState(VK_CONTROL) & 0x8000) - mask |= FCONTROL; - if (UserGetKeyState(VK_MENU) & 0x8000) - mask |= FALT; - if (mask == (fVirt & (FSHIFT | FCONTROL | FALT))) - goto found; + wParam, 0xff & HIWORD(lParam)); + + if (mask == (fVirt & (FSHIFT | FCONTROL | FALT))) goto found; DPRINT("but incorrect SHIFT/CTRL/ALT-state\n"); } else @@ -156,7 +137,7 @@ { if ((fVirt & FALT) && (lParam & 0x20000000)) { /* ^^ ALT pressed */ - DPRINT("found accel for Alt-%c\n", wParam & 0xff); + DPRINT("found accel for Alt-%c\n", LOWORD(wParam) & 0xff); goto found; } } @@ -173,80 +154,120 @@ mesg = 1; else if (IntGetCaptureWindow()) mesg = 2; - else if (!IntIsWindowVisible(Window)) /* FIXME: WINE IsWindowEnabled == IntIsWindowVisible? */ + else if (Window->style & WS_DISABLED) mesg = 3; else { #if 0 HMENU hMenu, hSubMenu, hSysMenu; UINT uSysStat = (UINT)-1, uStat = (UINT)-1, nPos; - - hMenu = (UserGetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD) ? 0 : GetMenu(hWnd); - hSysMenu = get_win_sys_menu(hWnd); + PMENU_OBJECT MenuObject, SubMenu; + MENU_ITEM MenuItem; + +// hMenu = (UserGetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD) ? 0 : GetMenu(hWnd); +// hSysMenu = get_win_sys_menu(hWnd); + hMenu = (Window->style & WS_CHILD) ? 0 : (HMENU)Window->IDMenu; + hSysMenu = Window->SystemMenu; + MenuObject = IntGetMenuObject(Window->SystemMenu); /* find menu item and ask application to initialize it */ /* 1. in the system menu */ hSubMenu = hSysMenu; - nPos = cmd; - if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) - { - co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hSysMenu, 0L); - if(hSubMenu != hSysMenu) +// nPos = cmd; +// if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) + nPos = IntGetMenuItemByFlag( MenuObject, + cmd, + MF_BYCOMMAND, + &SubMenu, + &MenuItem, + NULL); + + if (MenuItem && (nPos != (UINT)-1)) + { + hSubMenu = MenuItem.hSubMenu; + + if (IntGetCaptureWindow()) + mesg = 2; + if (Window->style & WS_DISABLED) + mesg = 3; + else + { + co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hSysMenu, 0L); + if(hSubMenu != hSysMenu) + { + nPos = MENU_FindSubMenu(&hSysMenu, hSubMenu); + DPRINT("hSysMenu = %p, hSubMenu = %p, nPos = %d\n", hSysMenu, hSubMenu, nPos); + co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, TRUE)); + } + uSysStat = GetMenuState(GetSubMenu(hSysMenu, 0), cmd, MF_BYCOMMAND); + } + } + else /* 2. in the window's menu */ + { + MenuObject = IntGetMenuObject(hMenu); + hSubMenu = hMenu; +// nPos = cmd; +// if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) + nPos = IntGetMenuItemByFlag( MenuObject, + cmd, + MF_BYCOMMAND, + &SubMenu, + &MenuItem, + NULL); + + if (MenuItem && (nPos != (UINT)-1)) { - nPos = MENU_FindSubMenu(&hSysMenu, hSubMenu); - TRACE_(accel)("hSysMenu = %p, hSubMenu = %p, nPos = %d\n", hSysMenu, hSubMenu, nPos); - co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, TRUE)); - } - uSysStat = GetMenuState(GetSubMenu(hSysMenu, 0), cmd, MF_BYCOMMAND); - } - else /* 2. in the window's menu */ - { - hSubMenu = hMenu; - nPos = cmd; - if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) - { - co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hMenu, 0L); - if(hSubMenu != hMenu) - { - nPos = MENU_FindSubMenu(&hMenu, hSubMenu); - TRACE_(accel)("hMenu = %p, hSubMenu = %p, nPos = %d\n", hMenu, hSubMenu, nPos); - co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, FALSE)); - } - uStat = GetMenuState(hMenu, cmd, MF_BYCOMMAND); - } - } - - if (uSysStat != (UINT)-1) - { - if (uSysStat & (MF_DISABLED|MF_GRAYED)) - mesg=4; - else - mesg=WM_SYSCOMMAND; - } - else - { - if (uStat != (UINT)-1) - { - if (IsIconic(hWnd)) - mesg=5; + if (IntGetCaptureWindow()) + mesg = 2; + if (Window->style & WS_DISABLED) + mesg = 3; else { - if (uStat & (MF_DISABLED|MF_GRAYED)) - mesg=6; - else - mesg=WM_COMMAND; + co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hMenu, 0L); + if(hSubMenu != hMenu) + { + nPos = MENU_FindSubMenu(&hMenu, hSubMenu); + DPRINT("hMenu = %p, hSubMenu = %p, nPos = %d\n", hMenu, hSubMenu, nPos); + co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, FALSE)); + } + uStat = GetMenuState(hMenu, cmd, MF_BYCOMMAND); } + } + } + + if (mesg == 0) + { + if (uSysStat != (UINT)-1) + { + if (uSysStat & (MF_DISABLED|MF_GRAYED)) + mesg=4; + else + mesg=WM_SYSCOMMAND; } else { - mesg=WM_COMMAND; + if (uStat != (UINT)-1) + { + if (Window->style & WS_MINIMIZE) + mesg=5; + else + { + if (uStat & (MF_DISABLED|MF_GRAYED)) + mesg=6; + else + mesg=WM_COMMAND; + } + } + else + { + mesg=WM_COMMAND; + } } } #else DPRINT1("Menu search not implemented\n"); mesg = WM_COMMAND; #endif - } if (mesg == WM_COMMAND) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -510,18 +510,25 @@ UserEnterCo(); - _SEH2_TRY - { - ProbeForRead(ResultPointer, sizeof(LRESULT), 1); - /* Simulate old behaviour: copy into our local buffer */ - Result = *(LRESULT*)ResultPointer; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Result = 0; - Hit = TRUE; - } - _SEH2_END; + if (ResultPointer) + { + _SEH2_TRY + { + ProbeForRead(ResultPointer, sizeof(LRESULT), 1); + /* Simulate old behaviour: copy into our local buffer */ + Result = *(LRESULT*)ResultPointer; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Result = 0; + Hit = TRUE; + } + _SEH2_END; + } + else + { + DPRINT1("ERROR: Hook ResultPointer 0x%x ResultLength %d\n",ResultPointer,ResultLength); + } if (!NT_SUCCESS(Status)) { 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -159,7 +159,7 @@ return OldCursor; } -BOOL UserSetCursorPos( INT x, INT y, BOOL SendMouseMoveMsg) +BOOL UserSetCursorPos( INT x, INT y) { PWND DesktopWindow; PSYSTEM_CURSORINFO CurInfo; @@ -194,21 +194,17 @@ pt.x = x; pt.y = y; - - if (SendMouseMoveMsg) - { - /* Generate a mouse move message */ - Msg.message = WM_MOUSEMOVE; - Msg.wParam = CurInfo->ButtonsDown; - Msg.lParam = MAKELPARAM(x, y); - Msg.pt = pt; - co_MsqInsertMouseMessage(&Msg); - } - - /* Store the new cursor position */ + /* 3. Generate a mouse move message, this sets the htEx. */ + Msg.message = WM_MOUSEMOVE; + Msg.wParam = CurInfo->ButtonsDown; + Msg.lParam = MAKELPARAM(x, y); + Msg.pt = pt; + co_MsqInsertMouseMessage(&Msg, 0, 0); + + /* 1. Store the new cursor position */ gpsi->ptCursor = pt; - /* Move the mouse pointer */ + /* 2. Move the mouse pointer */ GreMovePointer(hDC, x, y); return TRUE; @@ -681,7 +677,7 @@ { CurInfo->bClipped = TRUE; RECTL_bIntersectRect(&CurInfo->rcClip, prcl, &DesktopWindow->rcWindow); - UserSetCursorPos(gpsi->ptCursor.x, gpsi->ptCursor.y, FALSE); + UserSetCursorPos(gpsi->ptCursor.x, gpsi->ptCursor.y); } else { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -595,7 +595,7 @@ mi.dwFlags = MOUSEEVENTF_MOVE; mi.time = 0; mi.dwExtraInfo = 0; - IntMouseInput(&mi); + IntMouseInput(&mi,FALSE); } return hWndPrev; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -1003,6 +1003,10 @@ ClientInfo = pti->pClientInfo; SaveHook = pti->sphkCurrent; + /* Note: Setting pti->sphkCurrent will also lock the next hook to this + * hook ID. So, the CallNextHookEx will only call to that hook ID + * chain anyway. For Thread Hooks.... + */ /* Load it for the next call. */ pti->sphkCurrent = Hook; @@ -1042,7 +1046,7 @@ ObDereferenceObject(Hook->Thread); } - if ( Global ) + if ( Global && !pti->sphkCurrent) { PTHREADINFO ptiHook; @@ -1057,6 +1061,7 @@ * hook ID, this will have to post to each of the thread message queues * or make a direct call. */ + pti->sphkCurrent = Hook; // Prevent recursion within this thread. do { /* Hook->Thread is null, we hax around this with Hook->head.pti. */ @@ -1104,6 +1109,7 @@ } while ( Hook ); DPRINT("Ret: Global HookId %d Result 0x%x\n", HookId,Result); + pti->sphkCurrent = NULL; } Exit: return Result; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -53,7 +53,7 @@ if(mi.dx != 0 || mi.dy != 0) \ mi.dwFlags |= MOUSEEVENTF_MOVE; \ if(mi.dwFlags) \ - IntMouseInput(&mi); \ + IntMouseInput(&mi,FALSE); \ ClearMouseInput(mi); @@ -481,6 +481,7 @@ static VOID APIENTRY co_IntKeyboardSendAltKeyMsg() { + DPRINT1("co_IntKeyboardSendAltKeyMsg\n"); co_MsqPostKeyboardMessage(WM_SYSCOMMAND,SC_KEYMENU,0); } @@ -1073,7 +1074,7 @@ } BOOL FASTCALL -IntMouseInput(MOUSEINPUT *mi) +IntMouseInput(MOUSEINPUT *mi, BOOL Injected) { const UINT SwapBtnMsg[2][2] = { @@ -1137,7 +1138,7 @@ if(mi->dwFlags & MOUSEEVENTF_MOVE) { - UserSetCursorPos(MousePos.x, MousePos.y, TRUE); + UserSetCursorPos(MousePos.x, MousePos.y); } if(mi->dwFlags & MOUSEEVENTF_LEFTDOWN) { @@ -1145,7 +1146,7 @@ Msg.message = SwapBtnMsg[0][SwapButtons]; CurInfo->ButtonsDown |= SwapBtn[SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; - co_MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); } else if(mi->dwFlags & MOUSEEVENTF_LEFTUP) { @@ -1153,7 +1154,7 @@ Msg.message = SwapBtnMsg[1][SwapButtons]; CurInfo->ButtonsDown &= ~SwapBtn[SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; - co_MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); } if(mi->dwFlags & MOUSEEVENTF_MIDDLEDOWN) { @@ -1161,7 +1162,7 @@ Msg.message = WM_MBUTTONDOWN; CurInfo->ButtonsDown |= MK_MBUTTON; Msg.wParam |= CurInfo->ButtonsDown; - co_MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); } else if(mi->dwFlags & MOUSEEVENTF_MIDDLEUP) { @@ -1169,7 +1170,7 @@ Msg.message = WM_MBUTTONUP; CurInfo->ButtonsDown &= ~MK_MBUTTON; Msg.wParam |= CurInfo->ButtonsDown; - co_MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); } if(mi->dwFlags & MOUSEEVENTF_RIGHTDOWN) { @@ -1177,7 +1178,7 @@ Msg.message = SwapBtnMsg[0][!SwapButtons]; CurInfo->ButtonsDown |= SwapBtn[!SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; - co_MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); } else if(mi->dwFlags & MOUSEEVENTF_RIGHTUP) { @@ -1185,7 +1186,7 @@ Msg.message = SwapBtnMsg[1][!SwapButtons]; CurInfo->ButtonsDown &= ~SwapBtn[!SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; - co_MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); } if((mi->dwFlags & (MOUSEEVENTF_XDOWN | MOUSEEVENTF_XUP)) && @@ -1203,14 +1204,14 @@ gQueueKeyStateTable[VK_XBUTTON1] |= 0xc0; CurInfo->ButtonsDown |= MK_XBUTTON1; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); - co_MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); } if(mi->mouseData & XBUTTON2) { gQueueKeyStateTable[VK_XBUTTON2] |= 0xc0; CurInfo->ButtonsDown |= MK_XBUTTON2; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); - co_MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); } } else if(mi->dwFlags & MOUSEEVENTF_XUP) @@ -1221,28 +1222,28 @@ gQueueKeyStateTable[VK_XBUTTON1] &= ~0x80; CurInfo->ButtonsDown &= ~MK_XBUTTON1; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); - co_MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); } if(mi->mouseData & XBUTTON2) { gQueueKeyStateTable[VK_XBUTTON2] &= ~0x80; CurInfo->ButtonsDown &= ~MK_XBUTTON2; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); - co_MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); } } if(mi->dwFlags & MOUSEEVENTF_WHEEL) { Msg.message = WM_MOUSEWHEEL; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, mi->mouseData); - co_MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); } return TRUE; } BOOL FASTCALL -IntKeyboardInput(KEYBDINPUT *ki) +IntKeyboardInput(KEYBDINPUT *ki, BOOL Injected) { PUSER_MESSAGE_QUEUE FocusMessageQueue; MSG Msg; @@ -1346,6 +1347,7 @@ KbdHookData.vkCode = vk_hook; KbdHookData.scanCode = ki->wScan; KbdHookData.flags = flags >> 8; + if (Injected) KbdHookData.flags |= LLKHF_INJECTED; KbdHookData.time = Msg.time; KbdHookData.dwExtraInfo = ki->dwExtraInfo; if (co_HOOK_CallHooks(WH_KEYBOARD_LL, HC_ACTION, Msg.message, (LPARAM) &KbdHookData)) @@ -1510,13 +1512,13 @@ switch(SafeInput.type) { case INPUT_MOUSE: - if(IntMouseInput(&SafeInput.mi)) + if(IntMouseInput(&SafeInput.mi, TRUE)) { cnt++; } break; case INPUT_KEYBOARD: - if(IntKeyboardInput(&SafeInput.ki)) + if(IntKeyboardInput(&SafeInput.ki, TRUE)) { cnt++; } @@ -1541,4 +1543,280 @@ END_CLEANUP; } +BOOL +FASTCALL +IntQueryTrackMouseEvent( + LPTRACKMOUSEEVENT lpEventTrack) +{ + PDESKTOP pDesk; + PTHREADINFO pti; + + pti = PsGetCurrentThreadWin32Thread(); + pDesk = pti->rpdesk; + + /* Always cleared with size set and return true. */ + RtlZeroMemory(lpEventTrack ,sizeof(TRACKMOUSEEVENT)); + lpEventTrack->cbSize = sizeof(TRACKMOUSEEVENT); + + if ( pDesk->dwDTFlags & (DF_TME_LEAVE|DF_TME_HOVER) && + pDesk->spwndTrack && + pti->MessageQueue == pDesk->spwndTrack->head.pti->MessageQueue ) + { + if ( pDesk->htEx != HTCLIENT ) + lpEventTrack->dwFlags |= TME_NONCLIENT; + + if ( pDesk->dwDTFlags & DF_TME_LEAVE ) + lpEventTrack->dwFlags |= TME_LEAVE; + + if ( pDesk->dwDTFlags & DF_TME_HOVER ) + { + lpEventTrack->dwFlags |= TME_HOVER; + lpEventTrack->dwHoverTime = pDesk->dwMouseHoverTime; + } + lpEventTrack->hwndTrack = UserHMGetHandle(pDesk->spwndTrack); + } + return TRUE; +} + +BOOL +FASTCALL +IntTrackMouseEvent( + LPTRACKMOUSEEVENT lpEventTrack) +{ + PDESKTOP pDesk; + PTHREADINFO pti; + PWND pWnd; + POINT point; + + pti = PsGetCurrentThreadWin32Thread(); + pDesk = pti->rpdesk; + + if (!(pWnd = UserGetWindowObject(lpEventTrack->hwndTrack))) + return FALSE; + + if ( pDesk->spwndTrack != pWnd || + (pDesk->htEx != HTCLIENT) ^ !!(lpEventTrack->dwFlags & TME_NONCLIENT) ) + { + if ( lpEventTrack->dwFlags & TME_LEAVE && !(lpEventTrack->dwFlags & TME_CANCEL) ) + { + UserPostMessage( lpEventTrack->hwndTrack, + lpEventTrack->dwFlags & TME_NONCLIENT ? WM_NCMOUSELEAVE : WM_MOUSELEAVE, + 0, 0); + } + DPRINT("IntTrackMouseEvent spwndTrack 0x%x pwnd 0x%x\n", pDesk->spwndTrack,pWnd); + return TRUE; + } + + /* Tracking spwndTrack same as pWnd */ + if ( lpEventTrack->dwFlags & TME_CANCEL ) // Canceled mode. + { + if ( lpEventTrack->dwFlags & TME_LEAVE ) + pDesk->dwDTFlags &= ~DF_TME_LEAVE; + + if ( lpEventTrack->dwFlags & TME_HOVER ) + { + if ( pDesk->dwDTFlags & DF_TME_HOVER ) + { // Kill hover timer. + IntKillTimer(pWnd, ID_EVENT_SYSTIMER_MOUSEHOVER, TRUE); + pDesk->dwDTFlags &= ~DF_TME_HOVER; + } + } + } + else // Not Canceled. + { + if ( lpEventTrack->dwFlags & TME_LEAVE ) + pDesk->dwDTFlags |= DF_TME_LEAVE; + + if ( lpEventTrack->dwFlags & TME_HOVER ) + { + pDesk->dwDTFlags |= DF_TME_HOVER; + + if ( !lpEventTrack->dwHoverTime || lpEventTrack->dwHoverTime == HOVER_DEFAULT ) + pDesk->dwMouseHoverTime = gspv.iMouseHoverTime; // use the system default hover time-out. + else + pDesk->dwMouseHoverTime = lpEventTrack->dwHoverTime; + // Start timer for the hover period. + IntSetTimer( pWnd, ID_EVENT_SYSTIMER_MOUSEHOVER, pDesk->dwMouseHoverTime, SystemTimerProc, TMRF_SYSTEM); + // Get windows thread message points. + point = pWnd->head.pti->ptLast; + // Set desktop mouse hover from the system default hover rectangle. + RECTL_vSetRect(&pDesk->rcMouseHover, + point.x - gspv.iMouseHoverWidth / 2, + point.y - gspv.iMouseHoverHeight / 2, + point.x + gspv.iMouseHoverWidth / 2, + point.y + gspv.iMouseHoverHeight / 2); + } + } + return TRUE; +} + +BOOL +APIENTRY +NtUserTrackMouseEvent( + LPTRACKMOUSEEVENT lpEventTrack) +{ + TRACKMOUSEEVENT saveTME; + BOOL Ret = FALSE; + + DPRINT("Enter NtUserTrackMouseEvent\n"); + UserEnterExclusive(); + + _SEH2_TRY + { + ProbeForRead(lpEventTrack, sizeof(TRACKMOUSEEVENT), 1); + RtlCopyMemory(&saveTME, lpEventTrack, sizeof(TRACKMOUSEEVENT)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(goto Exit;) + } + _SEH2_END; + + if ( saveTME.cbSize != sizeof(TRACKMOUSEEVENT) ) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + goto Exit; + } + + if (saveTME.dwFlags & ~(TME_CANCEL|TME_QUERY|TME_NONCLIENT|TME_LEAVE|TME_HOVER) ) + { + EngSetLastError(ERROR_INVALID_FLAGS); + goto Exit; + } + + if ( saveTME.dwFlags & TME_QUERY ) + { + Ret = IntQueryTrackMouseEvent(&saveTME); + _SEH2_TRY + { + ProbeForWrite(lpEventTrack, sizeof(TRACKMOUSEEVENT), 1); + RtlCopyMemory(lpEventTrack, &saveTME, sizeof(TRACKMOUSEEVENT)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + Ret = FALSE; + } + _SEH2_END; + } + else + { + Ret = IntTrackMouseEvent(&saveTME); + } + +Exit: + DPRINT("Leave NtUserTrackMouseEvent, ret=%i\n",Ret); + UserLeave(); + return Ret; +} + +extern MOUSEMOVEPOINT MouseHistoryOfMoves[]; +extern INT gcur_count; + +DWORD +APIENTRY +NtUserGetMouseMovePointsEx( + UINT cbSize, + LPMOUSEMOVEPOINT lpptIn, + LPMOUSEMOVEPOINT lpptOut, + int nBufPoints, + DWORD resolution) +{ + MOUSEMOVEPOINT Safeppt; + BOOL Hit; + INT Count = -1; + DECLARE_RETURN(DWORD); + + DPRINT("Enter NtUserGetMouseMovePointsEx\n"); + UserEnterExclusive(); + + if ((cbSize != sizeof(MOUSEMOVEPOINT)) || (nBufPoints < 0) || (nBufPoints > 64)) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + RETURN( -1); + } + + if (!lpptIn || (!lpptOut && nBufPoints)) + { + EngSetLastError(ERROR_NOACCESS); + RETURN( -1); + } + + _SEH2_TRY + { + ProbeForRead( lpptIn, cbSize, 1); + RtlCopyMemory(&Safeppt, lpptIn, cbSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(RETURN( -1)) + } + _SEH2_END; + + // http://msdn.microsoft.com/en-us/library/ms646259(v=vs.85).aspx + // This explains the math issues in transforming points. + Count = gcur_count; // FIFO is forward so retrieve backward. + Hit = FALSE; + do + { + if (Safeppt.x == 0 && Safeppt.y == 0) + break; // No test. + // Finds the point, it returns the last nBufPoints prior to and including the supplied point. + if (MouseHistoryOfMoves[Count].x == Safeppt.x && MouseHistoryOfMoves[Count].y == Safeppt.y) + { + if ( Safeppt.time ) // Now test time and it seems to be absolute. + { + if (Safeppt.time == MouseHistoryOfMoves[Count].time) + { + Hit = TRUE; + break; + } + else + { + if (--Count < 0) Count = 63; + continue; + } + } + Hit = TRUE; + break; + } + if (--Count < 0) Count = 63; + } + while ( Count != gcur_count); + + switch(resolution) + { + case GMMP_USE_DISPLAY_POINTS: + if (nBufPoints) + { + _SEH2_TRY + { + ProbeForWrite(lpptOut, cbSize, 1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(RETURN( -1)) + } + _SEH2_END; + } + Count = nBufPoints; + break; + case GMMP_USE_HIGH_RESOLUTION_POINTS: + break; + default: + EngSetLastError(ERROR_POINT_NOT_FOUND); + RETURN( -1); + } + + RETURN( Count); + +CLEANUP: + DPRINT("Leave NtUserGetMouseMovePointsEx, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -400,7 +400,30 @@ return ret; } - +/*********************************************************************** + * get_key_state + */ +WORD FASTCALL get_key_state(void) +{ + WORD ret = 0; + + if (gpsi->aiSysMet[SM_SWAPBUTTON]) + { + if (UserGetAsyncKeyState(VK_RBUTTON) & 0x80) ret |= MK_LBUTTON; + if (UserGetAsyncKeyState(VK_LBUTTON) & 0x80) ret |= MK_RBUTTON; + } + else + { + if (UserGetAsyncKeyState(VK_LBUTTON) & 0x80) ret |= MK_LBUTTON; + if (UserGetAsyncKeyState(VK_RBUTTON) & 0x80) ret |= MK_RBUTTON; + } + if (UserGetAsyncKeyState(VK_MBUTTON) & 0x80) ret |= MK_MBUTTON; + if (UserGetAsyncKeyState(VK_SHIFT) & 0x80) ret |= MK_SHIFT; + if (UserGetAsyncKeyState(VK_CONTROL) & 0x80) ret |= MK_CONTROL; + if (UserGetAsyncKeyState(VK_XBUTTON1) & 0x80) ret |= MK_XBUTTON1; + if (UserGetAsyncKeyState(VK_XBUTTON2) & 0x80) ret |= MK_XBUTTON2; + return ret; +} SHORT APIENTRY Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -709,14 +709,14 @@ { return FALSE; } - if( lpmii->fType & ~fTypeMask) + if (lpmii->fType & ~fTypeMask) { DbgPrint("IntSetMenuItemInfo invalid fType flags %x\n", lpmii->fType & ~fTypeMask); lpmii->fMask &= ~(MIIM_TYPE | MIIM_FTYPE); } - if(lpmii->fMask & MIIM_TYPE) - { - if(lpmii->fMask & ( MIIM_STRING | MIIM_FTYPE | MIIM_BITMAP)) + if (lpmii->fMask & MIIM_TYPE) + { + if (lpmii->fMask & ( MIIM_STRING | MIIM_FTYPE | MIIM_BITMAP)) { DbgPrint("IntSetMenuItemInfo: Invalid combination of fMask bits used\n"); /* this does not happen on Win9x/ME */ @@ -2056,11 +2056,13 @@ if(!(Window = UserGetWindowObject(hWnd))) { + EngSetLastError(ERROR_INVALID_WINDOW_HANDLE); RETURN(FALSE); } if(!(Menu = UserGetMenuObject(hMenu))) { + EngSetLastError(ERROR_INVALID_MENU_HANDLE); RETURN(FALSE); } @@ -2228,6 +2230,9 @@ NULL, &MenuItem, NULL) < 0) { EngSetLastError(ERROR_INVALID_PARAMETER); +// This will crash menu (line 80) correct_behavior test! +// "NT4 and below can't handle a bigger MENUITEMINFO struct" + //EngSetLastError(ERROR_MENU_ITEM_NOT_FOUND); return( FALSE); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -20,6 +20,8 @@ /* GLOBALS *******************************************************************/ static PAGED_LOOKASIDE_LIST MessageLookasideList; +MOUSEMOVEPOINT MouseHistoryOfMoves[64]; +INT gcur_count = 0; /* FUNCTIONS *****************************************************************/ @@ -189,7 +191,7 @@ } VOID FASTCALL -co_MsqInsertMouseMessage(MSG* Msg) +co_MsqInsertMouseMessage(MSG* Msg, DWORD flags, ULONG_PTR dwExtraInfo) { LARGE_INTEGER LargeTickCount; MSLLHOOKSTRUCT MouseHookData; @@ -219,9 +221,9 @@ break; } - MouseHookData.flags = 0; + MouseHookData.flags = flags; // LLMHF_INJECTED MouseHookData.time = Msg->time; - MouseHookData.dwExtraInfo = 0; + MouseHookData.dwExtraInfo = dwExtraInfo; /* If the hook procedure returned non zero, dont send the message */ if (co_HOOK_CallHooks(WH_MOUSE_LL, HC_ACTION, Msg->message, (LPARAM) &MouseHookData)) @@ -232,11 +234,22 @@ if(!pwndDesktop) return; + /* Set hit somewhere on the desktop */ + pDesk = pwndDesktop->head.rpdesk; + pDesk->htEx = HTNOWHERE; + pDesk->spwndTrack = pwndDesktop; + /* Check if the mouse is captured */ Msg->hwnd = IntGetCaptureWindow(); if(Msg->hwnd != NULL) { pwnd = UserGetWindowObject(Msg->hwnd); + if ((pwnd->style & WS_VISIBLE) && + IntPtInWindow(pwnd, Msg->pt.x, Msg->pt.y)) + { + pDesk->htEx = HTCLIENT; + pDesk->spwndTrack = pwnd; + } } else { @@ -255,7 +268,6 @@ IntPtInWindow(pwnd, Msg->pt.x, Msg->pt.y)) { Msg->hwnd = pwnd->head.h; - pDesk = pwnd->head.rpdesk; pDesk->htEx = HTCLIENT; pDesk->spwndTrack = pwnd; break; @@ -277,6 +289,13 @@ MsqPostMessage(pwnd->head.pti->MessageQueue, Msg, TRUE, QS_MOUSEBUTTON); } } + + /* Do GetMouseMovePointsEx FIFO. */ + MouseHistoryOfMoves[gcur_count].x = Msg->pt.x; + MouseHistoryOfMoves[gcur_count].y = Msg->pt.y; + MouseHistoryOfMoves[gcur_count].time = Msg->time; + MouseHistoryOfMoves[gcur_count].dwExtraInfo = 0; // need to be passed from IntMouseInput mi.dwExtraInfo. + if (gcur_count++ == 64) gcur_count = 0; // 0 - 63 is 64, FIFO forwards. } // @@ -1276,7 +1295,7 @@ if (Remove) { RemoveEntryList(&CurrentMessage->ListEntry); - ClearMsgBitsMask(MessageQueue, CurrentMessage->QS_Flags); + ClearMsgBitsMask(MessageQueue, QS_INPUT); MsqDestroyMessage(CurrentMessage); } @@ -1336,7 +1355,7 @@ if (Remove) { RemoveEntryList(&CurrentMessage->ListEntry); - ClearMsgBitsMask(MessageQueue, CurrentMessage->QS_Flags); + ClearMsgBitsMask(MessageQueue, QS_POSTMESSAGE); MsqDestroyMessage(CurrentMessage); } return(TRUE); 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -277,56 +277,6 @@ return 0; } - -DWORD -APIENTRY -NtUserGetMouseMovePointsEx( - UINT cbSize, - LPMOUSEMOVEPOINT lppt, - LPMOUSEMOVEPOINT lpptBuf, - int nBufPoints, - DWORD resolution) -{ - UserEnterExclusive(); - - if ((cbSize != sizeof(MOUSEMOVEPOINT)) || (nBufPoints < 0) || (nBufPoints > 64)) - { - UserLeave(); - EngSetLastError(ERROR_INVALID_PARAMETER); - return -1; - } - - _SEH2_TRY - { - ProbeForRead(lppt, cbSize, 1); - ProbeForWrite(lpptBuf, cbSize, 1); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - EngSetLastError(ERROR_NOACCESS); - } - _SEH2_END; - -/* - Call a subfunction of GetMouseMovePointsEx! - switch(resolution) - { - case GMMP_USE_DISPLAY_POINTS: - case GMMP_USE_HIGH_RESOLUTION_POINTS: - break; - default: - EngSetLastError(GMMP_ERR_POINT_NOT_FOUND); - return GMMP_ERR_POINT_NOT_FOUND; - } - */ - UNIMPLEMENTED - UserLeave(); - return -1; -} - - - BOOL APIENTRY NtUserImpersonateDdeClientWindow( @@ -585,17 +535,6 @@ return 0; } - -BOOL -APIENTRY -NtUserTrackMouseEvent( - LPTRACKMOUSEEVENT lpEventTrack) -{ - UNIMPLEMENTED - - return 0; -} - DWORD APIENTRY Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -473,7 +473,7 @@ RETURN( (DWORD_PTR)co_IntRegisterLogonProcess((HANDLE)Param1, (BOOL)Param2)); case TWOPARAM_ROUTINE_SETCURSORPOS: - RETURN( (DWORD_PTR)UserSetCursorPos((int)Param1, (int)Param2, FALSE)); + RETURN( (DWORD_PTR)UserSetCursorPos((int)Param1, (int)Param2)); case TWOPARAM_ROUTINE_UNHOOKWINDOWSHOOK: RETURN( IntUnhookWindowsHook((int)Param1, (HOOKPROC)Param2)); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -17,6 +17,8 @@ #define NDEBUG #include <debug.h> +WORD FASTCALL get_key_state(void); + /* GLOBALS *******************************************************************/ static LIST_ENTRY TimersListHead; @@ -82,7 +84,7 @@ { /* Set the flag, it will be removed when ready */ RemoveEntryList(&pTmr->ptmrList); - if ((pTmr->pWnd == NULL) && (!(pTmr->flags & TMRF_SYSTEM))) + if ((pTmr->pWnd == NULL) && (!(pTmr->flags & TMRF_SYSTEM))) // System timers are reusable. { UINT_PTR IDEvent; @@ -287,7 +289,73 @@ UINT_PTR idEvent, DWORD dwTime) { - DPRINT( "Timer Running!\n" ); + PDESKTOP pDesk; + PWND pWnd = NULL; + + if (hwnd) + { + pWnd = UserGetWindowObject(hwnd); + if (!pWnd) + { + DPRINT1( "System Timer Proc has invalid window handle! 0x%x Id: %d\n", hwnd, idEvent); + return; + } + } + else + { + DPRINT( "Windowless Timer Running!\n" ); + return; + } + + switch (idEvent) + { +/* + Used in NtUserTrackMouseEvent. + */ + case ID_EVENT_SYSTIMER_MOUSEHOVER: + { + POINT Point; + UINT Msg; + WPARAM wParam; + + pDesk = pWnd->head.rpdesk; + if ( pDesk->dwDTFlags & DF_TME_HOVER && + pWnd == pDesk->spwndTrack ) + { + Point = gpsi->ptCursor; + if ( IntPtInRect(&pDesk->rcMouseHover, Point) ) + { + if (pDesk->htEx == HTCLIENT) // In a client area. + { + wParam = get_key_state(); + Msg = WM_MOUSEHOVER; + + if (pWnd->ExStyle & WS_EX_LAYOUTRTL) + { + Point.x = pWnd->rcClient.right - Point.x - 1; + } + else + Point.x -= pWnd->rcClient.left; + Point.y -= pWnd->rcClient.top; + } + else + { + wParam = pDesk->htEx; // Need to support all HTXYZ hits. + Msg = WM_NCMOUSEHOVER; + } + UserPostMessage(hwnd, Msg, wParam, MAKELPARAM(Point.x, Point.y)); + pDesk->dwDTFlags &= ~DF_TME_HOVER; + break; // Kill this timer. + } + } + } + return; // Not this window so just return. + + default: + DPRINT1( "System Timer Proc invalid id %d!\n", idEvent ); + break; + } + IntKillTimer(pWnd, idEvent, TRUE); } VOID @@ -296,7 +364,9 @@ { // Need to start gdi syncro timers then start timer with Hang App proc // that calles Idle process so the screen savers will know to run...... - IntSetTimer(NULL, 0, 1000, SystemTimerProc, TMRF_RIT); + IntSetTimer(NULL, 0, 1000, HungAppSysTimerProc, TMRF_RIT); +// Test Timers +// IntSetTimer(NULL, 0, 1000, SystemTimerProc, TMRF_RIT); } UINT_PTR @@ -347,6 +417,13 @@ pTmr->flags &= ~TMRF_READY; pti->cTimersReady++; Hit = TRUE; + // Now move this entry to the end of the list so it will not be + // called again in the next msg loop. + if (pLE != &TimersListHead) + { + RemoveEntryList(&pTmr->ptmrList); + InsertTailList(&TimersListHead, &pTmr->ptmrList); + } break; } 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Fri Apr 8 19:29:15 2011 @@ -1692,7 +1692,7 @@ DPRINT("Created object with handle %X\n", hWnd); if (NULL == pti->rpdesk->DesktopWindow) - { + { /*HACK! Helper for win32csr/desktopbg.c */ /* If there is no desktop window yet, we must be creating it */ pti->rpdesk->DesktopWindow = hWnd; pti->rpdesk->pDeskInfo->spwnd = pWnd; @@ -1891,7 +1891,7 @@ return pWnd; AllocError: - + DPRINT1("IntCreateWindow Allocation Error.\n"); if(pWnd) UserDereferenceObject(pWnd); @@ -2575,7 +2575,7 @@ msg.wParam = IntGetSysCursorInfo()->ButtonsDown; msg.lParam = MAKELPARAM(gpsi->ptCursor.x, gpsi->ptCursor.y); msg.pt = gpsi->ptCursor; - co_MsqInsertMouseMessage(&msg); + co_MsqInsertMouseMessage(&msg, 0, 0); if (!IntIsWindow(Window->head.h)) {

13 years, 12 months

← Newer
1
...
20
21
22
23
24
25
26
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2011