Skip to content

Commit 32c05bb

Browse files
committed
Fix order & add extended window style constants
1 parent 93a4202 commit 32c05bb

File tree

2 files changed

+33
-6
lines changed

2 files changed

+33
-6
lines changed

defplugins/auto/auto/interface.cpp

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -721,6 +721,33 @@ bool dnyAS_PluginLoad(dnyVersionInfo version, IShellPluginAPI* pInterfaceData, p
721721
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_GWL_STYLE int <= " + std::to_wstring(GWL_STYLE) + L";");
722722
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_GWL_USERDATA int <= " + std::to_wstring(GWLP_USERDATA) + L";");
723723
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_GWL_WNDPROC int <= " + std::to_wstring(GWLP_WNDPROC) + L";");
724+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_DLGMODALFRAME int <= " + std::to_wstring(WS_EX_DLGMODALFRAME) + L";");
725+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_NOPARENTNOTIFY int <= " + std::to_wstring(WS_EX_NOPARENTNOTIFY) + L";");
726+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_TOPMOST int <= " + std::to_wstring(WS_EX_TOPMOST) + L";");
727+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_ACCEPTFILES int <= " + std::to_wstring(WS_EX_ACCEPTFILES) + L";");
728+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_TRANSPARENT int <= " + std::to_wstring(WS_EX_TRANSPARENT) + L";");
729+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_MDICHILD int <= " + std::to_wstring(WS_EX_MDICHILD) + L";");
730+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_TOOLWINDOW int <= " + std::to_wstring(WS_EX_TOOLWINDOW) + L";");
731+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_WINDOWEDGE int <= " + std::to_wstring(WS_EX_WINDOWEDGE) + L";");
732+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_CLIENTEDGE int <= " + std::to_wstring(WS_EX_CLIENTEDGE) + L";");
733+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_CONTEXTHELP int <= " + std::to_wstring(WS_EX_CONTEXTHELP) + L";");
734+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_RIGHT int <= " + std::to_wstring(WS_EX_RIGHT) + L";");
735+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_LEFT int <= " + std::to_wstring(WS_EX_LEFT) + L";");
736+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_RTLREADING int <= " + std::to_wstring(WS_EX_RTLREADING) + L";");
737+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_LTRREADING int <= " + std::to_wstring(WS_EX_LTRREADING) + L";");
738+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_LEFTSCROLLBAR int <= " + std::to_wstring(WS_EX_LEFTSCROLLBAR) + L";");
739+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_RIGHTSCROLLBAR int <= " + std::to_wstring(WS_EX_RIGHTSCROLLBAR) + L";");
740+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_CONTROLPARENT int <= " + std::to_wstring(WS_EX_CONTROLPARENT) + L";");
741+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_STATICEDGE int <= " + std::to_wstring(WS_EX_STATICEDGE) + L";");
742+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_APPWINDOW int <= " + std::to_wstring(WS_EX_APPWINDOW) + L";");
743+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_OVERLAPPEDWINDOW int <= " + std::to_wstring(WS_EX_OVERLAPPEDWINDOW) + L";");
744+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_PALETTEWINDOW int <= " + std::to_wstring(WS_EX_PALETTEWINDOW) + L";");
745+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_LAYERED int <= " + std::to_wstring(WS_EX_LAYERED) + L";");
746+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_NOINHERITLAYOUT int <= " + std::to_wstring(WS_EX_NOINHERITLAYOUT) + L";");
747+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_NOREDIRECTIONBITMAP int <= " + std::to_wstring(WS_EX_NOREDIRECTIONBITMAP) + L";");
748+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_LAYOUTRTL int <= " + std::to_wstring(WS_EX_LAYOUTRTL) + L";");
749+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_COMPOSITED int <= " + std::to_wstring(WS_EX_COMPOSITED) + L";");
750+
g_pShellPluginAPI->Scr_ExecuteCode(L"const AUT_WS_EX_NOACTIVATE int <= " + std::to_wstring(WS_EX_NOACTIVATE) + L";");
724751

725752
//Register commands
726753
g_pShellPluginAPI->Cmd_RegisterCommand(L"aut_findwindow", &g_oFindWindowCommandInterface, CT_INT);

defplugins/forms/forms/interface.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,29 +1526,29 @@ bool dnyAS_PluginLoad(dnyVersionInfo version, IShellPluginAPI* pInterfaceData, p
15261526
//Register constants
15271527
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_BORDER int <= " + std::to_wstring(WS_BORDER) + L";");
15281528
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_CAPTION int <= " + std::to_wstring(WS_CAPTION) + L";");
1529-
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_CHILD int <= " + std::to_wstring(WS_CHILD) + L";");
15301529
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_CHILDWINDOW int <= " + std::to_wstring(WS_CHILDWINDOW) + L";");
1530+
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_CHILD int <= " + std::to_wstring(WS_CHILD) + L";");
15311531
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_CLIPCHILDREN int <= " + std::to_wstring(WS_CLIPCHILDREN) + L";");
15321532
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_CLIPSIBLINGS int <= " + std::to_wstring(WS_CLIPSIBLINGS) + L";");
15331533
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_DISABLED int <= " + std::to_wstring(WS_DISABLED) + L";");
15341534
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_DLGFRAME int <= " + std::to_wstring(WS_DLGFRAME) + L";");
15351535
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_GROUP int <= " + std::to_wstring(WS_GROUP) + L";");
15361536
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_HSCROLL int <= " + std::to_wstring(WS_HSCROLL) + L";");
15371537
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_ICONIC int <= " + std::to_wstring(WS_ICONIC) + L";");
1538-
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_MAXIMIZE int <= " + std::to_wstring(WS_MAXIMIZE) + L";");
15391538
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_MAXIMIZEBOX int <= " + std::to_wstring(WS_MAXIMIZEBOX) + L";");
1540-
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_MINIMIZE int <= " + std::to_wstring(WS_MINIMIZE) + L";");
1539+
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_MAXIMIZE int <= " + std::to_wstring(WS_MAXIMIZE) + L";");
15411540
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_MINIMIZEBOX int <= " + std::to_wstring(WS_MINIMIZEBOX) + L";");
1542-
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_OVERLAPPED int <= " + std::to_wstring(WS_OVERLAPPED) + L";");
1541+
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_MINIMIZE int <= " + std::to_wstring(WS_MINIMIZE) + L";");
15431542
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_OVERLAPPEDWINDOW int <= " + std::to_wstring(WS_OVERLAPPEDWINDOW) + L";");
1544-
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_POPUP int <= " + std::to_wstring(WS_POPUP) + L";");
1543+
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_OVERLAPPED int <= " + std::to_wstring(WS_OVERLAPPED) + L";");
15451544
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_POPUPWINDOW int <= " + std::to_wstring(WS_POPUPWINDOW) + L";");
1545+
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_POPUP int <= " + std::to_wstring(WS_POPUP) + L";");
15461546
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_SIZEBOX int <= " + std::to_wstring(WS_SIZEBOX) + L";");
15471547
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_SYSMENU int <= " + std::to_wstring(WS_SYSMENU) + L";");
15481548
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_TABSTOP int <= " + std::to_wstring(WS_TABSTOP) + L";");
15491549
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_THICKFRAME int <= " + std::to_wstring(WS_THICKFRAME) + L";");
1550-
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_TILED int <= " + std::to_wstring(WS_TILED) + L";");
15511550
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_TILEDWINDOW int <= " + std::to_wstring(WS_TILEDWINDOW) + L";");
1551+
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_TILED int <= " + std::to_wstring(WS_TILED) + L";");
15521552
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_VISIBLE int <= " + std::to_wstring(WS_VISIBLE) + L";");
15531553
g_pShellPluginAPI->Scr_ExecuteCode(L"const WS_VSCROLL int <= " + std::to_wstring(WS_VSCROLL) + L";");
15541554

0 commit comments

Comments
 (0)