May 2007 - Wine-Commits - list.winehq.org

Andrew Talbot : quartz: Exclude unused headers.
by Alexandre Julliard May 17, 2007

May 17, 2007

Module: wine Branch: master Commit: a894ab6bd019107e87cff587fcfe726d5cb87f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a894ab6bd019107e87cff587f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed May 16 19:02:39 2007 +0100 quartz: Exclude unused headers. --- dlls/quartz/parser.c | 5 ----- dlls/quartz/systemclock.c | 1 - dlls/quartz/transform.c | 6 ------ dlls/quartz/videorenderer.c | 2 -- dlls/quartz/waveparser.c | 1 - 5 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 8e85456..9bbda09 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -23,14 +23,9 @@ #include "control_private.h" #include "pin.h" -#include "uuids.h" -#include "aviriff.h" -#include "mmreg.h" #include "vfwmsgs.h" #include "amvideo.h" -#include "fourcc.h" - #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index d78611f..ff1a28a 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -22,7 +22,6 @@ #include "wine/debug.h" #include "wine/unicode.h" -#include "uuids.h" #include <assert.h> WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 13bd308..9adaf17 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -24,17 +24,11 @@ #include "control_private.h" #include "pin.h" -#include "uuids.h" -#include "aviriff.h" -#include "mmreg.h" -#include "vfwmsgs.h" #include "amvideo.h" #include "windef.h" #include "winbase.h" #include "dshow.h" #include "strmif.h" -#include "vfwmsgs.h" -#include "evcode.h" #include "vfw.h" #include <assert.h> diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index a7df440..b42338c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -27,10 +27,8 @@ #include "pin.h" #include "uuids.h" -#include "mmreg.h" #include "vfwmsgs.h" #include "amvideo.h" -#include "fourcc.h" #include "windef.h" #include "winbase.h" #include "dshow.h" diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 3997782..cbb387e 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -24,7 +24,6 @@ #include "uuids.h" #include "aviriff.h" -#include "mmreg.h" #include "vfwmsgs.h" #include "mmsystem.h"

1 0

Peter Oberndorfer : dbghelp: Minor cleanup.
by Alexandre Julliard May 17, 2007

May 17, 2007

Module: wine Branch: master Commit: b19fa1d2827b834f8202e8816143c471e7592951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b19fa1d2827b834f8202e8816… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Wed May 16 18:19:42 2007 +0200 dbghelp: Minor cleanup. --- dlls/dbghelp/elf_module.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index b844e59..30b7a3c 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -961,7 +961,7 @@ static BOOL elf_debuglink_parse(struct elf_file_map* fmap, struct module* module * 2/ padding on 4 byte boundary * 3/ CRC of the linked ELF file */ - const char* dbg_link = (char*)debuglink; + const char* dbg_link = (const char*)debuglink; DWORD crc; crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); @@ -1090,7 +1090,7 @@ static BOOL elf_load_debug_info_from_map(struct module* module, dw2_debug_loclist, elf_get_map_size(&debug_loclist_sect)); if (!lret) - WARN("Couldn't correctly read stabs\n"); + WARN("Couldn't correctly read dwarf2\n"); ret = ret || lret; } elf_unmap_section(&debug_sect);

1 0

Huw Davies : oleaut32: Type references are global to the typelib.
by Alexandre Julliard May 17, 2007

May 17, 2007

Module: wine Branch: master Commit: 9afcaf2ae11061416aeb24cdb6f03c8f25d92bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9afcaf2ae11061416aeb24cdb… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 10 13:56:16 2007 +0100 oleaut32: Type references are global to the typelib. --- dlls/oleaut32/tests/typelib.c | 2 - dlls/oleaut32/typelib.c | 197 +++++++++++++++++++++------------------- 2 files changed, 103 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9afcaf2ae11061416aeb2…

1 0

Alexandre Julliard : ntoskrnl.exe: Implemented PsGetVersion and added stubs for a couple of other Ps functions .
by Alexandre Julliard May 17, 2007

May 17, 2007

Module: wine Branch: master Commit: e0d5dbaeb86a39ef6d54f00935bbe4ddbe32eaad URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d5dbaeb86a39ef6d54f0093… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 17 09:49:28 2007 +0200 ntoskrnl.exe: Implemented PsGetVersion and added stubs for a couple of other Ps functions. --- dlls/ntoskrnl.exe/ntoskrnl.c | 54 +++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 8 ++-- 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index b14fca5..3380434 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -51,6 +51,7 @@ typedef struct _KSERVICE_TABLE_DESCRIPTOR KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4]; +typedef void (WINAPI *PCREATE_PROCESS_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); #ifdef __i386__ #define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ @@ -416,6 +417,59 @@ void WINAPI MmFreeNonCachedMemory( void *addr, SIZE_T size ) } +/*********************************************************************** + * PsGetCurrentProcessId (NTOSKRNL.EXE.@) + */ +HANDLE WINAPI PsGetCurrentProcessId(void) +{ + return (HANDLE)GetCurrentProcessId(); /* FIXME: not quite right... */ +} + + +/*********************************************************************** + * PsGetCurrentThreadId (NTOSKRNL.EXE.@) + */ +HANDLE WINAPI PsGetCurrentThreadId(void) +{ + return (HANDLE)GetCurrentThreadId(); /* FIXME: not quite right... */ +} + + +/*********************************************************************** + * PsGetVersion (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI PsGetVersion(ULONG *major, ULONG *minor, ULONG *build, UNICODE_STRING *version ) +{ + RTL_OSVERSIONINFOEXW info; + + RtlGetVersion( &info ); + if (major) *major = info.dwMajorVersion; + if (minor) *minor = info.dwMinorVersion; + if (build) *build = info.dwBuildNumber; + + if (version) + { +#if 0 /* FIXME: GameGuard passes an uninitialized pointer in version->Buffer */ + size_t len = min( strlenW(info.szCSDVersion)*sizeof(WCHAR), version->MaximumLength ); + memcpy( version->Buffer, info.szCSDVersion, len ); + if (len < version->MaximumLength) version->Buffer[len / sizeof(WCHAR)] = 0; + version->Length = len; +#endif + } + return TRUE; +} + + +/*********************************************************************** + * PsSetCreateProcessNotifyRoutine (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine( PCREATE_PROCESS_NOTIFY_ROUTINE callback, BOOLEAN remove ) +{ + FIXME( "stub: %p %d\n", callback, remove ); + return STATUS_SUCCESS; +} + + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 9aaa01e..2a89b33 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -850,10 +850,10 @@ @ stub PsEstablishWin32Callouts @ stub PsGetContextThread @ stub PsGetCurrentProcess -@ stub PsGetCurrentProcessId +@ stdcall PsGetCurrentProcessId() @ stub PsGetCurrentProcessSessionId @ stub PsGetCurrentThread -@ stub PsGetCurrentThreadId +@ stdcall PsGetCurrentThreadId() @ stub PsGetCurrentThreadPreviousMode @ stub PsGetCurrentThreadStackBase @ stub PsGetCurrentThreadStackLimit @@ -884,7 +884,7 @@ @ stub PsGetThreadSessionId @ stub PsGetThreadTeb @ stub PsGetThreadWin32Thread -@ stub PsGetVersion +@ stdcall PsGetVersion(ptr ptr ptr ptr) @ stub PsImpersonateClient @ stub PsInitialSystemProcess @ stub PsIsProcessBeingDebugged @@ -907,7 +907,7 @@ @ stub PsRevertThreadToSelf @ stub PsRevertToSelf @ stub PsSetContextThread -@ stub PsSetCreateProcessNotifyRoutine +@ stdcall PsSetCreateProcessNotifyRoutine(ptr long) @ stub PsSetCreateThreadNotifyRoutine @ stub PsSetJobUIRestrictionsClass @ stub PsSetLegoNotifyRoutine

1 0

Alexandre Julliard : ntoskrnl.exe: Export a Wine-internal function to run the device request handling loop.
by Alexandre Julliard May 17, 2007

May 17, 2007

