Convert HTASK to void* (based on a patch by Michael Stefaniuc).
This commit is contained in:
parent
3bd7d224fc
commit
13f2a17eb2
|
@ -222,6 +222,17 @@ DWORD WINAPI RegisterTasklist (DWORD x)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/***********************************************************************
|
||||||
|
* GetAppCompatFlags (USER32.@)
|
||||||
|
*/
|
||||||
|
DWORD WINAPI GetAppCompatFlags( HTASK hTask )
|
||||||
|
{
|
||||||
|
FIXME("stub\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* USER_489 (USER.489)
|
* USER_489 (USER.489)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -506,6 +506,7 @@ static DWORD MCI_LoadMciDriver(LPWINE_MM_IDATA iData, LPCSTR _strDevTyp,
|
||||||
wmd->lpfnYieldProc = MCI_DefYieldProc;
|
wmd->lpfnYieldProc = MCI_DefYieldProc;
|
||||||
wmd->dwYieldData = VK_CANCEL;
|
wmd->dwYieldData = VK_CANCEL;
|
||||||
wmd->hCreatorTask = GetCurrentTask();
|
wmd->hCreatorTask = GetCurrentTask();
|
||||||
|
wmd->CreatorThread = GetCurrentThreadId();
|
||||||
|
|
||||||
EnterCriticalSection(&iData->cs);
|
EnterCriticalSection(&iData->cs);
|
||||||
/* wmd must be inserted in list before sending opening the driver, coz' it
|
/* wmd must be inserted in list before sending opening the driver, coz' it
|
||||||
|
@ -2708,4 +2709,3 @@ BOOL MULTIMEDIA_MciInit(void)
|
||||||
RegCloseKey(hWineConf);
|
RegCloseKey(hWineConf);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1969,7 +1969,13 @@ YIELDPROC WINAPI mciGetYieldProc(UINT uDeviceID, DWORD* lpdwYieldData)
|
||||||
*/
|
*/
|
||||||
HTASK16 WINAPI mciGetCreatorTask16(UINT16 uDeviceID)
|
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)
|
HTASK WINAPI mciGetCreatorTask(UINT uDeviceID)
|
||||||
{
|
{
|
||||||
LPWINE_MCIDRIVER wmd;
|
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("(%u) => %08lx\n", uDeviceID, ret);
|
||||||
|
|
||||||
TRACE("=> %04x\n", ret);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -126,6 +126,7 @@ typedef struct tagWINE_MCIDRIVER {
|
||||||
DWORD dwYieldData;
|
DWORD dwYieldData;
|
||||||
BOOL bIs32;
|
BOOL bIs32;
|
||||||
HTASK16 hCreatorTask;
|
HTASK16 hCreatorTask;
|
||||||
|
DWORD CreatorThread;
|
||||||
UINT uTypeCmdTable;
|
UINT uTypeCmdTable;
|
||||||
UINT uSpecificCmdTable;
|
UINT uSpecificCmdTable;
|
||||||
struct tagWINE_MCIDRIVER*lpNext;
|
struct tagWINE_MCIDRIVER*lpNext;
|
||||||
|
|
|
@ -91,7 +91,7 @@ DECLARE_OLD_HANDLE(HPALETTE);
|
||||||
DECLARE_OLD_HANDLE(HPEN);
|
DECLARE_OLD_HANDLE(HPEN);
|
||||||
DECLARE_OLD_HANDLE(HRGN);
|
DECLARE_OLD_HANDLE(HRGN);
|
||||||
DECLARE_OLD_HANDLE(HRSRC);
|
DECLARE_OLD_HANDLE(HRSRC);
|
||||||
DECLARE_OLD_HANDLE(HTASK);
|
DECLARE_HANDLE(HTASK);
|
||||||
DECLARE_HANDLE(HWINEVENTHOOK);
|
DECLARE_HANDLE(HWINEVENTHOOK);
|
||||||
DECLARE_HANDLE(HWINSTA);
|
DECLARE_HANDLE(HWINSTA);
|
||||||
DECLARE_OLD_HANDLE(HWND);
|
DECLARE_OLD_HANDLE(HWND);
|
||||||
|
|
|
@ -1576,20 +1576,11 @@ void WINAPI TerminateApp16(HTASK16 hTask, WORD wFlags)
|
||||||
* GetAppCompatFlags (KERNEL.354)
|
* GetAppCompatFlags (KERNEL.354)
|
||||||
*/
|
*/
|
||||||
DWORD WINAPI GetAppCompatFlags16( HTASK16 hTask )
|
DWORD WINAPI GetAppCompatFlags16( HTASK16 hTask )
|
||||||
{
|
|
||||||
return GetAppCompatFlags( hTask );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* GetAppCompatFlags (USER32.@)
|
|
||||||
*/
|
|
||||||
DWORD WINAPI GetAppCompatFlags( HTASK hTask )
|
|
||||||
{
|
{
|
||||||
TDB *pTask;
|
TDB *pTask;
|
||||||
|
|
||||||
if (!hTask) hTask = GetCurrentTask();
|
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;
|
if (GlobalSize16(hTask) < sizeof(TDB)) return 0;
|
||||||
return pTask->compat_flags;
|
return pTask->compat_flags;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue