Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win32: Abort on error

Browse Source 
Returning NULL from a function that must not return NULL is not a good
idea.
This commit is contained in:
Benjamin Otte
2023-04-17 04:16:50 +02:00
parent 69fabb3ce9
commit 9ac31fe0a0
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
gdk/win32/gdksurface-win32.c
View File

@@ -448,7 +448,6 @@ gdk_win32_display_create_surface (GdkDisplay *display,
GdkSurfaceType surface_type,
GdkSurface *parent)
{
HWND hwndNew;
HANDLE owner;
ATOM klass = 0;
DWORD dwStyle = 0, dwExStyle;
@@ -530,19 +529,23 @@ gdk_win32_display_create_surface (GdkDisplay *display,
wtitle = g_utf8_to_utf16 (title, -1, NULL, NULL, NULL);
hwndNew = CreateWindowExW (dwExStyle,
MAKEINTRESOURCEW (klass),
wtitle,
dwStyle,
CW_USEDEFAULT, CW_USEDEFAULT,
CW_USEDEFAULT, CW_USEDEFAULT,
owner,
NULL,
_gdk_dll_hinstance,
surface);
impl->handle = hwndNew;
impl->handle = CreateWindowExW (dwExStyle,
MAKEINTRESOURCEW (klass),
wtitle,
dwStyle,
CW_USEDEFAULT, CW_USEDEFAULT,
CW_USEDEFAULT, CW_USEDEFAULT,
owner,
NULL,
_gdk_dll_hinstance,
surface);
if (impl->handle == NULL)
{
WIN32_API_FAILED ("CreateWindowExW");
g_error ("Fatal error: CreateWindowExW failed.");
}
GetWindowRect (hwndNew, &rect);
GetWindowRect (impl->handle, &rect);
impl->initial_x = rect.left;
impl->initial_y = rect.top;
@@ -559,13 +562,6 @@ gdk_win32_display_create_surface (GdkDisplay *display,
g_free (wtitle);
if (impl->handle == NULL)
{
WIN32_API_FAILED ("CreateWindowExW");
g_object_unref (impl);
return NULL;
}
gdk_surface_set_egl_native_window (surface, (void *) impl->handle);
if (surface_type != GDK_SURFACE_DRAG)