Module: wine Branch: master Commit: 4cbe5b78d3f2406776e512b7688853c60ccf907c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cbe5b78d3f2406776e512b76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 16 21:13:34 2007 +0200 ntoskrnl.exe: Export a Wine-internal function to run the device request handling loop. --- dlls/ntoskrnl.exe/ntoskrnl.c | 124 +++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 8 ++ 2 files changed, 132 insertions(+), 0 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 46cf820..b14fca5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -36,6 +36,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); +WINE_DECLARE_DEBUG_CHANNEL(relay); KSYSTEM_TIME KeTickCount; @@ -101,6 +102,129 @@ static HANDLE get_device_manager(void) return ret; } +/* process an ioctl request for a given device */ +static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, ULONG in_size, + void *out_buff, ULONG *out_size ) +{ + IRP irp; + MDL mdl; + IO_STACK_LOCATION irpsp; + PDRIVER_DISPATCH dispatch = device->DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL]; + NTSTATUS status; + + TRACE( "ioctl %x device %p in_size %u out_size %u\n", code, device, in_size, *out_size ); + + /* so we can spot things that we should initialize */ + memset( &irp, 0x55, sizeof(irp) ); + memset( &irpsp, 0x66, sizeof(irpsp) ); + memset( &mdl, 0x77, sizeof(mdl) ); + + irp.RequestorMode = UserMode; + irp.AssociatedIrp.SystemBuffer = in_buff; + irp.UserBuffer = out_buff; + irp.MdlAddress = &mdl; + irp.Tail.Overlay.s.u.CurrentStackLocation = &irpsp; + + irpsp.MajorFunction = IRP_MJ_DEVICE_CONTROL; + irpsp.Parameters.DeviceIoControl.OutputBufferLength = *out_size; + irpsp.Parameters.DeviceIoControl.InputBufferLength = in_size; + irpsp.Parameters.DeviceIoControl.IoControlCode = code; + irpsp.Parameters.DeviceIoControl.Type3InputBuffer = in_buff; + irpsp.DeviceObject = device; + + mdl.Next = NULL; + mdl.Size = 0; + mdl.StartVa = out_buff; + mdl.ByteCount = *out_size; + mdl.ByteOffset = 0; + + device->CurrentIrp = &irp; + + if (TRACE_ON(relay)) + DPRINTF( "%04x:Call driver dispatch %p (device=%p,irp=%p)\n", + GetCurrentThreadId(), dispatch, device, &irp ); + + status = dispatch( device, &irp ); + + if (TRACE_ON(relay)) + DPRINTF( "%04x:Ret driver dispatch %p (device=%p,irp=%p) retval=%08x\n", + GetCurrentThreadId(), dispatch, device, &irp, status ); + + *out_size = irp.IoStatus.u.Status ? 0 : irp.IoStatus.Information; + return irp.IoStatus.u.Status; +} + + +/*********************************************************************** + * wine_ntoskrnl_main_loop (Not a Windows API) + */ +NTSTATUS wine_ntoskrnl_main_loop( HANDLE stop_event ) +{ + HANDLE manager = get_device_manager(); + HANDLE ioctl = 0; + NTSTATUS status = STATUS_SUCCESS; + ULONG code = 0; + void *in_buff, *out_buff = NULL; + DEVICE_OBJECT *device = NULL; + ULONG in_size = 4096, out_size = 0; + HANDLE handles[2]; + + if (!(in_buff = HeapAlloc( GetProcessHeap(), 0, in_size ))) + { + ERR( "failed to allocate buffer\n" ); + return STATUS_NO_MEMORY; + } + + handles[0] = stop_event; + handles[1] = manager; + + for (;;) + { + SERVER_START_REQ( get_next_device_request ) + { + req->manager = manager; + req->prev = ioctl; + req->status = status; + wine_server_add_data( req, out_buff, out_size ); + wine_server_set_reply( req, in_buff, in_size ); + if (!(status = wine_server_call( req ))) + { + code = reply->code; + ioctl = reply->next; + device = reply->user_ptr; + in_size = reply->in_size; + out_size = reply->out_size; + } + else + { + ioctl = 0; /* no previous ioctl */ + out_size = 0; + in_size = reply->in_size; + } + } + SERVER_END_REQ; + + switch(status) + { + case STATUS_SUCCESS: + HeapFree( GetProcessHeap(), 0, out_buff ); + if (out_size) out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ); + else out_buff = NULL; + status = process_ioctl( device, code, in_buff, in_size, out_buff, &out_size ); + break; + case STATUS_BUFFER_OVERFLOW: + HeapFree( GetProcessHeap(), 0, in_buff ); + in_buff = HeapAlloc( GetProcessHeap(), 0, in_size ); + /* restart with larger buffer */ + break; + case STATUS_PENDING: + if (WaitForMultipleObjects( 2, handles, FALSE, INFINITE ) == WAIT_OBJECT_0) + return STATUS_SUCCESS; + break; + } + } +} + /*********************************************************************** * IoCreateDevice (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 963a2db..9aaa01e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1481,3 +1481,11 @@ @ cdecl -private wcsstr(wstr wstr) msvcrt.wcsstr @ cdecl -private wcstombs(ptr ptr long) msvcrt.wcstombs @ cdecl -private wctomb(ptr long) msvcrt.wctomb + +################################################################ +# Wine internal extensions +# +# All functions must be prefixed with '__wine_' (for internal functions) +# or 'wine_' (for user-visible functions) to avoid namespace conflicts. + +@ cdecl wine_ntoskrnl_main_loop(long)

1 0

Alexandre Julliard : ntoskrnl.exe: Implemented a number of memory allocation functions.
by Alexandre Julliard May 17, 2007

May 17, 2007

Module: wine Branch: master Commit: 982d6ccbe4fd31ac20f91ab28c916f57a79b73f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=982d6ccbe4fd31ac20f91ab28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 16 17:39:32 2007 +0200 ntoskrnl.exe: Implemented a number of memory allocation functions. --- dlls/ntoskrnl.exe/ntoskrnl.c | 78 +++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 16 ++++---- include/ddk/wdm.h | 4 ++ 3 files changed, 90 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 8884622..46cf820 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -214,6 +214,84 @@ void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) } +/*********************************************************************** + * ExAllocatePool (NTOSKRNL.EXE.@) + */ +PVOID WINAPI ExAllocatePool( POOL_TYPE type, SIZE_T size ) +{ + return ExAllocatePoolWithTag( type, size, 0 ); +} + + +/*********************************************************************** + * ExAllocatePoolWithQuota (NTOSKRNL.EXE.@) + */ +PVOID WINAPI ExAllocatePoolWithQuota( POOL_TYPE type, SIZE_T size ) +{ + return ExAllocatePoolWithTag( type, size, 0 ); +} + + +/*********************************************************************** + * ExAllocatePoolWithTag (NTOSKRNL.EXE.@) + */ +PVOID WINAPI ExAllocatePoolWithTag( POOL_TYPE type, SIZE_T size, ULONG tag ) +{ + /* FIXME: handle page alignment constraints */ + void *ret = HeapAlloc( GetProcessHeap(), 0, size ); + TRACE( "%lu pool %u -> %p\n", size, type, ret ); + return ret; +} + + +/*********************************************************************** + * ExAllocatePoolWithQuotaTag (NTOSKRNL.EXE.@) + */ +PVOID WINAPI ExAllocatePoolWithQuotaTag( POOL_TYPE type, SIZE_T size, ULONG tag ) +{ + return ExAllocatePoolWithTag( type, size, tag ); +} + + +/*********************************************************************** + * ExFreePool (NTOSKRNL.EXE.@) + */ +void WINAPI ExFreePool( void *ptr ) +{ + ExFreePoolWithTag( ptr, 0 ); +} + + +/*********************************************************************** + * ExFreePoolWithTag (NTOSKRNL.EXE.@) + */ +void WINAPI ExFreePoolWithTag( void *ptr, ULONG tag ) +{ + TRACE( "%p\n", ptr ); + HeapFree( GetProcessHeap(), 0, ptr ); +} + + +/*********************************************************************** + * MmAllocateNonCachedMemory (NTOSKRNL.EXE.@) + */ +LPVOID WINAPI MmAllocateNonCachedMemory( SIZE_T size ) +{ + TRACE( "%lu\n", size ); + return VirtualAlloc( NULL, size, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE|PAGE_NOCACHE ); +} + + +/*********************************************************************** + * MmFreeNonCachedMemory (NTOSKRNL.EXE.@) + */ +void WINAPI MmFreeNonCachedMemory( void *addr, SIZE_T size ) +{ + TRACE( "%p %lu\n", addr, size ); + VirtualFree( addr, 0, MEM_RELEASE ); +} + + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 5bfd792..963a2db 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -116,10 +116,10 @@ @ stub ExAcquireSharedStarveExclusive @ stub ExAcquireSharedWaitForExclusive @ stub ExAllocateFromPagedLookasideList -@ stub ExAllocatePool -@ stub ExAllocatePoolWithQuota -@ stub ExAllocatePoolWithQuotaTag -@ stub ExAllocatePoolWithTag +@ stdcall ExAllocatePool(long long) +@ stdcall ExAllocatePoolWithQuota(long long) +@ stdcall ExAllocatePoolWithQuotaTag(long long long) +@ stdcall ExAllocatePoolWithTag(long long long) @ stub ExAllocatePoolWithTagPriority @ stub ExConvertExclusiveToSharedLite @ stub ExCreateCallback @@ -131,8 +131,8 @@ @ stub ExEnumHandleTable @ stub ExEventObjectType @ stub ExExtendZone -@ stub ExFreePool -@ stub ExFreePoolWithTag +@ stdcall ExFreePool(ptr) +@ stdcall ExFreePoolWithTag(ptr long) @ stub ExFreeToPagedLookasideList @ stub ExGetCurrentProcessorCounts @ stub ExGetCurrentProcessorCpuUsage @@ -658,7 +658,7 @@ @ stub MmAllocateContiguousMemory @ stub MmAllocateContiguousMemorySpecifyCache @ stub MmAllocateMappingAddress -@ stub MmAllocateNonCachedMemory +@ stdcall MmAllocateNonCachedMemory(long) @ stub MmAllocatePagesForMdl @ stub MmBuildMdlForNonPagedPool @ stub MmCanFileBeTruncated @@ -671,7 +671,7 @@ @ stub MmFreeContiguousMemory @ stub MmFreeContiguousMemorySpecifyCache @ stub MmFreeMappingAddress -@ stub MmFreeNonCachedMemory +@ stdcall MmFreeNonCachedMemory(ptr long) @ stub MmFreePagesFromMdl @ stub MmGetPhysicalAddress @ stub MmGetPhysicalMemoryRanges diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 7d53a97..f9db943 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -865,6 +865,7 @@ PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG); PVOID WINAPI ExAllocatePoolWithQuotaTag(POOL_TYPE,SIZE_T,ULONG); void WINAPI ExFreePool(PVOID); +void WINAPI ExFreePoolWithTag(PVOID,ULONG); NTSTATUS WINAPI IoCreateDevice(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,DEVICE_OBJECT**); NTSTATUS WINAPI IoCreateSymbolicLink(UNICODE_STRING*,UNICODE_STRING*); @@ -874,6 +875,9 @@ PEPROCESS WINAPI IoGetCurrentProcess(void); PKTHREAD WINAPI KeGetCurrentThread(void); +LPVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); +void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); + #define PsGetCurrentProcess() IoGetCurrentProcess() #define PsGetCurrentThread() ((PETHREAD)KeGetCurrentThread()) HANDLE WINAPI PsGetCurrentProcessId(void);

