Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[hbelusca] 66753: [NTOS]: Addendum to r66735: move the code that prints our revision number in the SOS banner to a different place, in order to remain NT-compatible (that is, the CSDVersion string ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Mar 17 03:04:20 2015 New Revision: 66753 URL: http://svn.reactos.org/svn/reactos?rev=66753&view=rev Log: [NTOS]: Addendum to r66735: move the code that prints our revision number in the SOS banner to a different place, in order to remain NT-compatible (that is, the CSDVersion string should only contain "Service Pack ###" or "Service Pack ###, v.###" according to the value of the CSDReleaseType registry value). Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=667… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Tue Mar 17 03:04:20 2015 @@ -1217,13 +1217,10 @@ } /* Add the version format string */ - /* ReactOS specific: Append also the revision number */ Status = RtlStringCbPrintfA(RcEnd, Remaining, - "v.%u" - " r%u", - (CmNtCSDVersion & 0xFFFF0000) >> 16, - KERNEL_VERSION_BUILD_HEX); + "v.%u", + (CmNtCSDVersion & 0xFFFF0000) >> 16); if (!NT_SUCCESS(Status)) { /* Fail */ @@ -1429,12 +1426,15 @@ if (CmCSDVersionString.Length) { /* Print the version string */ + /* ReactOS specific: Append also the revision number */ Status = RtlStringCbPrintfExA(StringBuffer, Remaining, &EndBuffer, &Remaining, 0, + " r%u" ": %wZ", + KERNEL_VERSION_BUILD_HEX, &CmCSDVersionString); if (!NT_SUCCESS(Status)) {

9 years, 6 months

[hbelusca] 66752: [RSHELL]: Sync back with r66271.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Mar 17 01:53:16 2015 New Revision: 66752 URL: http://svn.reactos.org/svn/reactos?rev=66752&view=rev Log: [RSHELL]: Sync back with r66271. Modified: trunk/reactos/base/shell/rshell/CDesktopBrowser.cpp Modified: trunk/reactos/base/shell/rshell/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CDesktop… ============================================================================== --- trunk/reactos/base/shell/rshell/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CDesktopBrowser.cpp [iso-8859-1] Tue Mar 17 01:53:16 2015 @@ -22,7 +22,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(desktop); -#define SHDESK_TAG 0x4b534544 +#define SHDESK_TAG 'KSED' static const WCHAR szProgmanClassName [] = L"Progman"; static const WCHAR szProgmanWindowName [] = L"Program Manager"; @@ -497,7 +497,7 @@ wcProgman.hInstance = shell32_hInstance; wcProgman.hIcon = NULL; wcProgman.hCursor = LoadCursorW(NULL, IDC_ARROW); - wcProgman.hbrBackground = (HBRUSH) (COLOR_BACKGROUND + 1); + wcProgman.hbrBackground = NULL; wcProgman.lpszMenuName = NULL; wcProgman.lpszClassName = szProgmanClassName;

9 years, 6 months

[hbelusca] 66751: Sync with trunk r66750.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Mar 17 01:27:57 2015 New Revision: 66751 URL: http://svn.reactos.org/svn/reactos?rev=66751&view=rev Log: Sync with trunk r66750. Removed: branches/ReactOS-0.3.17-CLT2015/reactos/include/reactos/winlogon.h Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ (props changed) branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/bg-BG.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/cs-CZ.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/de-DE.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/en-US.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/es-ES.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/fr-FR.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/he-IL.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/it-IT.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/ja-JP.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/nl-NL.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/no-NO.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/pl-PL.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/pt-BR.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/ro-RO.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/ru-RU.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/sk-SK.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/sq-AL.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/sv-SE.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/tr-TR.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/uk-UA.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/zh-CN.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/zh-TW.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/mplay32.c branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/resource.h branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/bg-BG.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/cs-CZ.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/de-DE.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/en-US.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/es-ES.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/fr-FR.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/he-IL.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/it-IT.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/ja-JP.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/no-NO.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/pl-PL.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/pt-BR.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/ro-RO.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/ru-RU.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/sk-SK.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/sq-AL.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/sv-SE.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/tr-TR.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/uk-UA.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/zh-CN.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/zh-TW.rc branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/settingsdlg.c branches/ReactOS-0.3.17-CLT2015/reactos/base/shell/rshell/CMenuToolbars.cpp branches/ReactOS-0.3.17-CLT2015/reactos/base/system/winlogon/sas.c branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/hivesft.inf branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/hivesys.inf branches/ReactOS-0.3.17-CLT2015/reactos/dll/ntdll/ldr/ldrinit.c branches/ReactOS-0.3.17-CLT2015/reactos/dll/ntdll/ldr/ldrutils.c branches/ReactOS-0.3.17-CLT2015/reactos/dll/ntdll/rtl/version.c branches/ReactOS-0.3.17-CLT2015/reactos/dll/shellext/ntobjshex/ntobjns.cpp branches/ReactOS-0.3.17-CLT2015/reactos/dll/shellext/ntobjshex/regfolder.cpp branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/kernel32/winnls/string/nls.c branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/netapi32/access.c branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/netapi32/netapi32.c branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/netapi32/netapi32.spec branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/netapi32/wksta_new.c branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/CDefView.cpp branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/wine/shellpath.c branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/syssetup/install.c branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/userenv/setup.c branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/mouse.c branches/ReactOS-0.3.17-CLT2015/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.c branches/ReactOS-0.3.17-CLT2015/reactos/drivers/multimedia/audio/sndblst.old/sndblst.c branches/ReactOS-0.3.17-CLT2015/reactos/include/reactos/undocuser.h branches/ReactOS-0.3.17-CLT2015/reactos/lib/drivers/ip/network/interface.c branches/ReactOS-0.3.17-CLT2015/reactos/lib/rtl/version.c branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/config/cmdata.c branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/config/cmsysini.c branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ex/init.c branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/include/internal/ex.h branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/io/iomgr/driver.c branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/io/iomgr/iomgr.c branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/kdbg/kdb_cli.c branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ps/psmgr.c branches/ReactOS-0.3.17-CLT2015/reactos/win32ss/gdi/ntgdi/brush.h branches/ReactOS-0.3.17-CLT2015/reactos/win32ss/gdi/ntgdi/color.h branches/ReactOS-0.3.17-CLT2015/reactos/win32ss/gdi/ntgdi/path.h branches/ReactOS-0.3.17-CLT2015/reactos/win32ss/gdi/ntgdi/region.h branches/ReactOS-0.3.17-CLT2015/reactos/win32ss/user/ntuser/desktop.c branches/ReactOS-0.3.17-CLT2015/reactos/win32ss/user/ntuser/shutdown.c branches/ReactOS-0.3.17-CLT2015/reactos/win32ss/user/winsrv/usersrv/shutdown.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/mplay32/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/applications/rapps/settingsdlg.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/ntdll/rtl/version.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/shellext/ntobjshex/ntobjns.cpp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/shellext/ntobjshex/regfolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/netapi32/netapi32.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/netapi32/wksta_new.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/wine/shellpath.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/userenv/setup.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/drivers/multimedia/audio/sndblst.old/sndblst.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Removed: branches/ReactOS-0.3.17-CLT2015/reactos/include/reactos/winlogon.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/lib/drivers/ip/network/interface.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/lib/rtl/version.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/win32ss/gdi/ntgdi/color.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/win32ss/gdi/ntgdi/path.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/win32ss/gdi/ntgdi/region.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/win32ss/user/ntuser/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… Modified: branches/ReactOS-0.3.17-CLT2015/reactos/win32ss/user/winsrv/usersrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…

9 years, 6 months

[hbelusca] 66750: [WIN32K]: Since I don't have time to properly fix the desktop version painting for the CLT 2015 release, I hackfix that by printing a hardcoded version string built up from our st...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Mar 17 01:17:26 2015 New Revision: 66750 URL: http://svn.reactos.org/svn/reactos?rev=66750&view=rev Log: [WIN32K]: Since I don't have time to properly fix the desktop version painting for the CLT 2015 release, I hackfix that by printing a hardcoded version string built up from our static build numbers. Modified: trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Tue Mar 17 01:17:26 2015 @@ -10,6 +10,8 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserDesktop); + +#include <reactos/buildno.h> static NTSTATUS UserInitializeDesktop(PDESKTOP pdesk, PUNICODE_STRING DesktopName, PWINSTATION_OBJECT pwinsta); @@ -241,23 +243,27 @@ static int GetSystemVersionString(LPWSTR buffer) { - RTL_OSVERSIONINFOEXW versionInfo; - int len; - - versionInfo.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); - - if (!NT_SUCCESS(RtlGetVersion((PRTL_OSVERSIONINFOW)&versionInfo))) - return 0; - - if (versionInfo.dwMajorVersion <= 4) - len = swprintf(buffer, - L"ReactOS Version %lu.%lu %s Build %lu", - versionInfo.dwMajorVersion, versionInfo.dwMinorVersion, - versionInfo.szCSDVersion, versionInfo.dwBuildNumber&0xFFFF); - else - len = swprintf(buffer, - L"ReactOS %s (Build %lu)", - versionInfo.szCSDVersion, versionInfo.dwBuildNumber&0xFFFF); + int len; +#if 0 // Disabled until versioning in win32k gets correctly implemented (hbelusca). + RTL_OSVERSIONINFOEXW versionInfo; + + versionInfo.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); + + if (!NT_SUCCESS(RtlGetVersion((PRTL_OSVERSIONINFOW)&versionInfo))) + return 0; + + if (versionInfo.dwMajorVersion <= 4) + len = swprintf(buffer, + L"ReactOS Version %lu.%lu %s Build %lu", + versionInfo.dwMajorVersion, versionInfo.dwMinorVersion, + versionInfo.szCSDVersion, versionInfo.dwBuildNumber & 0xFFFF); + else + len = swprintf(buffer, + L"ReactOS %s (Build %lu)", + versionInfo.szCSDVersion, versionInfo.dwBuildNumber & 0xFFFF); +#else + len = swprintf(buffer, L"ReactOS Version %S %S", KERNEL_VERSION_STR, KERNEL_VERSION_BUILD_STR); +#endif return len; } @@ -988,37 +994,33 @@ BOOL FASTCALL IntPaintDesktop(HDC hDC) { - RECTL Rect; - HBRUSH DesktopBrush, PreviousBrush; - HWND hWndDesktop; - BOOL doPatBlt = TRUE; - PWND WndDesktop; - static WCHAR s_wszSafeMode[] = L"Safe Mode"; - int len; - COLORREF color_old; - UINT align_old; - int mode_old; - - if (GdiGetClipBox(hDC, &Rect) == ERROR) - { - return FALSE; - } - - hWndDesktop = IntGetDesktopWindow(); // rpdesk->DesktopWindow; - - WndDesktop = UserGetWindowObject(hWndDesktop); // rpdesk->pDeskInfo->spwnd; - if (!WndDesktop) - { - return FALSE; - } + RECTL Rect; + HBRUSH DesktopBrush, PreviousBrush; + HWND hWndDesktop; + BOOL doPatBlt = TRUE; + PWND WndDesktop; + static WCHAR s_wszSafeMode[] = L"Safe Mode"; + int len; + COLORREF color_old; + UINT align_old; + int mode_old; + + if (GdiGetClipBox(hDC, &Rect) == ERROR) + return FALSE; + + hWndDesktop = IntGetDesktopWindow(); // rpdesk->DesktopWindow; + + WndDesktop = UserGetWindowObject(hWndDesktop); // rpdesk->pDeskInfo->spwnd; + if (!WndDesktop) + return FALSE; if (!UserGetSystemMetrics(SM_CLEANBOOT)) { DesktopBrush = (HBRUSH)WndDesktop->pcls->hbrBackground; /* - * Paint desktop background - */ + * Paint desktop background + */ if (gspv.hbmWallpaper != NULL) { SIZE sz; @@ -1077,7 +1079,6 @@ gspv.cyWallpaper, SRCCOPY, 0); - } else if (gspv.WallpaperMode == wmTile) { @@ -1124,43 +1125,43 @@ /* Black desktop background in Safe Mode */ DesktopBrush = StockObjects[BLACK_BRUSH]; } - /* Back ground is set to none, clear the screen */ + /* Background is set to none, clear the screen */ if (doPatBlt) { - PreviousBrush = NtGdiSelectBrush(hDC, DesktopBrush); - NtGdiPatBlt(hDC, Rect.left, Rect.top, Rect.right, Rect.bottom, PATCOPY); - NtGdiSelectBrush(hDC, PreviousBrush); - } - - /* - * Display system version on the desktop background - */ - - if (g_PaintDesktopVersion || UserGetSystemMetrics(SM_CLEANBOOT)) - { - static WCHAR s_wszVersion[256] = {0}; - RECTL rect; - - if (*s_wszVersion) - { - len = wcslen(s_wszVersion); - } - else - { - len = GetSystemVersionString(s_wszVersion); - } - - if (len) - { - if (!UserSystemParametersInfo(SPI_GETWORKAREA, 0, &rect, 0)) - { - rect.right = UserGetSystemMetrics(SM_CXSCREEN); - rect.bottom = UserGetSystemMetrics(SM_CYSCREEN); - } - - color_old = IntGdiSetTextColor(hDC, RGB(255,255,255)); - align_old = IntGdiSetTextAlign(hDC, TA_RIGHT); - mode_old = IntGdiSetBkMode(hDC, TRANSPARENT); + PreviousBrush = NtGdiSelectBrush(hDC, DesktopBrush); + NtGdiPatBlt(hDC, Rect.left, Rect.top, Rect.right, Rect.bottom, PATCOPY); + NtGdiSelectBrush(hDC, PreviousBrush); + } + + /* + * Display system version on the desktop background + */ + + if (g_PaintDesktopVersion || UserGetSystemMetrics(SM_CLEANBOOT)) + { + static WCHAR s_wszVersion[256] = {0}; + RECTL rect; + + if (*s_wszVersion) + { + len = wcslen(s_wszVersion); + } + else + { + len = GetSystemVersionString(s_wszVersion); + } + + if (len) + { + if (!UserSystemParametersInfo(SPI_GETWORKAREA, 0, &rect, 0)) + { + rect.right = UserGetSystemMetrics(SM_CXSCREEN); + rect.bottom = UserGetSystemMetrics(SM_CYSCREEN); + } + + color_old = IntGdiSetTextColor(hDC, RGB(255,255,255)); + align_old = IntGdiSetTextAlign(hDC, TA_RIGHT); + mode_old = IntGdiSetBkMode(hDC, TRANSPARENT); if(!UserGetSystemMetrics(SM_CLEANBOOT)) { @@ -1186,12 +1187,12 @@ GreExtTextOutW(hDC, rect.right, rect.bottom - 5, 0, NULL, s_wszSafeMode, len, NULL, 0); } - IntGdiSetBkMode(hDC, mode_old); - IntGdiSetTextAlign(hDC, align_old); - IntGdiSetTextColor(hDC, color_old); - } - } - return TRUE; + IntGdiSetBkMode(hDC, mode_old); + IntGdiSetTextAlign(hDC, align_old); + IntGdiSetTextColor(hDC, color_old); + } + } + return TRUE; } static NTSTATUS

9 years, 6 months

[hbelusca] 66749: [SHELL32]: We need to also use the fonts string for the szValueName of the reg value (otherwise the default reg value gets the fonts dir path). Addendum to r66748. CORE-9362

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 16 23:48:31 2015 New Revision: 66749 URL: http://svn.reactos.org/svn/reactos?rev=66749&view=rev Log: [SHELL32]: We need to also use the fonts string for the szValueName of the reg value (otherwise the default reg value gets the fonts dir path). Addendum to r66748. CORE-9362 Modified: trunk/reactos/dll/win32/shell32/wine/shellpath.c Modified: trunk/reactos/dll/win32/shell32/wine/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shellpath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shellpath.c [iso-8859-1] Mon Mar 16 23:48:31 2015 @@ -787,7 +787,7 @@ { /* 0x14 - CSIDL_FONTS */ &FOLDERID_Fonts, CSIDL_Type_WindowsPath, - NULL, + FontsW, FontsW }, { /* 0x15 - CSIDL_TEMPLATES */

9 years, 6 months

[hbelusca] 66748: [SHELL32]: Fonts folder should point to C:\ReactOS\Fonts instead of C:\ReactOS :-) (and it is not internationalized).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 16 22:48:58 2015 New Revision: 66748 URL: http://svn.reactos.org/svn/reactos?rev=66748&view=rev Log: [SHELL32]: Fonts folder should point to C:\ReactOS\Fonts instead of C:\ReactOS :-) (and it is not internationalized). Modified: trunk/reactos/dll/win32/shell32/wine/shellpath.c trunk/reactos/dll/win32/userenv/setup.c Modified: trunk/reactos/dll/win32/shell32/wine/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shellpath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shellpath.c [iso-8859-1] Mon Mar 16 22:48:58 2015 @@ -787,8 +787,8 @@ { /* 0x14 - CSIDL_FONTS */ &FOLDERID_Fonts, CSIDL_Type_WindowsPath, - FontsW, - MAKEINTRESOURCEW(IDS_FONTS) + NULL, + FontsW }, { /* 0x15 - CSIDL_TEMPLATES */ &FOLDERID_Templates, Modified: trunk/reactos/dll/win32/userenv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/setup.c?… ============================================================================== --- trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] Mon Mar 16 22:48:58 2015 @@ -331,7 +331,7 @@ /* Set 'Fonts' folder path */ GetWindowsDirectoryW(szBuffer, MAX_PATH); - wcscat(szBuffer, L"\\fonts"); + wcscat(szBuffer, L"\\Fonts"); dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); Error = RegSetValueExW(hKey,

