September 2009 - Wine-commits

Peter Oberndorfer : shlwapi: Fix spec file for some unicode functions.
by Alexandre Julliard 29 Sep '09

29 Sep '09

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

Peter Oberndorfer : shlwapi: Fix prototype of SHCreateMemStream.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 2d41762553b7e6def412912a95af6b1e4c1447ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d41762553b7e6def412912a9… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Sep 28 22:23:58 2009 +0200 shlwapi: Fix prototype of SHCreateMemStream. --- dlls/shlwapi/regstream.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 6aca8f9..5c0e572 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -487,7 +487,7 @@ IStream * WINAPI SHOpenRegStreamW(HKEY hkey, LPCWSTR pszSubkey, * A copy of the memory pointed to by lpbData is made, and is freed * when the stream is released. */ -IStream * WINAPI SHCreateMemStream(LPBYTE lpbData, DWORD dwDataLen) +IStream * WINAPI SHCreateMemStream(const BYTE *lpbData, UINT dwDataLen) { IStream *iStrmRet = NULL;

1 0

Peter Oberndorfer : shlwapi: Implement IStream::Stat for registry/ memory streams.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 60b8750d3b15191304a6f4a41ed8210dc160f2e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b8750d3b15191304a6f4a41… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Sep 28 22:24:00 2009 +0200 shlwapi: Implement IStream::Stat for registry/memory streams. --- dlls/shlwapi/regstream.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 5c0e572..439c4d9 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -235,13 +235,28 @@ static HRESULT WINAPI IStream_fnLockUnlockRegion (IStream * iface, ULARGE_INTEGE /************************************************************************* * IStream_fnStat */ -static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD grfStatFlag) +static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD grfStatFlag) { ISHRegStream *This = (ISHRegStream *)iface; - TRACE("(%p)\n",This); + TRACE("(%p, %p, %d)\n",This,pstatstg,grfStatFlag); + + pstatstg->pwcsName = NULL; + pstatstg->type = STGTY_STREAM; + pstatstg->cbSize.QuadPart = This->dwLength; + pstatstg->mtime.dwHighDateTime = 0; + pstatstg->mtime.dwLowDateTime = 0; + pstatstg->ctime.dwHighDateTime = 0; + pstatstg->ctime.dwLowDateTime = 0; + pstatstg->atime.dwHighDateTime = 0; + pstatstg->atime.dwLowDateTime = 0; + pstatstg->grfMode = STGM_READWRITE; + pstatstg->grfLocksSupported = 0; + pstatstg->clsid = CLSID_NULL; + pstatstg->grfStateBits = 0; + pstatstg->reserved = 0; - return E_NOTIMPL; + return S_OK; } /*************************************************************************

1 0

Peter Oberndorfer : shlwapi: Fix logic of SHCreateMemStream in combination with NULL pointers.
by Alexandre Julliard 29 Sep '09

29 Sep '09

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 29 Sep '09

29 Sep '09

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: Implement IStream::Write, Seek and SetSize.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 58669ece91161803f68ded7cb881a4b2511e45b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58669ece91161803f68ded7cb… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Sep 28 22:24:08 2009 +0200 shlwapi: Implement IStream::Write, Seek and SetSize. On Write holes between file size and cursor are filled with 0 bytes. On SetSize holes caused by increasing file size are filled with 0 bytes. --- dlls/shlwapi/regstream.c | 60 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index caee2e8..cd48d93 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -144,13 +144,29 @@ static HRESULT WINAPI IStream_fnRead (IStream * iface, void* pv, ULONG cb, ULONG static HRESULT WINAPI IStream_fnWrite (IStream * iface, const void* pv, ULONG cb, ULONG* pcbWritten) { ISHRegStream *This = (ISHRegStream *)iface; + DWORD newLen = This->dwPos + cb; - TRACE("(%p)\n",This); + TRACE("(%p, %p, %d, %p)\n",This, pv, cb, pcbWritten); + + if (newLen < This->dwPos) /* overflow */ + return STG_E_INSUFFICIENTMEMORY; + + if (newLen > This->dwLength) + { + LPBYTE newBuf = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->pbBuffer, newLen); + if (!newBuf) + return STG_E_INSUFFICIENTMEMORY; + + This->dwLength = newLen; + This->pbBuffer = newBuf; + } + memmove(This->pbBuffer + This->dwPos, pv, cb); + This->dwPos += cb; /* adjust pointer */ if (pcbWritten) - *pcbWritten = 0; + *pcbWritten = cb; - return E_NOTIMPL; + return S_OK; } /************************************************************************** @@ -159,12 +175,28 @@ static HRESULT WINAPI IStream_fnWrite (IStream * iface, const void* pv, ULONG cb static HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) { ISHRegStream *This = (ISHRegStream *)iface; + LARGE_INTEGER tmp; + TRACE("(%p, %s, %d %p)\n", This, + wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition); + + if (dwOrigin == STREAM_SEEK_SET) + tmp = dlibMove; + else if (dwOrigin == STREAM_SEEK_CUR) + tmp.QuadPart = This->dwPos + dlibMove.QuadPart; + else if (dwOrigin == STREAM_SEEK_END) + tmp.QuadPart = This->dwLength + dlibMove.QuadPart; + else + return STG_E_INVALIDPARAMETER; - TRACE("(%p)\n",This); + if (tmp.QuadPart < 0) + return STG_E_INVALIDFUNCTION; + + /* we cut off the high part here */ + This->dwPos = tmp.LowPart; if (plibNewPosition) - plibNewPosition->QuadPart = 0; - return E_NOTIMPL; + plibNewPosition->QuadPart = This->dwPos; + return S_OK; } /************************************************************************** @@ -173,9 +205,21 @@ static HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, D static HRESULT WINAPI IStream_fnSetSize (IStream * iface, ULARGE_INTEGER libNewSize) { ISHRegStream *This = (ISHRegStream *)iface; + DWORD newLen; + LPBYTE newBuf; - TRACE("(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p, %s)\n", This, wine_dbgstr_longlong(libNewSize.QuadPart)); + + /* we cut off the high part here */ + newLen = libNewSize.LowPart; + newBuf = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->pbBuffer, newLen); + if (!newBuf) + return STG_E_INSUFFICIENTMEMORY; + + This->pbBuffer = newBuf; + This->dwLength = newLen; + + return S_OK; } /**************************************************************************

1 0

Alexandre Julliard : winedos: Always run the BIOS tick timer.
by Alexandre Julliard 29 Sep '09

29 Sep '09

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

Alexandre Julliard : kernel32: Make system. drv into a stand-alone 16-bit module.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 55b5e3a727a6a7d108fbbc3ebefe22ec84d70f7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b5e3a727a6a7d108fbbc3eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:56:10 2009 +0200 kernel32: Make system.drv into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 +++++++++ configure.ac | 1 + dlls/Makefile.in | 3 +-- dlls/kernel32/Makefile.in | 2 -- dlls/system.drv16/Makefile.in | 13 +++++++++++++ dlls/{kernel32 => system.drv16}/system.c | 8 +++++++- .../system.drv16.spec} | 0 8 files changed, 31 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f439b35..45362c3 100644 --- a/.gitignore +++ b/.gitignore @@ -119,7 +119,6 @@ dlls/setupx.dll16 dlls/shdocvw/shdocvw_v1.tlb dlls/stdole2.tlb/std_ole_v2.tlb dlls/stdole32.tlb/std_ole_v1.tlb -dlls/system.drv16 dlls/toolhelp.dll16 dlls/user.exe16 dlls/ver.dll16 diff --git a/configure b/configure index 2c8e4e5..b2cbd87 100755 --- a/configure +++ b/configure @@ -16658,6 +16658,14 @@ dlls/sxs/Makefile: dlls/sxs/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/sxs/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/system.drv16/Makefile" +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + system.drv16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/system.drv16/Makefile: dlls/system.drv16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/system.drv16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/t2embed/Makefile" test "x$enable_t2embed" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ t2embed" @@ -19045,6 +19053,7 @@ do "dlls/strmiids/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/strmiids/Makefile" ;; "dlls/svrapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/svrapi/Makefile" ;; "dlls/sxs/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sxs/Makefile" ;; + "dlls/system.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/system.drv16/Makefile" ;; "dlls/t2embed/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/t2embed/Makefile" ;; "dlls/tapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/tapi32/Makefile" ;; "dlls/traffic/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/traffic/Makefile" ;; diff --git a/configure.ac b/configure.ac index b773573..5fb8e9b 100644 --- a/configure.ac +++ b/configure.ac @@ -2443,6 +2443,7 @@ WINE_CONFIG_MAKEFILE([dlls/stress.dll16/Makefile],[dlls/Makedll.rules],[dlls],[A WINE_CONFIG_MAKEFILE([dlls/strmiids/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) WINE_CONFIG_MAKEFILE([dlls/svrapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/sxs/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/system.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/t2embed/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/tapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/traffic/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index de007a7..78be337 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -23,7 +23,6 @@ WIN16_FILES = \ krnl386.exe16 \ mmsystem.dll16 \ setupx.dll16 \ - system.drv16 \ toolhelp.dll16 \ user.exe16 \ ver.dll16 \ @@ -45,7 +44,7 @@ commdlg.dll16: gdi.exe16: echo "gdi32.dll" >$@ -krnl386.exe16 system.drv16 toolhelp.dll16: +krnl386.exe16 toolhelp.dll16: echo "kernel32.dll" >$@ setupx.dll16: diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 299f324..a64b699 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -11,7 +11,6 @@ EXTRADLLFLAGS = -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000 SPEC_SRCS16 = \ krnl386.exe.spec \ - system.drv.spec \ toolhelp.spec C_SRCS = \ @@ -55,7 +54,6 @@ C_SRCS = \ string.c \ sync.c \ syslevel.c \ - system.c \ tape.c \ task.c \ thread.c \ diff --git a/dlls/system.drv16/Makefile.in b/dlls/system.drv16/Makefile.in new file mode 100644 index 0000000..2fa90cf --- /dev/null +++ b/dlls/system.drv16/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = system.drv16 +IMPORTS = kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16 + +C_SRCS = system.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/kernel32/system.c b/dlls/system.drv16/system.c similarity index 96% rename from dlls/kernel32/system.c rename to dlls/system.drv16/system.c index 9395d83..46ab04e 100644 --- a/dlls/kernel32/system.c +++ b/dlls/system.drv16/system.c @@ -122,6 +122,7 @@ static void SYSTEM_StopTicks(void) DWORD WINAPI InquireSystem16( WORD code, WORD arg ) { WORD drivetype; + WCHAR root[3]; switch(code) { @@ -129,7 +130,12 @@ DWORD WINAPI InquireSystem16( WORD code, WORD arg ) return SYS_TIMER_RATE; case 1: /* Get drive type */ - drivetype = GetDriveType16( arg ); + root[0] = 'A' + arg; + root[1] = ':'; + root[2] = 0; + drivetype = GetDriveTypeW( root ); + if (drivetype == DRIVE_CDROM) drivetype = DRIVE_REMOTE; + else if (drivetype == DRIVE_NO_ROOT_DIR) drivetype = DRIVE_UNKNOWN; return MAKELONG( drivetype, drivetype ); case 2: /* Enable one-drive logic */ diff --git a/dlls/kernel32/system.drv.spec b/dlls/system.drv16/system.drv16.spec similarity index 100% rename from dlls/kernel32/system.drv.spec rename to dlls/system.drv16/system.drv16.spec

1 0

Alexandre Julliard : kernel32: Allocate the global arena array only once and store a pointer to it in THHOOK .
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 2e1b87d547797fec6e0b9371e60cb43f272370aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1b87d547797fec6e0b9371e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:56:44 2009 +0200 kernel32: Allocate the global arena array only once and store a pointer to it in THHOOK. --- dlls/kernel32/global16.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/global16.c b/dlls/kernel32/global16.c index 6d70767..42d4816 100644 --- a/dlls/kernel32/global16.c +++ b/dlls/kernel32/global16.c @@ -71,6 +71,7 @@ static GLOBALARENA *pGlobalArena; static int globalArenaSize; #define GLOBAL_MAX_ALLOC_SIZE 0x00ff0000 /* Largest allocation is 16M - 64K */ +#define GLOBAL_MAX_COUNT 8192 /* Max number of allocated blocks */ #define VALID_HANDLE(handle) (((handle)>>__AHSHIFT)<globalArenaSize) #define GET_ARENA_PTR(handle) (pGlobalArena + ((handle) >> __AHSHIFT)) @@ -113,15 +114,16 @@ static GLOBALARENA *GLOBAL_GetArena( WORD sel, WORD selcount ) if (((sel >> __AHSHIFT) + selcount) > globalArenaSize) { int newsize = ((sel >> __AHSHIFT) + selcount + 0xff) & ~0xff; - GLOBALARENA *pNewArena; - if (pGlobalArena) - pNewArena = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - pGlobalArena, newsize * sizeof(GLOBALARENA) ); - else - pNewArena = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, newsize * sizeof(GLOBALARENA) ); - if (!pNewArena) return 0; - pGlobalArena = pNewArena; + if (!pGlobalArena) + { + pGlobalArena = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + GLOBAL_MAX_COUNT * sizeof(GLOBALARENA) ); + if (!pGlobalArena) return 0; + /* Hack: store a pointer to it in THHOOK instead of a handle */ + *(GLOBALARENA **)&pThhook->hGlobalHeap = pGlobalArena; + } + if (newsize > GLOBAL_MAX_COUNT) return 0; globalArenaSize = newsize; } return pGlobalArena + (sel >> __AHSHIFT);

1 0

Alexandre Julliard : kernel32: Moved MemManInfo16 to toolhelp16.c.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 9bf4de22f466fd2c672365de2b42b371145af252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf4de22f466fd2c672365de2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:57:28 2009 +0200 kernel32: Moved MemManInfo16 to toolhelp16.c. --- dlls/kernel32/global16.c | 32 +++----------------------------- dlls/kernel32/toolhelp16.c | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/global16.c b/dlls/kernel32/global16.c index 42d4816..e572c3d 100644 --- a/dlls/kernel32/global16.c +++ b/dlls/kernel32/global16.c @@ -1063,39 +1063,13 @@ BOOL16 WINAPI GlobalEntryModule16( GLOBALENTRY *pGlobal, HMODULE16 hModule, /*********************************************************************** - * MemManInfo (TOOLHELP.72) - */ -BOOL16 WINAPI MemManInfo16( MEMMANINFO *info ) -{ - MEMORYSTATUS status; - - /* - * Not unsurprisingly although the documentation says you - * _must_ provide the size in the dwSize field, this function - * (under Windows) always fills the structure and returns true. - */ - GlobalMemoryStatus( &status ); - info->wPageSize = getpagesize(); - info->dwLargestFreeBlock = status.dwAvailVirtual; - info->dwMaxPagesAvailable = info->dwLargestFreeBlock / info->wPageSize; - info->dwMaxPagesLockable = info->dwMaxPagesAvailable; - info->dwTotalLinearSpace = status.dwTotalVirtual / info->wPageSize; - info->dwTotalUnlockedPages = info->dwTotalLinearSpace; - info->dwFreePages = info->dwMaxPagesAvailable; - info->dwTotalPages = info->dwTotalLinearSpace; - info->dwFreeLinearSpace = info->dwMaxPagesAvailable; - info->dwSwapFilePages = status.dwTotalPageFile / info->wPageSize; - return TRUE; -} - -/*********************************************************************** * GetFreeMemInfo (KERNEL.316) */ DWORD WINAPI GetFreeMemInfo16(void) { - MEMMANINFO info; - MemManInfo16( &info ); - return MAKELONG( info.dwTotalLinearSpace, info.dwMaxPagesAvailable ); + MEMORYSTATUS status; + GlobalMemoryStatus( &status ); + return MAKELONG( status.dwTotalVirtual/getpagesize(), status.dwAvailVirtual/getpagesize() ); } /*********************************************************************** diff --git a/dlls/kernel32/toolhelp16.c b/dlls/kernel32/toolhelp16.c index c6931d2..a98971a 100644 --- a/dlls/kernel32/toolhelp16.c +++ b/dlls/kernel32/toolhelp16.c @@ -64,6 +64,31 @@ BOOL16 WINAPI TaskFindHandle16( TASKENTRY *lpte, HTASK16 hTask ) return TaskNext16( lpte ); } +/*********************************************************************** + * MemManInfo (TOOLHELP.72) + */ +BOOL16 WINAPI MemManInfo16( MEMMANINFO *info ) +{ + MEMORYSTATUS status; + + /* + * Not unsurprisingly although the documentation says you + * _must_ provide the size in the dwSize field, this function + * (under Windows) always fills the structure and returns true. + */ + GlobalMemoryStatus( &status ); + info->wPageSize = getpagesize(); + info->dwLargestFreeBlock = status.dwAvailVirtual; + info->dwMaxPagesAvailable = info->dwLargestFreeBlock / info->wPageSize; + info->dwMaxPagesLockable = info->dwMaxPagesAvailable; + info->dwTotalLinearSpace = status.dwTotalVirtual / info->wPageSize; + info->dwTotalUnlockedPages = info->dwTotalLinearSpace; + info->dwFreePages = info->dwMaxPagesAvailable; + info->dwTotalPages = info->dwTotalLinearSpace; + info->dwFreeLinearSpace = info->dwMaxPagesAvailable; + info->dwSwapFilePages = status.dwTotalPageFile / info->wPageSize; + return TRUE; +} /*********************************************************************** * NotifyRegister (TOOLHELP.73)

1 0