Ros-diffs August 2014

ros-diffs@reactos.org

16 participants
226 discussions

[jgardou] 63947: [NTOS/MM] - Bring back PTE frame refcounting when serving a prototype PTE page fault. - Fix a bug in MiDeletePte where the said PTE frame was not unshared. - Improve transitional P...
by jgardou＠svn.reactos.org 25 Aug '14

25 Aug '14

Author: jgardou Date: Mon Aug 25 12:33:49 2014 New Revision: 63947 URL: http://svn.reactos.org/svn/reactos?rev=63947&view=rev Log: [NTOS/MM] - Bring back PTE frame refcounting when serving a prototype PTE page fault. - Fix a bug in MiDeletePte where the said PTE frame was not unshared. - Improve transitional PTEs deletion (will be needed for future work). Do not always trust the comments stating that "strange RosMm code broke everything" Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Mon Aug 25 12:33:49 2014 @@ -709,12 +709,9 @@ Pfn1->u3.e1.PrototypePte = 1; /* Increment the share count for the page table */ - // FIXME: This doesn't work because we seem to bump the sharecount to two, and MiDeletePte gets annoyed and ASSERTs. - // This could be beause MiDeletePte is now being called from strange code in Rosmm PageTablePte = MiAddressToPte(PointerPte); Pfn2 = MiGetPfnEntry(PageTablePte->u.Hard.PageFrameNumber); - //Pfn2->u2.ShareCount++; - DBG_UNREFERENCED_LOCAL_VARIABLE(Pfn2); + Pfn2->u2.ShareCount++; /* Check where we should be getting the protection information from */ if (PointerPte->u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED) Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Mon Aug 25 12:33:49 2014 @@ -407,15 +407,17 @@ /* See if the PTE is valid */ if (TempPte.u.Hard.Valid == 0) { - /* Prototype PTEs not supported yet */ + /* Prototype and paged out PTEs not supported yet */ ASSERT(TempPte.u.Soft.Prototype == 0); + ASSERT(TempPte.u.Soft.PageFileHigh == 0); + if (TempPte.u.Soft.Transition) { /* Get the PFN entry */ PageFrameIndex = PFN_FROM_PTE(&TempPte); Pfn1 = MiGetPfnEntry(PageFrameIndex); - DPRINT1("Pte %p is transitional!\n", PointerPte); + DPRINT("Pte %p is transitional!\n", PointerPte); /* Destroy the PTE */ MI_ERASE_PTE(PointerPte); @@ -433,12 +435,14 @@ /* And it should be in standby or modified list */ ASSERT((Pfn1->u3.e1.PageLocation == ModifiedPageList) || (Pfn1->u3.e1.PageLocation == StandbyPageList)); - /* Unlink it and put it back in free list */ + /* Unlink it and temporarily mark it as active */ MiUnlinkPageFromList(Pfn1); + Pfn1->u3.e2.ReferenceCount++; Pfn1->u3.e1.PageLocation = ActiveAndValid; - /* Bring it back into the free list */ - MiInsertPageInFreeList(PageFrameIndex); + /* This will put it back in free list and clean properly up */ + MI_SET_PFN_DELETED(Pfn1); + MiDecrementReferenceCount(Pfn1, PageFrameIndex); } return; } @@ -470,6 +474,11 @@ #if (_MI_PAGING_LEVELS == 2) } #endif + /* Drop the share count on the page table */ + PointerPde = MiPteToPde(PointerPte); + MiDecrementShareCount(MiGetPfnEntry(PointerPde->u.Hard.PageFrameNumber), + PointerPde->u.Hard.PageFrameNumber); + /* Drop the share count */ MiDecrementShareCount(Pfn1, PageFrameIndex);

1 0

[jgardou] 63946: [WIN32K] - Addendum to r63933: Pass absolute value of the font width to freetype. CORE-4657 Somehow got lost in the number of attached files. Spotted by Thomas Faber
by jgardou＠svn.reactos.org 25 Aug '14

25 Aug '14

Author: jgardou Date: Mon Aug 25 09:57:27 2014 New Revision: 63946 URL: http://svn.reactos.org/svn/reactos?rev=63946&view=rev Log: [WIN32K] - Addendum to r63933: Pass absolute value of the font width to freetype. CORE-4657 Somehow got lost in the number of attached files. Spotted by Thomas Faber Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Mon Aug 25 09:57:27 2014 @@ -1601,7 +1601,7 @@ } FT_Set_Pixel_Sizes(ft_face, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, + abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth), /* FIXME: Should set character height if neg */ (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)));

1 0

[jgardou] 63945: [SCSIPORT] - Use kernel handles instead of process handles
by jgardou＠svn.reactos.org 24 Aug '14

24 Aug '14

Author: jgardou Date: Sun Aug 24 19:49:42 2014 New Revision: 63945 URL: http://svn.reactos.org/svn/reactos?rev=63945&view=rev Log: [SCSIPORT] - Use kernel handles instead of process handles Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Sun Aug 24 19:49:42 2014 @@ -5296,7 +5296,7 @@ L"\\Registry\\Machine\\Hardware\\DeviceMap\\Scsi"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, - OBJ_CASE_INSENSITIVE | OBJ_OPENIF, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF | OBJ_KERNEL_HANDLE, 0, NULL); Status = ZwCreateKey(&ScsiKey, @@ -5323,7 +5323,7 @@ NameBuffer); InitializeObjectAttributes(&ObjectAttributes, &KeyName, - 0, + OBJ_KERNEL_HANDLE, ScsiKey, NULL); Status = ZwCreateKey(&ScsiPortKey,

1 0

[hbelusca] 63944: Fix the fix of revision 63943. Noticed by Thomas Faber. CORE-8150 #comment Indeed, do not confuse 'l' (lowercase L) with 'I' (uppercase i)!
by hbelusca＠svn.reactos.org 24 Aug '14

24 Aug '14

Author: hbelusca Date: Sun Aug 24 19:32:54 2014 New Revision: 63944 URL: http://svn.reactos.org/svn/reactos?rev=63944&view=rev Log: Fix the fix of revision 63943. Noticed by Thomas Faber. CORE-8150 #comment Indeed, do not confuse 'l' (lowercase L) with 'I' (uppercase i)! Modified: trunk/reactos/dll/cpl/desk/screensaver.c Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c… ============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] Sun Aug 24 19:32:54 2014 @@ -123,7 +123,7 @@ if (pData->Selection > 0) { _stprintf(szCmdline, - _T("%s /p %lu"), + _T("%s /p %Iu"), pData->ScreenSaverItems[pData->Selection].szFilename, (ULONG_PTR)hPreview); @@ -199,7 +199,7 @@ return; _stprintf(szCmdline, - _T("%s /c:%lu"), + _T("%s /c:%Iu"), pData->ScreenSaverItems[pData->Selection].szFilename, (ULONG_PTR)hwndDlg);