9 years, 6 months

[hbelusca] 66747: Fix some printf specifiers...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 16 22:10:59 2015 New Revision: 66747 URL: http://svn.reactos.org/svn/reactos?rev=66747&view=rev Log: Fix some printf specifiers... Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/drivers/input/i8042prt/mouse.c trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.c trunk/reactos/drivers/multimedia/audio/sndblst.old/sndblst.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Mon Mar 16 22:10:59 2015 @@ -478,7 +478,7 @@ hret = SHGetFolderPathW(NULL, csidl, NULL, 0, szPath); if (FAILED(hret)) { - FatalError("SHGetFolderPathW failed hret=0x%d\n", hret); + FatalError("SHGetFolderPathW failed hret=0x%lx\n", hret); continue; } Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mou… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] Mon Mar 16 22:10:59 2015 @@ -178,7 +178,7 @@ break; default: - ERR_(I8042PRT, "Unexpected state 0x%u!\n", DeviceExtension->MouseState); + ERR_(I8042PRT, "Unexpected state 0x%lx!\n", DeviceExtension->MouseState); ASSERT(FALSE); } } Modified: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.c [iso-8859-1] Mon Mar 16 22:10:59 2015 @@ -258,7 +258,7 @@ DPRINT("Received IOCTL_MIDI_PLAY\n"); Data = (PUCHAR) Irp->AssociatedIrp.SystemBuffer; - DPRINT("Sending %d bytes of MIDI data to 0x%d:\n", Stack->Parameters.DeviceIoControl.InputBufferLength, DeviceExtension->Port); + DPRINT("Sending %d bytes of MIDI data to 0x%x:\n", Stack->Parameters.DeviceIoControl.InputBufferLength, DeviceExtension->Port); for (ByteCount = 0; ByteCount < Stack->Parameters.DeviceIoControl.InputBufferLength; ByteCount ++) { Modified: trunk/reactos/drivers/multimedia/audio/sndblst.old/sndblst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/s… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/sndblst.old/sndblst.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/audio/sndblst.old/sndblst.c [iso-8859-1] Mon Mar 16 22:10:59 2015 @@ -316,7 +316,7 @@ DPRINT("Received IOCTL_MIDI_PLAY\n"); Data = (PUCHAR) Irp->AssociatedIrp.SystemBuffer; - DPRINT("Sending %d bytes of MIDI data to 0x%d:\n", Stack->Parameters.DeviceIoControl.InputBufferLength, DeviceExtension->Port); + DPRINT("Sending %d bytes of MIDI data to 0x%x:\n", Stack->Parameters.DeviceIoControl.InputBufferLength, DeviceExtension->Port); for (ByteCount = 0; ByteCount < Stack->Parameters.DeviceIoControl.InputBufferLength; ByteCount ++) {

