Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-11 05:52:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

WinMain annotation and argument name

Browse Source
This commit is contained in:
Enrico Giordani
2019-10-03 10:25:34 +02:00
committed by Enrico Giordani
parent 6839b4773a
commit 11396015fb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/editor/main.cpp
View File

@@ -343,7 +343,7 @@ void register_classes(HINSTANCE hInstance) {
RegisterClassExW(&wcex); RegisterClassExW(&wcex);
} }
int init_instance(HINSTANCE hInstance, int nCmdShow) { int init_instance(HINSTANCE hInstance, int nShowCmd) {
g_hinst = hInstance; g_hinst = hInstance;
RECT desktopRect; RECT desktopRect;
@@ -367,7 +367,7 @@ int init_instance(HINSTANCE hInstance, int nCmdShow) {
hInstance, hInstance,
nullptr); nullptr);
initialize_webview(g_main_wnd, nCmdShow); initialize_webview(g_main_wnd, nShowCmd);
UpdateWindow(g_main_wnd); UpdateWindow(g_main_wnd);
return TRUE; return TRUE;
@@ -418,12 +418,12 @@ void read_arguments() {
LocalFree(argument_list); LocalFree(argument_list);
} }
int start_webview_window(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { int start_webview_window(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd) {
// To be unlocked after the Window has finished being created. // To be unlocked after the Window has finished being created.
m_window_created_mutex.lock(); m_window_created_mutex.lock();
read_arguments(); read_arguments();
register_classes(hInstance); register_classes(hInstance);
init_instance(hInstance, nCmdShow); init_instance(hInstance, nShowCmd);
MSG msg; MSG msg;
// Main message loop: // Main message loop:
while (GetMessage(&msg, nullptr, 0, 0)) { while (GetMessage(&msg, nullptr, 0, 0)) {
@@ -434,7 +434,7 @@ int start_webview_window(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpC
return (int)msg.wParam; return (int)msg.wParam;
} }
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { int WINAPI WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPSTR lpCmdLine, _In_ int nShowCmd) {
CoInitialize(nullptr); CoInitialize(nullptr);
return start_webview_window(hInstance, hPrevInstance, lpCmdLine, nCmdShow); return start_webview_window(hInstance, hPrevInstance, lpCmdLine, nShowCmd);
} }