1 0

[hbelusca] 63943: [DESK]: Fix *printf format specifier. Adapted from a patch by Victor Martinez Calvo. CORE-8150 #resolve #comment Fixed, thanks!
by hbelusca＠svn.reactos.org 24 Aug '14

24 Aug '14

Author: hbelusca Date: Sun Aug 24 17:16:50 2014 New Revision: 63943 URL: http://svn.reactos.org/svn/reactos?rev=63943&view=rev Log: [DESK]: Fix *printf format specifier. Adapted from a patch by Victor Martinez Calvo. CORE-8150 #resolve #comment Fixed, thanks! Modified: trunk/reactos/dll/cpl/desk/screensaver.c Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c… ============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] Sun Aug 24 17:16:50 2014 @@ -123,9 +123,9 @@ if (pData->Selection > 0) { _stprintf(szCmdline, - _T("%s /p %u"), + _T("%s /p %lu"), pData->ScreenSaverItems[pData->Selection].szFilename, - hPreview); + (ULONG_PTR)hPreview); ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); @@ -188,8 +188,8 @@ ScreensaverConfig(HWND hwndDlg, PDATA pData) { /* - /c:<hwnd> Run configuration, hwnd is handle of calling window - */ + * /c:<hwnd> Run configuration, hwnd is handle of calling window + */ TCHAR szCmdline[2048]; STARTUPINFO si; @@ -199,9 +199,9 @@ return; _stprintf(szCmdline, - _T("%s /c:%u"), + _T("%s /c:%lu"), pData->ScreenSaverItems[pData->Selection].szFilename, - hwndDlg); + (ULONG_PTR)hwndDlg); ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si);

1 0

[hbelusca] 63942: Remove unneeded parentheses.
by hbelusca＠svn.reactos.org 24 Aug '14

24 Aug '14

Author: hbelusca Date: Sun Aug 24 17:07:43 2014 New Revision: 63942 URL: http://svn.reactos.org/svn/reactos?rev=63942&view=rev Log: Remove unneeded parentheses. Modified: trunk/reactos/base/applications/taskmgr/applpage.c trunk/reactos/base/applications/taskmgr/perfpage.c trunk/reactos/base/applications/taskmgr/procpage.c Modified: trunk/reactos/base/applications/taskmgr/applpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] Sun Aug 24 17:07:43 2014 @@ -184,21 +184,21 @@ InvalidateRect(hApplicationPageListCtrl, NULL, TRUE); GetClientRect(hApplicationPageEndTaskButton, &rc); - MapWindowPoints(hApplicationPageEndTaskButton, hDlg, (LPPOINT)(PRECT)(&rc), (sizeof(RECT)/sizeof(POINT)) ); + MapWindowPoints(hApplicationPageEndTaskButton, hDlg, (LPPOINT)(PRECT)(&rc), sizeof(RECT)/sizeof(POINT)); cx = rc.left + nXDifference; cy = rc.top + nYDifference; SetWindowPos(hApplicationPageEndTaskButton, NULL, cx, cy, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER); InvalidateRect(hApplicationPageEndTaskButton, NULL, TRUE); GetClientRect(hApplicationPageSwitchToButton, &rc); - MapWindowPoints(hApplicationPageSwitchToButton, hDlg, (LPPOINT)(PRECT)(&rc), (sizeof(RECT)/sizeof(POINT)) ); + MapWindowPoints(hApplicationPageSwitchToButton, hDlg, (LPPOINT)(PRECT)(&rc), sizeof(RECT)/sizeof(POINT)); cx = rc.left + nXDifference; cy = rc.top + nYDifference; SetWindowPos(hApplicationPageSwitchToButton, NULL, cx, cy, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER); InvalidateRect(hApplicationPageSwitchToButton, NULL, TRUE); GetClientRect(hApplicationPageNewTaskButton, &rc); - MapWindowPoints(hApplicationPageNewTaskButton, hDlg, (LPPOINT)(PRECT)(&rc), (sizeof(RECT)/sizeof(POINT)) ); + MapWindowPoints(hApplicationPageNewTaskButton, hDlg, (LPPOINT)(PRECT)(&rc), sizeof(RECT)/sizeof(POINT)); cx = rc.left + nXDifference; cy = rc.top + nYDifference; SetWindowPos(hApplicationPageNewTaskButton, NULL, cx, cy, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER); Modified: trunk/reactos/base/applications/taskmgr/perfpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfpage.c [iso-8859-1] Sun Aug 24 17:07:43 2014 @@ -67,7 +67,7 @@ int cx, cy, sx, sy; GetClientRect(hCntrl, &rc); - MapWindowPoints(hCntrl, hDlg, (LPPOINT)(PRECT)(&rc), (sizeof(RECT)/sizeof(POINT))); + MapWindowPoints(hCntrl, hDlg, (LPPOINT)(PRECT)(&rc), sizeof(RECT)/sizeof(POINT)); if (pos) { cx = rc.left; cy = rc.top; Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Sun Aug 24 17:07:43 2014 @@ -186,14 +186,14 @@ InvalidateRect(hProcessPageListCtrl, NULL, TRUE); GetClientRect(hProcessPageEndProcessButton, &rc); - MapWindowPoints(hProcessPageEndProcessButton, hDlg, (LPPOINT)(PRECT)(&rc), (sizeof(RECT)/sizeof(POINT)) ); + MapWindowPoints(hProcessPageEndProcessButton, hDlg, (LPPOINT)(PRECT)(&rc), sizeof(RECT)/sizeof(POINT)); cx = rc.left + nXDifference; cy = rc.top + nYDifference; SetWindowPos(hProcessPageEndProcessButton, NULL, cx, cy, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER); InvalidateRect(hProcessPageEndProcessButton, NULL, TRUE); GetClientRect(hProcessPageShowAllProcessesButton, &rc); - MapWindowPoints(hProcessPageShowAllProcessesButton, hDlg, (LPPOINT)(PRECT)(&rc), (sizeof(RECT)/sizeof(POINT)) ); + MapWindowPoints(hProcessPageShowAllProcessesButton, hDlg, (LPPOINT)(PRECT)(&rc), sizeof(RECT)/sizeof(POINT)); cx = rc.left; cy = rc.top + nYDifference; SetWindowPos(hProcessPageShowAllProcessesButton, NULL, cx, cy, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER);

1 0

[hbelusca] 63941: [TASKMGR]: Clarify the icon handle retrieval, getting rid also of that xhIcon variable. CORE-8148 #resolve #comment The original code was ok, but was not very clear.
by hbelusca＠svn.reactos.org 24 Aug '14

24 Aug '14

Author: hbelusca Date: Sun Aug 24 16:58:39 2014 New Revision: 63941 URL: http://svn.reactos.org/svn/reactos?rev=63941&view=rev Log: [TASKMGR]: Clarify the icon handle retrieval, getting rid also of that xhIcon variable. CORE-8148 #resolve #comment The original code was ok, but was not very clear. Modified: trunk/reactos/base/applications/taskmgr/applpage.c Modified: trunk/reactos/base/applications/taskmgr/applpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] Sun Aug 24 16:58:39 2014 @@ -332,11 +332,9 @@ WCHAR szText[260]; BOOL bLargeIcon; BOOL bHung = FALSE; - HICON* xhIcon = (HICON*)&hIcon; typedef int (FAR __stdcall *IsHungAppWindowProc)(HWND); IsHungAppWindowProc IsHungAppWindow; - /* Skip our window */ if (hWnd == hMainWnd) @@ -357,20 +355,21 @@ } noApps = FALSE; + /* Get the icon for this window */ hIcon = NULL; - SendMessageTimeoutW(hWnd, WM_GETICON,bLargeIcon ? ICON_BIG /*1*/ : ICON_SMALL /*0*/, 0, 0, 1000, (PDWORD_PTR)xhIcon); - + SendMessageTimeoutW(hWnd, WM_GETICON, bLargeIcon ? ICON_BIG : ICON_SMALL, 0, 0, 1000, (PDWORD_PTR)&hIcon); if (!hIcon) { + /* We failed, try to retrieve other icons... */ hIcon = (HICON)(LONG_PTR)GetClassLongPtrW(hWnd, bLargeIcon ? GCL_HICON : GCL_HICONSM); if (!hIcon) hIcon = (HICON)(LONG_PTR)GetClassLongPtrW(hWnd, bLargeIcon ? GCL_HICONSM : GCL_HICON); - if (!hIcon) SendMessageTimeoutW(hWnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (PDWORD_PTR)xhIcon); - if (!hIcon) SendMessageTimeoutW(hWnd, WM_GETICON, bLargeIcon ? ICON_SMALL /*0*/ : ICON_BIG /*1*/, 0, 0, 1000, (PDWORD_PTR)xhIcon); - } - - if (!hIcon) - hIcon = LoadIconW(hInst, bLargeIcon ? MAKEINTRESOURCEW(IDI_WINDOW) : MAKEINTRESOURCEW(IDI_WINDOWSM)); + if (!hIcon) SendMessageTimeoutW(hWnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (PDWORD_PTR)&hIcon); + if (!hIcon) SendMessageTimeoutW(hWnd, WM_GETICON, bLargeIcon ? ICON_SMALL : ICON_BIG, 0, 0, 1000, (PDWORD_PTR)&hIcon); + + /* If we still do not have any icon, load the default one */ + if (!hIcon) hIcon = LoadIconW(hInst, bLargeIcon ? MAKEINTRESOURCEW(IDI_WINDOW) : MAKEINTRESOURCEW(IDI_WINDOWSM)); + } bHung = FALSE;

1 0

[hbelusca] 63940: [MPLAY32] Implement a single-window mode for videos. Patch by Ricardo Hanke. TO ALL TRANSLATORS: Update the translations! CORE-7910 #resolve #comment Committed, thanks!
by hbelusca＠svn.reactos.org 24 Aug '14

24 Aug '14

Author: hbelusca Date: Sun Aug 24 15:40:34 2014 New Revision: 63940 URL: http://svn.reactos.org/svn/reactos?rev=63940&view=rev Log: [MPLAY32] Implement a single-window mode for videos. Patch by Ricardo Hanke. TO ALL TRANSLATORS: Update the translations! CORE-7910 #resolve #comment Committed, thanks! Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc trunk/reactos/base/applications/mplay32/lang/de-DE.rc trunk/reactos/base/applications/mplay32/lang/en-US.rc trunk/reactos/base/applications/mplay32/lang/es-ES.rc trunk/reactos/base/applications/mplay32/lang/fr-FR.rc trunk/reactos/base/applications/mplay32/lang/he-IL.rc trunk/reactos/base/applications/mplay32/lang/it-IT.rc trunk/reactos/base/applications/mplay32/lang/ja-JP.rc trunk/reactos/base/applications/mplay32/lang/nl-NL.rc trunk/reactos/base/applications/mplay32/lang/no-NO.rc trunk/reactos/base/applications/mplay32/lang/pl-PL.rc trunk/reactos/base/applications/mplay32/lang/pt-BR.rc trunk/reactos/base/applications/mplay32/lang/ro-RO.rc trunk/reactos/base/applications/mplay32/lang/ru-RU.rc trunk/reactos/base/applications/mplay32/lang/sk-SK.rc trunk/reactos/base/applications/mplay32/lang/sq-AL.rc trunk/reactos/base/applications/mplay32/lang/sv-SE.rc trunk/reactos/base/applications/mplay32/lang/tr-TR.rc trunk/reactos/base/applications/mplay32/lang/uk-UA.rc trunk/reactos/base/applications/mplay32/lang/zh-CN.rc trunk/reactos/base/applications/mplay32/lang/zh-TW.rc trunk/reactos/base/applications/mplay32/mplay32.c trunk/reactos/base/applications/mplay32/resource.h Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -19,6 +19,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&Device" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -20,6 +20,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&Device" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -15,6 +15,10 @@ MENUITEM "St&opp\tStrg+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "W&iederholen\tStrg+T", IDM_REPEAT + END + POPUP "&Ansicht" + BEGIN + MENUITEM "Einzelfenster-&Modus", IDM_SWITCHVIEW END POPUP "&GerÃ¤t" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -15,6 +15,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&Device" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -15,6 +15,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&Device" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -15,6 +15,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "RÃ©pÃ©&ter\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "PÃ©rip&hÃ©rique" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -15,6 +15,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&Device" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -15,6 +15,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&Device" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -15,6 +15,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&Device" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -15,6 +15,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&Device" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -15,6 +15,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&Device" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -23,6 +23,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&UrzÄdzenie" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -17,6 +17,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&Device" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -21,6 +21,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&Dispozitiv" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -15,6 +15,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -20,6 +20,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&Device" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -19,6 +19,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&Device" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -22,6 +22,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&Device" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -17,6 +17,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&AygÄ±t" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -23,6 +23,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&Device" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -17,6 +17,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&Device" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -23,6 +23,10 @@ MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT + END + POPUP "&View" + BEGIN + MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW END POPUP "&Device" BEGIN Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -19,7 +19,9 @@ BOOL bIsOpened = FALSE; BOOL bIsPaused = FALSE; BOOL bRepeat = FALSE; +BOOL bIsSingleWindow = FALSE; UINT MaxFilePos = 0; +RECT PrevWindowPos; /* ToolBar Buttons */ @@ -35,9 +37,11 @@ {TBICON_FORWARD, IDC_FORWARD, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0} }; -void EnableMenuItems(void) +void EnableMenuItems(HWND hwnd) { MCI_GENERIC_PARMS mciGeneric; + MCI_DGV_RECT_PARMS mciVideoRect; + MCI_DGV_WINDOW_PARMSW mciVideoWindow; DWORD dwError; EnableMenuItem(hMainMenu, IDM_CLOSE_FILE, MF_BYCOMMAND | MF_ENABLED); @@ -47,12 +51,38 @@ { EnableMenuItem(hMainMenu, IDM_DEVPROPS, MF_BYCOMMAND | MF_ENABLED); } + + mciVideoWindow.hWnd = hwnd; + + dwError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD)(LPSTR)&mciVideoWindow); + if (!dwError) + { + dwError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD)(LPSTR)&mciVideoRect); + if (!dwError) + { + EnableMenuItem(hMainMenu, IDM_SWITCHVIEW, MF_BYCOMMAND | MF_ENABLED); + } + } } void DisableMenuItems(void) { EnableMenuItem(hMainMenu, IDM_CLOSE_FILE, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(hMainMenu, IDM_DEVPROPS, MF_BYCOMMAND | MF_GRAYED); + EnableMenuItem(hMainMenu, IDM_SWITCHVIEW, MF_BYCOMMAND | MF_GRAYED); +} + +void ResizeClientArea(HWND hwnd, int nWidth, int nHeight) +{ + RECT rcClientRect; + RECT rcWindowRect; + POINT ptDifference; + + GetClientRect(hwnd, &rcClientRect); + GetWindowRect(hwnd, &rcWindowRect); + ptDifference.x = (rcWindowRect.right - rcWindowRect.left) - rcClientRect.right; + ptDifference.y = (rcWindowRect.bottom - rcWindowRect.top) - rcClientRect.bottom; + MoveWindow(hwnd, rcWindowRect.left, rcWindowRect.top, nWidth + ptDifference.x, nHeight + ptDifference.y, TRUE); } static VOID @@ -213,6 +243,77 @@ return FALSE; } +static VOID +SwitchViewMode(HWND hwnd) +{ + MCIERROR mciError; + MCI_DGV_RECT_PARMS mciVideoRect; + MCI_DGV_WINDOW_PARMSW mciVideoWindow; + RECT rcToolbarRect; + RECT rcTempRect; + + mciVideoWindow.hWnd = hwnd; + + mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD)(LPSTR)&mciVideoWindow); + if (mciError) + { + return; + } + + mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD)(LPSTR)&mciVideoRect); + if (mciError) + { + return; + } + + if (!bIsSingleWindow) + { + GetWindowRect(hwnd, &PrevWindowPos); + + SetParent(hTrackBar, hToolBar); + + mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE, (DWORD)(LPSTR)&mciVideoRect); + if (mciError) + { + ShowMCIError(hwnd, mciError); + return; + } + + GetWindowRect(hToolBar, &rcToolbarRect); + ResizeClientArea(hwnd, mciVideoRect.rc.right, mciVideoRect.rc.bottom + (rcToolbarRect.bottom - rcToolbarRect.top)); + + mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD)(LPSTR)&mciVideoWindow); + if (mciError) + { + ShowMCIError(hwnd, mciError); + return; + } + + GetWindowRect(hToolBar, &rcTempRect); + MoveWindow(hTrackBar, 180, 0, rcTempRect.right - rcTempRect.left - 180, 25, TRUE); + + CheckMenuItem(hMainMenu, IDM_SWITCHVIEW, MF_BYCOMMAND | MF_CHECKED); + bIsSingleWindow = TRUE; + } + else + { + bIsSingleWindow = FALSE; + CheckMenuItem(hMainMenu, IDM_SWITCHVIEW, MF_BYCOMMAND | MF_UNCHECKED); + + mciVideoWindow.hWnd = MCI_DGV_WINDOW_DEFAULT; + mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD)(LPSTR)&mciVideoWindow); + if (mciError) + { + ShowMCIError(hwnd, mciError); + return; + } + + SetParent(hTrackBar, hwnd); + + MoveWindow(hwnd, PrevWindowPos.left, PrevWindowPos.top, PrevWindowPos.right - PrevWindowPos.left, PrevWindowPos.bottom - PrevWindowPos.top, TRUE); + } +} + static DWORD CloseMciDevice(VOID) { @@ -295,7 +396,7 @@ bIsOpened = TRUE; _tcscpy(szPrevFile, lpFileName); - EnableMenuItems(); + EnableMenuItems(hwnd); return 0; } @@ -307,6 +408,12 @@ { SendMessage(hTrackBar, TBM_SETPOS, (WPARAM) TRUE, (LPARAM) 1); KillTimer(hwnd, IDT_PLAYTIMER); + + if (bIsSingleWindow) + { + SwitchViewMode(hwnd); + } + CloseMciDevice(); } } @@ -497,6 +604,11 @@ LoadString(hInstance, IDS_UNKNOWNFILEEXT, szErrorMessage, sizeof(szErrorMessage) / sizeof(TCHAR)); MessageBox(hwnd, szErrorMessage, szAppTitle, MB_OK | MB_ICONEXCLAMATION); return; + } + + if (bIsOpened) + { + StopPlayback(hwnd); } mciError = OpenMciDevice(hwnd, szDeviceName, szLocalFileName); @@ -622,12 +734,14 @@ { LPRECT pRect = (LPRECT)lParam; - if (pRect->right - pRect->left < MAIN_WINDOW_MIN_WIDTH) - pRect->right = pRect->left + MAIN_WINDOW_MIN_WIDTH; - - if (pRect->bottom - pRect->top != MAIN_WINDOW_HEIGHT) - pRect->bottom = pRect->top + MAIN_WINDOW_HEIGHT; - + if (!bIsSingleWindow) + { + if (pRect->right - pRect->left < MAIN_WINDOW_MIN_WIDTH) + pRect->right = pRect->left + MAIN_WINDOW_MIN_WIDTH; + + if (pRect->bottom - pRect->top != MAIN_WINDOW_HEIGHT) + pRect->bottom = pRect->top + MAIN_WINDOW_HEIGHT; + } return TRUE; } @@ -635,14 +749,33 @@ { RECT Rect; UINT Size; + RECT ToolbarRect; + MCI_DGV_PUT_PARMS mciPut; if (hToolBar && hTrackBar) { SendMessage(hToolBar, TB_AUTOSIZE, 0, 0); SendMessage(hToolBar, TB_GETITEMRECT, 1, (LPARAM)&Rect); - Size = GetSystemMetrics(SM_CYMENU) + Rect.bottom; - MoveWindow(hTrackBar, 0, 0, LOWORD(lParam), HIWORD(lParam) - Size, TRUE); + if (!bIsSingleWindow) + { + Size = GetSystemMetrics(SM_CYMENU) + Rect.bottom; + MoveWindow(hTrackBar, 0, 0, LOWORD(lParam), HIWORD(lParam) - Size, TRUE); + } + else + { + MoveWindow(hTrackBar, 180, 0, LOWORD(lParam) - 180, 25, TRUE); + + GetClientRect(hwnd, &Rect); + GetClientRect(hToolBar, &ToolbarRect); + + mciPut.rc.top = 0; + mciPut.rc.left = 0; + mciPut.rc.right = Rect.right; + mciPut.rc.bottom = Rect.bottom - (ToolbarRect.bottom - ToolbarRect.top) - 2; + + mciSendCommand(wDeviceId, MCI_PUT, MCI_DGV_PUT_DESTINATION | MCI_DGV_RECT | MCI_WAIT, (DWORD)&mciPut); + } } return 0L; } @@ -660,6 +793,15 @@ { SendMessage(hTrackBar, TBM_SETPOS, TRUE, 0); } + } + } + break; + + case WM_NCLBUTTONDBLCLK: + { + if (wParam == HTCAPTION) + { + SwitchViewMode(hwnd); } } break; @@ -732,6 +874,10 @@ break; } + case IDM_SWITCHVIEW: + SwitchViewMode(hwnd); + break; + case IDM_DEVPROPS: ShowDeviceProperties(hwnd); break; Modified: trunk/reactos/base/applications/mplay32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] Sun Aug 24 15:40:34 2014 @@ -41,6 +41,7 @@ #define IDM_VOLUMECTL 1004 #define IDM_DEVPROPS 1005 #define IDM_REPEAT 1006 +#define IDM_SWITCHVIEW 1007 /* ToolBar Icons */ #define TBICON_PLAY 0