9 years, 6 months

[hbelusca] 66746: [MPLAY32]: - Improve the app's title by printing the filename and the current state of the player. By Ricardo Hanke. - Fix pause state retrieval.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 16 21:16:07 2015 New Revision: 66746 URL: http://svn.reactos.org/svn/reactos?rev=66746&view=rev Log: [MPLAY32]: - Improve the app's title by printing the filename and the current state of the player. By Ricardo Hanke. - Fix pause state retrieval. 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] Mon Mar 16 21:16:07 2015 @@ -47,6 +47,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "ÐÑÐ¸ÑÐºÐ¸ Ð¿Ð¾Ð´Ð´ÑÑÐ¶Ð°Ð½Ð¸" IDS_TOOLTIP_PLAY "ÐÑÑÐºÐ°Ð½Ðµ" IDS_TOOLTIP_STOP "Ð¡Ð¿Ð¸ÑÐ°Ð½Ðµ" 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] Mon Mar 16 21:16:07 2015 @@ -48,6 +48,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "VÅ¡echny podporovanÃ©" IDS_TOOLTIP_PLAY "PÅehrÃ¡t" IDS_TOOLTIP_STOP "Zastavit" 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] Mon Mar 16 21:16:07 2015 @@ -43,6 +43,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unbekannt" + IDS_MODE_OPEN "GeÃ¶ffnet" + IDS_MODE_STOP "Angehalten" + IDS_MODE_PLAY "Wiedergabe" + IDS_MODE_PAUSE "Pause" + IDS_MODE_RECORD "Aufnehmen" + IDS_MODE_SEEK "Spulen" + IDS_MODE_NOT_READY "Nicht bereit" IDS_ALL_TYPES_FILTER "Alle unterstÃ¼tzten" IDS_TOOLTIP_PLAY "Wiedergabe" IDS_TOOLTIP_STOP "Stopp" 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] Mon Mar 16 21:16:07 2015 @@ -43,6 +43,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "All Supported" IDS_TOOLTIP_PLAY "Play" IDS_TOOLTIP_STOP "Stop" 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] Mon Mar 16 21:16:07 2015 @@ -43,6 +43,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "Todos los archivos soportados" IDS_TOOLTIP_PLAY "Reproducir" IDS_TOOLTIP_STOP "Detener" 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] Mon Mar 16 21:16:07 2015 @@ -43,6 +43,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Inconnu" + IDS_MODE_OPEN "Ouvert" + IDS_MODE_STOP "ArrÃªtÃ©" + IDS_MODE_PLAY "Lecture" + IDS_MODE_PAUSE "En pause" + IDS_MODE_RECORD "Enregistrement" + IDS_MODE_SEEK "Recherche" + IDS_MODE_NOT_READY "Pas prÃªt" IDS_ALL_TYPES_FILTER "Tous les types supportÃ©s" IDS_TOOLTIP_PLAY "Lecture" IDS_TOOLTIP_STOP "Stop" 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] Mon Mar 16 21:16:07 2015 @@ -43,6 +43,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "×× ××§××¦×× ×× ×ª××××" IDS_TOOLTIP_PLAY "× ××" IDS_TOOLTIP_STOP "×¢×¦××¨" 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] Mon Mar 16 21:16:07 2015 @@ -43,6 +43,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "Tutti i tipi supportati" IDS_TOOLTIP_PLAY "Riproduci" IDS_TOOLTIP_STOP "Interrompi" 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] Mon Mar 16 21:16:07 2015 @@ -43,6 +43,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "ãã¹ã¦ã®ãµãã¼ãããããã¡ã¤ã«" IDS_TOOLTIP_PLAY "åç" IDS_TOOLTIP_STOP "åæ¢" 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] Mon Mar 16 21:16:07 2015 @@ -43,6 +43,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "Mediabestanden" IDS_TOOLTIP_PLAY "Afspelen" IDS_TOOLTIP_STOP "Stoppen" 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] Mon Mar 16 21:16:07 2015 @@ -43,6 +43,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "Alle kompaktible filer" IDS_TOOLTIP_PLAY "Spill av" IDS_TOOLTIP_STOP "Stopp" 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] Mon Mar 16 21:16:07 2015 @@ -51,6 +51,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "Wszystkie formaty" IDS_TOOLTIP_PLAY "Odtwarzaj" IDS_TOOLTIP_STOP "Zatrzymaj" 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] Mon Mar 16 21:16:07 2015 @@ -45,6 +45,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "Todos os formatos" IDS_TOOLTIP_PLAY "Executar" IDS_TOOLTIP_STOP "Pausar" 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] Mon Mar 16 21:16:07 2015 @@ -49,6 +49,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "Toate admisibile" IDS_TOOLTIP_PLAY "Redare conÈinut multimedia" IDS_TOOLTIP_STOP "Oprirea lecturii" 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] Mon Mar 16 21:16:07 2015 @@ -43,6 +43,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "ÐÑÐµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÐ¼ÑÐµ" IDS_TOOLTIP_PLAY "ÐÐ¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ" IDS_TOOLTIP_STOP "ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ" 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] Mon Mar 16 21:16:07 2015 @@ -48,6 +48,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "VÅ¡etky podporovanÃ©" IDS_TOOLTIP_PLAY "PrehraÅ¥" IDS_TOOLTIP_STOP "ZastaviÅ¥" 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] Mon Mar 16 21:16:07 2015 @@ -47,6 +47,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "TÃ« gjith suportimet" IDS_TOOLTIP_PLAY "Fillo" IDS_TOOLTIP_STOP "Ndalo" 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] Mon Mar 16 21:16:07 2015 @@ -50,6 +50,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "Alla kompaktibla filer" IDS_TOOLTIP_PLAY "Spela upp" IDS_TOOLTIP_STOP "Stopp" 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] Mon Mar 16 21:16:07 2015 @@ -45,6 +45,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "Desteklenen KÃ¼tÃ¼kler" IDS_TOOLTIP_PLAY "Ãal" IDS_TOOLTIP_STOP "Durdur" 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] Mon Mar 16 21:16:07 2015 @@ -51,6 +51,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "ÐÑÑ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÐ²Ð°Ð½Ñ" IDS_TOOLTIP_PLAY "ÐÑÐ´ÑÐ²Ð¾ÑÐµÐ½Ð½Ñ" IDS_TOOLTIP_STOP "ÐÑÐ¿Ð¸Ð½Ð¸ÑÐ¸" 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] Mon Mar 16 21:16:07 2015 @@ -45,6 +45,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "æææ¯æçæ ¼å¼" IDS_TOOLTIP_PLAY "ææ¾" IDS_TOOLTIP_STOP "åæ¢" 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] Mon Mar 16 21:16:07 2015 @@ -51,6 +51,14 @@ STRINGTABLE BEGIN + IDS_MODE_UNKNOWN "Unknown" + IDS_MODE_OPEN "Opened" + IDS_MODE_STOP "Stopped" + IDS_MODE_PLAY "Playing" + IDS_MODE_PAUSE "Paused" + IDS_MODE_RECORD "Recording" + IDS_MODE_SEEK "Seeking" + IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "æææ¯æ´æ ¼å¼" IDS_TOOLTIP_PLAY "ææ¾" IDS_TOOLTIP_STOP "åæ¢" 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] Mon Mar 16 21:16:07 2015 @@ -19,13 +19,16 @@ TCHAR szAppTitle[256] = _T(""); TCHAR szDefaultFilter[MAX_PATH] = _T(""); -TCHAR *szFilter = NULL; +TCHAR szCurrentFile[MAX_PATH] = _T(""); +LPTSTR szFilter = NULL; WORD wDeviceId = 0; BOOL bRepeat = FALSE; BOOL bIsSingleWindow = FALSE; UINT MaxFilePos = 0; RECT PrevWindowPos; + +static DWORD GetDeviceMode(HWND hwnd); /* ToolBar Buttons */ static const TBBUTTON Buttons[] = @@ -87,6 +90,71 @@ 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); +} + +void UpdateWindowCaption(HWND hwnd) +{ + TCHAR szNewTitle[MAX_PATH + 3 + 256]; + TCHAR szStatus[128]; + + if (wDeviceId == 0) + { + SetWindowText(hwnd, szAppTitle); + return; + } + + switch (GetDeviceMode(hwnd)) + { + case MCI_MODE_PAUSE: + { + LoadString(hInstance, IDS_MODE_PAUSE, szStatus, ARRAYSIZE(szStatus)); + break; + } + + case MCI_MODE_STOP: + { + LoadString(hInstance, IDS_MODE_STOP, szStatus, ARRAYSIZE(szStatus)); + break; + } + + case MCI_MODE_PLAY: + { + LoadString(hInstance, IDS_MODE_PLAY, szStatus, ARRAYSIZE(szStatus)); + break; + } + + case MCI_MODE_OPEN: + { + LoadString(hInstance, IDS_MODE_OPEN, szStatus, ARRAYSIZE(szStatus)); + break; + } + + case MCI_MODE_RECORD: + { + LoadString(hInstance, IDS_MODE_RECORD, szStatus, ARRAYSIZE(szStatus)); + break; + } + + case MCI_MODE_SEEK: + { + LoadString(hInstance, IDS_MODE_SEEK, szStatus, ARRAYSIZE(szStatus)); + break; + } + + case MCI_MODE_NOT_READY: + { + LoadString(hInstance, IDS_MODE_NOT_READY, szStatus, ARRAYSIZE(szStatus)); + break; + } + + default: + { + LoadString(hInstance, IDS_MODE_UNKNOWN, szStatus, ARRAYSIZE(szStatus)); + } + } + + StringCbPrintf(szNewTitle, sizeof(szNewTitle), _T("%s - %s (%s)"), szAppTitle, szCurrentFile, szStatus); + SetWindowText(hwnd, szNewTitle); } static VOID @@ -375,7 +443,7 @@ MCI_STATUS_PARMS mciStatus; MCI_OPEN_PARMS mciOpen; DWORD dwFlags = MCI_OPEN_ELEMENT | MCI_WAIT; - TCHAR szNewTitle[MAX_PATH + 3 + 256]; + LPTSTR lpStr; if (wDeviceId) CloseMciDevice(); @@ -422,13 +490,22 @@ SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM)100000, (LPARAM)0); } - StringCbPrintf(szNewTitle, sizeof(szNewTitle), _T("%s - %s"), szAppTitle, lpFileName); - SetWindowText(hwnd, szNewTitle); - MaxFilePos = mciStatus.dwReturn; wDeviceId = mciOpen.wDeviceID; + /* NOTE: Everything above this line may be done instead in OpenMediaFile() */ + + lpStr = _tcsrchr(lpFileName, _T('\\')); + if (lpStr) // Get only the file name (skip the last path separator) + lpStr++; + else + lpStr = lpFileName; + + StringCbCopy(szCurrentFile, sizeof(szCurrentFile), lpStr); + EnableMenuItems(hwnd); + + UpdateWindowCaption(hwnd); return 0; } @@ -470,6 +547,8 @@ } mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0); + + UpdateWindowCaption(hwnd); SendMessage(hToolBar, TB_SETCMDID, @@ -604,6 +683,8 @@ return; } + UpdateWindowCaption(hwnd); + SendMessage(hToolBar, TB_SETCMDID, 0, @@ -636,7 +717,7 @@ case MCI_MODE_PLAY: { mciGeneric.dwCallback = (DWORD_PTR)hwnd; - mciError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_NOTIFY, (DWORD_PTR)&mciGeneric); + mciError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_NOTIFY | MCI_WAIT, (DWORD_PTR)&mciGeneric); idBmp = IDB_PLAYICON; idCmd = IDC_PLAY; break; @@ -662,6 +743,8 @@ ShowMCIError(hwnd, mciError); return; } + + UpdateWindowCaption(hwnd); SendMessage(hToolBar, TB_SETCMDID, @@ -695,7 +778,7 @@ SwitchViewMode(hwnd); CloseMciDevice(); - SetWindowText(hwnd, szAppTitle); + UpdateWindowCaption(hwnd); } static VOID @@ -1027,8 +1110,6 @@ case WM_SIZE: { RECT Rect; - RECT ToolbarRect; - MCI_DGV_PUT_PARMS mciPut; if (hToolBar && hTrackBar) { @@ -1037,13 +1118,14 @@ if (!bIsSingleWindow) { - UINT Size; - - Size = GetSystemMetrics(SM_CYMENU) + Rect.bottom; + UINT Size = GetSystemMetrics(SM_CYMENU) + Rect.bottom; MoveWindow(hTrackBar, 0, 0, LOWORD(lParam), HIWORD(lParam) - Size, TRUE); } else { + RECT ToolbarRect; + MCI_DGV_PUT_PARMS mciPut; + MoveWindow(hTrackBar, 180, 0, LOWORD(lParam) - 180, 25, TRUE); GetClientRect(hwnd, &Rect); @@ -1094,13 +1176,10 @@ case IDC_PAUSE: { if (wDeviceId) - { TogglePlaybackState(hwnd); - } else - { OpenFileDialog(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] Mon Mar 16 21:16:07 2015 @@ -27,8 +27,17 @@ #define IDS_PLAY 110 #define IDS_DEFAULTMCIERRMSG 111 +#define IDS_MODE_UNKNOWN 120 +#define IDS_MODE_OPEN 121 +#define IDS_MODE_STOP 122 +#define IDS_MODE_PLAY 123 +#define IDS_MODE_PAUSE 124 +#define IDS_MODE_RECORD 125 +#define IDS_MODE_SEEK 126 +#define IDS_MODE_NOT_READY 127 + /* Menu */ -#define IDR_MAINMENU 500 +#define IDR_MAINMENU 500 /* Accelerators */ #define ID_ACCELERATORS 800