1 0

Alexandre Julliard : kernel32: Support incrementing the module refcount in GetModuleHandleEx.
by Alexandre Julliard May 17, 2007

May 17, 2007

Module: wine Branch: master Commit: 306d71c3fe62398504e06da6474a20fd88e855a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=306d71c3fe62398504e06da64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 16 16:47:11 2007 +0200 kernel32: Support incrementing the module refcount in GetModuleHandleEx. --- dlls/kernel32/module.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index daf2714..1c61e7e 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -501,6 +501,12 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) { NTSTATUS status = STATUS_SUCCESS; HMODULE ret; + ULONG magic; + + /* if we are messing with the refcount, grab the loader lock */ + if ((flags & GET_MODULE_HANDLE_EX_FLAG_PIN) || + !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + LdrLockLoaderLock( 0, NULL, &magic ); if (!name) { @@ -515,21 +521,24 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) { UNICODE_STRING wstr; RtlInitUnicodeString( &wstr, name ); - status = LdrGetDllHandle( 0, 0, &wstr, &ret ); + status = LdrGetDllHandle( NULL, 0, &wstr, &ret ); } - if (status != STATUS_SUCCESS) + if (status == STATUS_SUCCESS) { - SetLastError( RtlNtStatusToDosError( status ) ); - return FALSE; + if (flags & GET_MODULE_HANDLE_EX_FLAG_PIN) + FIXME( "should pin refcount for %p\n", ret ); + else if (!(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + LdrAddRefDll( 0, ret ); } + else SetLastError( RtlNtStatusToDosError( status ) ); if ((flags & GET_MODULE_HANDLE_EX_FLAG_PIN) || !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) - FIXME( "should update refcount, flags %x\n", flags ); + LdrUnlockLoaderLock( 0, magic ); if (module) *module = ret; - return TRUE; + return (status == STATUS_SUCCESS); } /***********************************************************************

1 0

Alexandre Julliard : kernel32: Check for already loaded module also for LOAD_LIBRARY_AS_DATAFILE.
by Alexandre Julliard May 17, 2007

May 17, 2007

Module: wine Branch: master Commit: 8530cb0aecaef8f6e925c39a6c2c111f908c5509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8530cb0aecaef8f6e925c39a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 16 16:58:51 2007 +0200 kernel32: Check for already loaded module also for LOAD_LIBRARY_AS_DATAFILE. --- dlls/kernel32/module.c | 19 ++++++++++++++++--- dlls/kernel32/tests/loader.c | 4 ++-- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 1c61e7e..996abf3 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -844,24 +844,37 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) HMODULE hModule; WCHAR *load_path; + load_path = MODULE_get_dll_load_path( flags & LOAD_WITH_ALTERED_SEARCH_PATH ? libname->Buffer : NULL ); + if (flags & LOAD_LIBRARY_AS_DATAFILE) { + ULONG magic; + + LdrLockLoaderLock( 0, NULL, &magic ); + if (!(nts = LdrGetDllHandle( load_path, flags, libname, &hModule ))) + { + LdrAddRefDll( 0, hModule ); + LdrUnlockLoaderLock( 0, magic ); + goto done; + } + LdrUnlockLoaderLock( 0, magic ); + /* The method in load_library_as_datafile allows searching for the * 'native' libraries only */ - if (load_library_as_datafile( libname->Buffer, &hModule )) return hModule; + if (load_library_as_datafile( libname->Buffer, &hModule )) goto done; flags |= DONT_RESOLVE_DLL_REFERENCES; /* Just in case */ /* Fallback to normal behaviour */ } - load_path = MODULE_get_dll_load_path( flags & LOAD_WITH_ALTERED_SEARCH_PATH ? libname->Buffer : NULL ); nts = LdrLoadDll( load_path, flags, libname, &hModule ); - HeapFree( GetProcessHeap(), 0, load_path ); if (nts != STATUS_SUCCESS) { hModule = 0; SetLastError( RtlNtStatusToDosError( nts ) ); } +done: + HeapFree( GetProcessHeap(), 0, load_path ); return hModule; } diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index b67b81d..7b297a2 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -424,14 +424,14 @@ START_TEST(loader) SetLastError(0xdeadbeef); hlib_as_data_file = LoadLibraryEx(dll_name, 0, LOAD_LIBRARY_AS_DATAFILE); ok(hlib_as_data_file != 0, "LoadLibraryEx error %u\n", GetLastError()); -todo_wine ok(hlib_as_data_file == hlib, "hlib_as_file and hlib are different\n"); + ok(hlib_as_data_file == hlib, "hlib_as_file and hlib are different\n"); SetLastError(0xdeadbeef); ok(FreeLibrary(hlib), "FreeLibrary error %d\n", GetLastError()); SetLastError(0xdeadbeef); hlib = GetModuleHandle(dll_name); -todo_wine ok(hlib != 0, "GetModuleHandle error %u\n", GetLastError()); + ok(hlib != 0, "GetModuleHandle error %u\n", GetLastError()); SetLastError(0xdeadbeef); ok(FreeLibrary(hlib_as_data_file), "FreeLibrary error %d\n", GetLastError());

1 0

Alexandre Julliard : ntdll: Implemented LdrAddRefDll.
by Alexandre Julliard May 17, 2007

May 17, 2007

Module: wine Branch: master Commit: 447fda5206cf8df0648f4d694e0d9851b206e6ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=447fda5206cf8df0648f4d694… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 16 16:39:29 2007 +0200 ntdll: Implemented LdrAddRefDll. --- dlls/ntdll/loader.c | 24 ++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 7fee9bc..8d72936 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1821,6 +1821,30 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S /****************************************************************** + * LdrAddRefDll (NTDLL.@) + */ +NTSTATUS WINAPI LdrAddRefDll( ULONG flags, HMODULE module ) +{ + NTSTATUS ret = STATUS_SUCCESS; + WINE_MODREF *wm; + + if (flags) FIXME( "%p flags %x not implemented\n", module, flags ); + + RtlEnterCriticalSection( &loader_section ); + + if ((wm = get_modref( module ))) + { + if (wm->ldr.LoadCount != -1) wm->ldr.LoadCount++; + TRACE( "(%s) ldr.LoadCount: %d\n", debugstr_w(wm->ldr.BaseDllName.Buffer), wm->ldr.LoadCount ); + } + else ret = STATUS_INVALID_PARAMETER; + + RtlLeaveCriticalSection( &loader_section ); + return ret; +} + + +/****************************************************************** * LdrQueryProcessModuleInformation * */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index eeba2e1..3b26880 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -50,7 +50,7 @@ @ stub KiUserExceptionDispatcher # @ stub LdrAccessOutOfProcessResource @ stdcall LdrAccessResource(long ptr ptr ptr) -# @ stub LdrAddRefDll +@ stdcall LdrAddRefDll(long ptr) # @ stub LdrAlternateResourcesEnabled # @ stub LdrCreateOutOfProcessImage # @ stub LdrDestroyOutOfProcessImage diff --git a/include/winternl.h b/include/winternl.h index b75519e..8b650a9 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1731,6 +1731,7 @@ NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...); NTSTATUS WINAPIV DbgPrintEx(ULONG iComponentId, ULONG Level, LPCSTR fmt, ...); NTSTATUS WINAPI LdrAccessResource(HMODULE,const IMAGE_RESOURCE_DATA_ENTRY*,void**,PULONG); +NTSTATUS WINAPI LdrAddRefDll(ULONG,HMODULE); NTSTATUS WINAPI LdrFindResourceDirectory_U(HMODULE,const LDR_RESOURCE_INFO*,ULONG,const IMAGE_RESOURCE_DIRECTORY**); NTSTATUS WINAPI LdrFindResource_U(HMODULE,const LDR_RESOURCE_INFO*,ULONG,const IMAGE_RESOURCE_DATA_ENTRY**); NTSTATUS WINAPI LdrGetDllHandle(LPCWSTR, ULONG, const UNICODE_STRING*, HMODULE*);

1 0

Alexandre Julliard : ntdll: Reimplement LdrGetDllHandle to use the same search algorithm as LdrLoadDll .
by Alexandre Julliard May 17, 2007

May 17, 2007

Module: wine Branch: master Commit: b64530eee41d66ffd9021ed166b1efeffc43bc66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b64530eee41d66ffd9021ed16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 16 16:35:43 2007 +0200 ntdll: Reimplement LdrGetDllHandle to use the same search algorithm as LdrLoadDll. --- dlls/ntdll/loader.c | 101 ++++++++++++++++++++----------------------------- dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 2 +- 3 files changed, 43 insertions(+), 62 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a7d7f0f..7fee9bc 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1136,64 +1136,6 @@ NTSTATUS WINAPI LdrUnlockLoaderLock( ULONG flags, ULONG magic ) /****************************************************************** - * LdrGetDllHandle (NTDLL.@) - */ -NTSTATUS WINAPI LdrGetDllHandle(ULONG x, ULONG y, const UNICODE_STRING *name, HMODULE *base) -{ - NTSTATUS status = STATUS_DLL_NOT_FOUND; - WCHAR dllname[MAX_PATH+4], *p; - UNICODE_STRING str; - PLIST_ENTRY mark, entry; - PLDR_MODULE mod; - - if (x != 0 || y != 0) - FIXME("Unknown behavior, please report\n"); - - /* Append .DLL to name if no extension present */ - if (!(p = strrchrW( name->Buffer, '.')) || strchrW( p, '/' ) || strchrW( p, '\\')) - { - if (name->Length >= MAX_PATH) return STATUS_NAME_TOO_LONG; - strcpyW( dllname, name->Buffer ); - strcatW( dllname, dllW ); - RtlInitUnicodeString( &str, dllname ); - name = &str; - } - - RtlEnterCriticalSection( &loader_section ); - - if (cached_modref) - { - if (RtlEqualUnicodeString( name, &cached_modref->ldr.FullDllName, TRUE ) || - RtlEqualUnicodeString( name, &cached_modref->ldr.BaseDllName, TRUE )) - { - *base = cached_modref->ldr.BaseAddress; - status = STATUS_SUCCESS; - goto done; - } - } - - mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; - for (entry = mark->Flink; entry != mark; entry = entry->Flink) - { - mod = CONTAINING_RECORD(entry, LDR_MODULE, InLoadOrderModuleList); - - if (RtlEqualUnicodeString( name, &mod->FullDllName, TRUE ) || - RtlEqualUnicodeString( name, &mod->BaseDllName, TRUE )) - { - cached_modref = CONTAINING_RECORD(mod, WINE_MODREF, ldr); - *base = mod->BaseAddress; - status = STATUS_SUCCESS; - break; - } - } -done: - RtlLeaveCriticalSection( &loader_section ); - TRACE("%x %x %s -> %p\n", x, y, debugstr_us(name), status ? NULL : *base); - return status; -} - - -/****************************************************************** * LdrGetProcedureAddress (NTDLL.@) */ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name, @@ -1642,7 +1584,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, if (len) { if (len >= *size) goto overflow; - if ((*pwm = find_fullname_module( filename )) != NULL) goto found; + if ((*pwm = find_fullname_module( filename )) || !handle) goto found; if (!RtlDosPathNameToNtPathName_U( filename, &nt_name, NULL, NULL )) { @@ -1682,7 +1624,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, len = nt_name.Length - 4*sizeof(WCHAR); /* for \??\ prefix */ if (len >= *size) goto overflow; memcpy( filename, nt_name.Buffer + 4, len + sizeof(WCHAR) ); - if (!(*pwm = find_fullname_module( filename ))) + if (!(*pwm = find_fullname_module( filename )) && handle) { attr.Length = sizeof(attr); attr.RootDirectory = 0; @@ -1839,6 +1781,45 @@ NTSTATUS WINAPI LdrLoadDll(LPCWSTR path_name, DWORD flags, return nts; } + +/****************************************************************** + * LdrGetDllHandle (NTDLL.@) + */ +NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_STRING *name, HMODULE *base ) +{ + NTSTATUS status; + WCHAR buffer[128]; + WCHAR *filename; + ULONG size; + WINE_MODREF *wm; + + RtlEnterCriticalSection( &loader_section ); + + if (!load_path) load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; + + filename = buffer; + size = sizeof(buffer); + for (;;) + { + status = find_dll_file( load_path, name->Buffer, filename, &size, &wm, NULL ); + if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); + if (status != STATUS_BUFFER_TOO_SMALL) break; + /* grow the buffer and retry */ + if (!(filename = RtlAllocateHeap( GetProcessHeap(), 0, size ))) return STATUS_NO_MEMORY; + } + + if (status == STATUS_SUCCESS) + { + if (wm) *base = wm->ldr.BaseAddress; + else status = STATUS_DLL_NOT_FOUND; + } + + RtlLeaveCriticalSection( &loader_section ); + TRACE( "%s -> %p (load path %s)\n", debugstr_us(name), status ? NULL : *base, debugstr_w(load_path) ); + return status; +} + + /****************************************************************** * LdrQueryProcessModuleInformation * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 346f002..eeba2e1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -63,7 +63,7 @@ # @ stub LdrFindResourceEx_U @ stdcall LdrFindResource_U(long ptr long ptr) @ stub LdrFlushAlternateResourceModules -@ stdcall LdrGetDllHandle(long long ptr ptr) +@ stdcall LdrGetDllHandle(wstr long ptr ptr) # @ stub LdrGetDllHandleEx @ stdcall LdrGetProcedureAddress(ptr ptr long ptr) # @ stub LdrHotPatchRoutine diff --git a/include/winternl.h b/include/winternl.h index fa3696f..b75519e 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1733,7 +1733,7 @@ NTSTATUS WINAPIV DbgPrintEx(ULONG iComponentId, ULONG Level, LPCSTR fmt, ...); NTSTATUS WINAPI LdrAccessResource(HMODULE,const IMAGE_RESOURCE_DATA_ENTRY*,void**,PULONG); NTSTATUS WINAPI LdrFindResourceDirectory_U(HMODULE,const LDR_RESOURCE_INFO*,ULONG,const IMAGE_RESOURCE_DIRECTORY**); NTSTATUS WINAPI LdrFindResource_U(HMODULE,const LDR_RESOURCE_INFO*,ULONG,const IMAGE_RESOURCE_DATA_ENTRY**); -NTSTATUS WINAPI LdrGetDllHandle(ULONG, ULONG, const UNICODE_STRING*, HMODULE*); +NTSTATUS WINAPI LdrGetDllHandle(LPCWSTR, ULONG, const UNICODE_STRING*, HMODULE*); NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE, const ANSI_STRING*, ULONG, void**); void WINAPI LdrInitializeThunk(ULONG,ULONG,ULONG,ULONG); NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*);

1 0