September 2009 - Wine-Commits

Andrew Eikum : mshtml: Check for null pointers in IHTMLLocation_get*.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: 3b5ed104bf358bb0ecd876e7f170f458ddc52249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5ed104bf358bb0ecd876e7f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 28 13:31:08 2009 -0500 mshtml: Check for null pointers in IHTMLLocation_get*. --- dlls/mshtml/htmllocation.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 470d679..67ebf99 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -168,6 +168,10 @@ static HRESULT WINAPI HTMLLocation_get_protocol(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); FIXME("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + return E_NOTIMPL; } @@ -182,6 +186,10 @@ static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); FIXME("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + return E_NOTIMPL; } @@ -196,6 +204,10 @@ static HRESULT WINAPI HTMLLocation_get_hostname(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); FIXME("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + return E_NOTIMPL; } @@ -210,6 +222,10 @@ static HRESULT WINAPI HTMLLocation_get_port(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); FIXME("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + return E_NOTIMPL; } @@ -231,6 +247,9 @@ static HRESULT WINAPI HTMLLocation_get_pathname(IHTMLLocation *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); + if(!p) + return E_POINTER; + hres = get_url(This, &doc_url); if(FAILED(hres)) return hres; @@ -271,6 +290,10 @@ static HRESULT WINAPI HTMLLocation_get_search(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); FIXME("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + return E_NOTIMPL; } @@ -285,6 +308,10 @@ static HRESULT WINAPI HTMLLocation_get_hash(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); FIXME("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + return E_NOTIMPL; }

1 0

Peter Oberndorfer : shlwapi: Fix logic of SHCreateMemStream in combination with NULL pointers.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: d4f873055f10335dee490bde7558033857cc108f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4f873055f10335dee490bde7… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Sep 28 22:24:05 2009 +0200 shlwapi: Fix logic of SHCreateMemStream in combination with NULL pointers. --- dlls/shlwapi/regstream.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 439c4d9..ba68bd4 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -505,21 +505,22 @@ IStream * WINAPI SHOpenRegStreamW(HKEY hkey, LPCWSTR pszSubkey, IStream * WINAPI SHCreateMemStream(const BYTE *lpbData, UINT dwDataLen) { IStream *iStrmRet = NULL; + LPBYTE lpbDup; TRACE("(%p,%d)\n", lpbData, dwDataLen); - if (lpbData) - { - LPBYTE lpbDup = HeapAlloc(GetProcessHeap(), 0, dwDataLen); + if (!lpbData) + dwDataLen = 0; + + lpbDup = HeapAlloc(GetProcessHeap(), 0, dwDataLen); - if (lpbDup) - { - memcpy(lpbDup, lpbData, dwDataLen); - iStrmRet = IStream_Create(NULL, lpbDup, dwDataLen); + if (lpbDup) + { + memcpy(lpbDup, lpbData, dwDataLen); + iStrmRet = IStream_Create(NULL, lpbDup, dwDataLen); - if (!iStrmRet) - HeapFree(GetProcessHeap(), 0, lpbDup); - } + if (!iStrmRet) + HeapFree(GetProcessHeap(), 0, lpbDup); } return iStrmRet; }

1 0

Peter Oberndorfer : shlwapi: Fix IStream::Read for reg/mem stream.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: da984870cdc0cb4950feb301943beb15e1e54d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da984870cdc0cb4950feb3019… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Sep 28 22:24:07 2009 +0200 shlwapi: Fix IStream::Read for reg/mem stream. --- dlls/shlwapi/regstream.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index ba68bd4..caee2e8 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -116,24 +116,21 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface) static HRESULT WINAPI IStream_fnRead (IStream * iface, void* pv, ULONG cb, ULONG* pcbRead) { ISHRegStream *This = (ISHRegStream *)iface; - - DWORD dwBytesToRead, dwBytesLeft; + DWORD dwBytesToRead; TRACE("(%p)->(%p,0x%08x,%p)\n",This, pv, cb, pcbRead); - if (!pv) - return STG_E_INVALIDPOINTER; - - dwBytesLeft = This->dwLength - This->dwPos; - - if ( 0 >= dwBytesLeft ) /* end of buffer */ - return S_FALSE; - - dwBytesToRead = ( cb > dwBytesLeft) ? dwBytesLeft : cb; + if (This->dwPos >= This->dwLength) + dwBytesToRead = 0; + else + dwBytesToRead = This->dwLength - This->dwPos; - memmove ( pv, (This->pbBuffer) + (This->dwPos), dwBytesToRead); - - This->dwPos += dwBytesToRead; /* adjust pointer */ + dwBytesToRead = (cb > dwBytesToRead) ? dwBytesToRead : cb; + if (dwBytesToRead != 0) /* not at end of buffer and we want to read something */ + { + memmove(pv, This->pbBuffer + This->dwPos, dwBytesToRead); + This->dwPos += dwBytesToRead; /* adjust pointer */ + } if (pcbRead) *pcbRead = dwBytesToRead;

1 0

Peter Oberndorfer : shlwapi: Fix spec file for some unicode functions.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: ac573f6aba813617dfec774dee822901d33f050a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac573f6aba813617dfec774de… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Sep 28 22:23:56 2009 +0200 shlwapi: Fix spec file for some unicode functions. --- dlls/shlwapi/shlwapi.spec | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 3427722..1a79174 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -643,7 +643,7 @@ @ stdcall PathQuoteSpacesA (str) @ stdcall PathQuoteSpacesW (wstr) @ stdcall PathRelativePathToA(ptr str long str long) -@ stdcall PathRelativePathToW(ptr str long str long) +@ stdcall PathRelativePathToW(ptr wstr long wstr long) @ stdcall PathRemoveArgsA(str) @ stdcall PathRemoveArgsW(wstr) @ stdcall PathRemoveBackslashA (str) @@ -700,9 +700,9 @@ @ stdcall SHGetValueW ( long wstr wstr ptr ptr ptr ) @ stdcall SHIsLowMemoryMachine(long) @ stdcall SHOpenRegStream2A(long str str long) -@ stdcall SHOpenRegStream2W(long wstr str long) +@ stdcall SHOpenRegStream2W(long wstr wstr long) @ stdcall SHOpenRegStreamA(long str str long) -@ stdcall SHOpenRegStreamW(long wstr str long) +@ stdcall SHOpenRegStreamW(long wstr wstr long) @ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) @ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) @ stdcall SHQueryValueExA(long str ptr ptr ptr ptr) @@ -738,7 +738,7 @@ @ stdcall SHRegSetUSValueA ( str str long ptr long long) @ stdcall SHRegSetUSValueW ( wstr wstr long ptr long long) @ stdcall SHRegWriteUSValueA (long str long ptr long long) -@ stdcall SHRegWriteUSValueW (long str long ptr long long) +@ stdcall SHRegWriteUSValueW (long wstr long ptr long long) @ stdcall SHRegisterValidateTemplate(wstr long) @ stdcall SHReleaseThreadRef() @ stdcall SHSetThreadRef (ptr) @@ -785,7 +785,7 @@ @ stdcall StrPBrkW(wstr wstr) @ stdcall StrRChrA (str str long) @ stdcall StrRChrIA (str str long) -@ stdcall StrRChrIW (str str long) +@ stdcall StrRChrIW (wstr wstr long) @ stdcall StrRChrW (wstr wstr long) @ stdcall StrRStrIA (str str str) @ stdcall StrRStrIW (wstr wstr wstr)

1 0

Allan Tong : d3d8: Don' t release the parent device before destroying its children.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: 6792bb88430a619b5f3c3e2107396df337bc1a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6792bb88430a619b5f3c3e210… Author: Allan Tong <actong88(a)gmail.com> Date: Mon Sep 28 12:50:15 2009 -0400 d3d8: Don't release the parent device before destroying its children. --- dlls/d3d8/cubetexture.c | 6 +++++- dlls/d3d8/indexbuffer.c | 6 +++++- dlls/d3d8/surface.c | 5 ++++- dlls/d3d8/texture.c | 6 +++++- dlls/d3d8/vertexbuffer.c | 6 +++++- dlls/d3d8/volumetexture.c | 6 +++++- 6 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index d3ec98c..24417df 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -64,12 +64,16 @@ static ULONG WINAPI IDirect3DCubeTexture8Impl_Release(LPDIRECT3DCUBETEXTURE8 ifa TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + IDirect3DDevice8 *parentDevice = This->parentDevice; + TRACE("Releasing child %p\n", This->wineD3DCubeTexture); - IUnknown_Release(This->parentDevice); wined3d_mutex_lock(); IWineD3DCubeTexture_Release(This->wineD3DCubeTexture); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice8_Release(parentDevice); } return ref; } diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c index 4939122..bb62c39 100644 --- a/dlls/d3d8/indexbuffer.c +++ b/dlls/d3d8/indexbuffer.c @@ -64,10 +64,14 @@ static ULONG WINAPI IDirect3DIndexBuffer8Impl_Release(LPDIRECT3DINDEXBUFFER8 ifa TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice8_Release(This->parentDevice); + IDirect3DDevice8 *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DBuffer_Release(This->wineD3DIndexBuffer); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice8_Release(parentDevice); } return ref; } diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 2d00fce..8923dd8 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -79,11 +79,14 @@ static ULONG WINAPI IDirect3DSurface8Impl_Release(LPDIRECT3DSURFACE8 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - if (This->parentDevice) IUnknown_Release(This->parentDevice); + IDirect3DDevice8 *parentDevice = This->parentDevice; + /* Implicit surfaces are destroyed with the device, not if refcount reaches 0. */ wined3d_mutex_lock(); IWineD3DSurface_Release(This->wineD3DSurface); wined3d_mutex_unlock(); + + if (parentDevice) IDirect3DDevice8_Release(parentDevice); } return ref; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index e377fff..000b078 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -65,10 +65,14 @@ static ULONG WINAPI IDirect3DTexture8Impl_Release(LPDIRECT3DTEXTURE8 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice8_Release(This->parentDevice); + IDirect3DDevice8 *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DTexture_Release(This->wineD3DTexture); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice8_Release(parentDevice); } return ref; } diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index 99e8304..a798afd 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -65,10 +65,14 @@ static ULONG WINAPI IDirect3DVertexBuffer8Impl_Release(LPDIRECT3DVERTEXBUFFER8 i TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice8_Release(This->parentDevice); + IDirect3DDevice8 *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DBuffer_Release(This->wineD3DVertexBuffer); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice8_Release(parentDevice); } return ref; diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 46c1ec5..d31c156 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -65,10 +65,14 @@ static ULONG WINAPI IDirect3DVolumeTexture8Impl_Release(LPDIRECT3DVOLUMETEXTURE8 TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IUnknown_Release(This->parentDevice); + IDirect3DDevice8 *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DVolumeTexture_Release(This->wineD3DVolumeTexture); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice8_Release(parentDevice); } return ref; }

1 0

Aurimas Fišeras : jscript: Update Lithuanian translation.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: 9ef3dfdd24ea26ecee63f4a6379a98c5ab7bb53d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef3dfdd24ea26ecee63f4a63… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Sep 24 19:21:50 2009 +0300 jscript: Update Lithuanian translation. --- dlls/jscript/jscript_Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Lt.rc b/dlls/jscript/jscript_Lt.rc index bb09228..83c0680 100644 --- a/dlls/jscript/jscript_Lt.rc +++ b/dlls/jscript/jscript_Lt.rc @@ -44,4 +44,5 @@ STRINGTABLE DISCARDABLE IDS_JSCRIPT_EXPECTED "Tikėtasi JScript objekto" IDS_REGEXP_SYNTAX_ERROR "Sintaksės klaida reguliariajame reiškinyje" IDS_INVALID_LENGTH "Masyvo dydis turi būti teigiamas sveikasis skaičius" + IDS_ARRAY_EXPECTED "Tikėtasi masyvo objekto" }

1 0