9 years, 6 months

[dquintana] 66745: [NTOBJSHEX] * Fix leak of the PIDL and PIDL Manager from the shell folder destructors. * Switch PIDL Manager to a lazy enumeration so it won't lookup the folder contents unless/u...

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Mar 16 20:47:05 2015 New Revision: 66745 URL: http://svn.reactos.org/svn/reactos?rev=66745&view=rev Log: [NTOBJSHEX] * Fix leak of the PIDL and PIDL Manager from the shell folder destructors. * Switch PIDL Manager to a lazy enumeration so it won't lookup the folder contents unless/until they are needed. Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp [iso-8859-1] Mon Mar 16 20:47:05 2015 @@ -177,6 +177,15 @@ HRESULT Initialize(PWSTR ntPath) { m_ntPath = ntPath; + m_hDpa = NULL; + + return S_OK; + } + + HRESULT Enumerate() + { + if (m_hDpa) + return S_OK; m_hDpa = DPA_Create(10); @@ -196,7 +205,12 @@ if (!m_hDpa) { - return E_FAIL; + hr = Enumerate(); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (!m_hDpa) + return E_FAIL; } NtPidlEntry * info = (NtPidlEntry *) pcidl; @@ -234,9 +248,16 @@ HRESULT FindByName(LPCWSTR strParsingName, NtPidlEntry ** pinfo) { + HRESULT hr; + if (!m_hDpa) { - return E_FAIL; + hr = Enumerate(); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (!m_hDpa) + return E_FAIL; } TRACE("Searching for '%S' in a list of %d items\n", strParsingName, m_hDpaCount); @@ -263,6 +284,18 @@ HRESULT GetPidl(UINT index, NtPidlEntry ** pEntry) { + HRESULT hr; + + if (!m_hDpa) + { + hr = Enumerate(); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (!m_hDpa) + return E_FAIL; + } + *pEntry = NULL; NtPidlEntry * entry = (NtPidlEntry *) DPA_GetPtr(m_hDpa, index); @@ -277,10 +310,21 @@ HRESULT GetCount(UINT * count) { + HRESULT hr; + + if (!m_hDpa) + { + hr = Enumerate(); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (!m_hDpa) + return E_FAIL; + } + *count = m_hDpaCount; return S_OK; } - static LPITEMIDLIST CreatePidlFromItem(NtPidlEntry * entry) { @@ -292,7 +336,7 @@ return idl; } - HRESULT CompareIDs(LPARAM lParam, NtPidlEntry * first, NtPidlEntry * second) + static HRESULT CompareIDs(LPARAM lParam, NtPidlEntry * first, NtPidlEntry * second) { if ((lParam & 0xFFFF0000) == SHCIDS_ALLFIELDS) { @@ -387,7 +431,7 @@ return E_INVALIDARG; } - HRESULT CompareIDs(LPARAM lParam, NtPidlEntry * first, LPCITEMIDLIST pcidl) + static HRESULT CompareIDs(LPARAM lParam, NtPidlEntry * first, LPCITEMIDLIST pcidl) { LPCITEMIDLIST p = pcidl; NtPidlEntry * second = (NtPidlEntry*) &(p->mkid); @@ -397,7 +441,7 @@ return CompareIDs(lParam, first, second); } - HRESULT CompareIDs(LPARAM lParam, LPCITEMIDLIST pcidl1, LPCITEMIDLIST pcidl2) + static HRESULT CompareIDs(LPARAM lParam, LPCITEMIDLIST pcidl1, LPCITEMIDLIST pcidl2) { LPCITEMIDLIST p = pcidl1; NtPidlEntry * first = (NtPidlEntry*) &(p->mkid); @@ -407,7 +451,7 @@ return CompareIDs(lParam, first, pcidl2); } - ULONG ConvertAttributes(NtPidlEntry * entry, PULONG inMask) + static ULONG ConvertAttributes(NtPidlEntry * entry, PULONG inMask) { ULONG mask = inMask ? *inMask : 0xFFFFFFFF; ULONG flags = SFGAO_HASPROPSHEET | SFGAO_CANLINK; @@ -564,7 +608,10 @@ CNtObjectFolder::~CNtObjectFolder() { - TRACE("Destroying CNtObjectFolder %p\n", this); + if (m_shellPidl) + ILFree(m_shellPidl); + if (m_PidlManager) + delete m_PidlManager; } // IShellFolder Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] Mon Mar 16 20:47:05 2015 @@ -164,6 +164,15 @@ { m_ntPath = ntPath; m_hRoot = hRoot; + m_hDpa = NULL; + + return S_OK; + } + + HRESULT Enumerate() + { + if (m_hDpa) + return S_OK; m_hDpa = DPA_Create(10); @@ -182,7 +191,6 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; } - return S_OK; } @@ -192,7 +200,12 @@ if (!m_hDpa) { - return E_FAIL; + hr = Enumerate(); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (!m_hDpa) + return E_FAIL; } RegPidlEntry * info = (RegPidlEntry *) pcidl; @@ -230,10 +243,18 @@ HRESULT FindByName(LPCWSTR strParsingName, RegPidlEntry ** pinfo) { + HRESULT hr; + if (!m_hDpa) { - return E_FAIL; - } + hr = Enumerate(); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (!m_hDpa) + return E_FAIL; + } + TRACE("Searching for '%S' in a list of %d items\n", strParsingName, m_hDpaCount); @@ -259,6 +280,18 @@ HRESULT GetPidl(UINT index, RegPidlEntry ** pEntry) { + HRESULT hr; + + if (!m_hDpa) + { + hr = Enumerate(); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (!m_hDpa) + return E_FAIL; + } + *pEntry = NULL; RegPidlEntry * entry = (RegPidlEntry *) DPA_GetPtr(m_hDpa, index); @@ -273,6 +306,18 @@ HRESULT GetCount(UINT * count) { + HRESULT hr; + + if (!m_hDpa) + { + hr = Enumerate(); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (!m_hDpa) + return E_FAIL; + } + *count = m_hDpaCount; return S_OK; } @@ -288,7 +333,7 @@ return idl; } - HRESULT CompareIDs(LPARAM lParam, RegPidlEntry * first, RegPidlEntry * second) + static HRESULT CompareIDs(LPARAM lParam, RegPidlEntry * first, RegPidlEntry * second) { if ((lParam & 0xFFFF0000) == SHCIDS_ALLFIELDS) { @@ -373,7 +418,7 @@ return E_INVALIDARG; } - HRESULT CompareIDs(LPARAM lParam, RegPidlEntry * first, LPCITEMIDLIST pcidl) + static HRESULT CompareIDs(LPARAM lParam, RegPidlEntry * first, LPCITEMIDLIST pcidl) { LPCITEMIDLIST p = pcidl; RegPidlEntry * second = (RegPidlEntry*) &(p->mkid); @@ -383,7 +428,7 @@ return CompareIDs(lParam, first, second); } - HRESULT CompareIDs(LPARAM lParam, LPCITEMIDLIST pcidl1, LPCITEMIDLIST pcidl2) + static HRESULT CompareIDs(LPARAM lParam, LPCITEMIDLIST pcidl1, LPCITEMIDLIST pcidl2) { LPCITEMIDLIST p = pcidl1; RegPidlEntry * first = (RegPidlEntry*) &(p->mkid); @@ -393,7 +438,7 @@ return CompareIDs(lParam, first, pcidl2); } - ULONG ConvertAttributes(RegPidlEntry * entry, PULONG inMask) + static ULONG ConvertAttributes(RegPidlEntry * entry, PULONG inMask) { ULONG mask = inMask ? *inMask : 0xFFFFFFFF; ULONG flags = 0; @@ -416,7 +461,7 @@ (entry->entryType == REG_ENTRY_ROOT); } - HRESULT FormatValueData(DWORD contentType, PVOID td, DWORD contentsLength, PCWSTR * strContents) + static HRESULT FormatValueData(DWORD contentType, PVOID td, DWORD contentsLength, PCWSTR * strContents) { switch (contentType) { @@ -647,7 +692,10 @@ CRegistryFolder::~CRegistryFolder() { - TRACE("Destroying CRegistryFolder %p\n", this); + if (m_shellPidl) + ILFree(m_shellPidl); + if (m_PidlManager) + delete m_PidlManager; } // IShellFolder

9 years, 6 months

[hbelusca] 66744: [MPLAY32]: Some improvements to TogglePlaybackState(). By Ricardo Hanke. CORE-9378 #resolve #comment Committed, thanks!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 16 20:37:53 2015 New Revision: 66744 URL: http://svn.reactos.org/svn/reactos?rev=66744&view=rev Log: [MPLAY32]: Some improvements to TogglePlaybackState(). By Ricardo Hanke. CORE-9378 #resolve #comment Committed, thanks! Modified: trunk/reactos/base/applications/mplay32/mplay32.c 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] Mon Mar 16 20:37:53 2015 @@ -26,7 +26,6 @@ BOOL bIsSingleWindow = FALSE; UINT MaxFilePos = 0; RECT PrevWindowPos; - /* ToolBar Buttons */ static const TBBUTTON Buttons[] = @@ -552,31 +551,110 @@ } } +VOID CALLBACK +PlayTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +{ + MCI_STATUS_PARMS mciStatus; + MCI_PLAY_PARMS mciPlay; + DWORD dwPos; + + if (wDeviceId == 0) KillTimer(hwnd, IDT_PLAYTIMER); + + mciStatus.dwItem = MCI_STATUS_POSITION; + mciSendCommand(wDeviceId, MCI_STATUS, MCI_STATUS_ITEM, (DWORD_PTR)&mciStatus); + dwPos = mciStatus.dwReturn; + + if ((UINT)dwPos >= MaxFilePos) + { + 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 + { + SendMessage(hTrackBar, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)dwPos); + } +} + +static VOID +StartPlayback(HWND hwnd) +{ + MCIERROR mciError; + MCI_PLAY_PARMS mciPlay; + + SetTimer(hwnd, IDT_PLAYTIMER, 100, (TIMERPROC)PlayTimerProc); + + mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0); + + mciPlay.dwCallback = (DWORD_PTR)hwnd; + mciPlay.dwFrom = 0; + mciPlay.dwTo = MaxFilePos; + + mciError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY | MCI_FROM /*| MCI_TO*/, (DWORD_PTR)&mciPlay); + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); + return; + } + + SendMessage(hToolBar, + TB_SETCMDID, + 0, + IDC_PAUSE); + SendMessage(hToolBar, + TB_CHANGEBITMAP, + IDC_PAUSE, + IDB_PAUSEICON - IDB_PLAYICON); +} + static VOID TogglePlaybackState(HWND hwnd) { MCIERROR mciError; MCI_GENERIC_PARMS mciGeneric; - DWORD dwMode; ULONG idBmp = IDB_PLAYICON; ULONG idCmd = IDC_PLAY; if (wDeviceId == 0) return; - dwMode = GetDeviceMode(hwnd); - if (dwMode == MCI_MODE_PLAY) - { - mciGeneric.dwCallback = (DWORD_PTR)hwnd; - mciError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_NOTIFY, (DWORD_PTR)&mciGeneric); - idBmp = IDB_PLAYICON; - idCmd = IDC_PLAY; - } - else if (dwMode == MCI_MODE_PAUSE) - { - mciGeneric.dwCallback = (DWORD_PTR)hwnd; - mciError = mciSendCommand(wDeviceId, MCI_RESUME, MCI_NOTIFY, (DWORD_PTR)&mciGeneric); - idBmp = IDB_PAUSEICON; - idCmd = IDC_PAUSE; + switch (GetDeviceMode(hwnd)) + { + case MCI_MODE_OPEN: + case MCI_MODE_STOP: + { + StartPlayback(hwnd); + return; + } + + case MCI_MODE_PLAY: + { + mciGeneric.dwCallback = (DWORD_PTR)hwnd; + mciError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_NOTIFY, (DWORD_PTR)&mciGeneric); + idBmp = IDB_PLAYICON; + idCmd = IDC_PLAY; + break; + } + + case MCI_MODE_PAUSE: + { + mciGeneric.dwCallback = (DWORD_PTR)hwnd; + mciError = mciSendCommand(wDeviceId, MCI_RESUME, MCI_NOTIFY, (DWORD_PTR)&mciGeneric); + idBmp = IDB_PAUSEICON; + idCmd = IDC_PAUSE; + break; + } + + default: + { + return; + } } if (mciError != 0) @@ -606,69 +684,6 @@ { ShowMCIError(hwnd, mciError); } -} - -VOID CALLBACK -PlayTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) -{ - MCI_STATUS_PARMS mciStatus; - MCI_PLAY_PARMS mciPlay; - DWORD dwPos; - - if (wDeviceId == 0) KillTimer(hwnd, IDT_PLAYTIMER); - - mciStatus.dwItem = MCI_STATUS_POSITION; - mciSendCommand(wDeviceId, MCI_STATUS, MCI_STATUS_ITEM, (DWORD_PTR)&mciStatus); - dwPos = mciStatus.dwReturn; - - if ((UINT)dwPos >= MaxFilePos) - { - 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 - { - SendMessage(hTrackBar, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)dwPos); - } -} - -static VOID -StartPlayback(HWND hwnd) -{ - MCIERROR mciError; - MCI_PLAY_PARMS mciPlay; - - SetTimer(hwnd, IDT_PLAYTIMER, 100, (TIMERPROC)PlayTimerProc); - - mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0); - - mciPlay.dwCallback = (DWORD_PTR)hwnd; - mciPlay.dwFrom = 0; - mciPlay.dwTo = MaxFilePos; - - mciError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY | MCI_FROM /*| MCI_TO*/, (DWORD_PTR)&mciPlay); - if (mciError != 0) - { - ShowMCIError(hwnd, mciError); - return; - } - - SendMessage(hToolBar, - TB_SETCMDID, - 0, - IDC_PAUSE); - SendMessage(hToolBar, - TB_CHANGEBITMAP, - IDC_PAUSE, - IDB_PAUSEICON - IDB_PLAYICON); } static VOID @@ -1012,7 +1027,6 @@ case WM_SIZE: { RECT Rect; - UINT Size; RECT ToolbarRect; MCI_DGV_PUT_PARMS mciPut; @@ -1023,6 +1037,8 @@ if (!bIsSingleWindow) { + UINT Size; + Size = GetSystemMetrics(SM_CYMENU) + Rect.bottom; MoveWindow(hTrackBar, 0, 0, LOWORD(lParam), HIWORD(lParam) - Size, TRUE); } @@ -1079,12 +1095,7 @@ { if (wDeviceId) { - DWORD dwMode = GetDeviceMode(hwnd); - - if ((dwMode == MCI_MODE_STOP) || (dwMode == MCI_MODE_OPEN)) - StartPlayback(hwnd); - else if ((dwMode == MCI_MODE_PAUSE) || (dwMode = MCI_MODE_PLAY)) - TogglePlaybackState(hwnd); + TogglePlaybackState(hwnd); } else {

9 years, 6 months

← Newer
1
...
23
24
25
26
27
28
29
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2015