angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-13 07:17:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

flatlaf-natives-windows: reworked memory allocation error handling

Browse Source
This commit is contained in:
Karl Tauber
2022-11-26 19:05:24 +01:00
parent c3adadfe2f
commit c9b5274ccf
5 changed files with 60 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
flatlaf-natives/flatlaf-natives-windows/src/main/cpp/FlatWndProc.cpp
View File

@@ -23,7 +23,6 @@
#include <jawt.h>
#include <jawt_md.h>
#include "FlatWndProc.h"
#include "AllocRoutines.h"
#include "com_formdev_flatlaf_ui_FlatWindowsNativeWindowBorder_WndProc.h"
/**
@@ -101,15 +100,9 @@ HWND FlatWndProc::install( JNIEnv *env, jobject obj, jobject window ) {
// create HWND map
if( hwndMap == NULL ) {
HWNDMap* newHwndMap = new (FlatLafNoThrow) HWNDMap();
if(newHwndMap == NULL) {
hwndMap = new HWNDMap();
if( hwndMap == NULL )
return 0;
} else if(!newHwndMap->isTableAllocated()) {
FlatLafWin32ProcessHeapFree(newHwndMap);
return 0;
}
hwndMap = newHwndMap;
}
// get window handle
@@ -117,15 +110,18 @@ HWND FlatWndProc::install( JNIEnv *env, jobject obj, jobject window ) {
if( hwnd == NULL || hwndMap->get( hwnd ) != NULL )
return 0;
FlatWndProc* fwp = new (FlatLafNoThrow) FlatWndProc();
if(fwp == NULL)
FlatWndProc* fwp = new FlatWndProc();
if( fwp == NULL )
return 0;
if( !hwndMap->put( hwnd, fwp ) ) {
delete fwp;
return 0;
}
env->GetJavaVM( &fwp->jvm );
fwp->obj = env->NewGlobalRef( obj );
fwp->hwnd = hwnd;
if(!hwndMap->put( hwnd, fwp ))
return 0;
// replace window procedure
fwp->defaultWndProc = reinterpret_cast<WNDPROC>(
@@ -154,7 +150,7 @@ void FlatWndProc::uninstall( JNIEnv *env, jobject obj, HWND hwnd ) {
env->DeleteGlobalRef( fwp->obj );
if( fwp->background != NULL )
::DeleteObject( fwp->background );
FlatLafWin32ProcessHeapFree(fwp);
delete fwp;
}
void FlatWndProc::initIDs( JNIEnv *env, jobject obj ) {
@@ -312,7 +308,7 @@ LRESULT FlatWndProc::WmDestroy( HWND hwnd, int uMsg, WPARAM wParam, LPARAM lPara
if( background != NULL )
::DeleteObject( background );
hwndMap->remove( hwnd );
FlatLafWin32ProcessHeapFree(this);
delete this;
// call original AWT window procedure because it may fire window closed event in AwtWindow::WmDestroy()
return ::CallWindowProc( defaultWndProc2, hwnd, uMsg, wParam, lParam );