marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert HTASK to void* (based on a patch by Michael Stefaniuc).

oldstable
Alexandre Julliard 2002-07-28 23:48:27 +00:00
parent 3bd7d224fc
commit 13f2a17eb2
6 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/user/misc.c
View File

@ -222,6 +222,17 @@ DWORD WINAPI RegisterTasklist (DWORD x)
return TRUE;
}
/***********************************************************************
* GetAppCompatFlags (USER32.@)
*/
DWORD WINAPI GetAppCompatFlags( HTASK hTask )
{
FIXME("stub\n");
return 0;
}
/***********************************************************************
* USER_489 (USER.489)
*/

2
dlls/winmm/mci.c
View File

@ -506,6 +506,7 @@ static DWORD MCI_LoadMciDriver(LPWINE_MM_IDATA iData, LPCSTR _strDevTyp,
wmd->lpfnYieldProc = MCI_DefYieldProc;
wmd->dwYieldData = VK_CANCEL;
wmd->hCreatorTask = GetCurrentTask();
wmd->CreatorThread = GetCurrentThreadId();
EnterCriticalSection(&iData->cs);
/* wmd must be inserted in list before sending opening the driver, coz' it
@ -2708,4 +2709,3 @@ BOOL MULTIMEDIA_MciInit(void)
RegCloseKey(hWineConf);
return TRUE;
}

16
dlls/winmm/mmsystem.c
View File

@ -1969,7 +1969,13 @@ YIELDPROC WINAPI mciGetYieldProc(UINT uDeviceID, DWORD* lpdwYieldData)
*/
HTASK16 WINAPI mciGetCreatorTask16(UINT16 uDeviceID)
{
return mciGetCreatorTask(uDeviceID);
LPWINE_MCIDRIVER wmd;
HTASK16 ret = 0;
if ((wmd = MCI_GetDriver(uDeviceID))) ret = wmd->hCreatorTask;
TRACE("(%u) => %04x\n", uDeviceID, ret);
return ret;
}
/**************************************************************************
@ -1978,13 +1984,11 @@ HTASK16 WINAPI mciGetCreatorTask16(UINT16 uDeviceID)
HTASK WINAPI mciGetCreatorTask(UINT uDeviceID)
{
LPWINE_MCIDRIVER wmd;
HTASK ret;
HTASK ret = 0;
TRACE("(%u)\n", uDeviceID);
if ((wmd = MCI_GetDriver(uDeviceID))) ret = (HTASK)wmd->CreatorThread;
ret = (!(wmd = MCI_GetDriver(uDeviceID))) ? 0 : wmd->hCreatorTask;
TRACE("=> %04x\n", ret);
TRACE("(%u) => %08lx\n", uDeviceID, ret);
return ret;
}

1
dlls/winmm/winemm.h
View File

@ -126,6 +126,7 @@ typedef struct tagWINE_MCIDRIVER {
DWORD dwYieldData;
BOOL bIs32;
HTASK16 hCreatorTask;
DWORD CreatorThread;
UINT uTypeCmdTable;
UINT uSpecificCmdTable;
struct tagWINE_MCIDRIVER*lpNext;

2
include/windef.h
View File

@ -91,7 +91,7 @@ DECLARE_OLD_HANDLE(HPALETTE);
DECLARE_OLD_HANDLE(HPEN);
DECLARE_OLD_HANDLE(HRGN);
DECLARE_OLD_HANDLE(HRSRC);
DECLARE_OLD_HANDLE(HTASK);
DECLARE_HANDLE(HTASK);
DECLARE_HANDLE(HWINEVENTHOOK);
DECLARE_HANDLE(HWINSTA);
DECLARE_OLD_HANDLE(HWND);

11
loader/task.c
View File

@ -1576,20 +1576,11 @@ void WINAPI TerminateApp16(HTASK16 hTask, WORD wFlags)
* GetAppCompatFlags (KERNEL.354)
*/
DWORD WINAPI GetAppCompatFlags16( HTASK16 hTask )
{
return GetAppCompatFlags( hTask );
}
/***********************************************************************
* GetAppCompatFlags (USER32.@)
*/
DWORD WINAPI GetAppCompatFlags( HTASK hTask )
{
TDB *pTask;
if (!hTask) hTask = GetCurrentTask();
if (!(pTask=TASK_GetPtr( (HTASK16)hTask ))) return 0;
if (!(pTask=TASK_GetPtr( hTask ))) return 0;
if (GlobalSize16(hTask) < sizeof(TDB)) return 0;
return pTask->compat_flags;
}