Alexandre Julliard : kernel32: Moved GetThreadSelectorEntry to thread.c.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: b088cc578146d393423f24193e8ac2545f47cb13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b088cc578146d393423f24193… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:58:45 2009 +0200 kernel32: Moved GetThreadSelectorEntry to thread.c. --- dlls/kernel32/selector.c | 28 ++-------------------------- dlls/kernel32/thread.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/selector.c b/dlls/kernel32/selector.c index 4a642c0..d505982 100644 --- a/dlls/kernel32/selector.c +++ b/dlls/kernel32/selector.c @@ -559,38 +559,14 @@ LPVOID WINAPI MapSLFix( SEGPTR sptr ) return MapSL(sptr); } +#ifdef __i386__ + /*********************************************************************** * UnMapSLFixArray (KERNEL32.@) * * Must not change EAX, hence defined as asm function. */ -#ifdef __i386__ __ASM_STDCALL_FUNC( UnMapSLFixArray, 8, "ret $8" ) -#endif - - -/*********************************************************************** - * GetThreadSelectorEntry (KERNEL32.@) - */ -BOOL WINAPI GetThreadSelectorEntry( HANDLE hthread, DWORD sel, LPLDT_ENTRY ldtent ) -{ - THREAD_DESCRIPTOR_INFORMATION tdi; - NTSTATUS status; - - tdi.Selector = sel; - status = NtQueryInformationThread( hthread, ThreadDescriptorTableEntry, - &tdi, sizeof(tdi), NULL); - if (status) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - *ldtent = tdi.Entry; - return TRUE; -} - - -#ifdef __i386__ /*********************************************************************** * SMapLS (KERNEL32.@) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 0029e11..3115a60 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -422,6 +422,26 @@ DWORD WINAPI SetThreadIdealProcessor( } +/*********************************************************************** + * GetThreadSelectorEntry (KERNEL32.@) + */ +BOOL WINAPI GetThreadSelectorEntry( HANDLE hthread, DWORD sel, LPLDT_ENTRY ldtent ) +{ + THREAD_DESCRIPTOR_INFORMATION tdi; + NTSTATUS status; + + tdi.Selector = sel; + status = NtQueryInformationThread( hthread, ThreadDescriptorTableEntry, &tdi, sizeof(tdi), NULL); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + *ldtent = tdi.Entry; + return TRUE; +} + + /* callback for QueueUserAPC */ static void CALLBACK call_user_apc( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3 ) {

1 0

