unixaxwell/Program-Manager-II
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make it compile again

Browse Source
This commit is contained in:
freedom7341
2023-09-28 10:49:42 -06:00
parent cbb7373cc1
commit 5e6f59f946
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
progmgr/group.c
View File

@@ -99,7 +99,7 @@ HWND CreateGroupWindow(GROUP grp)
// Unless... this just works a different way and I don't have to // Unless... this just works a different way and I don't have to
// keep track of all these stupid little pointers... since I can // keep track of all these stupid little pointers... since I can
// just associate this with the appropriate window. // just associate this with the appropriate window.
pGroup = (PGROUP)malloc(sizeof(grp) + sizeof(ITEM) * grp.cItemArray); pGroup = (PGROUP)malloc(sizeof(grp) + sizeof(ITEM) * (grp.cItemArray + 1));
// Get group minimized/maximized flags // Get group minimized/maximized flags
@@ -124,7 +124,7 @@ HWND CreateGroupWindow(GROUP grp)
return NULL; return NULL;
// Associate the group structure pointer to the group window // Associate the group structure pointer to the group window
SetWindowLongPtr(hWndGroup, GWLP_USERDATA, pGroup); SetWindowLongPtr(hWndGroup, GWLP_USERDATA, (LONG_PTR)pGroup);
// Load the group icon // Load the group icon
if (ExtractIconEx(grp.szIconPath, grp.iIconIndex, &hIconLarge, &hIconSmall, 1)) if (ExtractIconEx(grp.szIconPath, grp.iIconIndex, &hIconLarge, &hIconSmall, 1))
@@ -164,11 +164,6 @@ BOOL RemoveGroupWindow(HWND hWndGroup)
// should group deletion be "abstracted" here or should i handle windows // should group deletion be "abstracted" here or should i handle windows
// and groups separately? // and groups separately?
if ((hGroupHeap = GetWindowLongPtr(hWndGroup, GWLP_USERDATA)) != NULL)
{
if (HeapDestroy(hGroupHeap))
return TRUE;
}
return FALSE; return FALSE;
} }

4
progmgr/group.h
View File

@@ -13,10 +13,10 @@
/* Definitions */ /* Definitions */
#define MAX_GROUPS 512 #define MAX_GROUPS 512
#define MAX_ITEMS 512 #define MAX_ITEMS 512
#define MAX_TITLE_LENGTH MAX_PATH #define MAX_TITLE_LENGTH 255 // Same as the registry key name max length
// Group Format Definitions // Group Format Definitions
#define GRP_SIGNATURE 0x47324D50L // PM2G #define GRP_SIGNATURE 0x47324D50L // PM2G
#define GRP_VERSION 1 // Increment for breaking changes #define GRP_VERSION 2 // Increment for breaking changes, format version
// Group Flag Values (DWORD) // Group Flag Values (DWORD)
#define GRP_FLAG_COMMON 0x00000001 #define GRP_FLAG_COMMON 0x00000001
#define GRP_FLAG_READONLY 0x00000002 #define GRP_FLAG_READONLY 0x00000002

BIN
progmgr/resource.h
View File

Binary file not shown.