Pruned windows/init.cpp to a minimal initialization that we can test things with, which includes adding a function to load err->Message with a formatted string.
Also added a better error for if InitCommonControlsEx() returns 0 without setting the last error; this usually means that v5 is loaded. Fixes #451. Updates #337.
This commit is contained in:
parent
b89a18f3dd
commit
c6aa8c3324
|
@ -1,4 +1,5 @@
|
||||||
// 19 april 2019
|
// 19 april 2019
|
||||||
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "ui.h"
|
#include "ui.h"
|
||||||
#include "uipriv.h"
|
#include "uipriv.h"
|
||||||
|
@ -58,6 +59,17 @@ int uiprivInitReturnError(uiInitError *err, const char *msg)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int uiprivInitReturnErrorf(uiInitError *err, const char *msg, ...)
|
||||||
|
{
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
// checkInitErrorLengths() above ensures that err->Message[255] will always be '\0' assuming the formatted string in msg passed to checkInitErrorLengths() is valid
|
||||||
|
va_start(ap, msg);
|
||||||
|
vsnprintf(err->Message, 256, msg, ap);
|
||||||
|
va_end(ap);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
void uiprivMarkInitialized(void)
|
void uiprivMarkInitialized(void)
|
||||||
{
|
{
|
||||||
initialized = 1;
|
initialized = 1;
|
||||||
|
|
|
@ -3,4 +3,5 @@
|
||||||
// init.c
|
// init.c
|
||||||
extern int uiprivInitCheckParams(void *options, uiInitError *err, const char *initErrors[]);
|
extern int uiprivInitCheckParams(void *options, uiInitError *err, const char *initErrors[]);
|
||||||
extern int uiprivInitReturnError(uiInitError *err, const char *msg);
|
extern int uiprivInitReturnError(uiInitError *err, const char *msg);
|
||||||
|
extern int uiprivInitReturnErrorf(uiInitError *err, const char *msg, ...);
|
||||||
extern void uiprivMarkInitialized(void);
|
extern void uiprivMarkInitialized(void);
|
||||||
|
|
|
@ -20,17 +20,26 @@ int uipriv_nCmdShow;
|
||||||
// see https://devblogs.microsoft.com/oldnewthing/20041025-00/?p=37483
|
// see https://devblogs.microsoft.com/oldnewthing/20041025-00/?p=37483
|
||||||
EXTERN_C IMAGE_DOS_HEADER __ImageBase;
|
EXTERN_C IMAGE_DOS_HEADER __ImageBase;
|
||||||
|
|
||||||
|
#define errICCFailed "InitCommonControlsEx() failed"
|
||||||
|
#define errICCFailedNoLastError "InitCommonControlsEx() failed, but didn't specify why. This usually means you forgot the Common Controls v6 manifest; refer to the libui documentation for instructions."
|
||||||
|
#define errCoInitializeFailed "CoInitialize() failed"
|
||||||
|
|
||||||
|
#define errHRESULTInitErrorsSuffix ": 0x00000000"
|
||||||
|
static const char *initErrors[] = {
|
||||||
|
errICCFailed errHRESULTInitErrorsSuffix,
|
||||||
|
errICCFailedNoLastError,
|
||||||
|
errCoInitializeFailed errHRESULTInitErrorsSuffix,
|
||||||
|
NULL,
|
||||||
|
};
|
||||||
|
#define uiprivInitReturnHRESULT(err, msg, hr) uiprivInitReturnErrorf(err, "%s: 0x%08I32X", msg, hr)
|
||||||
|
|
||||||
int uiInit(void *options, uiInitError *err)
|
int uiInit(void *options, uiInitError *err)
|
||||||
{
|
{
|
||||||
STARTUPINFOW si;
|
STARTUPINFOW si;
|
||||||
const char *ce;
|
|
||||||
HICON hDefaultIcon;
|
|
||||||
HCURSOR hDefaultCursor;
|
|
||||||
NONCLIENTMETRICSW ncm;
|
|
||||||
INITCOMMONCONTROLSEX icc;
|
INITCOMMONCONTROLSEX icc;
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
|
|
||||||
if (!uiprivInitCheckParams(options, err, NULL))
|
if (!uiprivInitCheckParams(options, err, initErrors))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (uipriv_hInstance == NULL)
|
if (uipriv_hInstance == NULL)
|
||||||
|
@ -40,75 +49,31 @@ int uiInit(void *options, uiInitError *err)
|
||||||
if ((si.dwFlags & STARTF_USESHOWWINDOW) != 0)
|
if ((si.dwFlags & STARTF_USESHOWWINDOW) != 0)
|
||||||
uipriv_nCmdShow = si.wShowWindow;
|
uipriv_nCmdShow = si.wShowWindow;
|
||||||
|
|
||||||
// LONGTERM set DPI awareness
|
|
||||||
|
|
||||||
hDefaultIcon = LoadIconW(NULL, IDI_APPLICATION);
|
|
||||||
if (hDefaultIcon == NULL)
|
|
||||||
return ieLastErr("loading default icon for window classes");
|
|
||||||
hDefaultCursor = LoadCursorW(NULL, IDC_ARROW);
|
|
||||||
if (hDefaultCursor == NULL)
|
|
||||||
return ieLastErr("loading default cursor for window classes");
|
|
||||||
|
|
||||||
ce = initUtilWindow(hDefaultIcon, hDefaultCursor);
|
|
||||||
if (ce != NULL)
|
|
||||||
return initerr(ce, L"GetLastError() ==", GetLastError());
|
|
||||||
|
|
||||||
if (registerWindowClass(hDefaultIcon, hDefaultCursor) == 0)
|
|
||||||
return ieLastErr("registering uiWindow window class");
|
|
||||||
|
|
||||||
ZeroMemory(&ncm, sizeof (NONCLIENTMETRICSW));
|
|
||||||
ncm.cbSize = sizeof (NONCLIENTMETRICSW);
|
|
||||||
if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof (NONCLIENTMETRICSW), &ncm, sizeof (NONCLIENTMETRICSW)) == 0)
|
|
||||||
return ieLastErr("getting default fonts");
|
|
||||||
hMessageFont = CreateFontIndirectW(&(ncm.lfMessageFont));
|
|
||||||
if (hMessageFont == NULL)
|
|
||||||
return ieLastErr("loading default messagebox font; this is the default UI font");
|
|
||||||
|
|
||||||
if (initContainer(hDefaultIcon, hDefaultCursor) == 0)
|
|
||||||
return ieLastErr("initializing uiWindowsMakeContainer() window class");
|
|
||||||
|
|
||||||
hollowBrush = (HBRUSH) GetStockObject(HOLLOW_BRUSH);
|
|
||||||
if (hollowBrush == NULL)
|
|
||||||
return ieLastErr("getting hollow brush");
|
|
||||||
|
|
||||||
ZeroMemory(&icc, sizeof (INITCOMMONCONTROLSEX));
|
ZeroMemory(&icc, sizeof (INITCOMMONCONTROLSEX));
|
||||||
icc.dwSize = sizeof (INITCOMMONCONTROLSEX);
|
icc.dwSize = sizeof (INITCOMMONCONTROLSEX);
|
||||||
icc.dwICC = wantedICCClasses;
|
icc.dwICC = wantedICCClasses;
|
||||||
if (InitCommonControlsEx(&icc) == 0)
|
if (InitCommonControlsEx(&icc) == 0) {
|
||||||
return ieLastErr("initializing Common Controls");
|
DWORD lasterr;
|
||||||
|
|
||||||
|
lasterr = GetLastError();
|
||||||
|
if (lasterr == 0)
|
||||||
|
return uiprivInitReturnError(err, errICCFailedNoLastError);
|
||||||
|
return uiprivInitReturnHRESULT(err, errICCFailed, HRESULT_FROM_WIN32(lasterr));
|
||||||
|
}
|
||||||
|
|
||||||
hr = CoInitialize(NULL);
|
hr = CoInitialize(NULL);
|
||||||
if (hr != S_OK && hr != S_FALSE)
|
if (hr != S_OK && hr != S_FALSE)
|
||||||
return ieHRESULT("initializing COM", hr);
|
return ieHRESULT("initializing COM", hr);
|
||||||
// LONGTERM initialize COM security
|
// LONGTERM initialize COM security
|
||||||
// LONGTERM (windows vista) turn off COM exception handling
|
// LONGTERM turn off COM exception handling
|
||||||
|
|
||||||
hr = initDraw();
|
uiprivMarkInitialized();
|
||||||
if (hr != S_OK)
|
return 1;
|
||||||
return ieHRESULT("initializing Direct2D", hr);
|
|
||||||
|
|
||||||
hr = uiprivInitDrawText();
|
|
||||||
if (hr != S_OK)
|
|
||||||
return ieHRESULT("initializing DirectWrite", hr);
|
|
||||||
|
|
||||||
if (registerAreaClass(hDefaultIcon, hDefaultCursor) == 0)
|
|
||||||
return ieLastErr("registering uiArea window class");
|
|
||||||
|
|
||||||
if (registerMessageFilter() == 0)
|
|
||||||
return ieLastErr("registering libui message filter");
|
|
||||||
|
|
||||||
if (registerD2DScratchClass(hDefaultIcon, hDefaultCursor) == 0)
|
|
||||||
return ieLastErr("initializing D2D scratch window class");
|
|
||||||
|
|
||||||
hr = uiprivInitImage();
|
|
||||||
if (hr != S_OK)
|
|
||||||
return ieHRESULT("initializing WIC", hr);
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void uiUninit(void)
|
void uiUninit(void)
|
||||||
{
|
{
|
||||||
|
CoUninitialize();
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef uiStatic
|
#ifndef uiStatic
|
||||||
|
|
Loading…
Reference in New Issue