1 0

[dquintana] 63939: Sync with trunk r63935.
by dquintana＠svn.reactos.org 24 Aug '14

24 Aug '14

Author: dquintana Date: Sun Aug 24 15:10:11 2014 New Revision: 63939 URL: http://svn.reactos.org/svn/reactos?rev=63939&view=rev Log: Sync with trunk r63935. Added: branches/shell-experiments/include/crt/ivec.h - copied unchanged from r63935, trunk/reactos/include/crt/ivec.h branches/shell-experiments/include/psdk/bthdef.h - copied unchanged from r63935, trunk/reactos/include/psdk/bthdef.h branches/shell-experiments/include/psdk/stralign.h - copied unchanged from r63935, trunk/reactos/include/psdk/stralign.h Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/base/applications/mscutils/eventvwr/eventvwr.c branches/shell-experiments/base/applications/mscutils/eventvwr/lang/bg-BG.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/cs-CZ.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/de-DE.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/el-GR.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/en-US.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/es-ES.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/fr-FR.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/he-IL.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/it-IT.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/ja-JP.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/ko-KR.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/no-NO.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/pl-PL.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/pt-BR.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/ro-RO.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/ru-RU.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/sk-SK.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/sq-AL.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/sv-SE.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/tr-TR.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/uk-UA.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/zh-CN.rc branches/shell-experiments/base/applications/mscutils/eventvwr/resource.h branches/shell-experiments/base/applications/rapps/misc.c branches/shell-experiments/base/shell/explorer/shell/shellfs.cpp branches/shell-experiments/base/shell/explorer/shell/winfs.cpp branches/shell-experiments/base/shell/explorer/shell/winfs.h branches/shell-experiments/boot/bootdata/packages/CMakeLists.txt branches/shell-experiments/cmake/CMakeMacros.cmake branches/shell-experiments/cmake/gcc.cmake branches/shell-experiments/dll/cpl/appwiz/addons.c branches/shell-experiments/dll/cpl/desk/general.c branches/shell-experiments/dll/win32/devmgr/lang/fr-FR.rc branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp branches/shell-experiments/dll/win32/shell32/folders/admintools.cpp branches/shell-experiments/dll/win32/shell32/folders/admintools.h branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp branches/shell-experiments/dll/win32/shell32/folders/cpanel.h branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp branches/shell-experiments/dll/win32/shell32/folders/desktop.h branches/shell-experiments/dll/win32/shell32/folders/fonts.cpp branches/shell-experiments/dll/win32/shell32/folders/fonts.h branches/shell-experiments/dll/win32/shell32/folders/fs.cpp branches/shell-experiments/dll/win32/shell32/folders/fs.h branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp branches/shell-experiments/dll/win32/shell32/folders/mycomp.h branches/shell-experiments/dll/win32/shell32/folders/mydocuments.cpp branches/shell-experiments/dll/win32/shell32/folders/mydocuments.h branches/shell-experiments/dll/win32/shell32/folders/netplaces.cpp branches/shell-experiments/dll/win32/shell32/folders/netplaces.h branches/shell-experiments/dll/win32/shell32/folders/printers.cpp branches/shell-experiments/dll/win32/shell32/folders/printers.h branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp branches/shell-experiments/dll/win32/shell32/folders/recyclebin.h branches/shell-experiments/drivers/filesystems/fastfat/CMakeLists.txt branches/shell-experiments/drivers/filesystems/fastfat/fcb.c branches/shell-experiments/drivers/filesystems/fastfat/fsctl.c branches/shell-experiments/drivers/filesystems/fastfat/rw.c branches/shell-experiments/drivers/filesystems/fastfat/vfat.h branches/shell-experiments/drivers/filesystems/npfs/seinfo.c branches/shell-experiments/drivers/network/ndisuio/main.c branches/shell-experiments/drivers/network/ndisuio/ndisuio.h branches/shell-experiments/drivers/network/ndisuio/protocol.c branches/shell-experiments/drivers/network/tcpip/tcpip/fileobjs.c branches/shell-experiments/hal/halx86/generic/dma.c branches/shell-experiments/include/psdk/driverspecs.h branches/shell-experiments/include/psdk/shobjidl.idl branches/shell-experiments/include/psdk/shtypes.idl branches/shell-experiments/lib/drivers/ip/transport/rawip/rawip.c branches/shell-experiments/lib/drivers/ip/transport/udp/udp.c branches/shell-experiments/media/fonts/UniVGA16.ttf branches/shell-experiments/ntoskrnl/cc/copy.c branches/shell-experiments/ntoskrnl/cc/fs.c branches/shell-experiments/ntoskrnl/cc/view.c branches/shell-experiments/ntoskrnl/config/cmsysini.c branches/shell-experiments/ntoskrnl/include/internal/cc.h branches/shell-experiments/ntoskrnl/io/iomgr/device.c branches/shell-experiments/ntoskrnl/io/pnpmgr/pnpmgr.c branches/shell-experiments/toolchain-gcc.cmake branches/shell-experiments/win32ss/gdi/gdi32/objects/bitmap.c branches/shell-experiments/win32ss/gdi/gdi32/objects/utils.c branches/shell-experiments/win32ss/gdi/ntgdi/dibobj.c branches/shell-experiments/win32ss/gdi/ntgdi/freetype.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/misc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/shell/explorer/shell/shellfs.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Modified: branches/shell-experiments/base/shell/explorer/shell/winfs.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Modified: branches/shell-experiments/base/shell/explorer/shell/winfs.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Modified: branches/shell-experiments/boot/bootdata/packages/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/cmake/CMakeMa… Modified: branches/shell-experiments/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/cmake/gcc.cma… Modified: branches/shell-experiments/dll/cpl/appwiz/addons.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/appwi… Modified: branches/shell-experiments/dll/cpl/desk/general.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/desk/… Modified: branches/shell-experiments/dll/win32/devmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/dev… Modified: branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/admintools.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/admintools.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/cpanel.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/desktop.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/fonts.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/fonts.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/fs.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/fs.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/mycomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/mydocuments.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/mydocuments.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/netplaces.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/netplaces.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/printers.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/printers.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/recyclebin.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/drivers/filesystems/fastfat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/npfs/seinfo.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/network/ndisuio/main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/netwo… Modified: branches/shell-experiments/drivers/network/ndisuio/ndisuio.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/netwo… Modified: branches/shell-experiments/drivers/network/ndisuio/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/netwo… Modified: branches/shell-experiments/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/netwo… Modified: branches/shell-experiments/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/hal/halx86/ge… Modified: branches/shell-experiments/include/psdk/driverspecs.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/shtypes.idl URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/drivers/i… Modified: branches/shell-experiments/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/drivers/i… Modified: branches/shell-experiments/media/fonts/UniVGA16.ttf URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/media/fonts/U… Modified: branches/shell-experiments/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/cc/c… Modified: branches/shell-experiments/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/cc/f… Modified: branches/shell-experiments/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/cc/v… Modified: branches/shell-experiments/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/conf… Modified: branches/shell-experiments/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/incl… Modified: branches/shell-experiments/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/i… Modified: branches/shell-experiments/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/p… Modified: branches/shell-experiments/toolchain-gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/toolchain-gcc… Modified: branches/shell-experiments/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/gdi32/objects/utils.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n…

