diff options
Diffstat (limited to 'c/main.cpp')
-rw-r--r-- | c/main.cpp | 58 |
1 files changed, 29 insertions, 29 deletions
@@ -45,7 +45,7 @@ static LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); static INT_PTR CALLBACK AboutDlgProc(HWND, UINT, WPARAM, LPARAM); static void UpdateTheme(); -void OnTerminate() +void OnTerminate() noexcept { try { std::rethrow_exception(std::current_exception()); @@ -89,10 +89,10 @@ int WINAPI WinMain(const HINSTANCE hInstance, const HINSTANCE, char* const, cons INITCOMMONCONTROLSEX icc; icc.dwSize = sizeof(icc); icc.dwICC = ICC_WIN95_CLASSES; - if (!InitCommonControlsEx(&icc)) throw Win32Error(GetLastError()); + throw_nil<InitCommonControlsEx>(&icc); - g_hPopupMenu = LoadMenu(NULL, MAKEINTRESOURCE(IDR_POPUPMENU)); - g_hPopupMenu = GetSubMenu(g_hPopupMenu, 0); + g_hPopupMenu = throw_nil<LoadMenu>((HINSTANCE)NULL, MAKEINTRESOURCE(IDR_POPUPMENU)); + g_hPopupMenu = throw_nil<GetSubMenu>(g_hPopupMenu, 0); WNDCLASSEX wc; memset(&wc, 0, sizeof(WNDCLASSEX)); @@ -105,31 +105,29 @@ int WINAPI WinMain(const HINSTANCE hInstance, const HINSTANCE, char* const, cons wc.lpszMenuName = MAKEINTRESOURCE(IDR_MENU); wc.lpszClassName = TEXT("Episode Browser"); wc.hIconSm = LoadIcon(NULL, IDI_APPLICATION); - if (!RegisterClassEx(&wc)) throw Win32Error(GetLastError()); + throw_nil<RegisterClassEx>(&wc); /* Create window. A CBT hook is used to initialize important * global variables before any messages are sent to the new * window. It is vital that the hook is set up correctly. */ - const HHOOK hHook = SetWindowsHookEx(WH_CBT, CBTProc, 0, GetCurrentThreadId()); - if (!hHook) throw Win32Error(GetLastError()); - const HWND hWnd = CreateWindowEx( + const HHOOK hHook = throw_nil<SetWindowsHookEx>(WH_CBT, CBTProc, + (HINSTANCE)NULL, GetCurrentThreadId()); + const HWND hWnd = throw_nil<CreateWindowEx>( 0, TEXT("Episode Browser"), TEXT("Episode Browser"), WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, - NULL, NULL, hInstance, NULL); - if (!hHook) throw Win32Error(GetLastError()); - if (!hWnd) throw Win32Error(GetLastError()); - UnhookWindowsHookEx(hHook); + (HWND)NULL, (HMENU)NULL, hInstance, (void*)NULL); + throw_nil<UnhookWindowsHookEx>(hHook); - g_hWndStatus = CreateWindowEx( + g_hWndStatus = throw_nil<CreateWindowEx>( 0, STATUSCLASSNAME, (const TCHAR*)NULL, WS_CHILD|WS_VISIBLE|SBARS_SIZEGRIP, 0, 0, 0, 0, - hWnd, (HMENU)ID_STATUS, hInstance, NULL); + hWnd, (HMENU)ID_STATUS, hInstance, (void*)NULL); ShowWindow(hWnd, nCmdShow); @@ -161,27 +159,29 @@ static LRESULT CALLBACK CBTProc(const int nCode, const WPARAM wParam, const LPAR g_hWnd = (HWND)wParam; /* Look up constants. */ - if (auto opLib = try_make<Library>(TEXT("User32.dll"))) + if (auto opLib = maybe_make<Library>(TEXT("User32.dll"))) if (auto GetDpiForWindow = opLib->GetProcAddress<UINT(HWND)>("GetDpiForWindow")) g_iDPI = GetDpiForWindow(g_hWnd); - if (auto opLib = try_make<Library>(TEXT("uxtheme.dll"))) + if (auto opLib = maybe_make<Library>(TEXT("uxtheme.dll"))) if (opLib->GetProcAddress<void>("SetWindowTheme")) g_bThemes = 1; - LOGFONT lf; - if (auto opLib = try_make<Library>(TEXT("User32.dll"))) { + if (auto opLib = maybe_make<Library>(TEXT("User32.dll"))) { if (opLib->GetProcAddress<void>("SystemParametersInfo" WA)) { NONCLIENTMETRICS m; m.cbSize = sizeof(NONCLIENTMETRICS); - SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &m, 0); - g_hfNormal = CreateFontIndirect(&m.lfMessageFont); + throw_nil<SystemParametersInfo>(SPI_GETNONCLIENTMETRICS, + sizeof(NONCLIENTMETRICS), &m, 0); + g_hfNormal = throw_nil<CreateFontIndirect>(&m.lfMessageFont); } } else - g_hfNormal = static_cast<HFONT>(GetStockObject(DEFAULT_GUI_FONT)); - GetObject(g_hfNormal, sizeof(LOGFONT), &lf); + g_hfNormal = static_cast<HFONT>(throw_nil<GetStockObject>(DEFAULT_GUI_FONT)); + + LOGFONT lf; + throw_nil<GetObject>(g_hfNormal, sizeof(LOGFONT), &lf); lf.lfWeight = FW_BOLD; - g_hfBold = CreateFontIndirect(&lf); + g_hfBold = throw_nil<CreateFontIndirect>(&lf); /* Create child windows. */ g_pDlv = new DataListView(g_hWnd); @@ -237,7 +237,7 @@ LRESULT CALLBACK WndProc(const HWND hWnd, const UINT uMsg, const WPARAM wParam, { const RECT* const lpr = (RECT*)lParam; g_iDPI = HIWORD(wParam); - SetWindowPos(hWnd, NULL, + warn_nil<SetWindowPos>(hWnd, (HWND)NULL, lpr->left, lpr->top, lpr->right-lpr->left, lpr->bottom-lpr->top, @@ -280,7 +280,7 @@ LRESULT CALLBACK WndProc(const HWND hWnd, const UINT uMsg, const WPARAM wParam, TEXT(""))); } else { i = 0; - KillTimer(hWnd, IDT_TIMER); + warn_nil<KillTimer>(hWnd, IDT_TIMER); g_pElv->Update(); } break; @@ -302,8 +302,8 @@ LRESULT CALLBACK WndProc(const HWND hWnd, const UINT uMsg, const WPARAM wParam, case IDM_FILE_FETCH_SCREENWRITERS: if (g_bThread) break; Pl("episode_data","thread_create","update_screenwriters",&g_aThread); - t: KillTimer(hWnd, IDT_TIMER); - SetTimer(hWnd, IDT_TIMER, 500, NULL); + t: warn_nil<KillTimer>(hWnd, IDT_TIMER); + if (!SetTimer(hWnd, IDT_TIMER, 500, (TIMERPROC)NULL)) break; SendMessage(g_hWndStatus, SB_SETTEXT, MAKEWPARAM(1,0), (LPARAM)TEXT(".")); g_bThread = 1; break; @@ -514,14 +514,14 @@ void UpdateLayout() /* Resize data list view. */ cyDlv = rc.bottom-yStatus-g_pDlv->Height(); - MoveWindow(g_pDlv->hWnd, 0, cyDlv, rc.right, rc.bottom-yStatus-cyDlv, TRUE); + throw_nil<MoveWindow>(g_pDlv->hWnd, 0, cyDlv, rc.right, rc.bottom-yStatus-cyDlv, TRUE); ListView_SetColumnWidth(g_pDlv->hWnd, DLVSIKEY, LVSCW_AUTOSIZE); cxColumn = ListView_GetColumnWidth(g_pDlv->hWnd, 0)+4; ListView_SetColumnWidth(g_pDlv->hWnd, DLVSIKEY, cxColumn); ListView_SetColumnWidth(g_pDlv->hWnd, DLVSIVALUE, rc.right-cxColumn-cxVScroll-4); /* Resize episode list view. */ - MoveWindow(g_pElv->hWnd, 0, 0, rc.right, cyDlv+1, TRUE); + throw_nil<MoveWindow>(g_pElv->hWnd, 0, 0, rc.right, cyDlv+1, TRUE); ListView_SetColumnWidth(g_pElv->hWnd, ELVSIEPISODE, LVSCW_AUTOSIZE); cxColumn = ListView_GetColumnWidth(g_pElv->hWnd, ELVSIEPISODE)+4; ListView_SetColumnWidth(g_pElv->hWnd, ELVSIEPISODE, cxColumn); |