Mirrors/winamp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

publish changes

Browse source
This commit is contained in:
Archie 2024-09-29 02:04:03 +00:00
parent afc5064a7b
commit ac2c6ac843
1605 changed files with 3354 additions and 3354 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Src/external_dependencies/openmpt-trunk/mptrack/ChannelManagerDlg.cpp
View file

@ -221,7 +221,7 @@ void CChannelManagerDlg::OnApply()
ResetState(true, true, true, true, true);
// Update document & windows
// Update document & arch
m_ModDoc->SetModified();
m_ModDoc->UpdateAllViews(nullptr, GeneralHint().Channels().ModType(), this); //refresh channel headers

4
Src/external_dependencies/openmpt-trunk/mptrack/Childfrm.cpp
View file

@ -1,7 +1,7 @@
/*
* ChildFrm.cpp
* ------------
* Purpose: Implementation of the MDI document child windows.
* Purpose: Implementation of the MDI document child arch.
* Notes : (currently none)
* Authors: OpenMPT Devs
* The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
@ -388,7 +388,7 @@ BOOL CChildFrame::OnToolTipText(UINT, NMHDR* pNMHDR, LRESULT* pResult)
mpt::String::WriteCStringBuf(pTTT->szText) = strTipText;
*pResult = 0;
// bring the tooltip window above other popup windows
// bring the tooltip window above other popup arch
::SetWindowPos(pNMHDR->hwndFrom, HWND_TOP, 0, 0, 0, 0,
SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOOWNERZORDER);

2
Src/external_dependencies/openmpt-trunk/mptrack/HTTP.cpp
View file

@ -125,7 +125,7 @@ class LastErrorException
{
public:
LastErrorException()
: exception(mpt::windows::GetErrorMessage(GetLastError(), GetModuleHandle(TEXT("wininet.dll"))))
: exception(mpt::arch::GetErrorMessage(GetLastError(), GetModuleHandle(TEXT("wininet.dll"))))
{
}
};

2
Src/external_dependencies/openmpt-trunk/mptrack/Mainbar.cpp
View file

@ -758,7 +758,7 @@ BOOL CMainToolBar::OnToolTipText(UINT, NMHDR* pNMHDR, LRESULT* pResult)
mpt::String::WriteWinBuf(pTTT->szText) = fmt;
*pResult = 0;
// bring the tooltip window above other popup windows
// bring the tooltip window above other popup arch
::SetWindowPos(pNMHDR->hwndFrom, HWND_TOP, 0, 0, 0, 0,
SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE | SWP_NOOWNERZORDER);

2
Src/external_dependencies/openmpt-trunk/mptrack/Moddoc.cpp
View file

@ -3318,7 +3318,7 @@ void CModDoc::DeserializeViews()
wnd.showCmd = SW_SHOWNOACTIVATE;
if(windowState == 1 || anyMaximized)
{
// Once a window has been maximized, all following windows have to be marked as maximized as well.
// Once a window has been maximized, all following arch have to be marked as maximized as well.
wnd.showCmd = SW_MAXIMIZE;
anyMaximized = true;
} else if(windowState == 2)

4
Src/external_dependencies/openmpt-trunk/mptrack/Mptrack.cpp
View file

@ -922,7 +922,7 @@ void CTrackApp::SetupPaths(bool overridePortable)
m_szConfigFileName = m_ConfigPath + P_("mptrack.ini"); // config file
m_szPluginCacheFileName = m_ConfigPath + P_("plugin.cache"); // plugin cache
// Force use of custom ini file rather than windowsDir\executableName.ini
// Force use of custom ini file rather than archDir\executableName.ini
if(m_pszProfileName)
{
free((void *)m_pszProfileName);
@ -1310,7 +1310,7 @@ BOOL CTrackApp::InitInstanceImpl(CMPTCommandLineInfo &cmdInfo)
{
return SoundDevice::SysInfo(mpt::osinfo::get_class(), mpt::OS::Windows::Version::Current(), mpt::OS::Windows::IsWine(), GetWineVersion()->HostClass(), GetWineVersion()->Version());
}
return SoundDevice::SysInfo(mpt::osinfo::get_class(), mpt::OS::Windows::Version::Current(), mpt::OS::Windows::IsWine(), mpt::osinfo::osclass::Unknown, mpt::osinfo::windows::wine::version());
return SoundDevice::SysInfo(mpt::osinfo::get_class(), mpt::OS::Windows::Version::Current(), mpt::OS::Windows::IsWine(), mpt::osinfo::osclass::Unknown, mpt::osinfo::arch::wine::version());
};
SoundDevice::SysInfo sysInfo = GetSysInfo();
SoundDevice::AppInfo appInfo;

2
Src/external_dependencies/openmpt-trunk/mptrack/PatternEditorDialogs.cpp
View file

@ -1685,7 +1685,7 @@ BOOL QuickChannelProperties::OnToolTipText(UINT, NMHDR *pNMHDR, LRESULT *pResult
mpt::String::WriteWinBuf(pTTT->szText) = text;
*pResult = 0;
// bring the tooltip window above other popup windows
// bring the tooltip window above other popup arch
::SetWindowPos(pNMHDR->hwndFrom, HWND_TOP, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE | SWP_NOOWNERZORDER);
return TRUE; // message was handled

2
Src/external_dependencies/openmpt-trunk/mptrack/SampleEditorDialogs.cpp
View file

@ -740,7 +740,7 @@ BOOL CSampleXFadeDlg::OnToolTipText(UINT, NMHDR *pNMHDR, LRESULT *pResult)
}
*pResult = 0;
// bring the tooltip window above other popup windows
// bring the tooltip window above other popup arch
::SetWindowPos(pNMHDR->hwndFrom, HWND_TOP, 0, 0, 0, 0,
SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOOWNERZORDER);
return TRUE;

22
Src/external_dependencies/openmpt-trunk/mptrack/UpdateCheck.cpp
View file

@ -40,7 +40,7 @@ OPENMPT_NAMESPACE_BEGIN
namespace Update {
struct windowsversion {
struct archversion {
uint64 version_major = 0;
uint64 version_minor = 0;
uint64 servicepack_major = 0;
@ -50,7 +50,7 @@ namespace Update {
uint64 wine_minor = 0;
uint64 wine_update = 0;
};
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(windowsversion
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(archversion
,version_major
,version_minor
,servicepack_major
@ -99,7 +99,7 @@ namespace Update {
bool can_autoupdate = false;
mpt::ustring autoupdate_minversion = U_("");
mpt::ustring os = U_("");
std::optional<windowsversion> required_windows_version;
std::optional<archversion> required_arch_version;
std::map<mpt::ustring, bool> required_architectures = {};
std::map<mpt::ustring, bool> supported_architectures = {};
std::map<mpt::ustring, std::map<mpt::ustring, bool>> required_processor_features = {};
@ -111,7 +111,7 @@ namespace Update {
,can_autoupdate
,autoupdate_minversion
,os
,required_windows_version
,required_arch_version
,required_architectures
,supported_architectures
,required_processor_features
@ -230,8 +230,8 @@ static UpdateInfo GetBestDownload(const Update::versions &versions)
for(auto & [downloadname, download] : versioninfo.downloads)
{
// is it for windows?
if(download.os != U_("windows") || !download.required_windows_version)
// is it for arch?
if(download.os != U_("arch") || !download.required_arch_version)
{
continue;
}
@ -276,9 +276,9 @@ static UpdateInfo GetBestDownload(const Update::versions &versions)
}
if(mpt::OS::Windows::Version::Current().IsBefore(
mpt::osinfo::windows::Version::System(mpt::saturate_cast<uint32>(download.required_windows_version->version_major), mpt::saturate_cast<uint32>(download.required_windows_version->version_minor)),
mpt::osinfo::windows::Version::ServicePack(mpt::saturate_cast<uint16>(download.required_windows_version->servicepack_major), mpt::saturate_cast<uint16>(download.required_windows_version->servicepack_minor)),
mpt::osinfo::windows::Version::Build(mpt::saturate_cast<uint32>(download.required_windows_version->build))
mpt::osinfo::arch::Version::System(mpt::saturate_cast<uint32>(download.required_arch_version->version_major), mpt::saturate_cast<uint32>(download.required_arch_version->version_minor)),
mpt::osinfo::arch::Version::ServicePack(mpt::saturate_cast<uint16>(download.required_arch_version->servicepack_major), mpt::saturate_cast<uint16>(download.required_arch_version->servicepack_minor)),
mpt::osinfo::arch::Version::Build(mpt::saturate_cast<uint32>(download.required_arch_version->build))
))
{
download_supported = false;
@ -286,7 +286,7 @@ static UpdateInfo GetBestDownload(const Update::versions &versions)
if(mpt::OS::Windows::IsWine() && theApp.GetWineVersion()->Version().IsValid())
{
if(theApp.GetWineVersion()->Version().IsBefore(mpt::OS::Wine::Version(mpt::saturate_cast<uint8>(download.required_windows_version->wine_major), mpt::saturate_cast<uint8>(download.required_windows_version->wine_minor), mpt::saturate_cast<uint8>(download.required_windows_version->wine_update))))
if(theApp.GetWineVersion()->Version().IsBefore(mpt::OS::Wine::Version(mpt::saturate_cast<uint8>(download.required_arch_version->wine_major), mpt::saturate_cast<uint8>(download.required_arch_version->wine_minor), mpt::saturate_cast<uint8>(download.required_arch_version->wine_update))))
{
download_supported = false;
}
@ -1436,7 +1436,7 @@ CString CUpdateCheck::Error::GetMessage() const
CString CUpdateCheck::Error::FormatErrorCode(CString errorMessage, DWORD errorCode)
{
errorMessage += mpt::ToCString(mpt::windows::GetErrorMessage(errorCode, GetModuleHandle(TEXT("wininet.dll"))));
errorMessage += mpt::ToCString(mpt::arch::GetErrorMessage(errorCode, GetModuleHandle(TEXT("wininet.dll"))));
return errorMessage;
}

2
Src/external_dependencies/openmpt-trunk/mptrack/View_gen.cpp
View file

@ -1806,7 +1806,7 @@ BOOL CViewGlobals::OnToolTipText(UINT, NMHDR *pNMHDR, LRESULT *pResult)
mpt::String::WriteWinBuf(pTTT->szText) = text;
*pResult = 0;
// bring the tooltip window above other popup windows
// bring the tooltip window above other popup arch
::SetWindowPos(pNMHDR->hwndFrom, HWND_TOP, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE | SWP_NOOWNERZORDER);
return TRUE; // message was handled

2
Src/external_dependencies/openmpt-trunk/mptrack/Vstplug.cpp
View file

@ -194,7 +194,7 @@ AEffect *CVstPlugin::LoadPlugin(bool maskCrashes, VSTPluginLib &plugin, HMODULE
#ifdef _DEBUG
mpt::ustring buf = MPT_UFORMAT("Warning: encountered problem when loading plugin dll. Error {}: {}")
( mpt::ufmt::hex(error)
, mpt::ToUnicode(mpt::windows::GetErrorMessage(error))
, mpt::ToUnicode(mpt::arch::GetErrorMessage(error))
);
Reporting::Error(buf, "DEBUG: Error when loading plugin dll");
#endif //_DEBUG

8
Src/external_dependencies/openmpt-trunk/mptrack/mptrack.rc
View file

@ -2988,7 +2988,7 @@ BEGIN
ID_HELP_INDEX "Opens Help\nHelp Topics"
ID_HELP_FINDER "List Help topics\nHelp Topics"
ID_HELP_USING "Display instructions about how to use help\nHelp"
ID_CONTEXT_HELP "Display help for buttons, menus and windows\nHelp"
ID_CONTEXT_HELP "Display help for buttons, menus and arch\nHelp"
ID_HELP "Display help for current task or command\nHelp"
END
@ -3002,9 +3002,9 @@ STRINGTABLE
BEGIN
ID_WINDOW_NEW "Open another window for the active song\nNew Window"
ID_WINDOW_ARRANGE "Arrange icons at the bottom of the window\nArrange Icons"
ID_WINDOW_CASCADE "Arrange windows so they overlap\nCascade Windows"
ID_WINDOW_TILE_HORZ "Arrange windows as non-overlapping tiles\nTile Windows"
ID_WINDOW_TILE_VERT "Arrange windows as non-overlapping tiles\nTile Windows"
ID_WINDOW_CASCADE "Arrange arch so they overlap\nCascade Windows"
ID_WINDOW_TILE_HORZ "Arrange arch as non-overlapping tiles\nTile Windows"
ID_WINDOW_TILE_VERT "Arrange arch as non-overlapping tiles\nTile Windows"
ID_WINDOW_SPLIT "Split the active window into panes\nSplit"
END

2
Src/external_dependencies/openmpt-trunk/mptrack/wine/WineWrapper.c
View file

@ -3,7 +3,7 @@
#include "NativeConfig.h"
#include <windows.h>
#include <arch.h>
#include <stdint.h>