Skip to content

W
wine-winehq
Commit 95105908 authored by Eric Williams's avatar Eric Williams Committed by Alexandre Julliard
Browse files
Options

Changed GROUP to PROGGROUP.

parent 220312e9
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 22 deletions
programs/progman/group.c
View file @ 95105908
......@@ -102,11 +102,11 @@ HLOCAL GROUP_AddGroup(LPCSTR lpszName, LPCSTR lpszGrpFile, INT nCmdShow,
/* FIXME shouldn't be necessary */
BOOL bSuppressShowWindow)
{
GROUP *group, *prior;
PROGGROUP *group, *prior;
MDICREATESTRUCT cs;
INT seqnum;
HLOCAL hPrior, *p;
HLOCAL hGroup = LocalAlloc(LMEM_FIXED, sizeof(GROUP));
HLOCAL hGroup = LocalAlloc(LMEM_FIXED, sizeof(PROGGROUP));
HLOCAL hName = LocalAlloc(LMEM_FIXED, 1 + lstrlen(lpszName));
HLOCAL hGrpFile = LocalAlloc(LMEM_FIXED, 1 + lstrlen(lpszGrpFile));
if (!hGroup || !hName || !hGrpFile)
......@@ -185,7 +185,7 @@ HLOCAL GROUP_AddGroup(LPCSTR lpszName, LPCSTR lpszGrpFile, INT nCmdShow,
VOID GROUP_ModifyGroup(HLOCAL hGroup)
{
GROUP *group = LocalLock(hGroup);
PROGGROUP *group = LocalLock(hGroup);
CHAR szName[MAX_PATHNAME_LEN];
CHAR szFile[MAX_PATHNAME_LEN];
lstrcpyn(szName, LocalLock(group->hName), MAX_PATHNAME_LEN);
......@@ -216,7 +216,7 @@ VOID GROUP_ModifyGroup(HLOCAL hGroup)
/* FIXME shouldn't be necessary */
VOID GROUP_ShowGroupWindow(HLOCAL hGroup)
{
GROUP *group = LocalLock(hGroup);
PROGGROUP *group = LocalLock(hGroup);
ShowWindow (group->hWnd, group->nCmdShow);
UpdateWindow (group->hWnd);
}
......@@ -228,16 +228,16 @@ VOID GROUP_ShowGroupWindow(HLOCAL hGroup)
VOID GROUP_DeleteGroup(HLOCAL hGroup)
{
GROUP *group = LocalLock(hGroup);
PROGGROUP *group = LocalLock(hGroup);
Globals.hActiveGroup = 0;
if (group->hPrior)
((GROUP*)LocalLock(group->hPrior))->hNext = group->hNext;
((PROGGROUP*)LocalLock(group->hPrior))->hNext = group->hNext;
else Globals.hGroups = group->hNext;
if (group->hNext)
((GROUP*)LocalLock(group->hNext))->hPrior = group->hPrior;
((PROGGROUP*)LocalLock(group->hNext))->hPrior = group->hPrior;
while (group->hPrograms)
PROGRAM_DeleteProgram(group->hPrograms, FALSE);
......@@ -268,7 +268,7 @@ HLOCAL GROUP_FirstGroup()
HLOCAL GROUP_NextGroup(HLOCAL hGroup)
{
GROUP *group;
PROGGROUP *group;
if (!hGroup) return(0);
group = LocalLock(hGroup);
return(group->hNext);
......@@ -291,7 +291,7 @@ HLOCAL GROUP_ActiveGroup()
HWND GROUP_GroupWnd(HLOCAL hGroup)
{
GROUP *group;
PROGGROUP *group;
if (!hGroup) return(0);
group = LocalLock(hGroup);
return(group->hWnd);
......@@ -304,7 +304,7 @@ HWND GROUP_GroupWnd(HLOCAL hGroup)
LPCSTR GROUP_GroupName(HLOCAL hGroup)
{
GROUP *group;
PROGGROUP *group;
if (!hGroup) return(0);
group = LocalLock(hGroup);
return(LocalLock(group->hName));
......
programs/progman/grpfile.c
View file @ 95105908
......@@ -23,7 +23,7 @@ static BOOL GRPFILE_ReadFileToBuffer(LPCSTR, HLOCAL*, INT*);
static HLOCAL GRPFILE_ScanGroup(LPCSTR, INT, LPCSTR, BOOL);
static HLOCAL GRPFILE_ScanProgram(LPCSTR, INT, LPCSTR, INT,
LPCSTR, HLOCAL,LPCSTR);
static BOOL GRPFILE_DoWriteGroupFile(HFILE file, GROUP *group);
static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group);
/***********************************************************************
*
......@@ -340,7 +340,7 @@ static HLOCAL GRPFILE_ScanProgram(LPCSTR buffer, INT size,
BOOL GRPFILE_WriteGroupFile(HLOCAL hGroup)
{
CHAR szPath[MAX_PATHNAME_LEN];
GROUP *group = LocalLock(hGroup);
PROGGROUP *group = LocalLock(hGroup);
OFSTRUCT dummy;
HFILE file;
BOOL ret;
......@@ -499,7 +499,7 @@ static UINT GRPFILE_WriteWithChecksum(HFILE file, LPCSTR str, UINT size)
* GRPFILE_DoWriteGroupFile
*/
static BOOL GRPFILE_DoWriteGroupFile(HFILE file, GROUP *group)
static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group)
{
BYTE buffer[34];
HLOCAL hProgram;
......
programs/progman/progman.h
View file @ 95105908
......@@ -100,7 +100,7 @@ typedef struct
/* magic `PMCC' */ /* Extension 0x8000 */
/* End of Extensions */ /* Extension 0xffff */
} GROUP;
} PROGGROUP;
typedef struct
{
......
programs/progman/program.c
View file @ 95105908
......@@ -22,7 +22,7 @@ static LRESULT PROGRAM_ProgramWndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARA
{
HLOCAL hProgram = (HLOCAL) GetWindowLong(hWnd, 0);
PROGRAM *program = LocalLock(hProgram);
GROUP *group = LocalLock(program->hGroup);
PROGGROUP *group = LocalLock(program->hGroup);
group->hActiveProgram = hProgram;
EnableMenuItem(Globals.hFileMenu, PM_MOVE , MF_ENABLED);
EnableMenuItem(Globals.hFileMenu, PM_COPY , MF_ENABLED);
......@@ -152,7 +152,7 @@ HLOCAL PROGRAM_AddProgram(HLOCAL hGroup, HICON hIcon, LPCSTR lpszName,
LPCSTR lpszIconFile, INT nIconIndex,
LPCSTR lpszWorkDir, INT nHotKey, INT nCmdShow)
{
GROUP *group = LocalLock(hGroup);
PROGGROUP *group = LocalLock(hGroup);
PROGRAM *program;
HLOCAL hPrior, *p;
HLOCAL hProgram = LocalAlloc(LMEM_FIXED, sizeof(PROGRAM));
......@@ -222,13 +222,13 @@ HLOCAL PROGRAM_AddProgram(HLOCAL hGroup, HICON hIcon, LPCSTR lpszName,
VOID PROGRAM_CopyMoveProgram(HLOCAL hProgram, BOOL bMove)
{
PROGRAM *program = LocalLock(hProgram);
GROUP *fromgroup = LocalLock(program->hGroup);
PROGGROUP *fromgroup = LocalLock(program->hGroup);
HLOCAL hGroup = DIALOG_CopyMove(LocalLock(program->hName),
LocalLock(fromgroup->hName), bMove);
if (!hGroup) return;
/* FIXME shouldn't be necessary */
OpenIcon(((GROUP*)LocalLock(hGroup))->hWnd);
OpenIcon(((PROGGROUP*)LocalLock(hGroup))->hWnd);
if (!PROGRAM_AddProgram(hGroup,
#if 0
......@@ -274,14 +274,14 @@ VOID PROGRAM_ExecuteProgram(HLOCAL hProgram)
VOID PROGRAM_DeleteProgram(HLOCAL hProgram, BOOL bUpdateGrpFile)
{
PROGRAM *program = LocalLock(hProgram);
GROUP *group = LocalLock(program->hGroup);
PROGGROUP *group = LocalLock(program->hGroup);
group->hActiveProgram = 0;
if (program->hPrior)
((PROGRAM*)LocalLock(program->hPrior))->hNext = program->hNext;
else
((GROUP*)LocalLock(program->hGroup))->hPrograms = program->hNext;
((PROGGROUP*)LocalLock(program->hGroup))->hPrograms = program->hNext;
if (program->hNext)
((PROGRAM*)LocalLock(program->hNext))->hPrior = program->hPrior;
......@@ -308,7 +308,7 @@ VOID PROGRAM_DeleteProgram(HLOCAL hProgram, BOOL bUpdateGrpFile)
HLOCAL PROGRAM_FirstProgram(HLOCAL hGroup)
{
GROUP *group;
PROGGROUP *group;
if (!hGroup) return(0);
group = LocalLock(hGroup);
return(group->hPrograms);
......@@ -334,7 +334,7 @@ HLOCAL PROGRAM_NextProgram(HLOCAL hProgram)
HLOCAL PROGRAM_ActiveProgram(HLOCAL hGroup)
{
GROUP *group;
PROGGROUP *group;
if (!hGroup) return(0);
group = LocalLock(hGroup);
if (IsIconic(group->hWnd)) return(0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment