RomanRom2/blizzget
1
0
Fork 0
mirror of https://github.com/CDAGaming/blizzget synced 2026-01-31 22:52:44 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'djkaty/master'

Browse Source
This commit is contained in:
CDAGaming 2021-03-24 23:11:29 -05:00
commit 350c2c6a56
No known key found for this signature in database
GPG Key ID: 0304C9C2F35557FB
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/data.cpp
View File

@ -101,7 +101,6 @@ void ProgramData::loadBuilds() {
File file = data_->ngdp_->load(cdn_hash); File file = data_->ngdp_->load(cdn_hash);
if (!file) return -1; if (!file) return -1;
data_->cdn_config = NGDP::ParseConfig(file); data_->cdn_config = NGDP::ParseConfig(file);
//data_->builds = split(data_->cdn_config["builds"]);
data_->builds.push_back(data_->ngdp_->version()->build); data_->builds.push_back(data_->ngdp_->version()->build);
notify(0); notify(0);
for (size_t i = 0; i < data_->builds.size() && !terminate_; ++i) { for (size_t i = 0; i < data_->builds.size() && !terminate_; ++i) {

4
src/frameui/window.cpp
View File

@ -63,7 +63,7 @@ WNDCLASSEX* Window::createclass(std::string const& wndClass) {
wcx->lpfnWndProc = WindowProc; wcx->lpfnWndProc = WindowProc;
wcx->hInstance = hInstance; wcx->hInstance = hInstance;
wcx->lpszClassName = regClass.c_str(); wcx->lpszClassName = regClass.c_str();
wcx->hCursor = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW)); wcx->hCursor = LoadCursor(NULL, IDC_ARROW);
return wcx; return wcx;
} }
delete wcx; delete wcx;
@ -79,7 +79,7 @@ void Window::create(int x, int y, int width, int height, std::string const& text
wcex.lpfnWndProc = WindowProc; wcex.lpfnWndProc = WindowProc;
wcex.hInstance = GetModuleHandle(NULL); wcex.hInstance = GetModuleHandle(NULL);
wcex.lpszClassName = "WUTILSWINDOW"; wcex.lpszClassName = "WUTILSWINDOW";
wcex.hCursor = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW)); wcex.hCursor = LoadCursor(NULL, IDC_ARROW);
windowClass = RegisterClassEx(&wcex); windowClass = RegisterClassEx(&wcex);
} }
hWnd = CreateWindowEx(exStyle, regClass.empty() ? "WUTILSWINDOW" : regClass.c_str(), text.c_str(), style, hWnd = CreateWindowEx(exStyle, regClass.empty() ? "WUTILSWINDOW" : regClass.c_str(), text.c_str(), style,

3
vc13/BlizzGet.vcxproj
View File

@ -53,12 +53,13 @@
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../libs;../src;./</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../libs;../src;./</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>../libs</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>../libs</AdditionalLibraryDirectories>
<AdditionalDependencies>comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">