Alexandre Julliard : kernel32: Moved private function prototypes out of toolhelp.h.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: 72b0389bc66b6bd467179a9e9365a3ff7f7676a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72b0389bc66b6bd467179a9e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:59:09 2009 +0200 kernel32: Moved private function prototypes out of toolhelp.h. --- dlls/kernel32/dosmem.c | 2 +- dlls/kernel32/kernel16.c | 1 - dlls/kernel32/kernel16_private.h | 7 +++++++ dlls/kernel32/kernel_main.c | 1 - dlls/kernel32/ne_segment.c | 1 - dlls/kernel32/snoop16.c | 1 - dlls/kernel32/toolhelp.h | 7 ------- 7 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/dosmem.c b/dlls/kernel32/dosmem.c index d8ea03b..178ed07 100644 --- a/dlls/kernel32/dosmem.c +++ b/dlls/kernel32/dosmem.c @@ -38,7 +38,7 @@ #include "wine/winbase16.h" #include "kernel_private.h" -#include "toolhelp.h" +#include "kernel16_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dosmem); diff --git a/dlls/kernel32/kernel16.c b/dlls/kernel32/kernel16.c index c004a3d..c5683db 100644 --- a/dlls/kernel32/kernel16.c +++ b/dlls/kernel32/kernel16.c @@ -26,7 +26,6 @@ #include "winternl.h" #include "wownt32.h" -#include "toolhelp.h" #include "kernel_private.h" #include "kernel16_private.h" #include "wine/debug.h" diff --git a/dlls/kernel32/kernel16_private.h b/dlls/kernel32/kernel16_private.h index 0c59bbd..aada5b2 100644 --- a/dlls/kernel32/kernel16_private.h +++ b/dlls/kernel32/kernel16_private.h @@ -188,6 +188,13 @@ static inline void stack16_pop( int size ) NtCurrentTeb()->WOW32Reserved = (char *)NtCurrentTeb()->WOW32Reserved + size; } +/* global16.c */ +extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, void *ptr, DWORD size, + HGLOBAL16 hOwner, unsigned char selflags ); +extern BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle ); +extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, void *ptr, DWORD size ); +extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner, unsigned char selflags ); + /* ne_module.c */ extern NE_MODULE *NE_GetPtr( HMODULE16 hModule ); extern WORD NE_GetOrdinal( HMODULE16 hModule, const char *name ); diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 2365e7a..d4f0724 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -35,7 +35,6 @@ #include "wine/winbase16.h" #include "wine/library.h" -#include "toolhelp.h" #include "kernel_private.h" #include "kernel16_private.h" #include "console_private.h" diff --git a/dlls/kernel32/ne_segment.c b/dlls/kernel32/ne_segment.c index 0ade4b0..4bc6603 100644 --- a/dlls/kernel32/ne_segment.c +++ b/dlls/kernel32/ne_segment.c @@ -39,7 +39,6 @@ #include "wine/library.h" #include "kernel_private.h" #include "kernel16_private.h" -#include "toolhelp.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(fixup); diff --git a/dlls/kernel32/snoop16.c b/dlls/kernel32/snoop16.c index 8c79269..efa20cd 100644 --- a/dlls/kernel32/snoop16.c +++ b/dlls/kernel32/snoop16.c @@ -33,7 +33,6 @@ #include "wine/library.h" #include "kernel_private.h" #include "kernel16_private.h" -#include "toolhelp.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(snoop); diff --git a/dlls/kernel32/toolhelp.h b/dlls/kernel32/toolhelp.h index 6506aae..da41a88 100644 --- a/dlls/kernel32/toolhelp.h +++ b/dlls/kernel32/toolhelp.h @@ -102,13 +102,6 @@ BOOL16 WINAPI GlobalEntryHandle16( GLOBALENTRY *pGlobal, HGLOBAL16 hItem ); BOOL16 WINAPI GlobalEntryModule16( GLOBALENTRY *pGlobal, HMODULE16 hModule, WORD wSeg ); -/* FIXME: Wine internal functions */ -extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, void *ptr, DWORD size, - HGLOBAL16 hOwner, unsigned char selflags ); -extern BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle ); -extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, void *ptr, DWORD size ); -extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner, unsigned char selflags ); - /* Local heap */ typedef struct

1 0

Alexandre Julliard : kernel32: Make toolhelp. dll into a stand-alone 16-bit module.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: c1dbeade529f45653f146a5849d9777c602dbda2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1dbeade529f45653f146a584… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 20:00:15 2009 +0200 kernel32: Make toolhelp.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 + configure.ac | 1 + dlls/Makefile.in | 3 +- dlls/kernel32/Makefile.in | 7 +- dlls/kernel32/global16.c | 97 +--- dlls/kernel32/local16.c | 90 +-- dlls/kernel32/ne_module.c | 53 -- dlls/kernel32/selector.c | 36 - dlls/kernel32/task.c | 83 --- dlls/kernel32/toolhelp16.c | 226 ------ dlls/toolhelp.dll16/Makefile.in | 13 + dlls/toolhelp.dll16/toolhelp.c | 737 ++++++++++++++++++++ .../toolhelp.dll16.spec} | 0 dlls/{kernel32 => toolhelp.dll16}/toolhelp.h | 0 15 files changed, 789 insertions(+), 567 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1dbeade529f45653f146…

1 0

