diff --git a/README.md b/README.md index d492dfa..c5adf7f 100644 --- a/README.md +++ b/README.md @@ -184,16 +184,3 @@ label{ /*标签选择器*/ --- -## 📖 学习 & 技术支持 - -- 视频教程：https://space.bilibili.com/240269358/video -- QQ：718987717 -- QQ群：758485934 -- 邮箱：[19980103ly@gmail.com]/[19980103ly@gmail.com] -- 微信：wx19980103yon - ---- - -## 📄 License - - diff --git a/demo/Adminstor/Adminstor/framework.h b/demo/Adminstor/Adminstor/framework.h index c420462..6c1b7b4 100644 --- a/demo/Adminstor/Adminstor/framework.h +++ b/demo/Adminstor/Adminstor/framework.h @@ -18,4 +18,7 @@ #include "EzUI/LayeredWindow.h"//分层窗口类-可以异型透明窗口 #include "ezui/UIManager.h"//ui管理类(使用xml生成控件) #include "EzUI/Animation.h" +#include "EzUI/TableView.h" + + diff --git a/demo/Adminstor/Adminstor/mainForm.cpp b/demo/Adminstor/Adminstor/mainForm.cpp index 960a0c8..45e7e2b 100644 --- a/demo/Adminstor/Adminstor/mainForm.cpp +++ b/demo/Adminstor/Adminstor/mainForm.cpp @@ -54,6 +54,15 @@ void mainForm::OnNotify(Control* sender, EventArgs& args) textAdmin->Insert(L"\n测试成功！",true); textAdmin->GetScrollBar()->ScrollTo(1.0); } + + TableView* tableView = (TableView*)FindControl("tableViewAdmin"); //获取表格控件 + if (tableView) { + tableView->SetColumnType(4, ezui::CellType::CheckBox); + tableView->SetColumnType(5, ezui::CellType::ComboBox); + tableView->SetColumnComboItems(5, {L"选择1", L"选择2" , L"选择3" }); + tableView->InsertRow(1); + tableView->SetRowData(tableView->GetRowCount() - 1, {L"uid1", L"192.168.200.131"}); + } } } break; diff --git a/demo/Adminstor/ThirdParty/EzUI/include/EzUI/TableView.h b/demo/Adminstor/ThirdParty/EzUI/include/EzUI/TableView.h new file mode 100644 index 0000000..88d24cd --- /dev/null +++ b/demo/Adminstor/ThirdParty/EzUI/include/EzUI/TableView.h @@ -0,0 +1,430 @@ +#pragma once +#include "Control.h" +#include "Label.h" +#include "TextBox.h" +#include "CheckBox.h" +#include "ComboBox.h" +#include "VScrollBar.h" +#include "HScrollBar.h" +#include +#include + +namespace ezui { + + // 第一列类型枚举 + enum class FirstColumnType { + TextBox, // 空白文本框（默认） + Index, // 不可编辑的序号（从1开始） + CheckBox // 选择框 + }; + + // 单元格类型枚举 + enum class CellType { + TextBox, // 文本框（默认） + CheckBox, // 选择框 + ComboBox, // 下拉选择框 + ReadOnly // 不可编辑（可选中复制但不能修改） + }; + + // 边框类型（复用框架的 StrokeStyle） + // StrokeStyle::None - 无边框 + // StrokeStyle::Solid - 实线 + // StrokeStyle::Dash - 虚线 + + // 排序方向 + enum class SortOrder { + None, // 未排序 + Ascending, // 升序 + Descending // 降序 + }; + + // 单元格独立样式（用于单独设置某个单元格的样式） + struct CellStyle { + Color BorderColor; + StrokeStyle BorderStyle = StrokeStyle::None; + Color BackColor; + Color ForeColor; + bool HasBorderColor = false; + bool HasBorderStyle = false; + bool HasBackColor = false; + bool HasForeColor = false; + + void SetBorderColor(const Color& color) { + BorderColor = color; + HasBorderColor = true; + } + void SetBorderStyle(StrokeStyle style) { + BorderStyle = style; + HasBorderStyle = true; + } + void SetBackColor(const Color& color) { + BackColor = color; + HasBackColor = true; + } + void SetForeColor(const Color& color) { + ForeColor = color; + HasForeColor = true; + } + void Reset() { + HasBorderColor = false; + HasBorderStyle = false; + HasBackColor = false; + HasForeColor = false; + } + }; + + // 单元格数据 + struct CellData { + UIString Text; // 单元格文本内容 + bool Checked = false; // 用于 CheckBox 类型 + int ComboIndex = -1; // 用于 ComboBox 类型，选中的索引 + CellStyle Style; // 单元格独立样式 + }; + + // 列信息 + struct ColumnInfo { + UIString HeaderText; // 表头文字 + int Width = 100; // 列宽 + CellType Type = CellType::TextBox; // 单元格类型 + std::vector ComboItems; // 下拉选项（仅 ComboBox 类型有效） + SortOrder CurrentSort = SortOrder::None; // 当前排序状态 + }; + + class UI_EXPORT TableView : public Control { + private: + // 滚动条 + VScrollBar m_vScrollBar; + HScrollBar m_hScrollBar; + + // 数据存储 + std::vector m_columns; // 列信息 + std::vector> m_data; // 二维数据 [row][col] + std::vector m_rowHeights; // 每行高度 + std::vector m_rowChecked; // 每行的选中状态（第一列为CheckBox时使用） + + // 第一列配置 + FirstColumnType m_firstColumnType = FirstColumnType::TextBox; + int m_firstColumnWidth = 50; // 第一列宽度 + + // 表头配置 + int m_headerHeight = 30; // 表头高度 + bool m_headerSelectAll = false; // 表头全选状态 + + // 默认行高 + int m_defaultRowHeight = 30; + + // 统一单元格样式 + int m_cellBorderSize = 1; + StrokeStyle m_cellBorderStyle = StrokeStyle::Solid; + Color m_cellBorderColor = Color::LightGray; + Color m_cellBackColor = Color::White; + Color m_cellForeColor = Color::Black; + int m_cellFontSize = 14; + std::wstring m_cellFontFamily = L"Microsoft YaHei"; + + // 表头样式 + Color m_headerBackColor = Color(0xFFE0E0E0); + Color m_headerForeColor = Color::Black; + + // 滚动偏移 + int m_scrollOffsetX = 0; + int m_scrollOffsetY = 0; + + // 内容大小缓存（供GetContentSize使用） + mutable Size m_contentSize; + + // 编辑状态 + bool m_editing = false; + int m_editRow = -1; + int m_editCol = -1; + TextBox* m_editBox = nullptr; + ComboBox* m_editCombo = nullptr; + CheckBox* m_editCheck = nullptr; + + // 列宽拖动 + bool m_draggingColumn = false; + int m_dragColumnIndex = -1; + int m_dragStartX = 0; + int m_dragStartWidth = 0; + + // 排序 + int m_sortColumnIndex = -1; + + // 鼠标悬停 + int m_hoverRow = -1; + int m_hoverCol = -1; + + // 双击检测 + ULONGLONG m_lastClickTime = 0; + int m_lastClickRow = -1; + int m_lastClickCol = -1; + + private: + void Init(); + + // 计算总内容宽度 + int GetContentWidth() const; + + // 计算总内容高度 + int GetContentHeight() const; + + // 获取列起始X坐标（考虑滚动偏移） + int GetColumnX(int colIndex) const; + + // 获取行起始Y坐标（考虑滚动偏移） + int GetRowY(int rowIndex) const; + + // 根据坐标获取单元格位置 + bool HitTestCell(const Point& pt, int* outRow, int* outCol) const; + + // 根据坐标检测是否在列边界上（用于拖动调整列宽） + int HitTestColumnBorder(const Point& pt) const; + + // 检测是否点击在垂直滚动条上 + bool HitTestVScrollBar(const Point& pt); + + // 检测是否点击在水平滚动条上 + bool HitTestHScrollBar(const Point& pt); + + // 绘制表头 + void DrawHeader(PaintEventArgs& args); + + // 绘制单元格 + void DrawCells(PaintEventArgs& args); + + // 绘制单个单元格 + void DrawCell(PaintEventArgs& args, int row, int col, const Rect& cellRect); + + // 绘制第一列 + void DrawFirstColumn(PaintEventArgs& args, int row, const Rect& cellRect); + + // 开始编辑单元格 + void BeginEdit(int row, int col); + + // 结束编辑 + void EndEdit(bool save = true); + + // 更新行高（根据内容） + void UpdateRowHeight(int row); + + // 计算文本需要的行数 + int CalculateTextLines(const UIString& text, int width) const; + + // 刷新滚动条 + void RefreshScrollBars(); + + // 滚动偏移处理 + void OffsetX(int offset); + void OffsetY(int offset); + + // 执行排序 + void DoSort(int colIndex); + + protected: + virtual void OnPaint(PaintEventArgs& args) override; + virtual void OnChildPaint(PaintEventArgs& args) override; + virtual void OnLayout() override; + virtual void OnMouseMove(const MouseEventArgs& args) override; + virtual void OnMouseDown(const MouseEventArgs& args) override; + virtual void OnMouseUp(const MouseEventArgs& args) override; + virtual void OnMouseDoubleClick(const MouseEventArgs& args) override; + virtual void OnMouseWheel(const MouseEventArgs& args) override; + virtual void OnMouseLeave(const MouseEventArgs& args) override; + virtual void OnSize(const SizeEventArgs& args) override; + virtual void OnKeyDown(const KeyboardEventArgs& args) override; + virtual void OnKeyChar(const KeyboardEventArgs& args) override; + virtual const Size& GetContentSize() override; + + public: + // 选中行背景色（当第一列为CheckBox且被选中时使用） + Color SelectedRowBackColor = Color(0xFFADD8E6); // 浅蓝色 + + // 单元格内容变化回调 + // 参数: row, col, newValue + std::function CellValueChanged = nullptr; + + public: + TableView(Object* parentObject = nullptr); + virtual ~TableView(); + + // ============ 表头设置 ============ + + // 设置表头（传入表头名数组） + void SetHeaders(const std::vector& headers); + + // 获取表头数量（不包含第一列） + int GetColumnCount() const; + + // 设置表头高度 + void SetHeaderHeight(int height); + + // 获取表头高度 + int GetHeaderHeight() const; + + // ============ 第一列设置 ============ + + // 设置第一列类型 + void SetFirstColumnType(FirstColumnType type); + + // 获取第一列类型 + FirstColumnType GetFirstColumnType() const; + + // 设置第一列宽度 + void SetFirstColumnWidth(int width); + + // 获取第一列宽度 + int GetFirstColumnWidth() const; + + // ============ 列设置 ============ + + // 设置某列宽度 + void SetColumnWidth(int colIndex, int width); + + // 获取某列宽度 + int GetColumnWidth(int colIndex) const; + + // 获取所有列宽 + const std::vector GetColumnWidths() const; + + // 设置某列单元格类型 + void SetColumnType(int colIndex, CellType type); + + // 获取某列单元格类型 + CellType GetColumnType(int colIndex) const; + + // 设置某列的下拉选项（仅对 ComboBox 类型有效） + void SetColumnComboItems(int colIndex, const std::vector& items); + + // ============ 行设置 ============ + + // 获取行数 + int GetRowCount() const; + + // 添加行 + void AddRow(); + + // 插入行 + void InsertRow(int rowIndex); + + // 删除行 + void RemoveRow(int rowIndex); + + // 清空所有行 + void ClearRows(); + + // 添加列 + void AddColumn(const UIString& headerText = L"", int width = 100); + + // 插入列 + void InsertColumn(int colIndex, const UIString& headerText = L"", int width = 100); + + // 删除列 + void RemoveColumn(int colIndex); + + // 获取行高 + int GetRowHeight(int rowIndex) const; + + // 获取所有行高 + const std::vector GetRowHeights() const; + + // 设置默认行高 + void SetDefaultRowHeight(int height); + + // ============ 数据操作 ============ + + // 设置单个单元格数据 + void SetData(int row, int col, const UIString& value); + + // 获取单个单元格数据 + UIString GetData(int row, int col) const; + + // 设置整行数据 + void SetRowData(int row, const std::vector& values); + + // 获取整行数据 + std::vector GetRowData(int row) const; + + // 获取整列数据 + std::vector GetColData(int col) const; + + // 设置全部数据（二维数组） + void SetAllData(const std::vector>& data); + + // 获取全部数据 + std::vector> GetAllData() const; + + // 设置单元格 CheckBox 状态 + void SetCellChecked(int row, int col, bool checked); + + // 获取单元格 CheckBox 状态 + bool GetCellChecked(int row, int col) const; + + // 设置单元格 ComboBox 选中索引 + void SetCellComboIndex(int row, int col, int index); + + // 获取单元格 ComboBox 选中索引 + int GetCellComboIndex(int row, int col) const; + + // ============ 行选中（第一列为CheckBox时） ============ + + // 设置某行选中状态 + void SetRowChecked(int row, bool checked); + + // 获取某行选中状态 + bool GetRowChecked(int row) const; + + // 获取所有选中的行索引 + std::vector GetCheckedRows() const; + + // 全选 + void SelectAll(); + + // 取消全选 + void DeselectAll(); + + // ============ 样式设置 ============ + + // 设置统一单元格样式 + void SetCellBorderSize(int size); + void SetCellBorderStyle(StrokeStyle style); + void SetCellBorderColor(const Color& color); + void SetCellBackColor(const Color& color); + void SetCellForeColor(const Color& color); + void SetCellFontSize(int size); + void SetCellFontFamily(const std::wstring& fontFamily); + + // 设置单独单元格样式 + void SetCellStyle(int row, int col, const CellStyle& style); + + // 获取单独单元格样式 + CellStyle GetCellStyle(int row, int col) const; + + // 重置单独单元格样式（使用统一样式） + void ResetCellStyle(int row, int col); + + // 设置表头样式 + void SetHeaderBackColor(const Color& color); + void SetHeaderForeColor(const Color& color); + + // ============ 鼠标悬停信息 ============ + + // 获取鼠标当前悬停的行号（-1表示表头或未悬停在任何行） + int GetHoverRow() const; + + // 获取鼠标当前悬停的列号（-1表示第一列或未悬停在任何列） + int GetHoverCol() const; + + // 获取鼠标当前悬停的行列号（通过指针返回） + void GetHoverCell(int* outRow, int* outCol) const; + + // ============ 滚动条 ============ + + virtual ScrollBar* GetVScrollBar(); + virtual ScrollBar* GetHScrollBar(); + + // ============ 属性设置（XML支持） ============ + + virtual void SetAttribute(const UIString& key, const UIString& value) override; + }; + +}; diff --git a/demo/Adminstor/ThirdParty/EzUI/include/EzUI/TextBox.h b/demo/Adminstor/ThirdParty/EzUI/include/EzUI/TextBox.h index 974b158..4803c56 100644 --- a/demo/Adminstor/ThirdParty/EzUI/include/EzUI/TextBox.h +++ b/demo/Adminstor/ThirdParty/EzUI/include/EzUI/TextBox.h @@ -112,5 +112,7 @@ namespace ezui { void SetPlaceholderText(const UIString& text); //设置密码框占位符(建议单字符) void SetPasswordChar(const UIString& passwordChar); + // 设置焦点并初始化光标到指定位置（-1表示文本末尾） + void SetFocusAndCaret(int caretPos = -1); }; }; diff --git a/demo/Adminstor/ThirdParty/EzUI/include/EzUI/UIManager.h b/demo/Adminstor/ThirdParty/EzUI/include/EzUI/UIManager.h index 92b4fce..65386d1 100644 --- a/demo/Adminstor/ThirdParty/EzUI/include/EzUI/UIManager.h +++ b/demo/Adminstor/ThirdParty/EzUI/include/EzUI/UIManager.h @@ -16,6 +16,7 @@ #include "ProgressBar.h" #include "Window.h" #include "ComboBox.h" +#include "TableView.h" namespace ezui { //主窗口中的内联页面类 diff --git a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_Win32.lib b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_Win32.lib index 5d7ac53..8b81975 100644 Binary files a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_Win32.lib and b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_Win32.lib differ diff --git a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_Win32.pdb b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_Win32.pdb index 59a5db8..064579b 100644 Binary files a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_Win32.pdb and b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_Win32.pdb differ diff --git a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_x64.lib b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_x64.lib index 9746662..182261f 100644 Binary files a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_x64.lib and b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_x64.lib differ diff --git a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_x64.pdb b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_x64.pdb index 74065a2..cfedb17 100644 Binary files a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_x64.pdb and b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_x64.pdb differ diff --git a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Release_Win32.lib b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Release_Win32.lib index 65f04fb..63c71ac 100644 Binary files a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Release_Win32.lib and b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Release_Win32.lib differ diff --git a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Release_x64.lib b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Release_x64.lib index 0fb7ad0..924d48f 100644 Binary files a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Release_x64.lib and b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Release_x64.lib differ diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Animation.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Animation.h index 90fc00a..24a3e04 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Animation.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Animation.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "EzUI.h" #include "Timer.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Application.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Application.h index 846c462..65d70ab 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Application.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Application.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Window.h" #include "Resource.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Bitmap.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Bitmap.h index 0094d20..3feb25f 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Bitmap.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Bitmap.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "EzUI.h" namespace ezui { diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/BorderlessWindow.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/BorderlessWindow.h index 5d50031..c065285 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/BorderlessWindow.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/BorderlessWindow.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Window.h" #include "ShadowBox.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Button.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Button.h index a1feab3..6909ed3 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Button.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Button.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Label.h" namespace ezui { diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/CheckBox.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/CheckBox.h index 18e8105..e669d8c 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/CheckBox.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/CheckBox.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Label.h" namespace ezui { diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/ComboBox.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/ComboBox.h index 16d3fa6..4712a21 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/ComboBox.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/ComboBox.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "TextBox.h" #include "Label.h" #include "VListView.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Control.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Control.h index ead3b45..2474c09 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Control.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Control.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "EzUI.h" namespace ezui { diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Direct2DRender.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Direct2DRender.h index eec533c..819e0b3 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Direct2DRender.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Direct2DRender.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "UIDef.h" #if USED_DIRECT2D #ifndef UI_EXPORT diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/EzUI.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/EzUI.h index 35b5100..fa56d40 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/EzUI.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/EzUI.h @@ -1,4 +1,4 @@ -/*/ +/*/ Author:yang Email:19980103ly@gmail.com/718987717@qq.com */ diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Frame.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Frame.h index 742cc89..765ea42 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Frame.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Frame.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "EzUI.h" #include "UILoader.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/HLayout.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/HLayout.h index 8d69bd3..40df818 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/HLayout.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/HLayout.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Control.h" namespace ezui { diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/HListView.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/HListView.h index 7029caf..fb13a34 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/HListView.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/HListView.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "PagedListView.h" #include "HScrollBar.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/HScrollBar.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/HScrollBar.h index 7fad96a..438e36f 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/HScrollBar.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/HScrollBar.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Control.h" #include "ScrollBar.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Label.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Label.h index b9cddc7..2ae7e86 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Label.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Label.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Control.h" namespace ezui { diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/LayeredWindow.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/LayeredWindow.h index 1f3f265..2819fc9 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/LayeredWindow.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/LayeredWindow.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "BorderlessWindow.h" #include "Bitmap.h" #include "Task.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Menu.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Menu.h index f83a9dc..bd4fd32 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Menu.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Menu.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "EzUI.h" namespace ezui { diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/NotifyIcon.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/NotifyIcon.h index ed35a47..d3c65cd 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/NotifyIcon.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/NotifyIcon.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Menu.h" #include namespace ezui { diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/PagedListView.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/PagedListView.h index 790eff2..3fb4585 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/PagedListView.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/PagedListView.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Control.h" namespace ezui { diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/PictureBox.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/PictureBox.h index 538a2a9..533a99c 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/PictureBox.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/PictureBox.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Control.h" #include "Timer.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/PopupWindow.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/PopupWindow.h index 9162648..b551b4d 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/PopupWindow.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/PopupWindow.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Window.h" #include "BorderlessWindow.h" #include "LayeredWindow.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/RadioButton.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/RadioButton.h index 09f9b1f..4579f84 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/RadioButton.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/RadioButton.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "CheckBox.h" namespace ezui { diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/RenderTypes.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/RenderTypes.h index 37d5793..4d3385b 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/RenderTypes.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/RenderTypes.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include namespace ezui { diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Resource.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Resource.h index 93e0e0c..318e767 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Resource.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Resource.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "UIString.h" namespace ezui { diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/ScrollBar.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/ScrollBar.h index 07cde52..7297976 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/ScrollBar.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/ScrollBar.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Control.h" #include "Animation.h" namespace ezui { diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/ShadowBox.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/ShadowBox.h index c7eed6e..86ca6cd 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/ShadowBox.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/ShadowBox.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Window.h" #include "Bitmap.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Spacer.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Spacer.h index 7e0291e..524f5ab 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Spacer.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Spacer.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Control.h" namespace ezui { diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/TabLayout.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/TabLayout.h index eb14323..7ac8773 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/TabLayout.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/TabLayout.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Control.h" #include "Timer.h" #include "Animation.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Task.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Task.h index 3417745..e83609c 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Task.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Task.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "EzUI.h" namespace ezui { namespace detail { diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/TextBox.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/TextBox.h index 9222e7a..97be515 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/TextBox.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/TextBox.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Control.h" #include "VScrollBar.h" #include "Timer.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/TileListView.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/TileListView.h index bbf3686..d1807c4 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/TileListView.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/TileListView.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "PagedListView.h" #include "VScrollBar.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Timer.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Timer.h index e06559e..0cbdcf8 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Timer.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Timer.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "EzUI.h" #include "Task.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/TreeView.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/TreeView.h index 63b827b..543e3a9 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/TreeView.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/TreeView.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "HListView.h" #include "VListView.h" namespace ezui { diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UIDef.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UIDef.h index b1c15a0..8157731 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UIDef.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UIDef.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include #include diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UILoader.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UILoader.h index f1a0a22..f48deb1 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UILoader.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UILoader.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Control.h" #include "Spacer.h" #include "HLayout.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UISelector.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UISelector.h index d4cb85e..d458663 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UISelector.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UISelector.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "UILoader.h" namespace ezui { diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UIString.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UIString.h index 6741255..f693b11 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UIString.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UIString.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "UIDef.h" #include #include diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UIStyle.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UIStyle.h index 7b0ae12..46f8455 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UIStyle.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/UIStyle.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "EzUI.h" namespace ezui { struct Style diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/VLayout.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/VLayout.h index f99fdd8..e91bb66 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/VLayout.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/VLayout.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Control.h" namespace ezui { diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/VListView.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/VListView.h index 60bdd13..8edc0c6 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/VListView.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/VListView.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "PagedListView.h" #include "VScrollBar.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/VScrollBar.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/VScrollBar.h index bb1597f..0456511 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/VScrollBar.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/VScrollBar.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Control.h" #include "ScrollBar.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Window.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Window.h index 4bd1831..6a4f407 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Window.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/Window.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Control.h" #include "ScrollBar.h" #include "Spacer.h" diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/tinystr.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/tinystr.h index c4372af..70be0fe 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/tinystr.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/tinystr.h @@ -1,4 +1,4 @@ -/* +/* www.sourceforge.net/projects/tinyxml This software is provided 'as-is', without any express or implied diff --git a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/tinyxml.h b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/tinyxml.h index ace034f..d6866ca 100644 --- a/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/tinyxml.h +++ b/demo/Adminstor/ThirdParty/EzUI2/include/EzUI/tinyxml.h @@ -1,4 +1,4 @@ -/* +/* www.sourceforge.net/projects/tinyxml Original code by Lee Thomason (www.grinninglizard.com) diff --git a/demo/Adminstor/enc_temp_folder/44d7e75c19a74468c16963c65a185e6/mainForm.cpp b/demo/Adminstor/enc_temp_folder/44d7e75c19a74468c16963c65a185e6/mainForm.cpp new file mode 100644 index 0000000..c9d6524 --- /dev/null +++ b/demo/Adminstor/enc_temp_folder/44d7e75c19a74468c16963c65a185e6/mainForm.cpp @@ -0,0 +1,106 @@ +#include "pch.h" +#include "mainForm.h" + + +void mainForm::OnNotify(Control* sender, EventArgs& args) +{ + UIString btnName = sender->Name; // 控件id + Event eventType = args.EventType; // 事件类型 + + switch (eventType) + { + case ezui::OnMouseDown: //鼠标按下 + { + if (btnName == "btnExitMain") { //退出 + int result = ::MessageBoxW(Hwnd(), L"要退出程序吗？", L"提示", MB_YESNO | MB_ICONQUESTION); + if (result == IDYES) + exit(0); + } + else if (btnName == "btnMinMain") { //最小化 + this->ShowMinimized(); + } + else if (btnName == "btnMaxMain") { //最大化|还原 + if (this->IsMaximized()) { + this->ShowNormal(); + // 修改控件文字 + Button* btnMax = (Button*)FindControl("btnMaxMain"); + btnMax->SetText(L"🗖"); + } + else { + this->ShowMaximized(); + // 修改控件文字 + Button* btnMax = (Button*)FindControl("btnMaxMain"); + btnMax->SetText(L"🗗"); + } + } + else if (btnName == "btnAdmin") { //到管理页面 获取 mainTab ，设置页面为0 + TabLayout* mainTab = (TabLayout*)FindControl("mainTab"); + mainTab->SetPageIndex(0); + mainTab->Invalidate(); + } + else if (btnName == "btnTools") { //到工具页面 获取 mainTab ，设置页面为1 + TabLayout* mainTab = (TabLayout*)FindControl("mainTab"); + mainTab->SetPageIndex(1); + mainTab->Invalidate(); + } + else if (btnName == "btnAdminConnect") { //管理页面的连接按钮按下，先获取 btnAdminConnect 按钮，设置为不可用，修改文字为“连接中...” + Button* btnAdminConnect = (Button*)FindControl("btnAdminConnect"); + btnAdminConnect->SetText(L"🔄"); + btnAdminConnect->Style.BackColor = Color(0, 185, 107); + } + else if (btnName == "btnAdminTemp") { //管理页面的测试按钮 + TextBox* textAdmin = (TextBox*)FindControl("textAdminOutput"); //获取输出框 + if (textAdmin) { + textAdmin->Insert(L"\n测试成功！",true); + textAdmin->GetScrollBar()->ScrollTo(1.0); + } + + TableView* tableView = (TableView*)FindControl("tableViewAdmin"); //获取表格控件 + if (tableView) { + tableView->SetColumnType(4, ezui::CellType::CheckBox); + tableView->SetColumnType(5, ezui::CellType::ComboBox); + tableView->SetColumnComboItems(5, {L"选择1", L"选择2"}); + tableView->InsertRow(1); + tableView->SetRowData(tableView->GetRowCount() - 1, {L"uid1", L"192.168.200.131"}); + } + } + } + break; + case ezui::OnMouseDoubleClick: //鼠标双击 + { + //if (btnName == "titleMain") { //标题布局 + // if (this->IsMaximized()) { + // this->ShowNormal(); + // } + // else { + // this->ShowMaximized(); + // } + //} + } + break; + default: + break; + } + if (args.EventType == Event::OnMouseDown) { + + + } + __super::OnNotify(sender, args); +} + +void mainForm::OnClose(bool& close) +{ + Application::Exit(); +} + +mainForm::mainForm() :LayeredWindow(1000, 750) +{ + SetResizable(true); // 启用窗口大小调整 + SetMiniSize(Size(600, 450)); // 设置最小尺寸 + umg.LoadXml("res/mainForm.htm");//加载xml里面的控件与样式 + umg.SetupUI(this); +} + +mainForm::~mainForm() +{ +} diff --git a/demo/DemoUi/DemoUi/pch.cpp b/demo/DemoUi/DemoUi/pch.cpp index 1730571..331e647 100644 --- a/demo/DemoUi/DemoUi/pch.cpp +++ b/demo/DemoUi/DemoUi/pch.cpp @@ -1 +1 @@ -#include "pch.h" \ No newline at end of file +#include "pch.h" \ No newline at end of file diff --git a/demo/DemoUi/DemoUi/pch.h b/demo/DemoUi/DemoUi/pch.h index c9c7883..bfcd21d 100644 --- a/demo/DemoUi/DemoUi/pch.h +++ b/demo/DemoUi/DemoUi/pch.h @@ -1,2 +1,2 @@ -#pragma once +#pragma once #include "framework.h" diff --git a/demo/DemoUi/DemoUi/resource.h b/demo/DemoUi/DemoUi/resource.h index 5f0a4d8..63c2c3b 100644 --- a/demo/DemoUi/DemoUi/resource.h +++ b/demo/DemoUi/DemoUi/resource.h @@ -1,8 +1,8 @@ -//{{NO_DEPENDENCIES}} +//{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by DemoUi.rc -// ¶һĬֵ +// 新对象的下一组默认值 // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS diff --git a/demo/ResPackage/FileSystem.cpp b/demo/ResPackage/FileSystem.cpp index bfd3a6d..eae40e8 100644 --- a/demo/ResPackage/FileSystem.cpp +++ b/demo/ResPackage/FileSystem.cpp @@ -1,4 +1,4 @@ -#include "FileSystem.h" +#include "FileSystem.h" namespace ezui { namespace File { bool Exists(const UIString& filename) { diff --git a/demo/ResPackage/FileSystem.h b/demo/ResPackage/FileSystem.h index bbed8b2..e3f48b7 100644 --- a/demo/ResPackage/FileSystem.h +++ b/demo/ResPackage/FileSystem.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "EzUI/EzUI.h" #include "EzUI/UIString.h" namespace ezui { diff --git a/demo/ResPackage/main.cpp b/demo/ResPackage/main.cpp index 4ee83b3..24c1294 100644 --- a/demo/ResPackage/main.cpp +++ b/demo/ResPackage/main.cpp @@ -1,4 +1,4 @@ -#include "mainFrom.h" +#include "mainFrom.h" int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR lpCmdLine, diff --git a/demo/ResPackage/mainFrom.cpp b/demo/ResPackage/mainFrom.cpp index b3e4e06..5da12ca 100644 --- a/demo/ResPackage/mainFrom.cpp +++ b/demo/ResPackage/mainFrom.cpp @@ -1,4 +1,4 @@ -#include "mainFrom.h" +#include "mainFrom.h" #include "FileSystem.h" const wchar_t* xml = LR"xml( diff --git a/demo/ResPackage/mainFrom.h b/demo/ResPackage/mainFrom.h index b9991ad..082c6d1 100644 --- a/demo/ResPackage/mainFrom.h +++ b/demo/ResPackage/mainFrom.h @@ -1,4 +1,4 @@ -#include "EzUI/Application.h" +#include "EzUI/Application.h" #include "EzUI/VLayout.h" #include "EzUI/TextBox.h" #include "EzUI/Button.h" diff --git a/demo/helloWorld/main.cpp b/demo/helloWorld/main.cpp index dcf7360..c4a105a 100644 --- a/demo/helloWorld/main.cpp +++ b/demo/helloWorld/main.cpp @@ -1,4 +1,4 @@ -//WIN32 desktop application UI framework (2d graphical library:direct2d,后期可能会采用其他跨平台的2d图形库对整个UI框架进行跨平台) +//WIN32 desktop application UI framework (2d graphical library:direct2d,后期可能会采用其他跨平台的2d图形库对整个UI框架进行跨平台) #include diff --git a/demo/kugou/DesktopLrcFrm.cpp b/demo/kugou/DesktopLrcFrm.cpp index 1c282d7..63a39dc 100644 --- a/demo/kugou/DesktopLrcFrm.cpp +++ b/demo/kugou/DesktopLrcFrm.cpp @@ -1,4 +1,4 @@ -#include "desktopLrcFrm.h" +#include "desktopLrcFrm.h" HWND GetDeskTopWnd() { HWND windowHandle = ::FindWindowW(L"Progman", L"Program Manager"); diff --git a/demo/kugou/DesktopLrcFrm.h b/demo/kugou/DesktopLrcFrm.h index 61df062..8582903 100644 --- a/demo/kugou/DesktopLrcFrm.h +++ b/demo/kugou/DesktopLrcFrm.h @@ -1,4 +1,4 @@ -#include "global.h" +#include "global.h" #include "lrcPanel.h" #include "VlcPlayer.h" diff --git a/demo/kugou/MainFrm.cpp b/demo/kugou/MainFrm.cpp index ac80f7e..ef63902 100644 --- a/demo/kugou/MainFrm.cpp +++ b/demo/kugou/MainFrm.cpp @@ -1,4 +1,4 @@ -#include "mainFrm.h" +#include "mainFrm.h" MainFrm::MainFrm() :Form(1020, 690) { InitForm(); diff --git a/demo/kugou/MainFrm.h b/demo/kugou/MainFrm.h index f0f437c..259e67f 100644 --- a/demo/kugou/MainFrm.h +++ b/demo/kugou/MainFrm.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "global.h" #include "widgets.h" #include "vlcPlayer.h" diff --git a/demo/kugou/VlcPlayer.cpp b/demo/kugou/VlcPlayer.cpp index 2c1ec18..d9b64a2 100644 --- a/demo/kugou/VlcPlayer.cpp +++ b/demo/kugou/VlcPlayer.cpp @@ -1,4 +1,4 @@ -#include "vlcPlayer.h" +#include "vlcPlayer.h" void* lock_cb(void* opaque, void** planes) { VlcPlayer* vp = (VlcPlayer*)opaque; diff --git a/demo/kugou/VlcPlayer.h b/demo/kugou/VlcPlayer.h index a330a05..6d9ed1a 100644 --- a/demo/kugou/VlcPlayer.h +++ b/demo/kugou/VlcPlayer.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "EzUI/Control.h" #include "EzUI/BorderlessWindow.h" #include "EzUI/Label.h" diff --git a/demo/kugou/base64.cpp b/demo/kugou/base64.cpp index 131c313..e011a8b 100644 --- a/demo/kugou/base64.cpp +++ b/demo/kugou/base64.cpp @@ -1,4 +1,4 @@ -/* +/* base64.cpp and base64.h base64 encoding and decoding with C++. More information at diff --git a/demo/kugou/base64.h b/demo/kugou/base64.h index 3ac6d0a..3a2d9c0 100644 --- a/demo/kugou/base64.h +++ b/demo/kugou/base64.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once // // base64 encoding and decoding with C++. // Version: 2.rc.08 (release candidate) diff --git a/demo/kugou/global.cpp b/demo/kugou/global.cpp index 207e1dc..2073cd7 100644 --- a/demo/kugou/global.cpp +++ b/demo/kugou/global.cpp @@ -1,4 +1,4 @@ -#include "global.h" +#include "global.h" namespace global { diff --git a/demo/kugou/global.h b/demo/kugou/global.h index 48f5084..7d7ac8c 100644 --- a/demo/kugou/global.h +++ b/demo/kugou/global.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "EzUI/EzUI.h" #include "EzUI/TextBox.h" #include "EzUI/BorderlessWindow.h" diff --git a/demo/kugou/include/Common/include/Common.h b/demo/kugou/include/Common/include/Common.h index cfb94d8..d7fa191 100644 --- a/demo/kugou/include/Common/include/Common.h +++ b/demo/kugou/include/Common/include/Common.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include #include #include diff --git a/demo/kugou/include/Common/include/ConfigIni.h b/demo/kugou/include/Common/include/ConfigIni.h index 72a39ed..59a20de 100644 --- a/demo/kugou/include/Common/include/ConfigIni.h +++ b/demo/kugou/include/Common/include/ConfigIni.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include #include "Text.h" diff --git a/demo/kugou/include/Common/include/FileSystem.h b/demo/kugou/include/Common/include/FileSystem.h index afbf3e3..344aeca 100644 --- a/demo/kugou/include/Common/include/FileSystem.h +++ b/demo/kugou/include/Common/include/FileSystem.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include #include #include diff --git a/demo/kugou/include/Common/include/JsonValue.h b/demo/kugou/include/Common/include/JsonValue.h index 6cb6324..145c862 100644 --- a/demo/kugou/include/Common/include/JsonValue.h +++ b/demo/kugou/include/Common/include/JsonValue.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include #include diff --git a/demo/kugou/include/Common/include/Log.h b/demo/kugou/include/Common/include/Log.h index 042fe55..e57155a 100644 --- a/demo/kugou/include/Common/include/Log.h +++ b/demo/kugou/include/Common/include/Log.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include #include "FileSystem.h" diff --git a/demo/kugou/include/Common/include/Socket.h b/demo/kugou/include/Common/include/Socket.h index af28961..bf82c65 100644 --- a/demo/kugou/include/Common/include/Socket.h +++ b/demo/kugou/include/Common/include/Socket.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include #include #include diff --git a/demo/kugou/include/Common/include/Text.h b/demo/kugou/include/Common/include/Text.h index 85a673a..75ab827 100644 --- a/demo/kugou/include/Common/include/Text.h +++ b/demo/kugou/include/Common/include/Text.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include #include #include diff --git a/demo/kugou/include/Common/include/UnZiper.h b/demo/kugou/include/Common/include/UnZiper.h index 85c0bb8..1874f24 100644 --- a/demo/kugou/include/Common/include/UnZiper.h +++ b/demo/kugou/include/Common/include/UnZiper.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Text.h" #include "FileSystem.h" diff --git a/demo/kugou/include/Common/include/Util.h b/demo/kugou/include/Common/include/Util.h index 18bcc8c..b1cb1bd 100644 --- a/demo/kugou/include/Common/include/Util.h +++ b/demo/kugou/include/Common/include/Util.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include #include diff --git a/demo/kugou/include/Common/include/WebClient.h b/demo/kugou/include/Common/include/WebClient.h index e388206..a8191a1 100644 --- a/demo/kugou/include/Common/include/WebClient.h +++ b/demo/kugou/include/Common/include/WebClient.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include #include #include diff --git a/demo/kugou/include/Common/include/WinTool.h b/demo/kugou/include/Common/include/WinTool.h index e55b303..fc02423 100644 --- a/demo/kugou/include/Common/include/WinTool.h +++ b/demo/kugou/include/Common/include/WinTool.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include #include #include diff --git a/demo/kugou/include/Common/include/Ziper.h b/demo/kugou/include/Common/include/Ziper.h index b4d0934..356ff0c 100644 --- a/demo/kugou/include/Common/include/Ziper.h +++ b/demo/kugou/include/Common/include/Ziper.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Text.h" #include "FileSystem.h" #include diff --git a/demo/kugou/include/Common/include/base64.h b/demo/kugou/include/Common/include/base64.h index 4860d63..a9852a6 100644 --- a/demo/kugou/include/Common/include/base64.h +++ b/demo/kugou/include/Common/include/base64.h @@ -1,4 +1,4 @@ -// +// // base64 encoding and decoding with C++. // Version: 2.rc.09 (release candidate) // diff --git a/demo/kugou/include/Common/include/curl/curl.h b/demo/kugou/include/Common/include/curl/curl.h index 6b6ac8a..6464012 100644 --- a/demo/kugou/include/Common/include/curl/curl.h +++ b/demo/kugou/include/Common/include/curl/curl.h @@ -1,4 +1,4 @@ -#ifndef CURLINC_CURL_H +#ifndef CURLINC_CURL_H #define CURLINC_CURL_H /*************************************************************************** * _ _ ____ _ diff --git a/demo/kugou/include/Common/include/curl/curlver.h b/demo/kugou/include/Common/include/curl/curlver.h index 6756c31..1f63157 100644 --- a/demo/kugou/include/Common/include/curl/curlver.h +++ b/demo/kugou/include/Common/include/curl/curlver.h @@ -1,4 +1,4 @@ -#ifndef CURLINC_CURLVER_H +#ifndef CURLINC_CURLVER_H #define CURLINC_CURLVER_H /*************************************************************************** * _ _ ____ _ diff --git a/demo/kugou/include/Common/include/curl/easy.h b/demo/kugou/include/Common/include/curl/easy.h index 2dbfb26..abb2130 100644 --- a/demo/kugou/include/Common/include/curl/easy.h +++ b/demo/kugou/include/Common/include/curl/easy.h @@ -1,4 +1,4 @@ -#ifndef CURLINC_EASY_H +#ifndef CURLINC_EASY_H #define CURLINC_EASY_H /*************************************************************************** * _ _ ____ _ diff --git a/demo/kugou/include/Common/include/curl/mprintf.h b/demo/kugou/include/Common/include/curl/mprintf.h index 3549552..0a8cc36 100644 --- a/demo/kugou/include/Common/include/curl/mprintf.h +++ b/demo/kugou/include/Common/include/curl/mprintf.h @@ -1,4 +1,4 @@ -#ifndef CURLINC_MPRINTF_H +#ifndef CURLINC_MPRINTF_H #define CURLINC_MPRINTF_H /*************************************************************************** * _ _ ____ _ diff --git a/demo/kugou/include/Common/include/curl/multi.h b/demo/kugou/include/Common/include/curl/multi.h index 37f9829..9e549d9 100644 --- a/demo/kugou/include/Common/include/curl/multi.h +++ b/demo/kugou/include/Common/include/curl/multi.h @@ -1,4 +1,4 @@ -#ifndef CURLINC_MULTI_H +#ifndef CURLINC_MULTI_H #define CURLINC_MULTI_H /*************************************************************************** * _ _ ____ _ diff --git a/demo/kugou/include/Common/include/curl/options.h b/demo/kugou/include/Common/include/curl/options.h index 14373b5..5574bda 100644 --- a/demo/kugou/include/Common/include/curl/options.h +++ b/demo/kugou/include/Common/include/curl/options.h @@ -1,4 +1,4 @@ -#ifndef CURLINC_OPTIONS_H +#ifndef CURLINC_OPTIONS_H #define CURLINC_OPTIONS_H /*************************************************************************** * _ _ ____ _ diff --git a/demo/kugou/include/Common/include/curl/stdcheaders.h b/demo/kugou/include/Common/include/curl/stdcheaders.h index 60596c7..01e8682 100644 --- a/demo/kugou/include/Common/include/curl/stdcheaders.h +++ b/demo/kugou/include/Common/include/curl/stdcheaders.h @@ -1,4 +1,4 @@ -#ifndef CURLINC_STDCHEADERS_H +#ifndef CURLINC_STDCHEADERS_H #define CURLINC_STDCHEADERS_H /*************************************************************************** * _ _ ____ _ diff --git a/demo/kugou/include/Common/include/curl/system.h b/demo/kugou/include/Common/include/curl/system.h index faf8fcf..d3222a0 100644 --- a/demo/kugou/include/Common/include/curl/system.h +++ b/demo/kugou/include/Common/include/curl/system.h @@ -1,4 +1,4 @@ -#ifndef CURLINC_SYSTEM_H +#ifndef CURLINC_SYSTEM_H #define CURLINC_SYSTEM_H /*************************************************************************** * _ _ ____ _ diff --git a/demo/kugou/include/Common/include/curl/typecheck-gcc.h b/demo/kugou/include/Common/include/curl/typecheck-gcc.h index 9e14d8a..bbe1101 100644 --- a/demo/kugou/include/Common/include/curl/typecheck-gcc.h +++ b/demo/kugou/include/Common/include/curl/typecheck-gcc.h @@ -1,4 +1,4 @@ -#ifndef CURLINC_TYPECHECK_GCC_H +#ifndef CURLINC_TYPECHECK_GCC_H #define CURLINC_TYPECHECK_GCC_H /*************************************************************************** * _ _ ____ _ diff --git a/demo/kugou/include/Common/include/curl/urlapi.h b/demo/kugou/include/Common/include/curl/urlapi.h index 3c4b4e1..6f9970a 100644 --- a/demo/kugou/include/Common/include/curl/urlapi.h +++ b/demo/kugou/include/Common/include/curl/urlapi.h @@ -1,4 +1,4 @@ -#ifndef CURLINC_URLAPI_H +#ifndef CURLINC_URLAPI_H #define CURLINC_URLAPI_H /*************************************************************************** * _ _ ____ _ diff --git a/demo/kugou/include/Common/include/httplib.h b/demo/kugou/include/Common/include/httplib.h index 37fc855..af8b6b0 100644 --- a/demo/kugou/include/Common/include/httplib.h +++ b/demo/kugou/include/Common/include/httplib.h @@ -1,4 +1,4 @@ -// +// // httplib.h // // Copyright (c) 2025 Yuji Hirose. All rights reserved. diff --git a/demo/kugou/include/Common/include/json/allocator.h b/demo/kugou/include/Common/include/json/allocator.h index 7540642..361540f 100644 --- a/demo/kugou/include/Common/include/json/allocator.h +++ b/demo/kugou/include/Common/include/json/allocator.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/demo/kugou/include/Common/include/json/assertions.h b/demo/kugou/include/Common/include/json/assertions.h index 666fa7f..0a0120d 100644 --- a/demo/kugou/include/Common/include/json/assertions.h +++ b/demo/kugou/include/Common/include/json/assertions.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/demo/kugou/include/Common/include/json/config.h b/demo/kugou/include/Common/include/json/config.h index 6359273..81d7969 100644 --- a/demo/kugou/include/Common/include/json/config.h +++ b/demo/kugou/include/Common/include/json/config.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/demo/kugou/include/Common/include/json/forwards.h b/demo/kugou/include/Common/include/json/forwards.h index affe33a..733b9d6 100644 --- a/demo/kugou/include/Common/include/json/forwards.h +++ b/demo/kugou/include/Common/include/json/forwards.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/demo/kugou/include/Common/include/json/json.h b/demo/kugou/include/Common/include/json/json.h index 5c776a1..c6a9bbd 100644 --- a/demo/kugou/include/Common/include/json/json.h +++ b/demo/kugou/include/Common/include/json/json.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/demo/kugou/include/Common/include/json/json_features.h b/demo/kugou/include/Common/include/json/json_features.h index e4a61d6..1940ed3 100644 --- a/demo/kugou/include/Common/include/json/json_features.h +++ b/demo/kugou/include/Common/include/json/json_features.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/demo/kugou/include/Common/include/json/reader.h b/demo/kugou/include/Common/include/json/reader.h index 46975d8..80e4248 100644 --- a/demo/kugou/include/Common/include/json/reader.h +++ b/demo/kugou/include/Common/include/json/reader.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/demo/kugou/include/Common/include/json/value.h b/demo/kugou/include/Common/include/json/value.h index a9ff772..66c7332 100644 --- a/demo/kugou/include/Common/include/json/value.h +++ b/demo/kugou/include/Common/include/json/value.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/demo/kugou/include/Common/include/json/version.h b/demo/kugou/include/Common/include/json/version.h index e931d03..99a27fa 100644 --- a/demo/kugou/include/Common/include/json/version.h +++ b/demo/kugou/include/Common/include/json/version.h @@ -1,4 +1,4 @@ -#ifndef JSON_VERSION_H_INCLUDED +#ifndef JSON_VERSION_H_INCLUDED #define JSON_VERSION_H_INCLUDED // Note: version must be updated in three places when doing a release. This diff --git a/demo/kugou/include/Common/include/json/writer.h b/demo/kugou/include/Common/include/json/writer.h index 7d8cf4d..bf13527 100644 --- a/demo/kugou/include/Common/include/json/writer.h +++ b/demo/kugou/include/Common/include/json/writer.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/demo/kugou/include/Common/include/mysql/big_endian.h b/demo/kugou/include/Common/include/mysql/big_endian.h index ef36402..4e0a22f 100644 --- a/demo/kugou/include/Common/include/mysql/big_endian.h +++ b/demo/kugou/include/Common/include/mysql/big_endian.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/binary_log_types.h b/demo/kugou/include/Common/include/mysql/binary_log_types.h index 7d04c55..c962c0f 100644 --- a/demo/kugou/include/Common/include/mysql/binary_log_types.h +++ b/demo/kugou/include/Common/include/mysql/binary_log_types.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/byte_order_generic.h b/demo/kugou/include/Common/include/mysql/byte_order_generic.h index dbf0f5c..0002482 100644 --- a/demo/kugou/include/Common/include/mysql/byte_order_generic.h +++ b/demo/kugou/include/Common/include/mysql/byte_order_generic.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/byte_order_generic_x86.h b/demo/kugou/include/Common/include/mysql/byte_order_generic_x86.h index 57e5e3e..53a079e 100644 --- a/demo/kugou/include/Common/include/mysql/byte_order_generic_x86.h +++ b/demo/kugou/include/Common/include/mysql/byte_order_generic_x86.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/decimal.h b/demo/kugou/include/Common/include/mysql/decimal.h index f89a333..bcab80d 100644 --- a/demo/kugou/include/Common/include/mysql/decimal.h +++ b/demo/kugou/include/Common/include/mysql/decimal.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/errmsg.h b/demo/kugou/include/Common/include/mysql/errmsg.h index 3029435..47f5f02 100644 --- a/demo/kugou/include/Common/include/mysql/errmsg.h +++ b/demo/kugou/include/Common/include/mysql/errmsg.h @@ -1,4 +1,4 @@ -#ifndef ERRMSG_INCLUDED +#ifndef ERRMSG_INCLUDED #define ERRMSG_INCLUDED /* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. diff --git a/demo/kugou/include/Common/include/mysql/keycache.h b/demo/kugou/include/Common/include/mysql/keycache.h index 78fc389..97e441c 100644 --- a/demo/kugou/include/Common/include/mysql/keycache.h +++ b/demo/kugou/include/Common/include/mysql/keycache.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/little_endian.h b/demo/kugou/include/Common/include/mysql/little_endian.h index 2bccb22..0b08cd0 100644 --- a/demo/kugou/include/Common/include/mysql/little_endian.h +++ b/demo/kugou/include/Common/include/mysql/little_endian.h @@ -1,4 +1,4 @@ -#ifndef LITTLE_ENDIAN_INCLUDED +#ifndef LITTLE_ENDIAN_INCLUDED #define LITTLE_ENDIAN_INCLUDED /* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. diff --git a/demo/kugou/include/Common/include/mysql/m_ctype.h b/demo/kugou/include/Common/include/mysql/m_ctype.h index 6d9a1a4..6257eec 100644 --- a/demo/kugou/include/Common/include/mysql/m_ctype.h +++ b/demo/kugou/include/Common/include/mysql/m_ctype.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/m_string.h b/demo/kugou/include/Common/include/mysql/m_string.h index eb6d13a..e37d3eb 100644 --- a/demo/kugou/include/Common/include/mysql/m_string.h +++ b/demo/kugou/include/Common/include/mysql/m_string.h @@ -1,4 +1,4 @@ -/* +/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify diff --git a/demo/kugou/include/Common/include/mysql/my_alloc.h b/demo/kugou/include/Common/include/mysql/my_alloc.h index d1084c2..203db5b 100644 --- a/demo/kugou/include/Common/include/mysql/my_alloc.h +++ b/demo/kugou/include/Common/include/mysql/my_alloc.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/my_byteorder.h b/demo/kugou/include/Common/include/mysql/my_byteorder.h index c37ab12..8dab9e8 100644 --- a/demo/kugou/include/Common/include/mysql/my_byteorder.h +++ b/demo/kugou/include/Common/include/mysql/my_byteorder.h @@ -1,4 +1,4 @@ -#ifndef MY_BYTEORDER_INCLUDED +#ifndef MY_BYTEORDER_INCLUDED #define MY_BYTEORDER_INCLUDED /* Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. diff --git a/demo/kugou/include/Common/include/mysql/my_command.h b/demo/kugou/include/Common/include/mysql/my_command.h index f60331c..d0ff20d 100644 --- a/demo/kugou/include/Common/include/mysql/my_command.h +++ b/demo/kugou/include/Common/include/mysql/my_command.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/my_compiler.h b/demo/kugou/include/Common/include/mysql/my_compiler.h index 2c3daee..8e1450b 100644 --- a/demo/kugou/include/Common/include/mysql/my_compiler.h +++ b/demo/kugou/include/Common/include/mysql/my_compiler.h @@ -1,4 +1,4 @@ -#ifndef MY_COMPILER_INCLUDED +#ifndef MY_COMPILER_INCLUDED #define MY_COMPILER_INCLUDED /* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. diff --git a/demo/kugou/include/Common/include/mysql/my_config.h b/demo/kugou/include/Common/include/mysql/my_config.h index 4815f9c..ee3ec51 100644 --- a/demo/kugou/include/Common/include/mysql/my_config.h +++ b/demo/kugou/include/Common/include/mysql/my_config.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/my_dbug.h b/demo/kugou/include/Common/include/mysql/my_dbug.h index 7911c19..4172264 100644 --- a/demo/kugou/include/Common/include/mysql/my_dbug.h +++ b/demo/kugou/include/Common/include/mysql/my_dbug.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/my_dir.h b/demo/kugou/include/Common/include/mysql/my_dir.h index 3fb3e54..7d524bf 100644 --- a/demo/kugou/include/Common/include/mysql/my_dir.h +++ b/demo/kugou/include/Common/include/mysql/my_dir.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/my_getopt.h b/demo/kugou/include/Common/include/mysql/my_getopt.h index d64aa75..8560251 100644 --- a/demo/kugou/include/Common/include/mysql/my_getopt.h +++ b/demo/kugou/include/Common/include/mysql/my_getopt.h @@ -1,4 +1,4 @@ - /* + /* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify diff --git a/demo/kugou/include/Common/include/mysql/my_global.h b/demo/kugou/include/Common/include/mysql/my_global.h index 8bbc080..c06c09b 100644 --- a/demo/kugou/include/Common/include/mysql/my_global.h +++ b/demo/kugou/include/Common/include/mysql/my_global.h @@ -1,4 +1,4 @@ -/* +/* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify diff --git a/demo/kugou/include/Common/include/mysql/my_list.h b/demo/kugou/include/Common/include/mysql/my_list.h index 9432d44..902cc0f 100644 --- a/demo/kugou/include/Common/include/mysql/my_list.h +++ b/demo/kugou/include/Common/include/mysql/my_list.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/my_sys.h b/demo/kugou/include/Common/include/mysql/my_sys.h index 77d028d..fd467cc 100644 --- a/demo/kugou/include/Common/include/mysql/my_sys.h +++ b/demo/kugou/include/Common/include/mysql/my_sys.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/my_thread.h b/demo/kugou/include/Common/include/mysql/my_thread.h index a9d9316..805d9df 100644 --- a/demo/kugou/include/Common/include/mysql/my_thread.h +++ b/demo/kugou/include/Common/include/mysql/my_thread.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/my_thread_local.h b/demo/kugou/include/Common/include/mysql/my_thread_local.h index 0b19a6d..12a4209 100644 --- a/demo/kugou/include/Common/include/mysql/my_thread_local.h +++ b/demo/kugou/include/Common/include/mysql/my_thread_local.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/my_xml.h b/demo/kugou/include/Common/include/mysql/my_xml.h index 3d6d335..a78279b 100644 --- a/demo/kugou/include/Common/include/mysql/my_xml.h +++ b/demo/kugou/include/Common/include/mysql/my_xml.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql.h b/demo/kugou/include/Common/include/mysql/mysql.h index 1260d97..82fbdd7 100644 --- a/demo/kugou/include/Common/include/mysql/mysql.h +++ b/demo/kugou/include/Common/include/mysql/mysql.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/client_authentication.h b/demo/kugou/include/Common/include/mysql/mysql/client_authentication.h index 94a408b..2536ceb 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/client_authentication.h +++ b/demo/kugou/include/Common/include/mysql/mysql/client_authentication.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/client_plugin.h b/demo/kugou/include/Common/include/mysql/mysql/client_plugin.h index 2b7fc95..6a09f9e 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/client_plugin.h +++ b/demo/kugou/include/Common/include/mysql/mysql/client_plugin.h @@ -1,4 +1,4 @@ -#ifndef MYSQL_CLIENT_PLUGIN_INCLUDED +#ifndef MYSQL_CLIENT_PLUGIN_INCLUDED /* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify diff --git a/demo/kugou/include/Common/include/mysql/mysql/com_data.h b/demo/kugou/include/Common/include/mysql/mysql/com_data.h index 9fc465e..6480df1 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/com_data.h +++ b/demo/kugou/include/Common/include/mysql/mysql/com_data.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/get_password.h b/demo/kugou/include/Common/include/mysql/mysql/get_password.h index 5b89ee1..f0456bc 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/get_password.h +++ b/demo/kugou/include/Common/include/mysql/mysql/get_password.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/group_replication_priv.h b/demo/kugou/include/Common/include/mysql/mysql/group_replication_priv.h index 6ded84f..a4363e4 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/group_replication_priv.h +++ b/demo/kugou/include/Common/include/mysql/mysql/group_replication_priv.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/innodb_priv.h b/demo/kugou/include/Common/include/mysql/mysql/innodb_priv.h index 834bebc..ae2e5c3 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/innodb_priv.h +++ b/demo/kugou/include/Common/include/mysql/mysql/innodb_priv.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/mysql_lex_string.h b/demo/kugou/include/Common/include/mysql/mysql/mysql_lex_string.h index 801e0f9..effbd49 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/mysql_lex_string.h +++ b/demo/kugou/include/Common/include/mysql/mysql/mysql_lex_string.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/plugin.h b/demo/kugou/include/Common/include/mysql/mysql/plugin.h index 0ee1b67..cd6b90f 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/plugin.h +++ b/demo/kugou/include/Common/include/mysql/mysql/plugin.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/plugin_audit.h b/demo/kugou/include/Common/include/mysql/mysql/plugin_audit.h index 606bfbf..e8577b6 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/plugin_audit.h +++ b/demo/kugou/include/Common/include/mysql/mysql/plugin_audit.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/plugin_auth.h b/demo/kugou/include/Common/include/mysql/mysql/plugin_auth.h index 0e2ac99..2263150 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/plugin_auth.h +++ b/demo/kugou/include/Common/include/mysql/mysql/plugin_auth.h @@ -1,4 +1,4 @@ -#ifndef MYSQL_PLUGIN_AUTH_INCLUDED +#ifndef MYSQL_PLUGIN_AUTH_INCLUDED /* Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify diff --git a/demo/kugou/include/Common/include/mysql/mysql/plugin_auth_common.h b/demo/kugou/include/Common/include/mysql/mysql/plugin_auth_common.h index e27b6d3..173fdeb 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/plugin_auth_common.h +++ b/demo/kugou/include/Common/include/mysql/mysql/plugin_auth_common.h @@ -1,4 +1,4 @@ -#ifndef MYSQL_PLUGIN_AUTH_COMMON_INCLUDED +#ifndef MYSQL_PLUGIN_AUTH_COMMON_INCLUDED /* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify diff --git a/demo/kugou/include/Common/include/mysql/mysql/plugin_ftparser.h b/demo/kugou/include/Common/include/mysql/mysql/plugin_ftparser.h index e96834f..1fe1086 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/plugin_ftparser.h +++ b/demo/kugou/include/Common/include/mysql/mysql/plugin_ftparser.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/plugin_group_replication.h b/demo/kugou/include/Common/include/mysql/mysql/plugin_group_replication.h index 0f427be..9bc871a 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/plugin_group_replication.h +++ b/demo/kugou/include/Common/include/mysql/mysql/plugin_group_replication.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/plugin_keyring.h b/demo/kugou/include/Common/include/mysql/mysql/plugin_keyring.h index df04084..fdcf2ba 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/plugin_keyring.h +++ b/demo/kugou/include/Common/include/mysql/mysql/plugin_keyring.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/plugin_trace.h b/demo/kugou/include/Common/include/mysql/mysql/plugin_trace.h index 8b03d1d..4da2fed 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/plugin_trace.h +++ b/demo/kugou/include/Common/include/mysql/mysql/plugin_trace.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/plugin_validate_password.h b/demo/kugou/include/Common/include/mysql/mysql/plugin_validate_password.h index e7a1a25..e779fdf 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/plugin_validate_password.h +++ b/demo/kugou/include/Common/include/mysql/mysql/plugin_validate_password.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_file.h b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_file.h index a7d0bcb..c209d39 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_file.h +++ b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_file.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_idle.h b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_idle.h index 662de59..3e3960f 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_idle.h +++ b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_idle.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_mdl.h b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_mdl.h index 0db0160..86f4716 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_mdl.h +++ b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_mdl.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_memory.h b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_memory.h index 2955c9d..3b16273 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_memory.h +++ b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_memory.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_ps.h b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_ps.h index e68994d..e59ddc1 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_ps.h +++ b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_ps.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_socket.h b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_socket.h index 94e17c4..3721cb5 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_socket.h +++ b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_socket.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_sp.h b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_sp.h index 5eeea37..bf6a2ab 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_sp.h +++ b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_sp.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_stage.h b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_stage.h index fa6dbc2..1eed58f 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_stage.h +++ b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_stage.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_statement.h b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_statement.h index 597d152..b9d62c0 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_statement.h +++ b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_statement.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_table.h b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_table.h index bad0ae3..e786147 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_table.h +++ b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_table.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_thread.h b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_thread.h index 7f87192..ea42ba3 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_thread.h +++ b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_thread.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_transaction.h b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_transaction.h index 4162939..efe0589 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_transaction.h +++ b/demo/kugou/include/Common/include/mysql/mysql/psi/mysql_transaction.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/psi/psi.h b/demo/kugou/include/Common/include/mysql/mysql/psi/psi.h index 34422d3..8ea2ae3 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/psi/psi.h +++ b/demo/kugou/include/Common/include/mysql/mysql/psi/psi.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/psi/psi_base.h b/demo/kugou/include/Common/include/mysql/mysql/psi/psi_base.h index d9f2520..dde307e 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/psi/psi_base.h +++ b/demo/kugou/include/Common/include/mysql/mysql/psi/psi_base.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/psi/psi_memory.h b/demo/kugou/include/Common/include/mysql/mysql/psi/psi_memory.h index d6915a1..5e30583 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/psi/psi_memory.h +++ b/demo/kugou/include/Common/include/mysql/mysql/psi/psi_memory.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_command.h b/demo/kugou/include/Common/include/mysql/mysql/service_command.h index 45521a7..a76d8b2 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_command.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_command.h @@ -1,4 +1,4 @@ -#ifndef MYSQL_SERVICE_COMMAND_INCLUDED +#ifndef MYSQL_SERVICE_COMMAND_INCLUDED #define MYSQL_SERVICE_COMMAND_INCLUDED /* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_locking.h b/demo/kugou/include/Common/include/mysql/mysql/service_locking.h index 7bb331b..610b5ee 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_locking.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_locking.h @@ -1,4 +1,4 @@ -/* +/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_my_plugin_log.h b/demo/kugou/include/Common/include/mysql/mysql/service_my_plugin_log.h index 88bb0be..ee5242f 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_my_plugin_log.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_my_plugin_log.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_my_snprintf.h b/demo/kugou/include/Common/include/mysql/mysql/service_my_snprintf.h index 1b44492..da9b7ca 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_my_snprintf.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_my_snprintf.h @@ -1,4 +1,4 @@ -#ifndef MYSQL_SERVICE_MY_SNPRINTF_INCLUDED +#ifndef MYSQL_SERVICE_MY_SNPRINTF_INCLUDED #define MYSQL_SERVICE_MY_SNPRINTF_INCLUDED /* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_mysql_alloc.h b/demo/kugou/include/Common/include/mysql/mysql/service_mysql_alloc.h index 99bf2ad..5517ed2 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_mysql_alloc.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_mysql_alloc.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_mysql_keyring.h b/demo/kugou/include/Common/include/mysql/mysql/service_mysql_keyring.h index 40f3cef..d41f553 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_mysql_keyring.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_mysql_keyring.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_mysql_password_policy.h b/demo/kugou/include/Common/include/mysql/mysql/service_mysql_password_policy.h index ef2f37d..5860519 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_mysql_password_policy.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_mysql_password_policy.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_mysql_string.h b/demo/kugou/include/Common/include/mysql/mysql/service_mysql_string.h index 3221195..a115f46 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_mysql_string.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_mysql_string.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_parser.h b/demo/kugou/include/Common/include/mysql/mysql/service_parser.h index 66b6740..6d90c0c 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_parser.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_parser.h @@ -1,4 +1,4 @@ -#ifndef MYSQL_SERVICE_PARSER_INCLUDED +#ifndef MYSQL_SERVICE_PARSER_INCLUDED #define MYSQL_SERVICE_PARSER_INCLUDED /* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_rpl_transaction_ctx.h b/demo/kugou/include/Common/include/mysql/mysql/service_rpl_transaction_ctx.h index 8351b82..65f8be0 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_rpl_transaction_ctx.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_rpl_transaction_ctx.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_rpl_transaction_write_set.h b/demo/kugou/include/Common/include/mysql/mysql/service_rpl_transaction_write_set.h index 854842f..f029423 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_rpl_transaction_write_set.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_rpl_transaction_write_set.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_rules_table.h b/demo/kugou/include/Common/include/mysql/mysql/service_rules_table.h index 574a20c..900c956 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_rules_table.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_rules_table.h @@ -1,4 +1,4 @@ -#ifdef __cplusplus +#ifdef __cplusplus #ifndef SERVICE_RULES_TABLE_INCLUDED #define SERVICE_RULES_TABLE_INCLUDED diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_security_context.h b/demo/kugou/include/Common/include/mysql/mysql/service_security_context.h index 2527c0d..b51760e 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_security_context.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_security_context.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_srv_session.h b/demo/kugou/include/Common/include/mysql/mysql/service_srv_session.h index 2461827..87e8a86 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_srv_session.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_srv_session.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_srv_session_info.h b/demo/kugou/include/Common/include/mysql/mysql/service_srv_session_info.h index 336e7a0..7223860 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_srv_session_info.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_srv_session_info.h @@ -1,4 +1,4 @@ -#ifndef MYSQL_SERVICE_SRV_SESSION_INFO_INCLUDED +#ifndef MYSQL_SERVICE_SRV_SESSION_INFO_INCLUDED #define MYSQL_SERVICE_SRV_SESSION_INFO_INCLUDED /* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_ssl_wrapper.h b/demo/kugou/include/Common/include/mysql/mysql/service_ssl_wrapper.h index 6f29464..30f0276 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_ssl_wrapper.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_ssl_wrapper.h @@ -1,4 +1,4 @@ -#ifndef SSL_WRAPPER_INCLUDED +#ifndef SSL_WRAPPER_INCLUDED #define SSL_WRAPPER_INCLUDED /* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_thd_alloc.h b/demo/kugou/include/Common/include/mysql/mysql/service_thd_alloc.h index 9a843d1..37d6770 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_thd_alloc.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_thd_alloc.h @@ -1,4 +1,4 @@ -#ifndef MYSQL_SERVICE_THD_ALLOC_INCLUDED +#ifndef MYSQL_SERVICE_THD_ALLOC_INCLUDED /* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_thd_engine_lock.h b/demo/kugou/include/Common/include/mysql/mysql/service_thd_engine_lock.h index 73aca0a..0317670 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_thd_engine_lock.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_thd_engine_lock.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_thd_wait.h b/demo/kugou/include/Common/include/mysql/mysql/service_thd_wait.h index d498afe..387cfd3 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_thd_wait.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_thd_wait.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql/service_thread_scheduler.h b/demo/kugou/include/Common/include/mysql/mysql/service_thread_scheduler.h index ac05e75..d44a3db 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/service_thread_scheduler.h +++ b/demo/kugou/include/Common/include/mysql/mysql/service_thread_scheduler.h @@ -1,4 +1,4 @@ -/* +/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify diff --git a/demo/kugou/include/Common/include/mysql/mysql/services.h b/demo/kugou/include/Common/include/mysql/mysql/services.h index f11298f..af5ced0 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/services.h +++ b/demo/kugou/include/Common/include/mysql/mysql/services.h @@ -1,4 +1,4 @@ -#ifndef MYSQL_SERVICES_INCLUDED +#ifndef MYSQL_SERVICES_INCLUDED /* Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify diff --git a/demo/kugou/include/Common/include/mysql/mysql/thread_pool_priv.h b/demo/kugou/include/Common/include/mysql/mysql/thread_pool_priv.h index 00bdc24..e6f8812 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/thread_pool_priv.h +++ b/demo/kugou/include/Common/include/mysql/mysql/thread_pool_priv.h @@ -1,4 +1,4 @@ -/* +/* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify diff --git a/demo/kugou/include/Common/include/mysql/mysql/thread_type.h b/demo/kugou/include/Common/include/mysql/mysql/thread_type.h index bc5ad69..9e4e36f 100644 --- a/demo/kugou/include/Common/include/mysql/mysql/thread_type.h +++ b/demo/kugou/include/Common/include/mysql/mysql/thread_type.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql_com.h b/demo/kugou/include/Common/include/mysql/mysql_com.h index e6d7158..1129976 100644 --- a/demo/kugou/include/Common/include/mysql/mysql_com.h +++ b/demo/kugou/include/Common/include/mysql/mysql_com.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql_com_server.h b/demo/kugou/include/Common/include/mysql/mysql_com_server.h index 4a49e36..40b06a4 100644 --- a/demo/kugou/include/Common/include/mysql/mysql_com_server.h +++ b/demo/kugou/include/Common/include/mysql/mysql_com_server.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql_embed.h b/demo/kugou/include/Common/include/mysql/mysql_embed.h index f68ec15..aef8559 100644 --- a/demo/kugou/include/Common/include/mysql/mysql_embed.h +++ b/demo/kugou/include/Common/include/mysql/mysql_embed.h @@ -1,4 +1,4 @@ -#ifndef MYSQL_EMBED_INCLUDED +#ifndef MYSQL_EMBED_INCLUDED #define MYSQL_EMBED_INCLUDED /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. diff --git a/demo/kugou/include/Common/include/mysql/mysql_time.h b/demo/kugou/include/Common/include/mysql/mysql_time.h index 8d486e3..5dc12e6 100644 --- a/demo/kugou/include/Common/include/mysql/mysql_time.h +++ b/demo/kugou/include/Common/include/mysql/mysql_time.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysql_version.h b/demo/kugou/include/Common/include/mysql/mysql_version.h index 5252f08..e659908 100644 --- a/demo/kugou/include/Common/include/mysql/mysql_version.h +++ b/demo/kugou/include/Common/include/mysql/mysql_version.h @@ -1,4 +1,4 @@ -/* Copyright Abandoned 1996,1999 TCX DataKonsult AB & Monty Program KB +/* Copyright Abandoned 1996,1999 TCX DataKonsult AB & Monty Program KB & Detron HB, 1996, 1999-2004, 2007 MySQL AB. This file is public domain and comes with NO WARRANTY of any kind */ diff --git a/demo/kugou/include/Common/include/mysql/mysqld_ername.h b/demo/kugou/include/Common/include/mysql/mysqld_ername.h index f382e68..50b19be 100644 --- a/demo/kugou/include/Common/include/mysql/mysqld_ername.h +++ b/demo/kugou/include/Common/include/mysql/mysqld_ername.h @@ -1,4 +1,4 @@ -/* Autogenerated file, please don't edit */ +/* Autogenerated file, please don't edit */ { "ER_HASHCHK", 1000, "hashchk" }, { "ER_NISAMCHK", 1001, "isamchk" }, diff --git a/demo/kugou/include/Common/include/mysql/mysqld_error.h b/demo/kugou/include/Common/include/mysql/mysqld_error.h index cc8e386..e4e4ad0 100644 --- a/demo/kugou/include/Common/include/mysql/mysqld_error.h +++ b/demo/kugou/include/Common/include/mysql/mysqld_error.h @@ -1,4 +1,4 @@ -/* Autogenerated file, please don't edit */ +/* Autogenerated file, please don't edit */ #ifndef MYSQLD_ERROR_INCLUDED #define MYSQLD_ERROR_INCLUDED diff --git a/demo/kugou/include/Common/include/mysql/mysqlx_ername.h b/demo/kugou/include/Common/include/mysql/mysqlx_ername.h index 74b1094..0458b26 100644 --- a/demo/kugou/include/Common/include/mysql/mysqlx_ername.h +++ b/demo/kugou/include/Common/include/mysql/mysqlx_ername.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. * * This program is free software; you can redistribute it and/or modify diff --git a/demo/kugou/include/Common/include/mysql/mysqlx_error.h b/demo/kugou/include/Common/include/mysql/mysqlx_error.h index 2019025..fefb12d 100644 --- a/demo/kugou/include/Common/include/mysql/mysqlx_error.h +++ b/demo/kugou/include/Common/include/mysql/mysqlx_error.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/mysqlx_version.h b/demo/kugou/include/Common/include/mysql/mysqlx_version.h index fa761cd..4357b78 100644 --- a/demo/kugou/include/Common/include/mysql/mysqlx_version.h +++ b/demo/kugou/include/Common/include/mysql/mysqlx_version.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. * * This program is free software; you can redistribute it and/or modify diff --git a/demo/kugou/include/Common/include/mysql/plugin.h b/demo/kugou/include/Common/include/mysql/plugin.h index 0ee1b67..cd6b90f 100644 --- a/demo/kugou/include/Common/include/mysql/plugin.h +++ b/demo/kugou/include/Common/include/mysql/plugin.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/plugin_audit.h b/demo/kugou/include/Common/include/mysql/plugin_audit.h index 606bfbf..e8577b6 100644 --- a/demo/kugou/include/Common/include/mysql/plugin_audit.h +++ b/demo/kugou/include/Common/include/mysql/plugin_audit.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/plugin_ftparser.h b/demo/kugou/include/Common/include/mysql/plugin_ftparser.h index e96834f..1fe1086 100644 --- a/demo/kugou/include/Common/include/mysql/plugin_ftparser.h +++ b/demo/kugou/include/Common/include/mysql/plugin_ftparser.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/plugin_group_replication.h b/demo/kugou/include/Common/include/mysql/plugin_group_replication.h index 0f427be..9bc871a 100644 --- a/demo/kugou/include/Common/include/mysql/plugin_group_replication.h +++ b/demo/kugou/include/Common/include/mysql/plugin_group_replication.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/plugin_keyring.h b/demo/kugou/include/Common/include/mysql/plugin_keyring.h index df04084..fdcf2ba 100644 --- a/demo/kugou/include/Common/include/mysql/plugin_keyring.h +++ b/demo/kugou/include/Common/include/mysql/plugin_keyring.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/plugin_validate_password.h b/demo/kugou/include/Common/include/mysql/plugin_validate_password.h index e7a1a25..e779fdf 100644 --- a/demo/kugou/include/Common/include/mysql/plugin_validate_password.h +++ b/demo/kugou/include/Common/include/mysql/plugin_validate_password.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/sql_common.h b/demo/kugou/include/Common/include/mysql/sql_common.h index 02988a7..c59be21 100644 --- a/demo/kugou/include/Common/include/mysql/sql_common.h +++ b/demo/kugou/include/Common/include/mysql/sql_common.h @@ -1,4 +1,4 @@ -#ifndef SQL_COMMON_INCLUDED +#ifndef SQL_COMMON_INCLUDED #define SQL_COMMON_INCLUDED /* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. diff --git a/demo/kugou/include/Common/include/mysql/sql_state.h b/demo/kugou/include/Common/include/mysql/sql_state.h index 125d0e6..84a6e9c 100644 --- a/demo/kugou/include/Common/include/mysql/sql_state.h +++ b/demo/kugou/include/Common/include/mysql/sql_state.h @@ -1,4 +1,4 @@ -/* Autogenerated file, please don't edit */ +/* Autogenerated file, please don't edit */ { ER_DUP_KEY ,"23000", "" }, { ER_OUTOFMEMORY ,"HY001", "S1001" }, diff --git a/demo/kugou/include/Common/include/mysql/sslopt-case.h b/demo/kugou/include/Common/include/mysql/sslopt-case.h index 285ba8d..a6e15c1 100644 --- a/demo/kugou/include/Common/include/mysql/sslopt-case.h +++ b/demo/kugou/include/Common/include/mysql/sslopt-case.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/sslopt-longopts.h b/demo/kugou/include/Common/include/mysql/sslopt-longopts.h index 4219cf8..695009c 100644 --- a/demo/kugou/include/Common/include/mysql/sslopt-longopts.h +++ b/demo/kugou/include/Common/include/mysql/sslopt-longopts.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/sslopt-vars.h b/demo/kugou/include/Common/include/mysql/sslopt-vars.h index 6355c06..5dedab4 100644 --- a/demo/kugou/include/Common/include/mysql/sslopt-vars.h +++ b/demo/kugou/include/Common/include/mysql/sslopt-vars.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/mysql/thr_cond.h b/demo/kugou/include/Common/include/mysql/thr_cond.h index 048a7b3..ae7b7b5 100644 --- a/demo/kugou/include/Common/include/mysql/thr_cond.h +++ b/demo/kugou/include/Common/include/mysql/thr_cond.h @@ -1,4 +1,4 @@ -#ifndef THR_COND_INCLUDED +#ifndef THR_COND_INCLUDED #define THR_COND_INCLUDED /* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. diff --git a/demo/kugou/include/Common/include/mysql/thr_mutex.h b/demo/kugou/include/Common/include/mysql/thr_mutex.h index 416e6a7..b6aa0bd 100644 --- a/demo/kugou/include/Common/include/mysql/thr_mutex.h +++ b/demo/kugou/include/Common/include/mysql/thr_mutex.h @@ -1,4 +1,4 @@ -#ifndef THR_MUTEX_INCLUDED +#ifndef THR_MUTEX_INCLUDED #define THR_MUTEX_INCLUDED /* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. diff --git a/demo/kugou/include/Common/include/mysql/thr_rwlock.h b/demo/kugou/include/Common/include/mysql/thr_rwlock.h index 6880895..b9943db 100644 --- a/demo/kugou/include/Common/include/mysql/thr_rwlock.h +++ b/demo/kugou/include/Common/include/mysql/thr_rwlock.h @@ -1,4 +1,4 @@ -#ifndef THR_RWLOCK_INCLUDED +#ifndef THR_RWLOCK_INCLUDED #define THR_RWLOCK_INCLUDED /* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. diff --git a/demo/kugou/include/Common/include/mysql/typelib.h b/demo/kugou/include/Common/include/mysql/typelib.h index eef970f..4f7ab45 100644 --- a/demo/kugou/include/Common/include/mysql/typelib.h +++ b/demo/kugou/include/Common/include/mysql/typelib.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, diff --git a/demo/kugou/include/Common/include/occi/ldap.h b/demo/kugou/include/Common/include/occi/ldap.h index fcb18f6..2e1366e 100644 --- a/demo/kugou/include/Common/include/occi/ldap.h +++ b/demo/kugou/include/Common/include/occi/ldap.h @@ -1,4 +1,4 @@ -/* +/* * $Header: ldap/public/ldap.h /main/36 2012/09/13 02:33:23 ravikum Exp $ */ diff --git a/demo/kugou/include/Common/include/occi/nzerror.h b/demo/kugou/include/Common/include/occi/nzerror.h index a47d95d..6a49b60 100644 --- a/demo/kugou/include/Common/include/occi/nzerror.h +++ b/demo/kugou/include/Common/include/occi/nzerror.h @@ -1,4 +1,4 @@ -/* DISABLE check_long_lines */ +/* DISABLE check_long_lines */ /* * $Header: security_src/public/nzerror.h /st_ldap_client12.2.0.1.0/1 2016/07/26 20:35:41 jrpierre Exp $ diff --git a/demo/kugou/include/Common/include/occi/nzt.h b/demo/kugou/include/Common/include/occi/nzt.h index 2dad27e..eb046a4 100644 --- a/demo/kugou/include/Common/include/occi/nzt.h +++ b/demo/kugou/include/Common/include/occi/nzt.h @@ -1,4 +1,4 @@ -/* DISABLE check_long_lines */ +/* DISABLE check_long_lines */ /* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.*/ diff --git a/demo/kugou/include/Common/include/occi/occi.h b/demo/kugou/include/Common/include/occi/occi.h index 2dca9e6..e60f560 100644 --- a/demo/kugou/include/Common/include/occi/occi.h +++ b/demo/kugou/include/Common/include/occi/occi.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2002, Oracle Corporation. All rights reserved. */ +/* Copyright (c) 2000, 2002, Oracle Corporation. All rights reserved. */ /* NAME diff --git a/demo/kugou/include/Common/include/occi/occiAQ.h b/demo/kugou/include/Common/include/occi/occiAQ.h index 67dae25..0f4c552 100644 --- a/demo/kugou/include/Common/include/occi/occiAQ.h +++ b/demo/kugou/include/Common/include/occi/occiAQ.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. +/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.*/ /* diff --git a/demo/kugou/include/Common/include/occi/occiCommon.h b/demo/kugou/include/Common/include/occi/occiCommon.h index 67f0101..f26fa45 100644 --- a/demo/kugou/include/Common/include/occi/occiCommon.h +++ b/demo/kugou/include/Common/include/occi/occiCommon.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. */ /* diff --git a/demo/kugou/include/Common/include/occi/occiControl.h b/demo/kugou/include/Common/include/occi/occiControl.h index 20685cb..381e3c2 100644 --- a/demo/kugou/include/Common/include/occi/occiControl.h +++ b/demo/kugou/include/Common/include/occi/occiControl.h @@ -1,4 +1,4 @@ -/* Copyright Oracle Corporation 2000, 2012. All Rights Reserved. */ +/* Copyright Oracle Corporation 2000, 2012. All Rights Reserved. */ /* NAME diff --git a/demo/kugou/include/Common/include/occi/occiData.h b/demo/kugou/include/Common/include/occi/occiData.h index 9c9631d..fc75ae4 100644 --- a/demo/kugou/include/Common/include/occi/occiData.h +++ b/demo/kugou/include/Common/include/occi/occiData.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. +/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. */ /* diff --git a/demo/kugou/include/Common/include/occi/occiObjects.h b/demo/kugou/include/Common/include/occi/occiObjects.h index 1b301ad..1f90af4 100644 --- a/demo/kugou/include/Common/include/occi/occiObjects.h +++ b/demo/kugou/include/Common/include/occi/occiObjects.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2007, Oracle. All rights reserved. */ +/* Copyright (c) 2000, 2007, Oracle. All rights reserved. */ /* NAME diff --git a/demo/kugou/include/Common/include/occi/oci.h b/demo/kugou/include/Common/include/occi/oci.h index d4b650d..13659a9 100644 --- a/demo/kugou/include/Common/include/occi/oci.h +++ b/demo/kugou/include/Common/include/occi/oci.h @@ -1,4 +1,4 @@ -/* Copyright (c) 1995, 2016, Oracle and/or its affiliates. +/* Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved.*/ /* diff --git a/demo/kugou/include/Common/include/occi/oci1.h b/demo/kugou/include/Common/include/occi/oci1.h index 8c59c94..adf341e 100644 --- a/demo/kugou/include/Common/include/occi/oci1.h +++ b/demo/kugou/include/Common/include/occi/oci1.h @@ -1,4 +1,4 @@ - + /* Copyright (c) 1997, 2005, Oracle. All rights reserved. */ /* NOTE: See 'header_template.doc' in the 'doc' dve under the 'forms' diff --git a/demo/kugou/include/Common/include/occi/oci8dp.h b/demo/kugou/include/Common/include/occi/oci8dp.h index d73258c..4c38792 100644 --- a/demo/kugou/include/Common/include/occi/oci8dp.h +++ b/demo/kugou/include/Common/include/occi/oci8dp.h @@ -1,4 +1,4 @@ -/* +/* * */ diff --git a/demo/kugou/include/Common/include/occi/ociap.h b/demo/kugou/include/Common/include/occi/ociap.h index cbe0d48..de67ccc 100644 --- a/demo/kugou/include/Common/include/occi/ociap.h +++ b/demo/kugou/include/Common/include/occi/ociap.h @@ -1,4 +1,4 @@ -/* Copyright (c) 1996, 2015, Oracle and/or its affiliates. +/* Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.*/ /* diff --git a/demo/kugou/include/Common/include/occi/ociapr.h b/demo/kugou/include/Common/include/occi/ociapr.h index 2f25c52..0f1fe62 100644 --- a/demo/kugou/include/Common/include/occi/ociapr.h +++ b/demo/kugou/include/Common/include/occi/ociapr.h @@ -1,4 +1,4 @@ -/* Copyright (c) 1991, 2005, Oracle. All rights reserved. */ +/* Copyright (c) 1991, 2005, Oracle. All rights reserved. */ /* NAME ociapr.h diff --git a/demo/kugou/include/Common/include/occi/ocidef.h b/demo/kugou/include/Common/include/occi/ocidef.h index 9fde50b..b9fbcca 100644 --- a/demo/kugou/include/Common/include/occi/ocidef.h +++ b/demo/kugou/include/Common/include/occi/ocidef.h @@ -1,4 +1,4 @@ -/* Copyright (c) 1981, 2005, Oracle. All rights reserved. */ +/* Copyright (c) 1981, 2005, Oracle. All rights reserved. */ /* Copyright (c) 1984, 2005, Oracle. All rights reserved. */ /* diff --git a/demo/kugou/include/Common/include/occi/ocidem.h b/demo/kugou/include/Common/include/occi/ocidem.h index f7bb786..c60f2b5 100644 --- a/demo/kugou/include/Common/include/occi/ocidem.h +++ b/demo/kugou/include/Common/include/occi/ocidem.h @@ -1,4 +1,4 @@ -/* +/* * */ diff --git a/demo/kugou/include/Common/include/occi/ocidfn.h b/demo/kugou/include/Common/include/occi/ocidfn.h index 06e0316..89548f9 100644 --- a/demo/kugou/include/Common/include/occi/ocidfn.h +++ b/demo/kugou/include/Common/include/occi/ocidfn.h @@ -1,4 +1,4 @@ -/* Copyright (c) 1991, 2012, Oracle and/or its affiliates. +/* Copyright (c) 1991, 2012, Oracle and/or its affiliates. All rights reserved. */ /* NAME diff --git a/demo/kugou/include/Common/include/occi/ociextp.h b/demo/kugou/include/Common/include/occi/ociextp.h index 7026a68..70d2e3a 100644 --- a/demo/kugou/include/Common/include/occi/ociextp.h +++ b/demo/kugou/include/Common/include/occi/ociextp.h @@ -1,4 +1,4 @@ -/* +/* * */ diff --git a/demo/kugou/include/Common/include/occi/ocikpr.h b/demo/kugou/include/Common/include/occi/ocikpr.h index 425d696..2931a43 100644 --- a/demo/kugou/include/Common/include/occi/ocikpr.h +++ b/demo/kugou/include/Common/include/occi/ocikpr.h @@ -1,4 +1,4 @@ -/* Copyright (c) 1991, 2005, Oracle. All rights reserved. */ +/* Copyright (c) 1991, 2005, Oracle. All rights reserved. */ /* NAME ocikpr.h - header of K & R compilers diff --git a/demo/kugou/include/Common/include/occi/ocixml.h b/demo/kugou/include/Common/include/occi/ocixml.h index 2a4e037..3fc7e60 100644 --- a/demo/kugou/include/Common/include/occi/ocixml.h +++ b/demo/kugou/include/Common/include/occi/ocixml.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2003, 2012, Oracle and/or its affiliates. +/* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. */ /* diff --git a/demo/kugou/include/Common/include/occi/ocixmldb.h b/demo/kugou/include/Common/include/occi/ocixmldb.h index 4a5bf47..cdaefc3 100644 --- a/demo/kugou/include/Common/include/occi/ocixmldb.h +++ b/demo/kugou/include/Common/include/occi/ocixmldb.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2003, 2014, Oracle and/or its affiliates. +/* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.*/ /* diff --git a/demo/kugou/include/Common/include/occi/ocixstream.h b/demo/kugou/include/Common/include/occi/ocixstream.h index eb183de..3b83c5d 100644 --- a/demo/kugou/include/Common/include/occi/ocixstream.h +++ b/demo/kugou/include/Common/include/occi/ocixstream.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2016, Oracle and/or its affiliates. +/* Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.*/ /* diff --git a/demo/kugou/include/Common/include/occi/odci.h b/demo/kugou/include/Common/include/occi/odci.h index 4baef52..cb54814 100644 --- a/demo/kugou/include/Common/include/occi/odci.h +++ b/demo/kugou/include/Common/include/occi/odci.h @@ -1,4 +1,4 @@ -/* +/* * */ diff --git a/demo/kugou/include/Common/include/occi/oratypes.h b/demo/kugou/include/Common/include/occi/oratypes.h index c2ef243..e3f503c 100644 --- a/demo/kugou/include/Common/include/occi/oratypes.h +++ b/demo/kugou/include/Common/include/occi/oratypes.h @@ -1,4 +1,4 @@ -/* +/* Copyright (c) 1982, 2012, Oracle and/or its affiliates. All rights reserved. */ diff --git a/demo/kugou/include/Common/include/occi/ori.h b/demo/kugou/include/Common/include/occi/ori.h index 60ea1b9..ec90b61 100644 --- a/demo/kugou/include/Common/include/occi/ori.h +++ b/demo/kugou/include/Common/include/occi/ori.h @@ -1,4 +1,4 @@ -/* Copyright (c) 1994, 2006, Oracle. All rights reserved. */ +/* Copyright (c) 1994, 2006, Oracle. All rights reserved. */ /* NAME diff --git a/demo/kugou/include/Common/include/occi/orid.h b/demo/kugou/include/Common/include/occi/orid.h index a105f64..737bd2d 100644 --- a/demo/kugou/include/Common/include/occi/orid.h +++ b/demo/kugou/include/Common/include/occi/orid.h @@ -1,4 +1,4 @@ -/* Copyright (c) 1994, 2006, Oracle. All rights reserved. */ +/* Copyright (c) 1994, 2006, Oracle. All rights reserved. */ /* Author: Tin Nguyen diff --git a/demo/kugou/include/Common/include/occi/orl.h b/demo/kugou/include/Common/include/occi/orl.h index e292c8e..0bd381a 100644 --- a/demo/kugou/include/Common/include/occi/orl.h +++ b/demo/kugou/include/Common/include/occi/orl.h @@ -1,4 +1,4 @@ -/* Copyright (c) 1993, 2014, Oracle and/or its affiliates. +/* Copyright (c) 1993, 2014, Oracle and/or its affiliates. All rights reserved.*/ /* diff --git a/demo/kugou/include/Common/include/occi/oro.h b/demo/kugou/include/Common/include/occi/oro.h index 5657092..c03dc19 100644 --- a/demo/kugou/include/Common/include/occi/oro.h +++ b/demo/kugou/include/Common/include/occi/oro.h @@ -1,4 +1,4 @@ -/* Copyright (c) 1994, 2014, Oracle and/or its affiliates. +/* Copyright (c) 1994, 2014, Oracle and/or its affiliates. All rights reserved.*/ /* diff --git a/demo/kugou/include/Common/include/occi/ort.h b/demo/kugou/include/Common/include/occi/ort.h index 41385e5..979e4cd 100644 --- a/demo/kugou/include/Common/include/occi/ort.h +++ b/demo/kugou/include/Common/include/occi/ort.h @@ -1,4 +1,4 @@ -/* @(#)ort.h 1.44 95/07/07 */ +/* @(#)ort.h 1.44 95/07/07 */ /* Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved. */ diff --git a/demo/kugou/include/Common/include/occi/xa.h b/demo/kugou/include/Common/include/occi/xa.h index 9dcd519..5340218 100644 --- a/demo/kugou/include/Common/include/occi/xa.h +++ b/demo/kugou/include/Common/include/occi/xa.h @@ -1,4 +1,4 @@ -/* Copyright (c) 1992, 2006, Oracle. All rights reserved. */ +/* Copyright (c) 1992, 2006, Oracle. All rights reserved. */ /* NAME diff --git a/demo/kugou/include/Common/include/openssl/aes.h b/demo/kugou/include/Common/include/openssl/aes.h index d0f9dfc..f0dbcd2 100644 --- a/demo/kugou/include/Common/include/openssl/aes.h +++ b/demo/kugou/include/Common/include/openssl/aes.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/asn1.h b/demo/kugou/include/Common/include/openssl/asn1.h index aada23d..5504007 100644 --- a/demo/kugou/include/Common/include/openssl/asn1.h +++ b/demo/kugou/include/Common/include/openssl/asn1.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\asn1.h.in * diff --git a/demo/kugou/include/Common/include/openssl/asn1_mac.h b/demo/kugou/include/Common/include/openssl/asn1_mac.h index fdcb983..b8b9c6f 100644 --- a/demo/kugou/include/Common/include/openssl/asn1_mac.h +++ b/demo/kugou/include/Common/include/openssl/asn1_mac.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/asn1err.h b/demo/kugou/include/Common/include/openssl/asn1err.h index d427622..8e3e5b0 100644 --- a/demo/kugou/include/Common/include/openssl/asn1err.h +++ b/demo/kugou/include/Common/include/openssl/asn1err.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/asn1t.h b/demo/kugou/include/Common/include/openssl/asn1t.h index a725c53..cc49229 100644 --- a/demo/kugou/include/Common/include/openssl/asn1t.h +++ b/demo/kugou/include/Common/include/openssl/asn1t.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\asn1t.h.in * diff --git a/demo/kugou/include/Common/include/openssl/async.h b/demo/kugou/include/Common/include/openssl/async.h index bc27d5d..2242b4d 100644 --- a/demo/kugou/include/Common/include/openssl/async.h +++ b/demo/kugou/include/Common/include/openssl/async.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/asyncerr.h b/demo/kugou/include/Common/include/openssl/asyncerr.h index c093f7b..3fe3d5e 100644 --- a/demo/kugou/include/Common/include/openssl/asyncerr.h +++ b/demo/kugou/include/Common/include/openssl/asyncerr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/bio.h b/demo/kugou/include/Common/include/openssl/bio.h index e5e46c9..05c4a51 100644 --- a/demo/kugou/include/Common/include/openssl/bio.h +++ b/demo/kugou/include/Common/include/openssl/bio.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\bio.h.in * diff --git a/demo/kugou/include/Common/include/openssl/bioerr.h b/demo/kugou/include/Common/include/openssl/bioerr.h index 787b30a..201b1c2 100644 --- a/demo/kugou/include/Common/include/openssl/bioerr.h +++ b/demo/kugou/include/Common/include/openssl/bioerr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/blowfish.h b/demo/kugou/include/Common/include/openssl/blowfish.h index 667d642..8dd1071 100644 --- a/demo/kugou/include/Common/include/openssl/blowfish.h +++ b/demo/kugou/include/Common/include/openssl/blowfish.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/bn.h b/demo/kugou/include/Common/include/openssl/bn.h index ecd7f01..12138c6 100644 --- a/demo/kugou/include/Common/include/openssl/bn.h +++ b/demo/kugou/include/Common/include/openssl/bn.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * diff --git a/demo/kugou/include/Common/include/openssl/bnerr.h b/demo/kugou/include/Common/include/openssl/bnerr.h index 7c3f6ef..753957d 100644 --- a/demo/kugou/include/Common/include/openssl/bnerr.h +++ b/demo/kugou/include/Common/include/openssl/bnerr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/buffer.h b/demo/kugou/include/Common/include/openssl/buffer.h index 5773b98..bf4c0d3 100644 --- a/demo/kugou/include/Common/include/openssl/buffer.h +++ b/demo/kugou/include/Common/include/openssl/buffer.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/buffererr.h b/demo/kugou/include/Common/include/openssl/buffererr.h index d18b1f8..aa27660 100644 --- a/demo/kugou/include/Common/include/openssl/buffererr.h +++ b/demo/kugou/include/Common/include/openssl/buffererr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/camellia.h b/demo/kugou/include/Common/include/openssl/camellia.h index 88c2279..85c4951 100644 --- a/demo/kugou/include/Common/include/openssl/camellia.h +++ b/demo/kugou/include/Common/include/openssl/camellia.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/cast.h b/demo/kugou/include/Common/include/openssl/cast.h index 0bf217b..ce215c4 100644 --- a/demo/kugou/include/Common/include/openssl/cast.h +++ b/demo/kugou/include/Common/include/openssl/cast.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/cmac.h b/demo/kugou/include/Common/include/openssl/cmac.h index f508618..4b312a5 100644 --- a/demo/kugou/include/Common/include/openssl/cmac.h +++ b/demo/kugou/include/Common/include/openssl/cmac.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2010-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/cmp.h b/demo/kugou/include/Common/include/openssl/cmp.h index e6aeff4..c77e52b 100644 --- a/demo/kugou/include/Common/include/openssl/cmp.h +++ b/demo/kugou/include/Common/include/openssl/cmp.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\cmp.h.in * diff --git a/demo/kugou/include/Common/include/openssl/cmp_util.h b/demo/kugou/include/Common/include/openssl/cmp_util.h index 9a16892..7ca3b01 100644 --- a/demo/kugou/include/Common/include/openssl/cmp_util.h +++ b/demo/kugou/include/Common/include/openssl/cmp_util.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 diff --git a/demo/kugou/include/Common/include/openssl/cmperr.h b/demo/kugou/include/Common/include/openssl/cmperr.h index 49fd5e3..fed607f 100644 --- a/demo/kugou/include/Common/include/openssl/cmperr.h +++ b/demo/kugou/include/Common/include/openssl/cmperr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/cms.h b/demo/kugou/include/Common/include/openssl/cms.h index 5b907f2..d83adfc 100644 --- a/demo/kugou/include/Common/include/openssl/cms.h +++ b/demo/kugou/include/Common/include/openssl/cms.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\cms.h.in * diff --git a/demo/kugou/include/Common/include/openssl/cmserr.h b/demo/kugou/include/Common/include/openssl/cmserr.h index f2d7708..ba77561 100644 --- a/demo/kugou/include/Common/include/openssl/cmserr.h +++ b/demo/kugou/include/Common/include/openssl/cmserr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/comp.h b/demo/kugou/include/Common/include/openssl/comp.h index 06ff581..e3420d5 100644 --- a/demo/kugou/include/Common/include/openssl/comp.h +++ b/demo/kugou/include/Common/include/openssl/comp.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/comperr.h b/demo/kugou/include/Common/include/openssl/comperr.h index 01dd3e6..448cb48 100644 --- a/demo/kugou/include/Common/include/openssl/comperr.h +++ b/demo/kugou/include/Common/include/openssl/comperr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/conf.h b/demo/kugou/include/Common/include/openssl/conf.h index 07793f1..e58803c 100644 --- a/demo/kugou/include/Common/include/openssl/conf.h +++ b/demo/kugou/include/Common/include/openssl/conf.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\conf.h.in * diff --git a/demo/kugou/include/Common/include/openssl/conf_api.h b/demo/kugou/include/Common/include/openssl/conf_api.h index ed67d57..5d10588 100644 --- a/demo/kugou/include/Common/include/openssl/conf_api.h +++ b/demo/kugou/include/Common/include/openssl/conf_api.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/conferr.h b/demo/kugou/include/Common/include/openssl/conferr.h index 5dd4868..de8fb5d 100644 --- a/demo/kugou/include/Common/include/openssl/conferr.h +++ b/demo/kugou/include/Common/include/openssl/conferr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/configuration.h b/demo/kugou/include/Common/include/openssl/configuration.h index 25f7948..0ddfddd 100644 --- a/demo/kugou/include/Common/include/openssl/configuration.h +++ b/demo/kugou/include/Common/include/openssl/configuration.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by configdata.pm from Configurations\common0.tmpl, Configurations\windows-makefile.tmpl * via makefile.in diff --git a/demo/kugou/include/Common/include/openssl/conftypes.h b/demo/kugou/include/Common/include/openssl/conftypes.h index 17cefaa..47cadc7 100644 --- a/demo/kugou/include/Common/include/openssl/conftypes.h +++ b/demo/kugou/include/Common/include/openssl/conftypes.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/core.h b/demo/kugou/include/Common/include/openssl/core.h index 9683ac7..cf9cfd8 100644 --- a/demo/kugou/include/Common/include/openssl/core.h +++ b/demo/kugou/include/Common/include/openssl/core.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/core_dispatch.h b/demo/kugou/include/Common/include/openssl/core_dispatch.h index 99fcda0..2e316d4 100644 --- a/demo/kugou/include/Common/include/openssl/core_dispatch.h +++ b/demo/kugou/include/Common/include/openssl/core_dispatch.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/core_names.h b/demo/kugou/include/Common/include/openssl/core_names.h index 6bed5a8..caf6e79 100644 --- a/demo/kugou/include/Common/include/openssl/core_names.h +++ b/demo/kugou/include/Common/include/openssl/core_names.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/core_object.h b/demo/kugou/include/Common/include/openssl/core_object.h index 62ccf39..d09660e 100644 --- a/demo/kugou/include/Common/include/openssl/core_object.h +++ b/demo/kugou/include/Common/include/openssl/core_object.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/crmf.h b/demo/kugou/include/Common/include/openssl/crmf.h index b2a82ed..03b6cce 100644 --- a/demo/kugou/include/Common/include/openssl/crmf.h +++ b/demo/kugou/include/Common/include/openssl/crmf.h @@ -1,4 +1,4 @@ -/*- +/*- * WARNING: do not edit! * Generated by makefile from include\openssl\crmf.h.in * diff --git a/demo/kugou/include/Common/include/openssl/crmferr.h b/demo/kugou/include/Common/include/openssl/crmferr.h index b242b92..4a20703 100644 --- a/demo/kugou/include/Common/include/openssl/crmferr.h +++ b/demo/kugou/include/Common/include/openssl/crmferr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/crypto.h b/demo/kugou/include/Common/include/openssl/crypto.h index 8b82593..f65b43d 100644 --- a/demo/kugou/include/Common/include/openssl/crypto.h +++ b/demo/kugou/include/Common/include/openssl/crypto.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\crypto.h.in * diff --git a/demo/kugou/include/Common/include/openssl/cryptoerr.h b/demo/kugou/include/Common/include/openssl/cryptoerr.h index c6a04d9..64879c0 100644 --- a/demo/kugou/include/Common/include/openssl/cryptoerr.h +++ b/demo/kugou/include/Common/include/openssl/cryptoerr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/cryptoerr_legacy.h b/demo/kugou/include/Common/include/openssl/cryptoerr_legacy.h index ccab33a..d22efe4 100644 --- a/demo/kugou/include/Common/include/openssl/cryptoerr_legacy.h +++ b/demo/kugou/include/Common/include/openssl/cryptoerr_legacy.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/ct.h b/demo/kugou/include/Common/include/openssl/ct.h index 06c41b7..d8178d9 100644 --- a/demo/kugou/include/Common/include/openssl/ct.h +++ b/demo/kugou/include/Common/include/openssl/ct.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\ct.h.in * diff --git a/demo/kugou/include/Common/include/openssl/cterr.h b/demo/kugou/include/Common/include/openssl/cterr.h index 935d32d..513c58a 100644 --- a/demo/kugou/include/Common/include/openssl/cterr.h +++ b/demo/kugou/include/Common/include/openssl/cterr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/decoder.h b/demo/kugou/include/Common/include/openssl/decoder.h index d4ee2cf..6385d13 100644 --- a/demo/kugou/include/Common/include/openssl/decoder.h +++ b/demo/kugou/include/Common/include/openssl/decoder.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/decodererr.h b/demo/kugou/include/Common/include/openssl/decodererr.h index 4212a38..b85a060 100644 --- a/demo/kugou/include/Common/include/openssl/decodererr.h +++ b/demo/kugou/include/Common/include/openssl/decodererr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/des.h b/demo/kugou/include/Common/include/openssl/des.h index 09798a6..92ee359 100644 --- a/demo/kugou/include/Common/include/openssl/des.h +++ b/demo/kugou/include/Common/include/openssl/des.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/dh.h b/demo/kugou/include/Common/include/openssl/dh.h index 50e0cf5..ba882e2 100644 --- a/demo/kugou/include/Common/include/openssl/dh.h +++ b/demo/kugou/include/Common/include/openssl/dh.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/dherr.h b/demo/kugou/include/Common/include/openssl/dherr.h index 074a701..2a07d76 100644 --- a/demo/kugou/include/Common/include/openssl/dherr.h +++ b/demo/kugou/include/Common/include/openssl/dherr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/dsa.h b/demo/kugou/include/Common/include/openssl/dsa.h index 5c0e4cd..5f7aba7 100644 --- a/demo/kugou/include/Common/include/openssl/dsa.h +++ b/demo/kugou/include/Common/include/openssl/dsa.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/dsaerr.h b/demo/kugou/include/Common/include/openssl/dsaerr.h index 26ada57..41e167c 100644 --- a/demo/kugou/include/Common/include/openssl/dsaerr.h +++ b/demo/kugou/include/Common/include/openssl/dsaerr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/dtls1.h b/demo/kugou/include/Common/include/openssl/dtls1.h index 5dc6b54..0b88fc8 100644 --- a/demo/kugou/include/Common/include/openssl/dtls1.h +++ b/demo/kugou/include/Common/include/openssl/dtls1.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2005-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/e_os2.h b/demo/kugou/include/Common/include/openssl/e_os2.h index 6728909..7d46431 100644 --- a/demo/kugou/include/Common/include/openssl/e_os2.h +++ b/demo/kugou/include/Common/include/openssl/e_os2.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/ebcdic.h b/demo/kugou/include/Common/include/openssl/ebcdic.h index e0ae1aa..3517098 100644 --- a/demo/kugou/include/Common/include/openssl/ebcdic.h +++ b/demo/kugou/include/Common/include/openssl/ebcdic.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/ec.h b/demo/kugou/include/Common/include/openssl/ec.h index 44d7193..50b3089 100644 --- a/demo/kugou/include/Common/include/openssl/ec.h +++ b/demo/kugou/include/Common/include/openssl/ec.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2022 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * diff --git a/demo/kugou/include/Common/include/openssl/ecdh.h b/demo/kugou/include/Common/include/openssl/ecdh.h index 56bd4cc..02e9b92 100644 --- a/demo/kugou/include/Common/include/openssl/ecdh.h +++ b/demo/kugou/include/Common/include/openssl/ecdh.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/ecdsa.h b/demo/kugou/include/Common/include/openssl/ecdsa.h index 56bd4cc..02e9b92 100644 --- a/demo/kugou/include/Common/include/openssl/ecdsa.h +++ b/demo/kugou/include/Common/include/openssl/ecdsa.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/ecerr.h b/demo/kugou/include/Common/include/openssl/ecerr.h index f15f91f..3b24148 100644 --- a/demo/kugou/include/Common/include/openssl/ecerr.h +++ b/demo/kugou/include/Common/include/openssl/ecerr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/encoder.h b/demo/kugou/include/Common/include/openssl/encoder.h index c37a6f1..6e7d270 100644 --- a/demo/kugou/include/Common/include/openssl/encoder.h +++ b/demo/kugou/include/Common/include/openssl/encoder.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/encodererr.h b/demo/kugou/include/Common/include/openssl/encodererr.h index 5e318b1..bc21988 100644 --- a/demo/kugou/include/Common/include/openssl/encodererr.h +++ b/demo/kugou/include/Common/include/openssl/encodererr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/engine.h b/demo/kugou/include/Common/include/openssl/engine.h index c965800..a2f810a 100644 --- a/demo/kugou/include/Common/include/openssl/engine.h +++ b/demo/kugou/include/Common/include/openssl/engine.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * diff --git a/demo/kugou/include/Common/include/openssl/engineerr.h b/demo/kugou/include/Common/include/openssl/engineerr.h index d439b68..ead1e53 100644 --- a/demo/kugou/include/Common/include/openssl/engineerr.h +++ b/demo/kugou/include/Common/include/openssl/engineerr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/err.h b/demo/kugou/include/Common/include/openssl/err.h index 2abf248..530b1cc 100644 --- a/demo/kugou/include/Common/include/openssl/err.h +++ b/demo/kugou/include/Common/include/openssl/err.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/ess.h b/demo/kugou/include/Common/include/openssl/ess.h index dad596a..d1e38db 100644 --- a/demo/kugou/include/Common/include/openssl/ess.h +++ b/demo/kugou/include/Common/include/openssl/ess.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\ess.h.in * diff --git a/demo/kugou/include/Common/include/openssl/esserr.h b/demo/kugou/include/Common/include/openssl/esserr.h index 165ce7c..de4f980 100644 --- a/demo/kugou/include/Common/include/openssl/esserr.h +++ b/demo/kugou/include/Common/include/openssl/esserr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/evp.h b/demo/kugou/include/Common/include/openssl/evp.h index e64072f..20d4a57 100644 --- a/demo/kugou/include/Common/include/openssl/evp.h +++ b/demo/kugou/include/Common/include/openssl/evp.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/evperr.h b/demo/kugou/include/Common/include/openssl/evperr.h index a5053f6..d3a6a37 100644 --- a/demo/kugou/include/Common/include/openssl/evperr.h +++ b/demo/kugou/include/Common/include/openssl/evperr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/fips_names.h b/demo/kugou/include/Common/include/openssl/fips_names.h index 0fdf544..1bf9b56 100644 --- a/demo/kugou/include/Common/include/openssl/fips_names.h +++ b/demo/kugou/include/Common/include/openssl/fips_names.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/fipskey.h b/demo/kugou/include/Common/include/openssl/fipskey.h index ccc1d2f..69ef030 100644 --- a/demo/kugou/include/Common/include/openssl/fipskey.h +++ b/demo/kugou/include/Common/include/openssl/fipskey.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\fipskey.h.in * diff --git a/demo/kugou/include/Common/include/openssl/hmac.h b/demo/kugou/include/Common/include/openssl/hmac.h index f9e1bff..f8b3ee2 100644 --- a/demo/kugou/include/Common/include/openssl/hmac.h +++ b/demo/kugou/include/Common/include/openssl/hmac.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/http.h b/demo/kugou/include/Common/include/openssl/http.h index f7ab214..72495b5 100644 --- a/demo/kugou/include/Common/include/openssl/http.h +++ b/demo/kugou/include/Common/include/openssl/http.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved. * Copyright Siemens AG 2018-2020 * diff --git a/demo/kugou/include/Common/include/openssl/httperr.h b/demo/kugou/include/Common/include/openssl/httperr.h index ee08959..06f783a 100644 --- a/demo/kugou/include/Common/include/openssl/httperr.h +++ b/demo/kugou/include/Common/include/openssl/httperr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/idea.h b/demo/kugou/include/Common/include/openssl/idea.h index 1f9bb3b..010f6f6 100644 --- a/demo/kugou/include/Common/include/openssl/idea.h +++ b/demo/kugou/include/Common/include/openssl/idea.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/kdf.h b/demo/kugou/include/Common/include/openssl/kdf.h index 0983230..0ddea38 100644 --- a/demo/kugou/include/Common/include/openssl/kdf.h +++ b/demo/kugou/include/Common/include/openssl/kdf.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/kdferr.h b/demo/kugou/include/Common/include/openssl/kdferr.h index 963d766..a0b4a86 100644 --- a/demo/kugou/include/Common/include/openssl/kdferr.h +++ b/demo/kugou/include/Common/include/openssl/kdferr.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/lhash.h b/demo/kugou/include/Common/include/openssl/lhash.h index 39dd625..382394b 100644 --- a/demo/kugou/include/Common/include/openssl/lhash.h +++ b/demo/kugou/include/Common/include/openssl/lhash.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/macros.h b/demo/kugou/include/Common/include/openssl/macros.h index a6bc3f1..afc8cb2 100644 --- a/demo/kugou/include/Common/include/openssl/macros.h +++ b/demo/kugou/include/Common/include/openssl/macros.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/md2.h b/demo/kugou/include/Common/include/openssl/md2.h index 5d4cb77..69769bb 100644 --- a/demo/kugou/include/Common/include/openssl/md2.h +++ b/demo/kugou/include/Common/include/openssl/md2.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/md4.h b/demo/kugou/include/Common/include/openssl/md4.h index 6c150a6..2160812 100644 --- a/demo/kugou/include/Common/include/openssl/md4.h +++ b/demo/kugou/include/Common/include/openssl/md4.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/md5.h b/demo/kugou/include/Common/include/openssl/md5.h index 77a5773..58bb289 100644 --- a/demo/kugou/include/Common/include/openssl/md5.h +++ b/demo/kugou/include/Common/include/openssl/md5.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/mdc2.h b/demo/kugou/include/Common/include/openssl/mdc2.h index 5a7ee28..4cf18fe 100644 --- a/demo/kugou/include/Common/include/openssl/mdc2.h +++ b/demo/kugou/include/Common/include/openssl/mdc2.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/modes.h b/demo/kugou/include/Common/include/openssl/modes.h index e190799..2f2b0d7 100644 --- a/demo/kugou/include/Common/include/openssl/modes.h +++ b/demo/kugou/include/Common/include/openssl/modes.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/obj_mac.h b/demo/kugou/include/Common/include/openssl/obj_mac.h index 0e86027..689db9c 100644 --- a/demo/kugou/include/Common/include/openssl/obj_mac.h +++ b/demo/kugou/include/Common/include/openssl/obj_mac.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by crypto/objects/objects.pl * diff --git a/demo/kugou/include/Common/include/openssl/objects.h b/demo/kugou/include/Common/include/openssl/objects.h index 9ea91c2..5f36603 100644 --- a/demo/kugou/include/Common/include/openssl/objects.h +++ b/demo/kugou/include/Common/include/openssl/objects.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/objectserr.h b/demo/kugou/include/Common/include/openssl/objectserr.h index 585217f..5aa6355 100644 --- a/demo/kugou/include/Common/include/openssl/objectserr.h +++ b/demo/kugou/include/Common/include/openssl/objectserr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/ocsp.h b/demo/kugou/include/Common/include/openssl/ocsp.h index 5688381..806a6a2 100644 --- a/demo/kugou/include/Common/include/openssl/ocsp.h +++ b/demo/kugou/include/Common/include/openssl/ocsp.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\ocsp.h.in * diff --git a/demo/kugou/include/Common/include/openssl/ocsperr.h b/demo/kugou/include/Common/include/openssl/ocsperr.h index 46a0523..000179a 100644 --- a/demo/kugou/include/Common/include/openssl/ocsperr.h +++ b/demo/kugou/include/Common/include/openssl/ocsperr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/opensslconf.h b/demo/kugou/include/Common/include/openssl/opensslconf.h index 1e83371..f34adae 100644 --- a/demo/kugou/include/Common/include/openssl/opensslconf.h +++ b/demo/kugou/include/Common/include/openssl/opensslconf.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/opensslv.h b/demo/kugou/include/Common/include/openssl/opensslv.h index 6f44a2e..3e97e79 100644 --- a/demo/kugou/include/Common/include/openssl/opensslv.h +++ b/demo/kugou/include/Common/include/openssl/opensslv.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\opensslv.h.in * diff --git a/demo/kugou/include/Common/include/openssl/ossl_typ.h b/demo/kugou/include/Common/include/openssl/ossl_typ.h index 82a5898..d239e6e 100644 --- a/demo/kugou/include/Common/include/openssl/ossl_typ.h +++ b/demo/kugou/include/Common/include/openssl/ossl_typ.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2019 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/param_build.h b/demo/kugou/include/Common/include/openssl/param_build.h index f29fdb2..a209cff 100644 --- a/demo/kugou/include/Common/include/openssl/param_build.h +++ b/demo/kugou/include/Common/include/openssl/param_build.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. * diff --git a/demo/kugou/include/Common/include/openssl/params.h b/demo/kugou/include/Common/include/openssl/params.h index d75eab0..fe139e2 100644 --- a/demo/kugou/include/Common/include/openssl/params.h +++ b/demo/kugou/include/Common/include/openssl/params.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. * diff --git a/demo/kugou/include/Common/include/openssl/pem.h b/demo/kugou/include/Common/include/openssl/pem.h index 80940df..324b130 100644 --- a/demo/kugou/include/Common/include/openssl/pem.h +++ b/demo/kugou/include/Common/include/openssl/pem.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/pem2.h b/demo/kugou/include/Common/include/openssl/pem2.h index a8a5325..964e0e7 100644 --- a/demo/kugou/include/Common/include/openssl/pem2.h +++ b/demo/kugou/include/Common/include/openssl/pem2.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/pemerr.h b/demo/kugou/include/Common/include/openssl/pemerr.h index 18f6d9e..3f0d571 100644 --- a/demo/kugou/include/Common/include/openssl/pemerr.h +++ b/demo/kugou/include/Common/include/openssl/pemerr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/pkcs12.h b/demo/kugou/include/Common/include/openssl/pkcs12.h index f0da086..6fa52c0 100644 --- a/demo/kugou/include/Common/include/openssl/pkcs12.h +++ b/demo/kugou/include/Common/include/openssl/pkcs12.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\pkcs12.h.in * diff --git a/demo/kugou/include/Common/include/openssl/pkcs12err.h b/demo/kugou/include/Common/include/openssl/pkcs12err.h index 933c832..43b0cbc 100644 --- a/demo/kugou/include/Common/include/openssl/pkcs12err.h +++ b/demo/kugou/include/Common/include/openssl/pkcs12err.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/pkcs7.h b/demo/kugou/include/Common/include/openssl/pkcs7.h index cf166ee..9d625ca 100644 --- a/demo/kugou/include/Common/include/openssl/pkcs7.h +++ b/demo/kugou/include/Common/include/openssl/pkcs7.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\pkcs7.h.in * diff --git a/demo/kugou/include/Common/include/openssl/pkcs7err.h b/demo/kugou/include/Common/include/openssl/pkcs7err.h index ceb1a50..59db607 100644 --- a/demo/kugou/include/Common/include/openssl/pkcs7err.h +++ b/demo/kugou/include/Common/include/openssl/pkcs7err.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/prov_ssl.h b/demo/kugou/include/Common/include/openssl/prov_ssl.h index d3e0896..280de8e 100644 --- a/demo/kugou/include/Common/include/openssl/prov_ssl.h +++ b/demo/kugou/include/Common/include/openssl/prov_ssl.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/proverr.h b/demo/kugou/include/Common/include/openssl/proverr.h index ad67a8f..cec5d1d 100644 --- a/demo/kugou/include/Common/include/openssl/proverr.h +++ b/demo/kugou/include/Common/include/openssl/proverr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/provider.h b/demo/kugou/include/Common/include/openssl/provider.h index dc86ff5..b376a5c 100644 --- a/demo/kugou/include/Common/include/openssl/provider.h +++ b/demo/kugou/include/Common/include/openssl/provider.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/rand.h b/demo/kugou/include/Common/include/openssl/rand.h index ad3054f..2e47647 100644 --- a/demo/kugou/include/Common/include/openssl/rand.h +++ b/demo/kugou/include/Common/include/openssl/rand.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/randerr.h b/demo/kugou/include/Common/include/openssl/randerr.h index b5e08e4..5890c88 100644 --- a/demo/kugou/include/Common/include/openssl/randerr.h +++ b/demo/kugou/include/Common/include/openssl/randerr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/rc2.h b/demo/kugou/include/Common/include/openssl/rc2.h index ff633fd..b21a7a0 100644 --- a/demo/kugou/include/Common/include/openssl/rc2.h +++ b/demo/kugou/include/Common/include/openssl/rc2.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/rc4.h b/demo/kugou/include/Common/include/openssl/rc4.h index 600b288..5130b26 100644 --- a/demo/kugou/include/Common/include/openssl/rc4.h +++ b/demo/kugou/include/Common/include/openssl/rc4.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/rc5.h b/demo/kugou/include/Common/include/openssl/rc5.h index de83352..7a2e995 100644 --- a/demo/kugou/include/Common/include/openssl/rc5.h +++ b/demo/kugou/include/Common/include/openssl/rc5.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/ripemd.h b/demo/kugou/include/Common/include/openssl/ripemd.h index 900ee31..c3545ec 100644 --- a/demo/kugou/include/Common/include/openssl/ripemd.h +++ b/demo/kugou/include/Common/include/openssl/ripemd.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/rsa.h b/demo/kugou/include/Common/include/openssl/rsa.h index a55c972..6a31acd 100644 --- a/demo/kugou/include/Common/include/openssl/rsa.h +++ b/demo/kugou/include/Common/include/openssl/rsa.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/rsaerr.h b/demo/kugou/include/Common/include/openssl/rsaerr.h index c58463c..a108044 100644 --- a/demo/kugou/include/Common/include/openssl/rsaerr.h +++ b/demo/kugou/include/Common/include/openssl/rsaerr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/safestack.h b/demo/kugou/include/Common/include/openssl/safestack.h index 159ccf2..e5830d6 100644 --- a/demo/kugou/include/Common/include/openssl/safestack.h +++ b/demo/kugou/include/Common/include/openssl/safestack.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\safestack.h.in * diff --git a/demo/kugou/include/Common/include/openssl/seed.h b/demo/kugou/include/Common/include/openssl/seed.h index edb218a..1d5b221 100644 --- a/demo/kugou/include/Common/include/openssl/seed.h +++ b/demo/kugou/include/Common/include/openssl/seed.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/self_test.h b/demo/kugou/include/Common/include/openssl/self_test.h index ee4949e..7854b41 100644 --- a/demo/kugou/include/Common/include/openssl/self_test.h +++ b/demo/kugou/include/Common/include/openssl/self_test.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/sha.h b/demo/kugou/include/Common/include/openssl/sha.h index 6e65a04..351665b 100644 --- a/demo/kugou/include/Common/include/openssl/sha.h +++ b/demo/kugou/include/Common/include/openssl/sha.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/srp.h b/demo/kugou/include/Common/include/openssl/srp.h index a86fa5d..15ad69a 100644 --- a/demo/kugou/include/Common/include/openssl/srp.h +++ b/demo/kugou/include/Common/include/openssl/srp.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\srp.h.in * diff --git a/demo/kugou/include/Common/include/openssl/srtp.h b/demo/kugou/include/Common/include/openssl/srtp.h index d64606e..60fa79f 100644 --- a/demo/kugou/include/Common/include/openssl/srtp.h +++ b/demo/kugou/include/Common/include/openssl/srtp.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/ssl.h b/demo/kugou/include/Common/include/openssl/ssl.h index 441b818..31c5c93 100644 --- a/demo/kugou/include/Common/include/openssl/ssl.h +++ b/demo/kugou/include/Common/include/openssl/ssl.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\ssl.h.in * diff --git a/demo/kugou/include/Common/include/openssl/ssl2.h b/demo/kugou/include/Common/include/openssl/ssl2.h index 428ead0..52242db 100644 --- a/demo/kugou/include/Common/include/openssl/ssl2.h +++ b/demo/kugou/include/Common/include/openssl/ssl2.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/ssl3.h b/demo/kugou/include/Common/include/openssl/ssl3.h index 49bd51f..3067d51 100644 --- a/demo/kugou/include/Common/include/openssl/ssl3.h +++ b/demo/kugou/include/Common/include/openssl/ssl3.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * diff --git a/demo/kugou/include/Common/include/openssl/sslerr.h b/demo/kugou/include/Common/include/openssl/sslerr.h index 1e36405..7c1dbbb 100644 --- a/demo/kugou/include/Common/include/openssl/sslerr.h +++ b/demo/kugou/include/Common/include/openssl/sslerr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/sslerr_legacy.h b/demo/kugou/include/Common/include/openssl/sslerr_legacy.h index ccf6d3b..49c6332 100644 --- a/demo/kugou/include/Common/include/openssl/sslerr_legacy.h +++ b/demo/kugou/include/Common/include/openssl/sslerr_legacy.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/stack.h b/demo/kugou/include/Common/include/openssl/stack.h index f0c5c54..e3cd6ac 100644 --- a/demo/kugou/include/Common/include/openssl/stack.h +++ b/demo/kugou/include/Common/include/openssl/stack.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/store.h b/demo/kugou/include/Common/include/openssl/store.h index 3c1445e..90d8ffb 100644 --- a/demo/kugou/include/Common/include/openssl/store.h +++ b/demo/kugou/include/Common/include/openssl/store.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/storeerr.h b/demo/kugou/include/Common/include/openssl/storeerr.h index 00529c8..7597819 100644 --- a/demo/kugou/include/Common/include/openssl/storeerr.h +++ b/demo/kugou/include/Common/include/openssl/storeerr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/symhacks.h b/demo/kugou/include/Common/include/openssl/symhacks.h index 816f8f9..2b73590 100644 --- a/demo/kugou/include/Common/include/openssl/symhacks.h +++ b/demo/kugou/include/Common/include/openssl/symhacks.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/tls1.h b/demo/kugou/include/Common/include/openssl/tls1.h index 91558fa..97afdea 100644 --- a/demo/kugou/include/Common/include/openssl/tls1.h +++ b/demo/kugou/include/Common/include/openssl/tls1.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * Copyright 2005 Nokia. All rights reserved. diff --git a/demo/kugou/include/Common/include/openssl/trace.h b/demo/kugou/include/Common/include/openssl/trace.h index ae14f6d..b07a55a 100644 --- a/demo/kugou/include/Common/include/openssl/trace.h +++ b/demo/kugou/include/Common/include/openssl/trace.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/ts.h b/demo/kugou/include/Common/include/openssl/ts.h index 5136e4e..f191aa9 100644 --- a/demo/kugou/include/Common/include/openssl/ts.h +++ b/demo/kugou/include/Common/include/openssl/ts.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/tserr.h b/demo/kugou/include/Common/include/openssl/tserr.h index e1b943e..dd16c4a 100644 --- a/demo/kugou/include/Common/include/openssl/tserr.h +++ b/demo/kugou/include/Common/include/openssl/tserr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/txt_db.h b/demo/kugou/include/Common/include/openssl/txt_db.h index af169a3..5861476 100644 --- a/demo/kugou/include/Common/include/openssl/txt_db.h +++ b/demo/kugou/include/Common/include/openssl/txt_db.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/types.h b/demo/kugou/include/Common/include/openssl/types.h index de9f166..9db8ac7 100644 --- a/demo/kugou/include/Common/include/openssl/types.h +++ b/demo/kugou/include/Common/include/openssl/types.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/ui.h b/demo/kugou/include/Common/include/openssl/ui.h index 835b0eb..feb1378 100644 --- a/demo/kugou/include/Common/include/openssl/ui.h +++ b/demo/kugou/include/Common/include/openssl/ui.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\ui.h.in * diff --git a/demo/kugou/include/Common/include/openssl/uierr.h b/demo/kugou/include/Common/include/openssl/uierr.h index 473b04e..74953aa 100644 --- a/demo/kugou/include/Common/include/openssl/uierr.h +++ b/demo/kugou/include/Common/include/openssl/uierr.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/whrlpool.h b/demo/kugou/include/Common/include/openssl/whrlpool.h index 05ba463..d7580de 100644 --- a/demo/kugou/include/Common/include/openssl/whrlpool.h +++ b/demo/kugou/include/Common/include/openssl/whrlpool.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2005-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use diff --git a/demo/kugou/include/Common/include/openssl/x509.h b/demo/kugou/include/Common/include/openssl/x509.h index eda5d70..365bd87 100644 --- a/demo/kugou/include/Common/include/openssl/x509.h +++ b/demo/kugou/include/Common/include/openssl/x509.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\x509.h.in * diff --git a/demo/kugou/include/Common/include/openssl/x509_vfy.h b/demo/kugou/include/Common/include/openssl/x509_vfy.h index e04df0d..fea2c1a 100644 --- a/demo/kugou/include/Common/include/openssl/x509_vfy.h +++ b/demo/kugou/include/Common/include/openssl/x509_vfy.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\x509_vfy.h.in * diff --git a/demo/kugou/include/Common/include/openssl/x509err.h b/demo/kugou/include/Common/include/openssl/x509err.h index 34ead4b..f1ab3b2 100644 --- a/demo/kugou/include/Common/include/openssl/x509err.h +++ b/demo/kugou/include/Common/include/openssl/x509err.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/openssl/x509v3.h b/demo/kugou/include/Common/include/openssl/x509v3.h index 57b50a6..f0b797d 100644 --- a/demo/kugou/include/Common/include/openssl/x509v3.h +++ b/demo/kugou/include/Common/include/openssl/x509v3.h @@ -1,4 +1,4 @@ -/* +/* * WARNING: do not edit! * Generated by makefile from include\openssl\x509v3.h.in * diff --git a/demo/kugou/include/Common/include/openssl/x509v3err.h b/demo/kugou/include/Common/include/openssl/x509v3err.h index 1ae3a56..8a1b3f5 100644 --- a/demo/kugou/include/Common/include/openssl/x509v3err.h +++ b/demo/kugou/include/Common/include/openssl/x509v3err.h @@ -1,4 +1,4 @@ -/* +/* * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/demo/kugou/include/Common/include/qrcode/qrencode.h b/demo/kugou/include/Common/include/qrcode/qrencode.h index 1a934cc..28c0862 100644 --- a/demo/kugou/include/Common/include/qrcode/qrencode.h +++ b/demo/kugou/include/Common/include/qrcode/qrencode.h @@ -1,4 +1,4 @@ -/** +/** * qrencode - QR Code encoder * * Copyright (C) 2006-2017 Kentaro Fukuchi diff --git a/demo/kugou/include/Common/include/zconf.h b/demo/kugou/include/Common/include/zconf.h index 4944a4e..9381931 100644 --- a/demo/kugou/include/Common/include/zconf.h +++ b/demo/kugou/include/Common/include/zconf.h @@ -1,4 +1,4 @@ -/* zconf.h -- configuration of the zlib compression library +/* zconf.h -- configuration of the zlib compression library * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ diff --git a/demo/kugou/include/Common/include/zip/unzip.cpp b/demo/kugou/include/Common/include/zip/unzip.cpp index 53d3c99..375f4be 100644 --- a/demo/kugou/include/Common/include/zip/unzip.cpp +++ b/demo/kugou/include/Common/include/zip/unzip.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/demo/kugou/include/Common/include/zip/unzip.h b/demo/kugou/include/Common/include/zip/unzip.h index f4b351c..fe4bd98 100644 --- a/demo/kugou/include/Common/include/zip/unzip.h +++ b/demo/kugou/include/Common/include/zip/unzip.h @@ -1,4 +1,4 @@ -#ifndef _unzip_H +#ifndef _unzip_H #define _unzip_H #pragma warning (disable:4996) diff --git a/demo/kugou/include/Common/include/zip/zip.cpp b/demo/kugou/include/Common/include/zip/zip.cpp index e6b1203..9dde12f 100644 --- a/demo/kugou/include/Common/include/zip/zip.cpp +++ b/demo/kugou/include/Common/include/zip/zip.cpp @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include #include #include diff --git a/demo/kugou/include/Common/include/zip/zip.h b/demo/kugou/include/Common/include/zip/zip.h index 4505925..6d8743b 100644 --- a/demo/kugou/include/Common/include/zip/zip.h +++ b/demo/kugou/include/Common/include/zip/zip.h @@ -1,4 +1,4 @@ -#ifndef _zip_H +#ifndef _zip_H #define _zip_H #pragma warning (disable:4996) diff --git a/demo/kugou/include/Common/include/zlib.h b/demo/kugou/include/Common/include/zlib.h index 8d4b932..1cb1005 100644 --- a/demo/kugou/include/Common/include/zlib.h +++ b/demo/kugou/include/Common/include/zlib.h @@ -1,4 +1,4 @@ -/* zlib.h -- interface of the 'zlib' general purpose compression library +/* zlib.h -- interface of the 'zlib' general purpose compression library version 1.3.1, January 22nd, 2024 Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler diff --git a/demo/kugou/include/Common/include/zlib/zconf.h b/demo/kugou/include/Common/include/zlib/zconf.h index 4944a4e..9381931 100644 --- a/demo/kugou/include/Common/include/zlib/zconf.h +++ b/demo/kugou/include/Common/include/zlib/zconf.h @@ -1,4 +1,4 @@ -/* zconf.h -- configuration of the zlib compression library +/* zconf.h -- configuration of the zlib compression library * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ diff --git a/demo/kugou/include/Common/include/zlib/zlib.h b/demo/kugou/include/Common/include/zlib/zlib.h index 8d4b932..1cb1005 100644 --- a/demo/kugou/include/Common/include/zlib/zlib.h +++ b/demo/kugou/include/Common/include/zlib/zlib.h @@ -1,4 +1,4 @@ -/* zlib.h -- interface of the 'zlib' general purpose compression library +/* zlib.h -- interface of the 'zlib' general purpose compression library version 1.3.1, January 22nd, 2024 Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler diff --git a/demo/kugou/include/vlc/include/vlc/deprecated.h b/demo/kugou/include/vlc/include/vlc/deprecated.h index 65df232..c0ff35f 100644 --- a/demo/kugou/include/vlc/include/vlc/deprecated.h +++ b/demo/kugou/include/vlc/include/vlc/deprecated.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * deprecated.h: libvlc deprecated API ***************************************************************************** * Copyright (C) 1998-2008 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/libvlc.h b/demo/kugou/include/vlc/include/vlc/libvlc.h index a3ab0d7..e868178 100644 --- a/demo/kugou/include/vlc/include/vlc/libvlc.h +++ b/demo/kugou/include/vlc/include/vlc/libvlc.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * libvlc.h: libvlc external API ***************************************************************************** * Copyright (C) 1998-2009 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/libvlc_events.h b/demo/kugou/include/vlc/include/vlc/libvlc_events.h index f268fb5..342b020 100644 --- a/demo/kugou/include/vlc/include/vlc/libvlc_events.h +++ b/demo/kugou/include/vlc/include/vlc/libvlc_events.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * libvlc_events.h: libvlc_events external API structure ***************************************************************************** * Copyright (C) 1998-2010 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/libvlc_media.h b/demo/kugou/include/vlc/include/vlc/libvlc_media.h index e3e9913..0410b89 100644 --- a/demo/kugou/include/vlc/include/vlc/libvlc_media.h +++ b/demo/kugou/include/vlc/include/vlc/libvlc_media.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * libvlc_media.h: libvlc external API ***************************************************************************** * Copyright (C) 1998-2009 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/libvlc_media_discoverer.h b/demo/kugou/include/vlc/include/vlc/libvlc_media_discoverer.h index 3883419..eded557 100644 --- a/demo/kugou/include/vlc/include/vlc/libvlc_media_discoverer.h +++ b/demo/kugou/include/vlc/include/vlc/libvlc_media_discoverer.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * libvlc_media_discoverer.h: libvlc external API ***************************************************************************** * Copyright (C) 1998-2009 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/libvlc_media_library.h b/demo/kugou/include/vlc/include/vlc/libvlc_media_library.h index 4134c07..b378e9c 100644 --- a/demo/kugou/include/vlc/include/vlc/libvlc_media_library.h +++ b/demo/kugou/include/vlc/include/vlc/libvlc_media_library.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * libvlc_media_library.h: libvlc external API ***************************************************************************** * Copyright (C) 1998-2009 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/libvlc_media_list.h b/demo/kugou/include/vlc/include/vlc/libvlc_media_list.h index 6330c6f..ccc4be6 100644 --- a/demo/kugou/include/vlc/include/vlc/libvlc_media_list.h +++ b/demo/kugou/include/vlc/include/vlc/libvlc_media_list.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * libvlc_media_list.h: libvlc_media_list API ***************************************************************************** * Copyright (C) 1998-2008 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/libvlc_media_list_player.h b/demo/kugou/include/vlc/include/vlc/libvlc_media_list_player.h index 5fa3285..31612a4 100644 --- a/demo/kugou/include/vlc/include/vlc/libvlc_media_list_player.h +++ b/demo/kugou/include/vlc/include/vlc/libvlc_media_list_player.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * libvlc_media_list_player.h: libvlc_media_list API ***************************************************************************** * Copyright (C) 1998-2008 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/libvlc_media_player.h b/demo/kugou/include/vlc/include/vlc/libvlc_media_player.h index 00afa61..27045d4 100644 --- a/demo/kugou/include/vlc/include/vlc/libvlc_media_player.h +++ b/demo/kugou/include/vlc/include/vlc/libvlc_media_player.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * libvlc_media_player.h: libvlc_media_player external API ***************************************************************************** * Copyright (C) 1998-2010 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/libvlc_structures.h b/demo/kugou/include/vlc/include/vlc/libvlc_structures.h index 54cd1fd..71f0afd 100644 --- a/demo/kugou/include/vlc/include/vlc/libvlc_structures.h +++ b/demo/kugou/include/vlc/include/vlc/libvlc_structures.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * libvlc_structures.h: libvlc_* new external API structures ***************************************************************************** * Copyright (C) 1998-2008 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/libvlc_version.h b/demo/kugou/include/vlc/include/vlc/libvlc_version.h index b985eb8..a2471ca 100644 --- a/demo/kugou/include/vlc/include/vlc/libvlc_version.h +++ b/demo/kugou/include/vlc/include/vlc/libvlc_version.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * libvlc_version.h ***************************************************************************** * Copyright (C) 2010 Rémi Denis-Courmont diff --git a/demo/kugou/include/vlc/include/vlc/libvlc_vlm.h b/demo/kugou/include/vlc/include/vlc/libvlc_vlm.h index 20c75f5..39fcb3f 100644 --- a/demo/kugou/include/vlc/include/vlc/libvlc_vlm.h +++ b/demo/kugou/include/vlc/include/vlc/libvlc_vlm.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * libvlc_vlm.h: libvlc_* new external API ***************************************************************************** * Copyright (C) 1998-2008 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_about.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_about.h index b41c009..e276b9c 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_about.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_about.h @@ -1,4 +1,4 @@ -/* Automatically generated file - DO NOT EDIT */ +/* Automatically generated file - DO NOT EDIT */ static const char psz_license[] = " GNU GENERAL PUBLIC LICENSE\n" " Version 2, June 1991\n" diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_access.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_access.h index 3697db0..6baad29 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_access.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_access.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_access.h: Access descriptor, queries and methods ***************************************************************************** * Copyright (C) 1999-2006 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_addons.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_addons.h index 92d5bc6..c76650f 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_addons.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_addons.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_addons.h : addons handling and describing ***************************************************************************** * Copyright (C) 2013 VideoLAN and authors diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_aout.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_aout.h index 5d1d068..0044940 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_aout.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_aout.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_aout.h : audio output interface ***************************************************************************** * Copyright (C) 2002-2011 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_aout_volume.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_aout_volume.h index f571afb..560291f 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_aout_volume.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_aout_volume.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_aout_volume.h: audio volume module ***************************************************************************** * Copyright (C) 2002-2009 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_arrays.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_arrays.h index dac7a52..8519134 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_arrays.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_arrays.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_arrays.h : Arrays and data structures handling ***************************************************************************** * Copyright (C) 1999-2004 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_atomic.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_atomic.h index af88eab..6647730 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_atomic.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_atomic.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_atomic.h: ***************************************************************************** * Copyright (C) 2010 Rémi Denis-Courmont diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_avcodec.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_avcodec.h index 664633a..b22fd23 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_avcodec.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_avcodec.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_avcodec.h: VLC thread support for libavcodec ***************************************************************************** * Copyright (C) 2009-2010 Rémi Denis-Courmont diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_bits.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_bits.h index 80010de..68090ed 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_bits.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_bits.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_bits.h : Bit handling helpers ***************************************************************************** * Copyright (C) 2003 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_block.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_block.h index 20377e1..5eb8c2a 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_block.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_block.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_block.h: Data blocks management functions ***************************************************************************** * Copyright (C) 2003 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_block_helper.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_block_helper.h index 2e6231f..7901908 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_block_helper.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_block_helper.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_block_helper.h: Helper functions for data blocks management. ***************************************************************************** * Copyright (C) 2003 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_charset.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_charset.h index e771fd3..f53b004 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_charset.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_charset.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_charset.h: Unicode UTF-8 wrappers function ***************************************************************************** * Copyright (C) 2003-2005 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_codec.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_codec.h index be775cd..13b9be9 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_codec.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_codec.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_codec.h: Definition of the decoder and encoder structures ***************************************************************************** * Copyright (C) 1999-2003 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_common.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_common.h index 8b4b923..512fe63 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_common.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_common.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_common.h: common definitions * Collection of useful common types and macros definitions ***************************************************************************** diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_config.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_config.h index 50b4887..98e69ab 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_config.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_config.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_config.h: limits and configuration * Defines all compilation-time configuration constants and size limits ***************************************************************************** diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_config_cat.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_config_cat.h index 225e026..b15fc86 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_config_cat.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_config_cat.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_config_cat.h : Definition of configuration categories ***************************************************************************** * Copyright (C) 2003 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_configuration.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_configuration.h index c35fc6e..c4b6908 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_configuration.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_configuration.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_configuration.h : configuration management module * This file describes the programming interface for the configuration module. * It includes functions allowing to declare, get or set configuration options. diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_cpu.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_cpu.h index 910900a..3b014e8 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_cpu.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_cpu.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_cpu.h: CPU capabilities ***************************************************************************** * Copyright (C) 1998-2009 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_demux.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_demux.h index 4cd49ce..af450de 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_demux.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_demux.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_demux.h: Demuxer descriptor, queries and methods ***************************************************************************** * Copyright (C) 1999-2005 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_dialog.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_dialog.h index 168bea4..54ebe3f 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_dialog.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_dialog.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_dialog.h: user interaction dialogs ***************************************************************************** * Copyright (C) 2009 Rémi Denis-Courmont diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_epg.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_epg.h index 2ae770f..d84d90e 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_epg.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_epg.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_epg.h: Electronic Program Guide ***************************************************************************** * Copyright (C) 2007 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_es.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_es.h index e131c73..3c6d09e 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_es.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_es.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_es.h: Elementary stream formats descriptions ***************************************************************************** * Copyright (C) 1999-2012 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_es_out.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_es_out.h index 8e2bad1..0dfc24c 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_es_out.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_es_out.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_es_out.h: es_out (demuxer output) descriptor, queries and methods ***************************************************************************** * Copyright (C) 1999-2004 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_events.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_events.h index b167e91..ce21f91 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_events.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_events.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_events.h: events definitions * Interface used to send events. ***************************************************************************** diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_filter.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_filter.h index 91a14a8..a118261 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_filter.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_filter.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_filter.h: filter related structures and functions ***************************************************************************** * Copyright (C) 1999-2008 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_fingerprinter.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_fingerprinter.h index e5d3afe..70d3aa8 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_fingerprinter.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_fingerprinter.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_fingerprinter.h: Fingerprinter abstraction layer ***************************************************************************** * Copyright (C) 2012 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_fourcc.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_fourcc.h index f691438..8ee9ad0 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_fourcc.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_fourcc.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_fourcc.h: Definition of various FOURCC and helpers ***************************************************************************** * Copyright (C) 2009 Laurent Aimar diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_fs.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_fs.h index 533aa9b..3e509cf 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_fs.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_fs.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_fs.h: File system helpers ***************************************************************************** * Copyright © 2006-2010 Rémi Denis-Courmont diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_gcrypt.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_gcrypt.h index 89bdab8..9afa5b8 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_gcrypt.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_gcrypt.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_gcrypt.h: VLC thread support for gcrypt ***************************************************************************** * Copyright (C) 2004-2010 Rémi Denis-Courmont diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_http.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_http.h index 9b0510a..e7e3156 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_http.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_http.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_http.h: Shared code for HTTP clients ***************************************************************************** * Copyright (C) 2001-2008 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_httpd.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_httpd.h index ade72f9..fbd0128 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_httpd.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_httpd.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_httpd.h: builtin HTTP/RTSP server. ***************************************************************************** * Copyright (C) 2004-2006 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_image.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_image.h index 52419af..cedece4 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_image.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_image.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_image.h : wrapper for image reading/writing facilities ***************************************************************************** * Copyright (C) 2004 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_inhibit.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_inhibit.h index b1f7330..78a4f73 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_inhibit.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_inhibit.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_inhibit.h: VLC screen saver inhibition ***************************************************************************** * Copyright (C) 2009 Rémi Denis-Courmont diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_input.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_input.h index 8471cdb..642c38a 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_input.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_input.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_input.h: Core input structures ***************************************************************************** * Copyright (C) 1999-2006 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_input_item.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_input_item.h index 8dd17a8..febdac4 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_input_item.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_input_item.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_input_item.h: Core input item ***************************************************************************** * Copyright (C) 1999-2009 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_keys.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_keys.h index bf31710..4916e70 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_keys.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_keys.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_keys.h: keycode defines ***************************************************************************** * Copyright (C) 2003-2009 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_main.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_main.h index 142ce01..8ae78d6 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_main.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_main.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_main.h: access to all program variables * Declaration and extern access to LibVLC instance object. ***************************************************************************** diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_md5.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_md5.h index 0d61b39..dbb566a 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_md5.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_md5.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_md5.h: MD5 hash ***************************************************************************** * Copyright © 2004-2011 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_media_library.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_media_library.h index e7e1f70..3547b9c 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_media_library.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_media_library.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_media_library.h: SQL-based media library ***************************************************************************** * Copyright (C) 2008-2010 the VideoLAN Team and AUTHORS diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_messages.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_messages.h index e5b1833..672d325 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_messages.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_messages.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_messages.h: messages interface * This library provides basic functions for threads to interact with user * interface, such as message output. diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_meta.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_meta.h index 75cf8b3..0648ccc 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_meta.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_meta.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_meta.h: Stream meta-data ***************************************************************************** * Copyright (C) 2004 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_meta_fetcher.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_meta_fetcher.h index e806145..9c3e9b3 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_meta_fetcher.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_meta_fetcher.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_meta_fetcher.h ***************************************************************************** * Copyright (C) 2009 Rémi Denis-Courmont diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_mime.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_mime.h index f04fc95..1dd305d 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_mime.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_mime.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_mime.h: Mime type recognition ***************************************************************************** * Copyright (C) 2012 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_modules.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_modules.h index be68094..97653fc 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_modules.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_modules.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_modules.h : Module descriptor and load functions ***************************************************************************** * Copyright (C) 2001-2011 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_mouse.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_mouse.h index c62ee3c..6d50af7 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_mouse.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_mouse.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_mouse.h: mouse related structures and functions ***************************************************************************** * Copyright (C) 2009 Laurent Aimar diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_mtime.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_mtime.h index 42172e0..c53c9f6 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_mtime.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_mtime.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_mtime.h: high resolution time management functions ***************************************************************************** * This header provides portable high precision time management functions, diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_network.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_network.h index 3461c9f..e468cb0 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_network.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_network.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_network.h: interface to communicate with network plug-ins ***************************************************************************** * Copyright (C) 2002-2005 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_objects.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_objects.h index db3f8fe..991cf2e 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_objects.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_objects.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_objects.h: vlc_object_t definition and manipulation methods ***************************************************************************** * Copyright (C) 2002-2008 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_opengl.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_opengl.h index 1cc8ca2..587da1a 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_opengl.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_opengl.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_opengl.h: VLC GL API ***************************************************************************** * Copyright (C) 2009 Laurent Aimar diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_picture.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_picture.h index 7979996..d1cc358 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_picture.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_picture.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_picture.h: picture definitions ***************************************************************************** * Copyright (C) 1999 - 2009 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_picture_fifo.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_picture_fifo.h index d337a3b..960e9fa 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_picture_fifo.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_picture_fifo.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_picture_fifo.h: picture fifo definitions ***************************************************************************** * Copyright (C) 2009 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_picture_pool.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_picture_pool.h index 147d9c8..e1a4c06 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_picture_pool.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_picture_pool.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_picture_pool.h: picture pool definitions ***************************************************************************** * Copyright (C) 2009 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_playlist.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_playlist.h index 6b0f684..16076b4 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_playlist.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_playlist.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_playlist.h : Playlist functions ***************************************************************************** * Copyright (C) 1999-2004 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_plugin.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_plugin.h index 14c48f0..96baeb0 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_plugin.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_plugin.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_plugin.h : Macros used from within a module. ***************************************************************************** * Copyright (C) 2001-2006 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_probe.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_probe.h index efa4d97..13401ce 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_probe.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_probe.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_probe.h: service probing interface ***************************************************************************** * Copyright (C) 2009 Rémi Denis-Courmont diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_rand.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_rand.h index 761cee5..bb5eccc 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_rand.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_rand.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_rand.h: RNG ***************************************************************************** * Copyright © 2007 Rémi Denis-Courmont diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_services_discovery.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_services_discovery.h index 3652230..c1ed3de 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_services_discovery.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_services_discovery.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_services_discovery.h : Services Discover functions ***************************************************************************** * Copyright (C) 1999-2004 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_sout.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_sout.h index 7df3a52..420d8bb 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_sout.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_sout.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_sout.h : stream output module ***************************************************************************** * Copyright (C) 2002-2008 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_spu.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_spu.h index cbd20ea..913c393 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_spu.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_spu.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_spu.h: spu_t definition and functions. ***************************************************************************** * Copyright (C) 1999-2010 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_stream.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_stream.h index 5cec1b3..c641904 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_stream.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_stream.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_stream.h: Stream (between access and demux) descriptor and methods ***************************************************************************** * Copyright (C) 1999-2004 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_strings.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_strings.h index 52a5bde..1d35bd7 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_strings.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_strings.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_strings.h: String functions ***************************************************************************** * Copyright (C) 2006 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_subpicture.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_subpicture.h index 8d78bb4..42cc0eb 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_subpicture.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_subpicture.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_subpicture.h: subpicture definitions ***************************************************************************** * Copyright (C) 1999 - 2009 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_text_style.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_text_style.h index 10a1b5b..679f152 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_text_style.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_text_style.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_text_style.h: text_style_t definition and helpers. ***************************************************************************** * Copyright (C) 1999-2010 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_threads.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_threads.h index d3f021b..cbaa6e5 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_threads.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_threads.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_threads.h : threads implementation for the VideoLAN client * This header provides portable declarations for mutexes & conditions ***************************************************************************** diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_tls.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_tls.h index e9db9cc..9a9e79e 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_tls.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_tls.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_tls.h: Transport Layer Security API ***************************************************************************** * Copyright (C) 2004-2011 Rémi Denis-Courmont diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_url.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_url.h index f548ef4..98e5583 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_url.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_url.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_url.h: URL related macros ***************************************************************************** * Copyright (C) 2002-2006 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_variables.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_variables.h index b5b83ab..e13d160 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_variables.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_variables.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_variables.h: variables handling ***************************************************************************** * Copyright (C) 2002-2004 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_video_splitter.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_video_splitter.h index 419a4ca..9ce0558 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_video_splitter.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_video_splitter.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_video_splitter.h: "video splitter" related structures and functions ***************************************************************************** * Copyright (C) 2009 Laurent Aimar diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_vlm.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_vlm.h index 58680b6..adb6995 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_vlm.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_vlm.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_vlm.h: VLM core structures ***************************************************************************** * Copyright (C) 2000, 2001 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_vout.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_vout.h index 2ff13aa..cb2ca06 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_vout.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_vout.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_vout.h: common video definitions ***************************************************************************** * Copyright (C) 1999 - 2008 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_vout_display.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_vout_display.h index 8142b91..2ac54ec 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_vout_display.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_vout_display.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_vout_display.h: vout_display_t definitions ***************************************************************************** * Copyright (C) 2009 Laurent Aimar diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_vout_osd.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_vout_osd.h index 8b2b27d..73b9382 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_vout_osd.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_vout_osd.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_vout_osd.h: vout OSD ***************************************************************************** * Copyright (C) 1999-2010 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_vout_window.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_vout_window.h index 85dd6d0..7238b96 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_vout_window.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_vout_window.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_vout_window.h: vout_window_t definitions ***************************************************************************** * Copyright (C) 2008 Rémi Denis-Courmont diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_xlib.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_xlib.h index b6818c1..f8add42 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_xlib.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_xlib.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_xlib.h: initialization of Xlib ***************************************************************************** * Copyright (C) 2010 Rémi Denis-Courmont diff --git a/demo/kugou/include/vlc/include/vlc/plugins/vlc_xml.h b/demo/kugou/include/vlc/include/vlc/plugins/vlc_xml.h index 3bb8312..afe6c23 100644 --- a/demo/kugou/include/vlc/include/vlc/plugins/vlc_xml.h +++ b/demo/kugou/include/vlc/include/vlc/plugins/vlc_xml.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc_xml.h: XML abstraction layer ***************************************************************************** * Copyright (C) 2004-2010 VLC authors and VideoLAN diff --git a/demo/kugou/include/vlc/include/vlc/vlc.h b/demo/kugou/include/vlc/include/vlc/vlc.h index a6eb47f..73e68d9 100644 --- a/demo/kugou/include/vlc/include/vlc/vlc.h +++ b/demo/kugou/include/vlc/include/vlc/vlc.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/***************************************************************************** * vlc.h: global header for libvlc ***************************************************************************** * Copyright (C) 1998-2008 VLC authors and VideoLAN diff --git a/demo/kugou/lrcPanel.cpp b/demo/kugou/lrcPanel.cpp index 5939e96..d3bdb15 100644 --- a/demo/kugou/lrcPanel.cpp +++ b/demo/kugou/lrcPanel.cpp @@ -1,4 +1,4 @@ -#include "lrcPanel.h" +#include "lrcPanel.h" void LrcPanel::ChangePostion(int postion) { for (auto _it = LrcList.rbegin(); _it != LrcList.rend(); _it++) diff --git a/demo/kugou/lrcPanel.h b/demo/kugou/lrcPanel.h index 67f01c3..e093f64 100644 --- a/demo/kugou/lrcPanel.h +++ b/demo/kugou/lrcPanel.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "global.h" class Lrc { diff --git a/demo/kugou/main.cpp b/demo/kugou/main.cpp index 7c6c0f2..e2414fc 100644 --- a/demo/kugou/main.cpp +++ b/demo/kugou/main.cpp @@ -1,4 +1,4 @@ -#include "global.h" +#include "global.h" #include "mainFrm.h" int APIENTRY wWinMain(_In_ HINSTANCE hInstance, diff --git a/demo/kugou/widgets.cpp b/demo/kugou/widgets.cpp index 616be13..bf9b558 100644 --- a/demo/kugou/widgets.cpp +++ b/demo/kugou/widgets.cpp @@ -1,4 +1,4 @@ -#include "widgets.h" +#include "widgets.h" LocalItem::LocalItem(const UIString& _songName, const UIString& _songTime) { diff --git a/demo/kugou/widgets.h b/demo/kugou/widgets.h index f4e8c8b..cfde033 100644 --- a/demo/kugou/widgets.h +++ b/demo/kugou/widgets.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "global.h" /// /// 左侧本地歌曲列表中的Item diff --git a/demo/mode/UI.cpp b/demo/mode/UI.cpp index dc27ba1..14e92f2 100644 --- a/demo/mode/UI.cpp +++ b/demo/mode/UI.cpp @@ -1,2 +1,2 @@ -#include "pch.h" +#include "pch.h" #include "ui.h" diff --git a/include/EzUI/TableView.h b/include/EzUI/TableView.h new file mode 100644 index 0000000..88d24cd --- /dev/null +++ b/include/EzUI/TableView.h @@ -0,0 +1,430 @@ +#pragma once +#include "Control.h" +#include "Label.h" +#include "TextBox.h" +#include "CheckBox.h" +#include "ComboBox.h" +#include "VScrollBar.h" +#include "HScrollBar.h" +#include +#include + +namespace ezui { + + // 第一列类型枚举 + enum class FirstColumnType { + TextBox, // 空白文本框（默认） + Index, // 不可编辑的序号（从1开始） + CheckBox // 选择框 + }; + + // 单元格类型枚举 + enum class CellType { + TextBox, // 文本框（默认） + CheckBox, // 选择框 + ComboBox, // 下拉选择框 + ReadOnly // 不可编辑（可选中复制但不能修改） + }; + + // 边框类型（复用框架的 StrokeStyle） + // StrokeStyle::None - 无边框 + // StrokeStyle::Solid - 实线 + // StrokeStyle::Dash - 虚线 + + // 排序方向 + enum class SortOrder { + None, // 未排序 + Ascending, // 升序 + Descending // 降序 + }; + + // 单元格独立样式（用于单独设置某个单元格的样式） + struct CellStyle { + Color BorderColor; + StrokeStyle BorderStyle = StrokeStyle::None; + Color BackColor; + Color ForeColor; + bool HasBorderColor = false; + bool HasBorderStyle = false; + bool HasBackColor = false; + bool HasForeColor = false; + + void SetBorderColor(const Color& color) { + BorderColor = color; + HasBorderColor = true; + } + void SetBorderStyle(StrokeStyle style) { + BorderStyle = style; + HasBorderStyle = true; + } + void SetBackColor(const Color& color) { + BackColor = color; + HasBackColor = true; + } + void SetForeColor(const Color& color) { + ForeColor = color; + HasForeColor = true; + } + void Reset() { + HasBorderColor = false; + HasBorderStyle = false; + HasBackColor = false; + HasForeColor = false; + } + }; + + // 单元格数据 + struct CellData { + UIString Text; // 单元格文本内容 + bool Checked = false; // 用于 CheckBox 类型 + int ComboIndex = -1; // 用于 ComboBox 类型，选中的索引 + CellStyle Style; // 单元格独立样式 + }; + + // 列信息 + struct ColumnInfo { + UIString HeaderText; // 表头文字 + int Width = 100; // 列宽 + CellType Type = CellType::TextBox; // 单元格类型 + std::vector ComboItems; // 下拉选项（仅 ComboBox 类型有效） + SortOrder CurrentSort = SortOrder::None; // 当前排序状态 + }; + + class UI_EXPORT TableView : public Control { + private: + // 滚动条 + VScrollBar m_vScrollBar; + HScrollBar m_hScrollBar; + + // 数据存储 + std::vector m_columns; // 列信息 + std::vector> m_data; // 二维数据 [row][col] + std::vector m_rowHeights; // 每行高度 + std::vector m_rowChecked; // 每行的选中状态（第一列为CheckBox时使用） + + // 第一列配置 + FirstColumnType m_firstColumnType = FirstColumnType::TextBox; + int m_firstColumnWidth = 50; // 第一列宽度 + + // 表头配置 + int m_headerHeight = 30; // 表头高度 + bool m_headerSelectAll = false; // 表头全选状态 + + // 默认行高 + int m_defaultRowHeight = 30; + + // 统一单元格样式 + int m_cellBorderSize = 1; + StrokeStyle m_cellBorderStyle = StrokeStyle::Solid; + Color m_cellBorderColor = Color::LightGray; + Color m_cellBackColor = Color::White; + Color m_cellForeColor = Color::Black; + int m_cellFontSize = 14; + std::wstring m_cellFontFamily = L"Microsoft YaHei"; + + // 表头样式 + Color m_headerBackColor = Color(0xFFE0E0E0); + Color m_headerForeColor = Color::Black; + + // 滚动偏移 + int m_scrollOffsetX = 0; + int m_scrollOffsetY = 0; + + // 内容大小缓存（供GetContentSize使用） + mutable Size m_contentSize; + + // 编辑状态 + bool m_editing = false; + int m_editRow = -1; + int m_editCol = -1; + TextBox* m_editBox = nullptr; + ComboBox* m_editCombo = nullptr; + CheckBox* m_editCheck = nullptr; + + // 列宽拖动 + bool m_draggingColumn = false; + int m_dragColumnIndex = -1; + int m_dragStartX = 0; + int m_dragStartWidth = 0; + + // 排序 + int m_sortColumnIndex = -1; + + // 鼠标悬停 + int m_hoverRow = -1; + int m_hoverCol = -1; + + // 双击检测 + ULONGLONG m_lastClickTime = 0; + int m_lastClickRow = -1; + int m_lastClickCol = -1; + + private: + void Init(); + + // 计算总内容宽度 + int GetContentWidth() const; + + // 计算总内容高度 + int GetContentHeight() const; + + // 获取列起始X坐标（考虑滚动偏移） + int GetColumnX(int colIndex) const; + + // 获取行起始Y坐标（考虑滚动偏移） + int GetRowY(int rowIndex) const; + + // 根据坐标获取单元格位置 + bool HitTestCell(const Point& pt, int* outRow, int* outCol) const; + + // 根据坐标检测是否在列边界上（用于拖动调整列宽） + int HitTestColumnBorder(const Point& pt) const; + + // 检测是否点击在垂直滚动条上 + bool HitTestVScrollBar(const Point& pt); + + // 检测是否点击在水平滚动条上 + bool HitTestHScrollBar(const Point& pt); + + // 绘制表头 + void DrawHeader(PaintEventArgs& args); + + // 绘制单元格 + void DrawCells(PaintEventArgs& args); + + // 绘制单个单元格 + void DrawCell(PaintEventArgs& args, int row, int col, const Rect& cellRect); + + // 绘制第一列 + void DrawFirstColumn(PaintEventArgs& args, int row, const Rect& cellRect); + + // 开始编辑单元格 + void BeginEdit(int row, int col); + + // 结束编辑 + void EndEdit(bool save = true); + + // 更新行高（根据内容） + void UpdateRowHeight(int row); + + // 计算文本需要的行数 + int CalculateTextLines(const UIString& text, int width) const; + + // 刷新滚动条 + void RefreshScrollBars(); + + // 滚动偏移处理 + void OffsetX(int offset); + void OffsetY(int offset); + + // 执行排序 + void DoSort(int colIndex); + + protected: + virtual void OnPaint(PaintEventArgs& args) override; + virtual void OnChildPaint(PaintEventArgs& args) override; + virtual void OnLayout() override; + virtual void OnMouseMove(const MouseEventArgs& args) override; + virtual void OnMouseDown(const MouseEventArgs& args) override; + virtual void OnMouseUp(const MouseEventArgs& args) override; + virtual void OnMouseDoubleClick(const MouseEventArgs& args) override; + virtual void OnMouseWheel(const MouseEventArgs& args) override; + virtual void OnMouseLeave(const MouseEventArgs& args) override; + virtual void OnSize(const SizeEventArgs& args) override; + virtual void OnKeyDown(const KeyboardEventArgs& args) override; + virtual void OnKeyChar(const KeyboardEventArgs& args) override; + virtual const Size& GetContentSize() override; + + public: + // 选中行背景色（当第一列为CheckBox且被选中时使用） + Color SelectedRowBackColor = Color(0xFFADD8E6); // 浅蓝色 + + // 单元格内容变化回调 + // 参数: row, col, newValue + std::function CellValueChanged = nullptr; + + public: + TableView(Object* parentObject = nullptr); + virtual ~TableView(); + + // ============ 表头设置 ============ + + // 设置表头（传入表头名数组） + void SetHeaders(const std::vector& headers); + + // 获取表头数量（不包含第一列） + int GetColumnCount() const; + + // 设置表头高度 + void SetHeaderHeight(int height); + + // 获取表头高度 + int GetHeaderHeight() const; + + // ============ 第一列设置 ============ + + // 设置第一列类型 + void SetFirstColumnType(FirstColumnType type); + + // 获取第一列类型 + FirstColumnType GetFirstColumnType() const; + + // 设置第一列宽度 + void SetFirstColumnWidth(int width); + + // 获取第一列宽度 + int GetFirstColumnWidth() const; + + // ============ 列设置 ============ + + // 设置某列宽度 + void SetColumnWidth(int colIndex, int width); + + // 获取某列宽度 + int GetColumnWidth(int colIndex) const; + + // 获取所有列宽 + const std::vector GetColumnWidths() const; + + // 设置某列单元格类型 + void SetColumnType(int colIndex, CellType type); + + // 获取某列单元格类型 + CellType GetColumnType(int colIndex) const; + + // 设置某列的下拉选项（仅对 ComboBox 类型有效） + void SetColumnComboItems(int colIndex, const std::vector& items); + + // ============ 行设置 ============ + + // 获取行数 + int GetRowCount() const; + + // 添加行 + void AddRow(); + + // 插入行 + void InsertRow(int rowIndex); + + // 删除行 + void RemoveRow(int rowIndex); + + // 清空所有行 + void ClearRows(); + + // 添加列 + void AddColumn(const UIString& headerText = L"", int width = 100); + + // 插入列 + void InsertColumn(int colIndex, const UIString& headerText = L"", int width = 100); + + // 删除列 + void RemoveColumn(int colIndex); + + // 获取行高 + int GetRowHeight(int rowIndex) const; + + // 获取所有行高 + const std::vector GetRowHeights() const; + + // 设置默认行高 + void SetDefaultRowHeight(int height); + + // ============ 数据操作 ============ + + // 设置单个单元格数据 + void SetData(int row, int col, const UIString& value); + + // 获取单个单元格数据 + UIString GetData(int row, int col) const; + + // 设置整行数据 + void SetRowData(int row, const std::vector& values); + + // 获取整行数据 + std::vector GetRowData(int row) const; + + // 获取整列数据 + std::vector GetColData(int col) const; + + // 设置全部数据（二维数组） + void SetAllData(const std::vector>& data); + + // 获取全部数据 + std::vector> GetAllData() const; + + // 设置单元格 CheckBox 状态 + void SetCellChecked(int row, int col, bool checked); + + // 获取单元格 CheckBox 状态 + bool GetCellChecked(int row, int col) const; + + // 设置单元格 ComboBox 选中索引 + void SetCellComboIndex(int row, int col, int index); + + // 获取单元格 ComboBox 选中索引 + int GetCellComboIndex(int row, int col) const; + + // ============ 行选中（第一列为CheckBox时） ============ + + // 设置某行选中状态 + void SetRowChecked(int row, bool checked); + + // 获取某行选中状态 + bool GetRowChecked(int row) const; + + // 获取所有选中的行索引 + std::vector GetCheckedRows() const; + + // 全选 + void SelectAll(); + + // 取消全选 + void DeselectAll(); + + // ============ 样式设置 ============ + + // 设置统一单元格样式 + void SetCellBorderSize(int size); + void SetCellBorderStyle(StrokeStyle style); + void SetCellBorderColor(const Color& color); + void SetCellBackColor(const Color& color); + void SetCellForeColor(const Color& color); + void SetCellFontSize(int size); + void SetCellFontFamily(const std::wstring& fontFamily); + + // 设置单独单元格样式 + void SetCellStyle(int row, int col, const CellStyle& style); + + // 获取单独单元格样式 + CellStyle GetCellStyle(int row, int col) const; + + // 重置单独单元格样式（使用统一样式） + void ResetCellStyle(int row, int col); + + // 设置表头样式 + void SetHeaderBackColor(const Color& color); + void SetHeaderForeColor(const Color& color); + + // ============ 鼠标悬停信息 ============ + + // 获取鼠标当前悬停的行号（-1表示表头或未悬停在任何行） + int GetHoverRow() const; + + // 获取鼠标当前悬停的列号（-1表示第一列或未悬停在任何列） + int GetHoverCol() const; + + // 获取鼠标当前悬停的行列号（通过指针返回） + void GetHoverCell(int* outRow, int* outCol) const; + + // ============ 滚动条 ============ + + virtual ScrollBar* GetVScrollBar(); + virtual ScrollBar* GetHScrollBar(); + + // ============ 属性设置（XML支持） ============ + + virtual void SetAttribute(const UIString& key, const UIString& value) override; + }; + +}; diff --git a/include/EzUI/TextBox.h b/include/EzUI/TextBox.h index 974b158..4803c56 100644 --- a/include/EzUI/TextBox.h +++ b/include/EzUI/TextBox.h @@ -112,5 +112,7 @@ namespace ezui { void SetPlaceholderText(const UIString& text); //设置密码框占位符(建议单字符) void SetPasswordChar(const UIString& passwordChar); + // 设置焦点并初始化光标到指定位置（-1表示文本末尾） + void SetFocusAndCaret(int caretPos = -1); }; }; diff --git a/include/EzUI/UIManager.h b/include/EzUI/UIManager.h index 92b4fce..65386d1 100644 --- a/include/EzUI/UIManager.h +++ b/include/EzUI/UIManager.h @@ -16,6 +16,7 @@ #include "ProgressBar.h" #include "Window.h" #include "ComboBox.h" +#include "TableView.h" namespace ezui { //主窗口中的内联页面类 diff --git a/lib/EzUI_Debug_Win32.lib b/lib/EzUI_Debug_Win32.lib index 5d7ac53..8b81975 100644 Binary files a/lib/EzUI_Debug_Win32.lib and b/lib/EzUI_Debug_Win32.lib differ diff --git a/lib/EzUI_Debug_Win32.pdb b/lib/EzUI_Debug_Win32.pdb index 59a5db8..064579b 100644 Binary files a/lib/EzUI_Debug_Win32.pdb and b/lib/EzUI_Debug_Win32.pdb differ diff --git a/lib/EzUI_Debug_x64.lib b/lib/EzUI_Debug_x64.lib index 9746662..182261f 100644 Binary files a/lib/EzUI_Debug_x64.lib and b/lib/EzUI_Debug_x64.lib differ diff --git a/lib/EzUI_Debug_x64.pdb b/lib/EzUI_Debug_x64.pdb index 74065a2..cfedb17 100644 Binary files a/lib/EzUI_Debug_x64.pdb and b/lib/EzUI_Debug_x64.pdb differ diff --git a/lib/EzUI_Release_Win32.lib b/lib/EzUI_Release_Win32.lib index 65f04fb..63c71ac 100644 Binary files a/lib/EzUI_Release_Win32.lib and b/lib/EzUI_Release_Win32.lib differ diff --git a/lib/EzUI_Release_x64.lib b/lib/EzUI_Release_x64.lib index 0fb7ad0..924d48f 100644 Binary files a/lib/EzUI_Release_x64.lib and b/lib/EzUI_Release_x64.lib differ diff --git a/sources/TableView.cpp b/sources/TableView.cpp new file mode 100644 index 0000000..e58cae7 --- /dev/null +++ b/sources/TableView.cpp @@ -0,0 +1,1711 @@ +#include "TableView.h" + +namespace ezui { + + TableView::TableView(Object* parentObject) : Control(parentObject) { + Init(); + } + + TableView::~TableView() { + EndEdit(false); + // 注意：m_editBox、m_editCombo、m_editCheck 作为子控件，由父控件自动管理 + // 不需要手动 delete，否则会导致双重释放 + m_editBox = nullptr; + m_editCombo = nullptr; + m_editCheck = nullptr; + } + + void TableView::Init() { + // 初始化垂直滚动条 + m_vScrollBar.SetWidth(10); + m_vScrollBar.Parent = this; + m_vScrollBar.OffsetCallback = [this](int offset) { + this->OffsetY(offset); + }; + + // 初始化水平滚动条 + m_hScrollBar.SetHeight(10); + m_hScrollBar.Parent = this; + m_hScrollBar.OffsetCallback = [this](int offset) { + this->OffsetX(offset); + }; + + // 创建编辑控件（初始隐藏） + m_editBox = new TextBox(); + m_editBox->SetVisible(false); + m_editBox->SetMultiLine(true); + // 为编辑框设置默认字体样式 + m_editBox->Style.FontSize = m_cellFontSize; + m_editBox->Style.FontFamily = L"Microsoft YaHei"; + // 添加到子控件列表，这样才能正确处理事件和绘制 + this->Add(m_editBox); + m_editBox->TextChanged = [this](const UIString& text) { + if (m_editing && m_editRow >= 0 && m_editCol >= 0) { + // 实时更新数据 + if (m_editRow < (int)m_data.size() && m_editCol < (int)m_data[m_editRow].size()) { + m_data[m_editRow][m_editCol].Text = text; + UpdateRowHeight(m_editRow); + if (CellValueChanged) { + CellValueChanged(m_editRow, m_editCol, text); + } + } + } + }; + } + + int TableView::GetContentWidth() const { + int width = m_firstColumnWidth; + for (const auto& col : m_columns) { + width += col.Width; + } + return width; + } + + int TableView::GetContentHeight() const { + int height = m_headerHeight; + for (int h : m_rowHeights) { + height += h; + } + return height; + } + + int TableView::GetColumnX(int colIndex) const { + int x = m_firstColumnWidth - m_scrollOffsetX; + for (int i = 0; i < colIndex && i < (int)m_columns.size(); ++i) { + x += m_columns[i].Width; + } + return x; + } + + int TableView::GetRowY(int rowIndex) const { + int y = m_headerHeight - m_scrollOffsetY; + for (int i = 0; i < rowIndex && i < (int)m_rowHeights.size(); ++i) { + y += m_rowHeights[i]; + } + return y; + } + + bool TableView::HitTestCell(const Point& pt, int* outRow, int* outCol) const { + // 检查是否在表头区域 + if (pt.Y < m_headerHeight) { + *outRow = -1; + // 检查是否在第一列 + if (pt.X < m_firstColumnWidth) { + *outCol = -1; + return true; + } + // 检查是否在数据列 + int x = m_firstColumnWidth; + for (int i = 0; i < (int)m_columns.size(); ++i) { + if (pt.X >= x - m_scrollOffsetX && pt.X < x - m_scrollOffsetX + m_columns[i].Width) { + *outCol = i; + return true; + } + x += m_columns[i].Width; + } + return false; + } + + // 检查行 + int y = m_headerHeight; + for (int row = 0; row < (int)m_rowHeights.size(); ++row) { + int rowY = y - m_scrollOffsetY; + if (pt.Y >= rowY && pt.Y < rowY + m_rowHeights[row]) { + *outRow = row; + + // 检查列 + if (pt.X < m_firstColumnWidth) { + *outCol = -1; // 第一列 + return true; + } + + int x = m_firstColumnWidth; + for (int col = 0; col < (int)m_columns.size(); ++col) { + int colX = x - m_scrollOffsetX; + if (pt.X >= colX && pt.X < colX + m_columns[col].Width) { + *outCol = col; + return true; + } + x += m_columns[col].Width; + } + return false; + } + y += m_rowHeights[row]; + } + + *outRow = -1; + *outCol = -1; + return false; + } + + int TableView::HitTestColumnBorder(const Point& pt) const { + const int borderHitWidth = 5; // 边界检测宽度 + + // 只在表头区域检测 + if (pt.Y >= m_headerHeight) { + return -2; // 返回-2表示不在表头区域，不应该显示拖动光标 + } + + // 检测第一列右边界 + int x = m_firstColumnWidth; + if (std::abs(pt.X - x) <= borderHitWidth) { + return -1; // 返回-1表示第一列边界（特殊处理） + } + + // 检测数据列边界 + for (int i = 0; i < (int)m_columns.size(); ++i) { + x += m_columns[i].Width; + int borderX = x - m_scrollOffsetX; + if (std::abs(pt.X - borderX) <= borderHitWidth) { + return i; + } + } + + return -2; // 未命中任何边界 + } + + bool TableView::HitTestVScrollBar(const Point& pt) { + if (!m_vScrollBar.IsVisible()) { + return false; + } + Rect scrollRect = m_vScrollBar.GetRect(); + return scrollRect.Contains(pt); + } + + bool TableView::HitTestHScrollBar(const Point& pt) { + if (!m_hScrollBar.IsVisible()) { + return false; + } + Rect scrollRect = m_hScrollBar.GetRect(); + return scrollRect.Contains(pt); + } + + void TableView::DrawHeader(PaintEventArgs& args) { + auto& g = args.Graphics; + + // 绘制表头背景 + Rect headerRect(0, 0, Width(), m_headerHeight); + g.SetColor(m_headerBackColor); + g.FillRectangle(RectF(headerRect)); + + // 绘制第一列表头 + Rect firstColRect(0, 0, m_firstColumnWidth, m_headerHeight); + g.SetColor(m_headerBackColor); + g.FillRectangle(RectF(firstColRect)); + + // 如果第一列是 CheckBox 类型，绘制全选复选框 + if (m_firstColumnType == FirstColumnType::CheckBox) { + int checkSize = (std::min)(m_headerHeight - 8, 16); + int checkX = (m_firstColumnWidth - checkSize) / 2; + int checkY = (m_headerHeight - checkSize) / 2; + Rect checkRect(checkX, checkY, checkSize, checkSize); + + // 绘制复选框边框 + g.SetColor(m_cellBorderColor); + g.DrawRectangle(RectF(checkRect)); + + // 如果全选，绘制勾选标记 + if (m_headerSelectAll) { + g.SetColor(m_headerForeColor); + // 简单的勾选线 + PointF p1(checkX + 3, checkY + checkSize / 2); + PointF p2(checkX + checkSize / 3, checkY + checkSize - 4); + PointF p3(checkX + checkSize - 3, checkY + 4); + g.DrawLine(p1, p2); + g.DrawLine(p2, p3); + } + } else if (m_firstColumnType == FirstColumnType::Index) { + // 绘制 "#" 或序号标题 + Font font(m_cellFontFamily, m_cellFontSize); + g.SetFont(font); + g.SetColor(m_headerForeColor); + TextLayout layout(L"#", font, SizeF(m_firstColumnWidth, m_headerHeight), TextAlign::MiddleCenter); + g.DrawTextLayout(layout, PointF(0, 0)); + } + + // 绘制第一列边框 + if (m_cellBorderStyle != StrokeStyle::None) { + g.SetColor(m_cellBorderColor); + g.DrawRectangle(RectF(firstColRect)); + } + + // 绘制数据列表头 + int x = m_firstColumnWidth - m_scrollOffsetX; + for (int i = 0; i < (int)m_columns.size(); ++i) { + const auto& col = m_columns[i]; + + // 裁剪到可见区域 + if (x + col.Width <= m_firstColumnWidth || x >= Width()) { + x += col.Width; + continue; + } + + Rect colRect(x, 0, col.Width, m_headerHeight); + + // 绘制表头文字 + Font font(m_cellFontFamily, m_cellFontSize); + g.SetFont(font); + g.SetColor(m_headerForeColor); + + // 添加排序指示器 + std::wstring headerText = col.HeaderText.unicode(); + if (col.CurrentSort == SortOrder::Ascending) { + headerText = headerText + L" ▲"; + } else if (col.CurrentSort == SortOrder::Descending) { + headerText = headerText + L" ▼"; + } + + TextLayout layout(headerText, font, SizeF(col.Width - 4, m_headerHeight), TextAlign::MiddleCenter); + g.DrawTextLayout(layout, PointF(x + 2, 0)); + + // 绘制边框 + if (m_cellBorderStyle != StrokeStyle::None) { + g.SetColor(m_cellBorderColor); + g.DrawRectangle(RectF(colRect)); + } + + x += col.Width; + } + } + + void TableView::DrawCells(PaintEventArgs& args) { + int startY = m_headerHeight; + + for (int row = 0; row < (int)m_data.size(); ++row) { + int rowY = startY + GetRowY(row) - m_headerHeight; + int rowHeight = m_rowHeights[row]; + + // 跳过不可见行 + if (rowY + rowHeight <= m_headerHeight || rowY >= Height()) { + continue; + } + + // 绘制第一列 + Rect firstColRect(0, rowY, m_firstColumnWidth, rowHeight); + DrawFirstColumn(args, row, firstColRect); + + // 绘制数据列 + int x = m_firstColumnWidth - m_scrollOffsetX; + for (int col = 0; col < (int)m_columns.size(); ++col) { + int colWidth = m_columns[col].Width; + + // 跳过不可见列 + if (x + colWidth <= m_firstColumnWidth || x >= Width()) { + x += colWidth; + continue; + } + + Rect cellRect(x, rowY, colWidth, rowHeight); + DrawCell(args, row, col, cellRect); + x += colWidth; + } + } + } + + void TableView::DrawFirstColumn(PaintEventArgs& args, int row, const Rect& cellRect) { + auto& g = args.Graphics; + + // 获取行选中状态背景色 + Color backColor = m_cellBackColor; + if (m_firstColumnType == FirstColumnType::CheckBox && row < (int)m_rowChecked.size() && m_rowChecked[row]) { + backColor = SelectedRowBackColor; + } + + // 绘制背景 + g.SetColor(backColor); + g.FillRectangle(RectF(cellRect)); + + // 根据第一列类型绘制内容 + if (m_firstColumnType == FirstColumnType::Index) { + // 绘制序号 + Font font(m_cellFontFamily, m_cellFontSize); + g.SetFont(font); + g.SetColor(m_cellForeColor); + std::wstring indexText = std::to_wstring(row + 1); // 从1开始 + TextLayout layout(indexText, font, SizeF(m_firstColumnWidth - 4, cellRect.Height), TextAlign::MiddleCenter); + g.DrawTextLayout(layout, PointF(cellRect.X + 2, cellRect.Y)); + } else if (m_firstColumnType == FirstColumnType::CheckBox) { + // 绘制复选框 + int checkSize = (std::min)(cellRect.Height - 8, 16); + int checkX = cellRect.X + (m_firstColumnWidth - checkSize) / 2; + int checkY = cellRect.Y + (cellRect.Height - checkSize) / 2; + Rect checkRect(checkX, checkY, checkSize, checkSize); + + g.SetColor(m_cellBorderColor); + g.DrawRectangle(RectF(checkRect)); + + if (row < (int)m_rowChecked.size() && m_rowChecked[row]) { + g.SetColor(m_cellForeColor); + PointF p1(checkX + 3, checkY + checkSize / 2); + PointF p2(checkX + checkSize / 3, checkY + checkSize - 4); + PointF p3(checkX + checkSize - 3, checkY + 4); + g.DrawLine(p1, p2); + g.DrawLine(p2, p3); + } + } + // TextBox 类型第一列留空 + + // 绘制边框 + if (m_cellBorderStyle != StrokeStyle::None) { + g.SetColor(m_cellBorderColor); + g.DrawRectangle(RectF(cellRect)); + } + } + + void TableView::DrawCell(PaintEventArgs& args, int row, int col, const Rect& cellRect) { + auto& g = args.Graphics; + + if (row >= (int)m_data.size() || col >= (int)m_data[row].size()) { + return; + } + + const auto& cellData = m_data[row][col]; + const auto& colInfo = m_columns[col]; + + // 确定背景色 + Color backColor = m_cellBackColor; + + // 如果第一列是 CheckBox 且选中，使用选中行背景色（优先级低） + if (m_firstColumnType == FirstColumnType::CheckBox && row < (int)m_rowChecked.size() && m_rowChecked[row]) { + backColor = SelectedRowBackColor; + } + + // 如果单元格有独立背景色，使用独立设置（优先级高） + if (cellData.Style.HasBackColor) { + backColor = cellData.Style.BackColor; + } + + // 如果正在编辑此单元格，跳过内容绘制（只绘制背景），让 TextBox 绘制内容 + bool isEditing = m_editing && m_editRow == row && m_editCol == col; + + // 绘制背景（编辑时也需要绘制，但使用白色以匹配 TextBox） + if (isEditing) { + g.SetColor(Color::White); + } else { + g.SetColor(backColor); + } + g.FillRectangle(RectF(cellRect)); + + // 如果正在编辑此单元格，跳过内容绘制 + if (isEditing) { + return; + } + + // 确定前景色 + Color foreColor = m_cellForeColor; + if (cellData.Style.HasForeColor) { + foreColor = cellData.Style.ForeColor; + } + + // 根据单元格类型绘制内容 + Font font(m_cellFontFamily, m_cellFontSize); + g.SetFont(font); + g.SetColor(foreColor); + + switch (colInfo.Type) { + case CellType::TextBox: + case CellType::ReadOnly: { + // 绘制文本 + TextLayout layout(cellData.Text.unicode(), font, + SizeF(cellRect.Width - 4, cellRect.Height - 2), TextAlign::MiddleLeft); + g.DrawTextLayout(layout, PointF(cellRect.X + 2, cellRect.Y + 1)); + break; + } + case CellType::CheckBox: { + // 绘制复选框 + int checkSize = (std::min)(cellRect.Height - 8, 16); + int checkX = cellRect.X + (cellRect.Width - checkSize) / 2; + int checkY = cellRect.Y + (cellRect.Height - checkSize) / 2; + Rect checkRect(checkX, checkY, checkSize, checkSize); + + g.SetColor(m_cellBorderColor); + g.DrawRectangle(RectF(checkRect)); + + if (cellData.Checked) { + g.SetColor(foreColor); + PointF p1(checkX + 3, checkY + checkSize / 2); + PointF p2(checkX + checkSize / 3, checkY + checkSize - 4); + PointF p3(checkX + checkSize - 3, checkY + 4); + g.DrawLine(p1, p2); + g.DrawLine(p2, p3); + } + break; + } + case CellType::ComboBox: { + // 绘制下拉框文本 + UIString displayText; + if (cellData.ComboIndex >= 0 && cellData.ComboIndex < (int)colInfo.ComboItems.size()) { + displayText = colInfo.ComboItems[cellData.ComboIndex]; + } + TextLayout layout(displayText.unicode(), font, + SizeF(cellRect.Width - 20, cellRect.Height - 2), TextAlign::MiddleLeft); + g.DrawTextLayout(layout, PointF(cellRect.X + 2, cellRect.Y + 1)); + + // 绘制下拉箭头 + int arrowSize = 8; + int arrowX = cellRect.GetRight() - arrowSize - 4; + int arrowY = cellRect.Y + (cellRect.Height - arrowSize / 2) / 2; + PointF ap1(arrowX, arrowY); + PointF ap2(arrowX + arrowSize, arrowY); + PointF ap3(arrowX + arrowSize / 2, arrowY + arrowSize / 2); + g.SetColor(foreColor); + g.DrawLine(ap1, ap3); + g.DrawLine(ap2, ap3); + break; + } + } + + // 绘制边框 + StrokeStyle borderStyle = m_cellBorderStyle; + Color borderColor = m_cellBorderColor; + + if (cellData.Style.HasBorderStyle) { + borderStyle = cellData.Style.BorderStyle; + } + if (cellData.Style.HasBorderColor) { + borderColor = cellData.Style.BorderColor; + } + + if (borderStyle != StrokeStyle::None) { + g.SetColor(borderColor); + // TODO: 支持虚线样式 + g.DrawRectangle(RectF(cellRect)); + } + } + + void TableView::BeginEdit(int row, int col) { + if (row < 0 || col < 0 || row >= (int)m_data.size() || col >= (int)m_columns.size()) { + return; + } + + const auto& colInfo = m_columns[col]; + + // ReadOnly 类型不能编辑 + if (colInfo.Type == CellType::ReadOnly) { + return; + } + + EndEdit(true); // 结束之前的编辑 + + m_editing = true; + m_editRow = row; + m_editCol = col; + + // 计算单元格位置 + int x = GetColumnX(col); + int y = GetRowY(row); + int width = colInfo.Width; + int height = m_rowHeights[row]; + + Rect editRect(x, y, width, height); + + switch (colInfo.Type) { + case CellType::TextBox: { + // 确保 TextBox 字体与单元格字体一致 + m_editBox->Style.FontSize = m_cellFontSize; + m_editBox->Style.FontFamily = m_cellFontFamily; + m_editBox->SetRect(editRect); + m_editBox->SetText(m_data[row][col].Text); + m_editBox->SetVisible(true); + // 确保 TextBox 获得正确的窗口句柄（从 TableView 继承） + m_editBox->SetHwnd(this->Hwnd()); + // 触发焦点事件（这会启动光标闪烁计时器） + m_editBox->SendEvent(FocusEventArgs(m_editBox)); + Invalidate(); + break; + } + case CellType::CheckBox: { + // 直接切换状态 + m_data[row][col].Checked = !m_data[row][col].Checked; + m_editing = false; + m_editRow = -1; + m_editCol = -1; + if (CellValueChanged) { + CellValueChanged(row, col, m_data[row][col].Checked ? L"true" : L"false"); + } + Invalidate(); + break; + } + case CellType::ComboBox: { + // TODO: 显示下拉列表 + // 暂时简化处理，循环选择 + int nextIndex = (m_data[row][col].ComboIndex + 1) % (std::max)(1, (int)colInfo.ComboItems.size()); + m_data[row][col].ComboIndex = nextIndex; + m_editing = false; + m_editRow = -1; + m_editCol = -1; + + UIString newValue; + if (nextIndex >= 0 && nextIndex < (int)colInfo.ComboItems.size()) { + newValue = colInfo.ComboItems[nextIndex]; + } + if (CellValueChanged) { + CellValueChanged(row, col, newValue); + } + Invalidate(); + break; + } + default: + m_editing = false; + m_editRow = -1; + m_editCol = -1; + break; + } + } + + void TableView::EndEdit(bool save) { + if (!m_editing) { + return; + } + + if (save && m_editRow >= 0 && m_editCol >= 0) { + if (m_editRow < (int)m_data.size() && m_editCol < (int)m_data[m_editRow].size()) { + const auto& colInfo = m_columns[m_editCol]; + if (colInfo.Type == CellType::TextBox) { + m_data[m_editRow][m_editCol].Text = m_editBox->GetText(); + UpdateRowHeight(m_editRow); + } + } + } + + m_editBox->SetVisible(false); + m_editing = false; + m_editRow = -1; + m_editCol = -1; + + Invalidate(); + } + + void TableView::UpdateRowHeight(int row) { + if (row < 0 || row >= (int)m_data.size()) { + return; + } + + int maxHeight = m_defaultRowHeight; + + // 遍历该行所有单元格，计算最大需要的高度 + for (int col = 0; col < (int)m_data[row].size() && col < (int)m_columns.size(); ++col) { + const auto& cellData = m_data[row][col]; + const auto& colInfo = m_columns[col]; + + if (colInfo.Type == CellType::TextBox || colInfo.Type == CellType::ReadOnly) { + int lines = CalculateTextLines(cellData.Text, colInfo.Width - 4); + int neededHeight = lines * (m_cellFontSize + 4) + 8; + if (neededHeight > maxHeight) { + maxHeight = neededHeight; + } + } + } + + if (row < (int)m_rowHeights.size()) { + m_rowHeights[row] = maxHeight; + } + + RefreshScrollBars(); + Invalidate(); + } + + int TableView::CalculateTextLines(const UIString& text, int width) const { + if (text.empty() || width <= 0) { + return 1; + } + + Font font(m_cellFontFamily, m_cellFontSize); + TextLayout layout(text.unicode(), font, SizeF(width, EZUI_FLOAT_MAX)); + Size box = layout.GetFontBox(); + + int fontHeight = m_cellFontSize + 4; + int lines = (box.Height + fontHeight - 1) / fontHeight; + return (std::max)(1, lines); + } + + void TableView::RefreshScrollBars() { + int contentWidth = GetContentWidth(); + int contentHeight = GetContentHeight(); + + // 可视区域大小（初步计算，不考虑滚动条） + int viewWidth = Width(); + int viewHeight = Height() - m_headerHeight; + + // 判断是否需要滚动条 + bool needVScroll = (contentHeight - m_headerHeight) > viewHeight; + bool needHScroll = contentWidth > viewWidth; + + // 如果需要垂直滚动条，水平可视区域要减去滚动条宽度 + if (needVScroll) { + viewWidth -= m_vScrollBar.Width(); + // 重新判断是否需要水平滚动条 + needHScroll = contentWidth > viewWidth; + } + + // 如果需要水平滚动条，垂直可视区域要减去滚动条高度 + if (needHScroll) { + viewHeight -= m_hScrollBar.Height(); + // 重新判断是否需要垂直滚动条 + if (!needVScroll) { + needVScroll = (contentHeight - m_headerHeight) > viewHeight; + if (needVScroll) { + viewWidth -= m_vScrollBar.Width(); + } + } + } + + // 设置垂直滚动条 + if (needVScroll) { + m_vScrollBar.SetVisible(true); + int vScrollHeight = Height() - m_headerHeight - (needHScroll ? m_hScrollBar.Height() : 0); + m_vScrollBar.SetRect(Rect(Width() - m_vScrollBar.Width(), m_headerHeight, + m_vScrollBar.Width(), vScrollHeight)); + } else { + m_vScrollBar.SetVisible(false); + m_scrollOffsetY = 0; + } + + // 设置水平滚动条 + if (needHScroll) { + m_hScrollBar.SetVisible(true); + int hScrollWidth = Width() - m_firstColumnWidth - (needVScroll ? m_vScrollBar.Width() : 0); + m_hScrollBar.SetRect(Rect(m_firstColumnWidth, Height() - m_hScrollBar.Height(), + hScrollWidth, m_hScrollBar.Height())); + } else { + m_hScrollBar.SetVisible(false); + m_scrollOffsetX = 0; + } + + m_vScrollBar.RefreshScroll(); + m_hScrollBar.RefreshScroll(); + } + + void TableView::OffsetX(int offset) { + m_scrollOffsetX = -offset; + Invalidate(); + } + + void TableView::OffsetY(int offset) { + m_scrollOffsetY = -offset; + Invalidate(); + } + + void TableView::DoSort(int colIndex) { + if (colIndex < 0 || colIndex >= (int)m_columns.size()) { + return; + } + + // 更新排序状态 + SortOrder newOrder = SortOrder::Ascending; + if (m_columns[colIndex].CurrentSort == SortOrder::Ascending) { + newOrder = SortOrder::Descending; + } else if (m_columns[colIndex].CurrentSort == SortOrder::Descending) { + newOrder = SortOrder::None; + } + + // 重置其他列的排序状态 + for (auto& col : m_columns) { + col.CurrentSort = SortOrder::None; + } + m_columns[colIndex].CurrentSort = newOrder; + + if (newOrder == SortOrder::None) { + Invalidate(); + return; + } + + // 创建索引数组进行排序 + std::vector indices(m_data.size()); + for (int i = 0; i < (int)indices.size(); ++i) { + indices[i] = i; + } + + // 排序 + std::sort(indices.begin(), indices.end(), [this, colIndex, newOrder](int a, int b) { + UIString textA, textB; + if (colIndex < (int)m_data[a].size()) { + textA = m_data[a][colIndex].Text; + } + if (colIndex < (int)m_data[b].size()) { + textB = m_data[b][colIndex].Text; + } + + if (newOrder == SortOrder::Ascending) { + return textA < textB; + } else { + return textA > textB; + } + }); + + // 重新排列数据 + std::vector> newData(m_data.size()); + std::vector newRowHeights(m_rowHeights.size()); + std::vector newRowChecked(m_rowChecked.size()); + + for (int i = 0; i < (int)indices.size(); ++i) { + int oldIndex = indices[i]; + newData[i] = std::move(m_data[oldIndex]); + if (oldIndex < (int)m_rowHeights.size()) { + newRowHeights[i] = m_rowHeights[oldIndex]; + } + if (oldIndex < (int)m_rowChecked.size()) { + newRowChecked[i] = m_rowChecked[oldIndex]; + } + } + + m_data = std::move(newData); + m_rowHeights = std::move(newRowHeights); + m_rowChecked = std::move(newRowChecked); + + Invalidate(); + } + + // ============ 重写的虚函数 ============ + + void TableView::OnPaint(PaintEventArgs& args) { + __super::OnPaint(args); + + // 绘制单元格（先绘制，这样表头会覆盖在上面） + DrawCells(args); + + // 绘制表头 + DrawHeader(args); + + // 绘制滚动条 + if (m_vScrollBar.IsVisible()) { + m_vScrollBar.SendEvent(args); + } + if (m_hScrollBar.IsVisible()) { + m_hScrollBar.SendEvent(args); + } + + // 绘制编辑控件（放在最后确保在最上层） + if (m_editBox->IsVisible()) { + m_editBox->SendEvent(args); + } + } + + void TableView::OnChildPaint(PaintEventArgs& args) { + // 重写子控件绘制，跳过 m_editBox（因为我们在 OnPaint 中单独处理） + // 其他子控件正常绘制 + ViewControls.clear(); + Rect rect(0, 0, Width(), Height()); + for (auto& it : GetControls()) { + if (it == m_editBox) { + continue; // 跳过编辑框，由 OnPaint 单独处理 + } + if (rect.IntersectsWith(it->GetRect())) { + ViewControls.push_back(it); + } + it->SendEvent(args); + } + } + + void TableView::OnLayout() { + // 设置滚动条位置 + m_vScrollBar.SetRect(Rect(Width() - m_vScrollBar.Width(), m_headerHeight, + m_vScrollBar.Width(), Height() - m_headerHeight - (m_hScrollBar.IsVisible() ? m_hScrollBar.Height() : 0))); + + m_hScrollBar.SetRect(Rect(m_firstColumnWidth, Height() - m_hScrollBar.Height(), + Width() - m_firstColumnWidth - (m_vScrollBar.IsVisible() ? m_vScrollBar.Width() : 0), m_hScrollBar.Height())); + + RefreshScrollBars(); + __super::OnLayout(); + } + + void TableView::OnMouseMove(const MouseEventArgs& args) { + __super::OnMouseMove(args); + + // 转发事件给编辑框（用于文本选择） + if (m_editBox->IsVisible()) { + Rect editRect = m_editBox->GetRect(); + m_editBox->SendEvent(MouseEventArgs(Event::OnMouseMove, + Point(args.Location.X - editRect.X, args.Location.Y - editRect.Y), + args.Button, args.ZDelta)); + } + + // 转发事件给滚动条 + if (m_vScrollBar.IsVisible()) { + m_vScrollBar.SendEvent(MouseEventArgs(Event::OnMouseMove, + Point(args.Location.X - m_vScrollBar.X(), args.Location.Y - m_vScrollBar.Y()), + args.Button, args.ZDelta)); + } + if (m_hScrollBar.IsVisible()) { + m_hScrollBar.SendEvent(MouseEventArgs(Event::OnMouseMove, + Point(args.Location.X - m_hScrollBar.X(), args.Location.Y - m_hScrollBar.Y()), + args.Button, args.ZDelta)); + } + + // 列宽拖动 + if (m_draggingColumn) { + int delta = args.Location.X - m_dragStartX; + int newWidth = (std::max)(20, m_dragStartWidth + delta); + + if (m_dragColumnIndex == -1) { + // 拖动第一列 + m_firstColumnWidth = newWidth; + } else if (m_dragColumnIndex >= 0 && m_dragColumnIndex < (int)m_columns.size()) { + m_columns[m_dragColumnIndex].Width = newWidth; + } + + RefreshScrollBars(); + Invalidate(); + return; + } + + // 检测鼠标是否在列边界上 + int borderCol = HitTestColumnBorder(args.Location); + if (borderCol >= -1) { // -1 表示第一列边界 + // 设置调整大小的光标 + Style.Cursor = LoadCursor(Cursor::SIZEWE); + } else { + Style.Cursor = LoadCursor(Cursor::ARROW); + } + + // 更新悬停状态 + int row, col; + if (HitTestCell(args.Location, &row, &col)) { + if (m_hoverRow != row || m_hoverCol != col) { + m_hoverRow = row; + m_hoverCol = col; + Invalidate(); + } + } + } + + void TableView::OnMouseDown(const MouseEventArgs& args) { + __super::OnMouseDown(args); + + if (args.Button != MouseButton::Left) { + return; + } + + // 检查是否点击在编辑框上 + if (m_editBox->IsVisible()) { + Rect editRect = m_editBox->GetRect(); + if (editRect.Contains(args.Location)) { + m_editBox->SendEvent(MouseEventArgs(Event::OnMouseDown, + Point(args.Location.X - editRect.X, args.Location.Y - editRect.Y), + args.Button, args.ZDelta)); + return; + } + } + + // 检查是否点击在滚动条上 + if (HitTestVScrollBar(args.Location)) { + m_vScrollBar.SendEvent(MouseEventArgs(Event::OnMouseDown, + Point(args.Location.X - m_vScrollBar.X(), args.Location.Y - m_vScrollBar.Y()), + args.Button, args.ZDelta)); + return; + } + if (HitTestHScrollBar(args.Location)) { + m_hScrollBar.SendEvent(MouseEventArgs(Event::OnMouseDown, + Point(args.Location.X - m_hScrollBar.X(), args.Location.Y - m_hScrollBar.Y()), + args.Button, args.ZDelta)); + return; + } + + // 检测是否点击在列边界上 + int borderCol = HitTestColumnBorder(args.Location); + if (borderCol >= -1) { + m_draggingColumn = true; + m_dragColumnIndex = borderCol; + m_dragStartX = args.Location.X; + if (borderCol == -1) { + m_dragStartWidth = m_firstColumnWidth; + } else { + m_dragStartWidth = m_columns[borderCol].Width; + } + return; + } + + int row, col; + if (!HitTestCell(args.Location, &row, &col)) { + EndEdit(true); + return; + } + + // 点击表头 + if (row == -1) { + if (col == -1) { + // 点击第一列表头（全选） + if (m_firstColumnType == FirstColumnType::CheckBox) { + m_headerSelectAll = !m_headerSelectAll; + for (int i = 0; i < (int)m_rowChecked.size(); ++i) { + m_rowChecked[i] = m_headerSelectAll; + } + Invalidate(); + } + } else { + // 点击数据列表头（排序） + DoSort(col); + } + return; + } + + // 点击第一列 + if (col == -1) { + if (m_firstColumnType == FirstColumnType::CheckBox && row < (int)m_rowChecked.size()) { + m_rowChecked[row] = !m_rowChecked[row]; + + // 更新全选状态 + bool allChecked = true; + for (bool checked : m_rowChecked) { + if (!checked) { + allChecked = false; + break; + } + } + m_headerSelectAll = allChecked; + + Invalidate(); + } + return; + } + + // 点击数据单元格 + // 获取单元格类型 + CellType cellType = CellType::TextBox; + if (col >= 0 && col < (int)m_columns.size()) { + cellType = m_columns[col].Type; + } + + // CheckBox 和 ComboBox 单击就触发 + if (cellType == CellType::CheckBox || cellType == CellType::ComboBox) { + BeginEdit(row, col); + m_lastClickTime = 0; + m_lastClickRow = -1; + m_lastClickCol = -1; + return; + } + + // TextBox 类型需要双击才进入编辑 + ULONGLONG currentTime = ::GetTickCount64(); + if (currentTime - m_lastClickTime < 300 && + m_lastClickRow == row && m_lastClickCol == col) { + // 双击，开始编辑 + BeginEdit(row, col); + m_lastClickTime = 0; // 重置，避免三击触发 + m_lastClickRow = -1; + m_lastClickCol = -1; + } else { + // 单击，记录时间和位置 + m_lastClickTime = currentTime; + m_lastClickRow = row; + m_lastClickCol = col; + EndEdit(true); + } + } + + void TableView::OnMouseUp(const MouseEventArgs& args) { + __super::OnMouseUp(args); + m_draggingColumn = false; + + // 转发事件给编辑框 + if (m_editBox->IsVisible()) { + Rect editRect = m_editBox->GetRect(); + m_editBox->SendEvent(MouseEventArgs(Event::OnMouseUp, + Point(args.Location.X - editRect.X, args.Location.Y - editRect.Y), + args.Button, args.ZDelta)); + } + + // 转发事件给滚动条 + if (m_vScrollBar.IsVisible()) { + m_vScrollBar.SendEvent(MouseEventArgs(Event::OnMouseUp, + Point(args.Location.X - m_vScrollBar.X(), args.Location.Y - m_vScrollBar.Y()), + args.Button, args.ZDelta)); + } + if (m_hScrollBar.IsVisible()) { + m_hScrollBar.SendEvent(MouseEventArgs(Event::OnMouseUp, + Point(args.Location.X - m_hScrollBar.X(), args.Location.Y - m_hScrollBar.Y()), + args.Button, args.ZDelta)); + } + } + + void TableView::OnMouseDoubleClick(const MouseEventArgs& args) { + __super::OnMouseDoubleClick(args); + + int row, col; + if (HitTestCell(args.Location, &row, &col) && row >= 0 && col >= 0) { + BeginEdit(row, col); + } + } + + void TableView::OnMouseWheel(const MouseEventArgs& args) { + __super::OnMouseWheel(args); + + if (m_vScrollBar.IsVisible()) { + m_vScrollBar.SendEvent(MouseEventArgs(Event::OnMouseWheel, args.Location, args.Button, args.ZDelta)); + } + } + + void TableView::OnMouseLeave(const MouseEventArgs& args) { + __super::OnMouseLeave(args); + m_hoverRow = -1; + m_hoverCol = -1; + Style.Cursor = LoadCursor(Cursor::ARROW); + } + + void TableView::OnSize(const SizeEventArgs& args) { + __super::OnSize(args); + RefreshScrollBars(); + } + + void TableView::OnKeyDown(const KeyboardEventArgs& args) { + __super::OnKeyDown(args); + + // 如果编辑框可见，将键盘事件转发给编辑框 + if (m_editBox->IsVisible()) { + m_editBox->SendEvent(args); + } + + if (args.wParam == VK_ESCAPE) { + EndEdit(false); + } else if (args.wParam == VK_RETURN && !m_editing) { + // 如果不是多行编辑，回车可以结束编辑 + } + } + + void TableView::OnKeyChar(const KeyboardEventArgs& args) { + __super::OnKeyChar(args); + + // 如果编辑框可见，将字符输入事件转发给编辑框 + if (m_editBox->IsVisible()) { + m_editBox->SendEvent(args); + } + } + + // ============ 公共接口实现 ============ + + void TableView::SetHeaders(const std::vector& headers) { + m_columns.clear(); + for (const auto& header : headers) { + ColumnInfo col; + col.HeaderText = header; + col.Width = 100; + m_columns.push_back(col); + } + + // 更新现有数据的列数 + for (auto& row : m_data) { + row.resize(m_columns.size()); + } + + RefreshScrollBars(); + Invalidate(); + } + + int TableView::GetColumnCount() const { + return (int)m_columns.size(); + } + + void TableView::SetHeaderHeight(int height) { + m_headerHeight = (std::max)(20, height); + RefreshScrollBars(); + Invalidate(); + } + + int TableView::GetHeaderHeight() const { + return m_headerHeight; + } + + void TableView::SetFirstColumnType(FirstColumnType type) { + m_firstColumnType = type; + + // 如果切换到 CheckBox 类型，初始化选中状态 + if (type == FirstColumnType::CheckBox) { + m_rowChecked.resize(m_data.size(), false); + } + + Invalidate(); + } + + FirstColumnType TableView::GetFirstColumnType() const { + return m_firstColumnType; + } + + void TableView::SetFirstColumnWidth(int width) { + m_firstColumnWidth = (std::max)(20, width); + RefreshScrollBars(); + Invalidate(); + } + + int TableView::GetFirstColumnWidth() const { + return m_firstColumnWidth; + } + + void TableView::SetColumnWidth(int colIndex, int width) { + if (colIndex >= 0 && colIndex < (int)m_columns.size()) { + m_columns[colIndex].Width = (std::max)(20, width); + RefreshScrollBars(); + Invalidate(); + } + } + + int TableView::GetColumnWidth(int colIndex) const { + if (colIndex >= 0 && colIndex < (int)m_columns.size()) { + return m_columns[colIndex].Width; + } + return 0; + } + + const std::vector TableView::GetColumnWidths() const { + std::vector widths; + for (const auto& col : m_columns) { + widths.push_back(col.Width); + } + return widths; + } + + void TableView::SetColumnType(int colIndex, CellType type) { + if (colIndex >= 0 && colIndex < (int)m_columns.size()) { + m_columns[colIndex].Type = type; + Invalidate(); + } + } + + CellType TableView::GetColumnType(int colIndex) const { + if (colIndex >= 0 && colIndex < (int)m_columns.size()) { + return m_columns[colIndex].Type; + } + return CellType::TextBox; + } + + void TableView::SetColumnComboItems(int colIndex, const std::vector& items) { + if (colIndex >= 0 && colIndex < (int)m_columns.size()) { + m_columns[colIndex].ComboItems = items; + } + } + + int TableView::GetRowCount() const { + return (int)m_data.size(); + } + + void TableView::AddRow() { + std::vector newRow(m_columns.size()); + m_data.push_back(newRow); + m_rowHeights.push_back(m_defaultRowHeight); + + if (m_firstColumnType == FirstColumnType::CheckBox) { + m_rowChecked.push_back(false); + } + + RefreshScrollBars(); + Invalidate(); + } + + void TableView::InsertRow(int rowIndex) { + if (rowIndex < 0) rowIndex = 0; + if (rowIndex > (int)m_data.size()) rowIndex = (int)m_data.size(); + + std::vector newRow(m_columns.size()); + m_data.insert(m_data.begin() + rowIndex, newRow); + m_rowHeights.insert(m_rowHeights.begin() + rowIndex, m_defaultRowHeight); + + if (m_firstColumnType == FirstColumnType::CheckBox) { + m_rowChecked.insert(m_rowChecked.begin() + rowIndex, false); + } + + RefreshScrollBars(); + Invalidate(); + } + + void TableView::RemoveRow(int rowIndex) { + if (rowIndex >= 0 && rowIndex < (int)m_data.size()) { + m_data.erase(m_data.begin() + rowIndex); + m_rowHeights.erase(m_rowHeights.begin() + rowIndex); + + if (rowIndex < (int)m_rowChecked.size()) { + m_rowChecked.erase(m_rowChecked.begin() + rowIndex); + } + + RefreshScrollBars(); + Invalidate(); + } + } + + void TableView::ClearRows() { + m_data.clear(); + m_rowHeights.clear(); + m_rowChecked.clear(); + m_headerSelectAll = false; + m_scrollOffsetX = 0; + m_scrollOffsetY = 0; + RefreshScrollBars(); + Invalidate(); + } + + void TableView::AddColumn(const UIString& headerText, int width) { + ColumnInfo col; + col.HeaderText = headerText; + col.Width = (std::max)(20, width); + m_columns.push_back(col); + + // 为所有行添加新列的数据 + for (auto& row : m_data) { + row.push_back(CellData()); + } + + RefreshScrollBars(); + Invalidate(); + } + + void TableView::InsertColumn(int colIndex, const UIString& headerText, int width) { + if (colIndex < 0) colIndex = 0; + if (colIndex > (int)m_columns.size()) colIndex = (int)m_columns.size(); + + ColumnInfo col; + col.HeaderText = headerText; + col.Width = (std::max)(20, width); + m_columns.insert(m_columns.begin() + colIndex, col); + + // 为所有行插入新列的数据 + for (auto& row : m_data) { + row.insert(row.begin() + colIndex, CellData()); + } + + RefreshScrollBars(); + Invalidate(); + } + + void TableView::RemoveColumn(int colIndex) { + if (colIndex >= 0 && colIndex < (int)m_columns.size()) { + m_columns.erase(m_columns.begin() + colIndex); + + // 从所有行删除该列的数据 + for (auto& row : m_data) { + if (colIndex < (int)row.size()) { + row.erase(row.begin() + colIndex); + } + } + + RefreshScrollBars(); + Invalidate(); + } + } + + int TableView::GetRowHeight(int rowIndex) const { + if (rowIndex >= 0 && rowIndex < (int)m_rowHeights.size()) { + return m_rowHeights[rowIndex]; + } + return m_defaultRowHeight; + } + + const std::vector TableView::GetRowHeights() const { + return m_rowHeights; + } + + void TableView::SetDefaultRowHeight(int height) { + m_defaultRowHeight = (std::max)(20, height); + } + + void TableView::SetData(int row, int col, const UIString& value) { + // 自动扩展行 + while (row >= (int)m_data.size()) { + AddRow(); + } + + // 确保列足够 + if (col >= 0 && col < (int)m_columns.size()) { + if (col >= (int)m_data[row].size()) { + m_data[row].resize(m_columns.size()); + } + m_data[row][col].Text = value; + UpdateRowHeight(row); + + if (CellValueChanged) { + CellValueChanged(row, col, value); + } + } + } + + UIString TableView::GetData(int row, int col) const { + if (row >= 0 && row < (int)m_data.size() && + col >= 0 && col < (int)m_data[row].size()) { + return m_data[row][col].Text; + } + return UIString(); + } + + void TableView::SetRowData(int row, const std::vector& values) { + // 自动扩展行 + while (row >= (int)m_data.size()) { + AddRow(); + } + + for (int col = 0; col < (int)values.size() && col < (int)m_columns.size(); ++col) { + if (col >= (int)m_data[row].size()) { + m_data[row].resize(m_columns.size()); + } + m_data[row][col].Text = values[col]; + } + + UpdateRowHeight(row); + } + + std::vector TableView::GetRowData(int row) const { + std::vector result; + if (row >= 0 && row < (int)m_data.size()) { + for (const auto& cell : m_data[row]) { + result.push_back(cell.Text); + } + } + return result; + } + + std::vector TableView::GetColData(int col) const { + std::vector result; + if (col >= 0 && col < (int)m_columns.size()) { + for (const auto& row : m_data) { + if (col < (int)row.size()) { + result.push_back(row[col].Text); + } else { + result.push_back(UIString()); + } + } + } + return result; + } + + void TableView::SetAllData(const std::vector>& data) { + ClearRows(); + + for (const auto& rowData : data) { + AddRow(); + int row = (int)m_data.size() - 1; + for (int col = 0; col < (int)rowData.size() && col < (int)m_columns.size(); ++col) { + m_data[row][col].Text = rowData[col]; + } + UpdateRowHeight(row); + } + } + + std::vector> TableView::GetAllData() const { + std::vector> result; + for (int row = 0; row < (int)m_data.size(); ++row) { + result.push_back(GetRowData(row)); + } + return result; + } + + void TableView::SetCellChecked(int row, int col, bool checked) { + if (row >= 0 && row < (int)m_data.size() && + col >= 0 && col < (int)m_data[row].size()) { + m_data[row][col].Checked = checked; + Invalidate(); + } + } + + bool TableView::GetCellChecked(int row, int col) const { + if (row >= 0 && row < (int)m_data.size() && + col >= 0 && col < (int)m_data[row].size()) { + return m_data[row][col].Checked; + } + return false; + } + + void TableView::SetCellComboIndex(int row, int col, int index) { + if (row >= 0 && row < (int)m_data.size() && + col >= 0 && col < (int)m_data[row].size()) { + m_data[row][col].ComboIndex = index; + Invalidate(); + } + } + + int TableView::GetCellComboIndex(int row, int col) const { + if (row >= 0 && row < (int)m_data.size() && + col >= 0 && col < (int)m_data[row].size()) { + return m_data[row][col].ComboIndex; + } + return -1; + } + + void TableView::SetRowChecked(int row, bool checked) { + if (m_firstColumnType == FirstColumnType::CheckBox && + row >= 0 && row < (int)m_rowChecked.size()) { + m_rowChecked[row] = checked; + + // 更新全选状态 + bool allChecked = true; + for (bool c : m_rowChecked) { + if (!c) { + allChecked = false; + break; + } + } + m_headerSelectAll = allChecked; + + Invalidate(); + } + } + + bool TableView::GetRowChecked(int row) const { + if (row >= 0 && row < (int)m_rowChecked.size()) { + return m_rowChecked[row]; + } + return false; + } + + std::vector TableView::GetCheckedRows() const { + std::vector result; + for (int i = 0; i < (int)m_rowChecked.size(); ++i) { + if (m_rowChecked[i]) { + result.push_back(i); + } + } + return result; + } + + void TableView::SelectAll() { + if (m_firstColumnType == FirstColumnType::CheckBox) { + m_headerSelectAll = true; + for (int i = 0; i < (int)m_rowChecked.size(); ++i) { + m_rowChecked[i] = true; + } + Invalidate(); + } + } + + void TableView::DeselectAll() { + if (m_firstColumnType == FirstColumnType::CheckBox) { + m_headerSelectAll = false; + for (int i = 0; i < (int)m_rowChecked.size(); ++i) { + m_rowChecked[i] = false; + } + Invalidate(); + } + } + + void TableView::SetCellBorderSize(int size) { + m_cellBorderSize = (std::max)(0, size); + Invalidate(); + } + + void TableView::SetCellBorderStyle(StrokeStyle style) { + m_cellBorderStyle = style; + Invalidate(); + } + + void TableView::SetCellBorderColor(const Color& color) { + m_cellBorderColor = color; + Invalidate(); + } + + void TableView::SetCellBackColor(const Color& color) { + m_cellBackColor = color; + Invalidate(); + } + + void TableView::SetCellForeColor(const Color& color) { + m_cellForeColor = color; + Invalidate(); + } + + void TableView::SetCellFontSize(int size) { + m_cellFontSize = (std::max)(8, size); + // 同步更新编辑框字体 + m_editBox->Style.FontSize = m_cellFontSize; + // 更新所有行高 + for (int i = 0; i < (int)m_data.size(); ++i) { + UpdateRowHeight(i); + } + } + + void TableView::SetCellFontFamily(const std::wstring& fontFamily) { + m_cellFontFamily = fontFamily; + // 同步更新编辑框字体 + m_editBox->Style.FontFamily = m_cellFontFamily; + // 更新所有行高 + for (int i = 0; i < (int)m_data.size(); ++i) { + UpdateRowHeight(i); + } + } + + void TableView::SetCellStyle(int row, int col, const CellStyle& style) { + if (row >= 0 && row < (int)m_data.size() && + col >= 0 && col < (int)m_data[row].size()) { + m_data[row][col].Style = style; + Invalidate(); + } + } + + CellStyle TableView::GetCellStyle(int row, int col) const { + if (row >= 0 && row < (int)m_data.size() && + col >= 0 && col < (int)m_data[row].size()) { + return m_data[row][col].Style; + } + return CellStyle(); + } + + void TableView::ResetCellStyle(int row, int col) { + if (row >= 0 && row < (int)m_data.size() && + col >= 0 && col < (int)m_data[row].size()) { + m_data[row][col].Style.Reset(); + Invalidate(); + } + } + + void TableView::SetHeaderBackColor(const Color& color) { + m_headerBackColor = color; + Invalidate(); + } + + void TableView::SetHeaderForeColor(const Color& color) { + m_headerForeColor = color; + Invalidate(); + } + + int TableView::GetHoverRow() const { + return m_hoverRow; + } + + int TableView::GetHoverCol() const { + return m_hoverCol; + } + + void TableView::GetHoverCell(int* outRow, int* outCol) const { + if (outRow) *outRow = m_hoverRow; + if (outCol) *outCol = m_hoverCol; + } + + const Size& TableView::GetContentSize() { + // 计算内容大小供滚动条使用 + m_contentSize.Width = GetContentWidth(); + m_contentSize.Height = GetContentHeight(); + return m_contentSize; + } + + ScrollBar* TableView::GetVScrollBar() { + return &m_vScrollBar; + } + + ScrollBar* TableView::GetHScrollBar() { + return &m_hScrollBar; + } + + void TableView::SetAttribute(const UIString& key, const UIString& value) { + __super::SetAttribute(key, value); + + // 辅助函数：解析整数 + auto parseInt = [](const UIString& v) -> int { + UIString tmp = v; + ui_text::Replace(&tmp, "px", ""); + tmp = tmp.trim(); + return std::atoi(tmp.c_str()); + }; + + // 辅助函数：解析颜色 + auto parseColor = [](const UIString& v) -> Color { + bool isGood = false; + return Color::Make(v, &isGood); + }; + + do { + // 表头高度 + if (key == "header-height" || key == "headerheight") { + SetHeaderHeight(parseInt(value)); + break; + } + + // 第一列类型 + if (key == "first-column-type" || key == "firstcolumntype") { + if (value == "index" || value == "number") { + SetFirstColumnType(FirstColumnType::Index); + } else if (value == "checkbox" || value == "check") { + SetFirstColumnType(FirstColumnType::CheckBox); + } else { + SetFirstColumnType(FirstColumnType::TextBox); + } + break; + } + + // 第一列宽度 + if (key == "first-column-width" || key == "firstcolumnwidth") { + SetFirstColumnWidth(parseInt(value)); + break; + } + + // 默认行高 + if (key == "default-row-height" || key == "defaultrowheight" || key == "row-height" || key == "rowheight") { + SetDefaultRowHeight(parseInt(value)); + break; + } + + // 单元格边框大小 + if (key == "cell-border-size" || key == "cellbordersize" || key == "border-size" || key == "bordersize") { + SetCellBorderSize(parseInt(value)); + break; + } + + // 单元格边框样式 + if (key == "cell-border-style" || key == "cellborderstyle" || key == "border-style" || key == "borderstyle") { + if (value == "solid") { + SetCellBorderStyle(StrokeStyle::Solid); + } else if (value == "dash" || value == "dashed") { + SetCellBorderStyle(StrokeStyle::Dash); + } else if (value == "none") { + SetCellBorderStyle(StrokeStyle::None); + } + break; + } + + // 单元格边框颜色 + if (key == "cell-border-color" || key == "cellbordercolor" || key == "border-color" || key == "bordercolor") { + SetCellBorderColor(parseColor(value)); + break; + } + + // 单元格背景颜色 + if (key == "cell-back-color" || key == "cellbackcolor" || key == "cell-background" || key == "cellbackground") { + SetCellBackColor(parseColor(value)); + break; + } + + // 单元格前景颜色（文字颜色） + if (key == "cell-fore-color" || key == "cellforecolor" || key == "cell-color" || key == "cellcolor") { + SetCellForeColor(parseColor(value)); + break; + } + + // 单元格字体大小 + if (key == "cell-font-size" || key == "cellfontsize") { + SetCellFontSize(parseInt(value)); + break; + } + + // 单元格字体 + if (key == "cell-font-family" || key == "cellfontfamily" || key == "cell-font" || key == "cellfont") { + SetCellFontFamily(value.unicode()); + break; + } + + // 表头背景颜色 + if (key == "header-back-color" || key == "headerbackcolor" || key == "header-background" || key == "headerbackground") { + SetHeaderBackColor(parseColor(value)); + break; + } + + // 表头前景颜色（文字颜色） + if (key == "header-fore-color" || key == "headerforecolor" || key == "header-color" || key == "headercolor") { + SetHeaderForeColor(parseColor(value)); + break; + } + + // 选中行背景颜色 + if (key == "selected-row-back-color" || key == "selectedrowbackcolor" || key == "selected-color" || key == "selectedcolor") { + SelectedRowBackColor = parseColor(value); + Invalidate(); + break; + } + + // 表头文字（逗号分隔） + if (key == "headers" || key == "columns") { + auto headers = value.split(","); + std::vector headerList; + for (auto& h : headers) { + headerList.push_back(h.trim()); + } + SetHeaders(headerList); + break; + } + + } while (false); + } + +} diff --git a/sources/TextBox.cpp b/sources/TextBox.cpp index 50fee9c..7a5b614 100644 --- a/sources/TextBox.cpp +++ b/sources/TextBox.cpp @@ -45,7 +45,7 @@ namespace ezui { m_timer->Stop(); } void TextBox::SetPadding(int px, int py) { - // 兼容旧接口：水平=px 垂直=py + // 兼容旧接口：水平=px 垂直=py SetPadding4(px, py, px, py); } void TextBox::SetPadding4(int left, int top, int right, int bottom) { @@ -649,6 +649,35 @@ namespace ezui { { this->m_passwordChar = passwordChar.unicode(); } + void TextBox::SetFocusAndCaret(int caretPos) + { + // 设置焦点状态 + m_focus = true; + m_bCareShow = true; + m_timer->Start(); + + // 设置光标位置 + if (caretPos < 0) { + m_textPos = (int)m_text.size(); // -1 表示末尾 + } else { + m_textPos = caretPos; + } + + // 确保 m_textPos 在有效范围内 + if (m_textPos < 0) m_textPos = 0; + if (m_textPos > (int)m_text.size()) m_textPos = (int)m_text.size(); + + // 清除选中状态 + m_selectRects.clear(); + m_pointA = Point(); + m_pointB = Point(); + m_A_TextPos = m_textPos; + m_B_TextPos = m_textPos; + + // 需要重绘以确保 m_font 和 m_textLayout 被初始化 + // 之后 OnForePaint 中会调用 BuildCare + Invalidate(); + } Rect TextBox::GetCareRect() { Rect rect(m_careRect); @@ -744,6 +773,10 @@ namespace ezui { m_font = new Font(fontFamily, fontSize); Analysis(); } + // 如果有焦点但光标未初始化，重新构建光标 + if (m_focus && m_careRect.IsEmptyArea() && m_textLayout) { + BuildCare(); + } Color fontColor = GetForeColor(); e.Graphics.SetFont(fontFamily, fontSize); if (m_text.empty()) { diff --git a/sources/UIManager.cpp b/sources/UIManager.cpp index 575e515..4f2b681 100644 --- a/sources/UIManager.cpp +++ b/sources/UIManager.cpp @@ -63,6 +63,9 @@ namespace ezui { RegisterControl("progress"); RegisterControl