1 0

[hbelusca] 63938: [MPLAY32] - Add a "Play" menu, add keyboard accelerators and add a repeat mode. Patch by Ricardo Henke. - Few whitespace fixes. - Fix french resources. TO ALL TRANSLATORS: Please ...
by hbelusca＠svn.reactos.org 24 Aug '14

24 Aug '14

Author: hbelusca Date: Sun Aug 24 14:59:44 2014 New Revision: 63938 URL: http://svn.reactos.org/svn/reactos?rev=63938&view=rev Log: [MPLAY32] - Add a "Play" menu, add keyboard accelerators and add a repeat mode. Patch by Ricardo Henke. - Few whitespace fixes. - Fix french resources. TO ALL TRANSLATORS: Please update the translations! CORE-7929 #resolve #comment Committed, thanks! Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc trunk/reactos/base/applications/mplay32/lang/de-DE.rc trunk/reactos/base/applications/mplay32/lang/en-US.rc trunk/reactos/base/applications/mplay32/lang/es-ES.rc trunk/reactos/base/applications/mplay32/lang/fr-FR.rc trunk/reactos/base/applications/mplay32/lang/he-IL.rc trunk/reactos/base/applications/mplay32/lang/it-IT.rc trunk/reactos/base/applications/mplay32/lang/ja-JP.rc trunk/reactos/base/applications/mplay32/lang/nl-NL.rc trunk/reactos/base/applications/mplay32/lang/no-NO.rc trunk/reactos/base/applications/mplay32/lang/pl-PL.rc trunk/reactos/base/applications/mplay32/lang/pt-BR.rc trunk/reactos/base/applications/mplay32/lang/ro-RO.rc trunk/reactos/base/applications/mplay32/lang/ru-RU.rc trunk/reactos/base/applications/mplay32/lang/sk-SK.rc trunk/reactos/base/applications/mplay32/lang/sq-AL.rc trunk/reactos/base/applications/mplay32/lang/sv-SE.rc trunk/reactos/base/applications/mplay32/lang/tr-TR.rc trunk/reactos/base/applications/mplay32/lang/uk-UA.rc trunk/reactos/base/applications/mplay32/lang/zh-CN.rc trunk/reactos/base/applications/mplay32/lang/zh-TW.rc trunk/reactos/base/applications/mplay32/mplay32.c trunk/reactos/base/applications/mplay32/resource.h Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -8,10 +8,17 @@ BEGIN POPUP "&Ð¤Ð°Ð¹Ð»" BEGIN - MENUITEM "&ÐÑÐ²Ð°ÑÑÐ½Ðµ...", IDM_OPEN_FILE - MENUITEM "&ÐÐ°ÑÐ²Ð°ÑÑÐ½Ðµ", IDM_CLOSE_FILE + MENUITEM "&ÐÑÐ²Ð°ÑÑÐ½Ðµ...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&ÐÐ°ÑÐ²Ð°ÑÑÐ½Ðµ\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "ÐÐ·&ÑÐ¾Ð´", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&Device" BEGIN @@ -23,6 +30,15 @@ BEGIN MENUITEM "&ÐÐ°...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -9,10 +9,17 @@ BEGIN POPUP "&Soubor" BEGIN - MENUITEM "&OtevÅÃt...", IDM_OPEN_FILE - MENUITEM "&ZavÅÃt", IDM_CLOSE_FILE + MENUITEM "&OtevÅÃt...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&ZavÅÃt\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&UkonÄit", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&Device" BEGIN @@ -24,6 +31,15 @@ BEGIN MENUITEM "&O programu...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -4,10 +4,17 @@ BEGIN POPUP "&Datei" BEGIN - MENUITEM "Ã&ffnen...", IDM_OPEN_FILE - MENUITEM "Sch&lieÃen", IDM_CLOSE_FILE + MENUITEM "Ã&ffnen...\tStrg+O", IDM_OPEN_FILE + MENUITEM "Sch&lieÃen\tStrg+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Beenden", IDM_EXIT + END + POPUP "&Wiedergabe" + BEGIN + MENUITEM "Wiedergabe/&Pause\tStrg+P", IDC_PLAY + MENUITEM "St&opp\tStrg+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "W&iederholen\tStrg+T", IDM_REPEAT END POPUP "&GerÃ¤t" BEGIN @@ -19,6 +26,15 @@ BEGIN MENUITEM "&Ãber...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -4,10 +4,17 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "&Open...", IDM_OPEN_FILE - MENUITEM "&Close", IDM_CLOSE_FILE + MENUITEM "&Open...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Close\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Exit", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&Device" BEGIN @@ -19,6 +26,15 @@ BEGIN MENUITEM "&About...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -4,10 +4,17 @@ BEGIN POPUP "&Archivo" BEGIN - MENUITEM "&Abrir...", IDM_OPEN_FILE - MENUITEM "&Cerrar", IDM_CLOSE_FILE + MENUITEM "&Abrir...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Cerrar\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Salir", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&Device" BEGIN @@ -19,6 +26,15 @@ BEGIN MENUITEM "&Acerca de...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -4,21 +4,37 @@ BEGIN POPUP "&Fichier" BEGIN - MENUITEM "&Ouvrir...", IDM_OPEN_FILE - MENUITEM "&Fermer", IDM_CLOSE_FILE + MENUITEM "&Ouvrir...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Fermer\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Quitter", IDM_EXIT END - POPUP "&Device" + POPUP "&Lecture" BEGIN - MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM "Lecture/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP MENUITEM SEPARATOR - MENUITEM "&Volume Control", IDM_VOLUMECTL + MENUITEM "RÃ©pÃ©&ter\tCtrl+T", IDM_REPEAT + END + POPUP "PÃ©rip&hÃ©rique" + BEGIN + MENUITEM "&PropriÃ©tÃ©s", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "ContrÃ´le du &volume", IDM_VOLUMECTL END POPUP "&Aide" BEGIN MENUITEM "&Ã propos...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -4,10 +4,17 @@ BEGIN POPUP "&×§×××¥" BEGIN - MENUITEM "&×¤×ª×...", IDM_OPEN_FILE - MENUITEM "&×¡×××¨", IDM_CLOSE_FILE + MENUITEM "&×¤×ª×...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&×¡×××¨\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&××¦×××", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&Device" BEGIN @@ -19,6 +26,15 @@ BEGIN MENUITEM "&×××××ª", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -4,10 +4,17 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "&Apri...", IDM_OPEN_FILE - MENUITEM "&Chiudi", IDM_CLOSE_FILE + MENUITEM "&Apri...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Chiudi\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Esci", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&Device" BEGIN @@ -19,6 +26,15 @@ BEGIN MENUITEM "&Informazioni...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -4,10 +4,17 @@ BEGIN POPUP "ãã¡ã¤ã«(&F)" BEGIN - MENUITEM "éã(&O)...", IDM_OPEN_FILE - MENUITEM "éãã(&C)", IDM_CLOSE_FILE + MENUITEM "éã(&O)...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "éãã(&C)\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "çµäº(&E)", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&Device" BEGIN @@ -19,6 +26,15 @@ BEGIN MENUITEM "ãã¼ã¸ã§ã³æå ±(&A)...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -4,10 +4,17 @@ BEGIN POPUP "&Bestand" BEGIN - MENUITEM "&Openen...", IDM_OPEN_FILE - MENUITEM "&Sluiten", IDM_CLOSE_FILE + MENUITEM "&Openen...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Sluiten\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Afsluiten", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&Device" BEGIN @@ -19,6 +26,15 @@ BEGIN MENUITEM "&Over...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -4,10 +4,17 @@ BEGIN POPUP "&Fil" BEGIN - MENUITEM "&Ãpne...", IDM_OPEN_FILE - MENUITEM "&Lukk", IDM_CLOSE_FILE + MENUITEM "&Ãpne...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Lukk\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Avslutt", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&Device" BEGIN @@ -19,6 +26,15 @@ BEGIN MENUITEM "&Om...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -12,10 +12,17 @@ BEGIN POPUP "&Plik" BEGIN - MENUITEM "&OtwÃ³rz...", IDM_OPEN_FILE - MENUITEM "&Zamknij", IDM_CLOSE_FILE + MENUITEM "&OtwÃ³rz...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Zamknij\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&WyjdÅº", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&UrzÄdzenie" BEGIN @@ -27,6 +34,15 @@ BEGIN MENUITEM "&O programie...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -6,10 +6,17 @@ BEGIN POPUP "&Arquivo" BEGIN - MENUITEM "&Abrir...", IDM_OPEN_FILE - MENUITEM "&Fechar", IDM_CLOSE_FILE + MENUITEM "&Abrir...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Fechar\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Sair", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&Device" BEGIN @@ -21,6 +28,15 @@ BEGIN MENUITEM "&Sobre...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -10,10 +10,17 @@ BEGIN POPUP "&FiÈier" BEGIN - MENUITEM "&Deschidereâ¦", IDM_OPEN_FILE - MENUITEM "Ã&nchide", IDM_CLOSE_FILE + MENUITEM "&Deschidereâ¦\tCtrl+O", IDM_OPEN_FILE + MENUITEM "Ã&nchide\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "I&eÈire", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&Dispozitiv" BEGIN @@ -25,6 +32,15 @@ BEGIN MENUITEM "&Despreâ¦", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -4,10 +4,17 @@ BEGIN POPUP "&Ð¤Ð°Ð¹Ð»" BEGIN - MENUITEM "&ÐÑÐºÑÑÑÑ...", IDM_OPEN_FILE - MENUITEM "&ÐÐ°ÐºÑÑÑÑ", IDM_CLOSE_FILE + MENUITEM "&ÐÑÐºÑÑÑÑ...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&ÐÐ°ÐºÑÑÑÑ\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&ÐÑÑÐ¾Ð´", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾" BEGIN @@ -19,6 +26,15 @@ BEGIN MENUITEM "&Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -9,10 +9,17 @@ BEGIN POPUP "&SÃºbor" BEGIN - MENUITEM "&OtvoriÅ¥...", IDM_OPEN_FILE - MENUITEM "&ZavrieÅ¥", IDM_CLOSE_FILE + MENUITEM "&OtvoriÅ¥...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&ZavrieÅ¥\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "S&konÄiÅ¥", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&Device" BEGIN @@ -24,6 +31,15 @@ BEGIN MENUITEM "Ä&o je...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -8,10 +8,17 @@ BEGIN POPUP "&Skeda" BEGIN - MENUITEM "&Hape...", IDM_OPEN_FILE - MENUITEM "&Mbylle", IDM_CLOSE_FILE + MENUITEM "&Hape...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Mbylle\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Dil", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&Device" BEGIN @@ -23,6 +30,15 @@ BEGIN MENUITEM "&Rreth...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -11,10 +11,17 @@ BEGIN POPUP "&Arkiv" BEGIN - MENUITEM "&Ãppna...", IDM_OPEN_FILE - MENUITEM "&StÃ¤ng", IDM_CLOSE_FILE + MENUITEM "&Ãppna...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&StÃ¤ng\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Avsluta", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&Device" BEGIN @@ -26,6 +33,15 @@ BEGIN MENUITEM "&Om...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -6,10 +6,17 @@ BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN - MENUITEM "&AÃ§...", IDM_OPEN_FILE - MENUITEM "&Kapat", IDM_CLOSE_FILE + MENUITEM "&AÃ§...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&Kapat\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&AygÄ±t" BEGIN @@ -21,6 +28,15 @@ BEGIN MENUITEM "&Ãzerine...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -12,10 +12,17 @@ BEGIN POPUP "&Ð¤Ð°Ð¹Ð»" BEGIN - MENUITEM "&ÐÑÐ´ÐºÑÐ¸ÑÐ¸...", IDM_OPEN_FILE - MENUITEM "&ÐÐ°ÐºÑÐ¸ÑÐ¸", IDM_CLOSE_FILE + MENUITEM "&ÐÑÐ´ÐºÑÐ¸ÑÐ¸...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "&ÐÐ°ÐºÑÐ¸ÑÐ¸\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&ÐÐ¸ÑÑÐ´", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&Device" BEGIN @@ -27,6 +34,15 @@ BEGIN MENUITEM "&ÐÑÐ¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -6,10 +6,17 @@ BEGIN POPUP "æä»¶(&F)" BEGIN - MENUITEM "æå¼... (&O)", IDM_OPEN_FILE - MENUITEM "å³é(&C)", IDM_CLOSE_FILE + MENUITEM "æå¼... (&O)\tCtrl+O", IDM_OPEN_FILE + MENUITEM "å³é(&C)\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "éåº(&E)", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&Device" BEGIN @@ -21,6 +28,15 @@ BEGIN MENUITEM "å³äº... (&A)", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -12,10 +12,17 @@ BEGIN POPUP "æªæ¡(&F)" BEGIN - MENUITEM "éå(&O)...", IDM_OPEN_FILE - MENUITEM "éé(&C)", IDM_CLOSE_FILE + MENUITEM "éå(&O)...\tCtrl+O", IDM_OPEN_FILE + MENUITEM "éé(&C)\tCtrl+W", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "çµæ(&E)", IDM_EXIT + END + POPUP "&Play" + BEGIN + MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY + MENUITEM "St&op\tCtrl+S", IDC_STOP + MENUITEM SEPARATOR + MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT END POPUP "&Device" BEGIN @@ -27,6 +34,15 @@ BEGIN MENUITEM "éæ¼(&A)...", IDM_ABOUT END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^O", IDM_OPEN_FILE + "^W", IDM_CLOSE_FILE + "^P", IDC_PLAY + "^S", IDC_STOP + "^T", IDM_REPEAT END STRINGTABLE Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -18,6 +18,7 @@ WORD wDeviceId; BOOL bIsOpened = FALSE; BOOL bIsPaused = FALSE; +BOOL bRepeat = FALSE; UINT MaxFilePos = 0; @@ -432,6 +433,7 @@ PlayTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) { MCI_STATUS_PARMS mciStatus; + MCI_PLAY_PARMS mciPlay; DWORD dwPos; if (!bIsOpened) KillTimer(hwnd, IDT_PLAYTIMER); @@ -442,7 +444,16 @@ if((UINT)dwPos >= MaxFilePos) { - StopPlayback(hwnd); + if (!bRepeat) + { + StopPlayback(hwnd); + } + else + { + mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0); + mciPlay.dwCallback = (DWORD_PTR)hwnd; + mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY, (DWORD_PTR)&mciPlay); + } } else { @@ -548,9 +559,11 @@ switch (Message) { case WM_CREATE: + { InitControls(hwnd); hMainMenu = GetMenu(hwnd); break; + } case WM_DROPFILES: { @@ -579,25 +592,25 @@ { case IDC_PLAY: lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PLAY); - break; + break; case IDC_STOP: lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_STOP); - break; + break; case IDC_EJECT: lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_EJECT); - break; + break; case IDC_BACKWARD: lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_BACKWARD); - break; + break; case IDC_SEEKBACK: lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_SEEKBACK); - break; + break; case IDC_SEEKFORW: lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_SEEKFORW); - break; + break; case IDC_FORWARD: lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_FORWARD); - break; + break; } break; } @@ -652,9 +665,11 @@ break; case WM_COMMAND: + { switch (LOWORD(wParam)) { case IDC_PLAY: + { if (bIsOpened) { if (bIsPaused) @@ -670,6 +685,7 @@ PlayFile(hwnd, NULL); } break; + } case IDC_STOP: StopPlayback(hwnd); @@ -701,6 +717,21 @@ _tcscpy(szPrevFile, _T("\0")); break; + case IDM_REPEAT: + { + if (!bRepeat) + { + CheckMenuItem(hMainMenu, IDM_REPEAT, MF_BYCOMMAND | MF_CHECKED); + bRepeat = TRUE; + } + else + { + CheckMenuItem(hMainMenu, IDM_REPEAT, MF_BYCOMMAND | MF_UNCHECKED); + bRepeat = FALSE; + } + break; + } + case IDM_DEVPROPS: ShowDeviceProperties(hwnd); break; @@ -710,17 +741,19 @@ break; case IDM_ABOUT: - { + { HICON mplayIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN)); ShellAbout(hwnd, szAppTitle, 0, mplayIcon); - DeleteObject(mplayIcon); - break; - } + DeleteObject(mplayIcon); + break; + } + case IDM_EXIT: PostMessage(hwnd, WM_CLOSE, 0, 0); return 0; } break; + } case WM_DESTROY: StopPlayback(hwnd); @@ -739,6 +772,7 @@ HWND hwnd; MSG msg; DWORD dwError; + HANDLE hAccel; hInstance = hInst; @@ -777,6 +811,8 @@ return 0; } + hAccel = LoadAccelerators(hInstance, MAKEINTRESOURCE(ID_ACCELERATORS)); + DragAcceptFiles(hwnd, TRUE); DisableMenuItems(); @@ -796,9 +832,14 @@ /* Message Loop */ while (GetMessage(&msg, NULL, 0, 0)) { - TranslateMessage(&msg); - DispatchMessage(&msg); - } + if (!TranslateAccelerator(hwnd, hAccel, &msg)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + + DestroyAcceleratorTable(hAccel); return (INT)msg.wParam; } Modified: trunk/reactos/base/applications/mplay32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] Sun Aug 24 14:59:44 2014 @@ -30,6 +30,9 @@ /* Menu */ #define IDR_MAINMENU 500 +/* Accelerators */ +#define ID_ACCELERATORS 800 + /* Menu items */ #define IDM_OPEN_FILE 1000 #define IDM_CLOSE_FILE 1001 @@ -37,6 +40,7 @@ #define IDM_ABOUT 1003 #define IDM_VOLUMECTL 1004 #define IDM_DEVPROPS 1005 +#define IDM_REPEAT 1006 /* ToolBar Icons */ #define TBICON_PLAY 0

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
23
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 August 2014