Alexandre Julliard : winedos: Always run the BIOS tick timer.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: 68dd560860c8284dfa851d2e643f30e0001c3584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68dd560860c8284dfa851d2e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:55:39 2009 +0200 winedos: Always run the BIOS tick timer. --- dlls/kernel32/dosmem.c | 1 - dlls/kernel32/instr.c | 7 ------- dlls/kernel32/kernel_private.h | 1 - dlls/winedos/dosmem.c | 23 ++++++++++++++++++++--- dlls/winedos/winedos.spec | 3 --- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/dosmem.c b/dlls/kernel32/dosmem.c index f162139..d8ea03b 100644 --- a/dlls/kernel32/dosmem.c +++ b/dlls/kernel32/dosmem.c @@ -115,7 +115,6 @@ BOOL load_winedos(void) GET_ADDR(outport); GET_ADDR(EmulateInterruptPM); GET_ADDR(CallBuiltinHandler); - GET_ADDR(BiosTick); #undef GET_ADDR } RtlRemoveVectoredExceptionHandler( dosmem_handler ); diff --git a/dlls/kernel32/instr.c b/dlls/kernel32/instr.c index 7fdc4cd..7f5ddc4 100644 --- a/dlls/kernel32/instr.c +++ b/dlls/kernel32/instr.c @@ -106,13 +106,6 @@ static BOOL INSTR_ReplaceSelector( CONTEXT86 *context, WORD *sel ) { if (*sel == 0x40) { - static WORD sys_timer = 0; - if (!sys_timer) - { - if (!winedos.BiosTick) load_winedos(); - if (winedos.BiosTick) - sys_timer = CreateSystemTimer( 55, winedos.BiosTick ); - } *sel = DOSMEM_BiosDataSeg; return TRUE; } diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 386bab2..a65d93f 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -137,7 +137,6 @@ extern struct winedos_exports void (WINAPI *CallBuiltinHandler)( CONTEXT86 *context, BYTE intnum ); DWORD (WINAPI *inport)( int port, int size ); void (WINAPI *outport)( int port, int size, DWORD val ); - void (* BiosTick)(WORD timer); } winedos; /* returns directory handle for named objects */ diff --git a/dlls/winedos/dosmem.c b/dlls/winedos/dosmem.c index d453da3..06823f8 100644 --- a/dlls/winedos/dosmem.c +++ b/dlls/winedos/dosmem.c @@ -224,10 +224,25 @@ static void DOSMEM_FillBiosSegments(void) * * Increment the BIOS tick counter. Called by timer signal handler. */ -void BiosTick( WORD timer ) +static void CALLBACK BiosTick( LPVOID arg, DWORD low, DWORD high ) { - BIOSDATA *pBiosData = DOSVM_BiosData(); - if (pBiosData) pBiosData->Ticks++; + BIOSDATA *pBiosData = arg; + pBiosData->Ticks++; +} + +/*********************************************************************** + * timer_thread + */ +static DWORD CALLBACK timer_thread( void *arg ) +{ + LARGE_INTEGER when; + HANDLE timer; + + if (!(timer = CreateWaitableTimerA( NULL, FALSE, NULL ))) return 0; + + when.u.LowPart = when.u.HighPart = 0; + SetWaitableTimer( timer, &when, 55 /* actually 54.925 */, BiosTick, arg, FALSE ); + for (;;) SleepEx( INFINITE, TRUE ); } /*********************************************************************** @@ -488,6 +503,8 @@ BOOL DOSMEM_InitDosMemory(void) * Set DOS memory base and initialize conventional memory. */ DOSMEM_InitMemory(DOSMEM_dosmem + reserve); + + CloseHandle( CreateThread( NULL, 0, timer_thread, DOSVM_BiosData(), 0, NULL )); return TRUE; } diff --git a/dlls/winedos/winedos.spec b/dlls/winedos/winedos.spec index 98f9048..6847874 100644 --- a/dlls/winedos/winedos.spec +++ b/dlls/winedos/winedos.spec @@ -11,6 +11,3 @@ @ cdecl FreeDosBlock(ptr) DOSMEM_FreeBlock @ cdecl AllocDosBlock(long ptr) DOSMEM_AllocBlock @ cdecl ResizeDosBlock(ptr long long) DOSMEM_ResizeBlock - -# BIOS functions -@ cdecl BiosTick(long)

1 0