wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Detlef Riekenberg : setupapi: Move IsUserAdmin to shell32.IsUserAnAdmin.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: ed1b527dd94d3fd26f2ad81e451c59df42d89a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed1b527dd94d3fd26f2ad81e4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jun 12 22:25:06 2009 +0200 setupapi: Move IsUserAdmin to shell32.IsUserAnAdmin. --- dlls/setupapi/misc.c | 62 +------------------------------------ dlls/shell32/shell32.spec | 2 +- dlls/shell32/shellord.c | 74 ++++++++++++++++++++++++++++++++++++++++++-- include/shlobj.h | 1 + 4 files changed, 74 insertions(+), 65 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index a9efa2a..08c0c79 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -30,6 +30,7 @@ #include "lzexpand.h" #include "softpub.h" #include "mscat.h" +#include "shlobj.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -197,67 +198,8 @@ LONG WINAPI QueryRegistryValue(HKEY hKey, */ BOOL WINAPI IsUserAdmin(VOID) { - SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY}; - HANDLE hToken; - DWORD dwSize; - PTOKEN_GROUPS lpGroups; - PSID lpSid; - DWORD i; - BOOL bResult = FALSE; - TRACE("\n"); - - if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) - { - return FALSE; - } - - if (!GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize)) - { - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) - { - CloseHandle(hToken); - return FALSE; - } - } - - lpGroups = MyMalloc(dwSize); - if (lpGroups == NULL) - { - CloseHandle(hToken); - return FALSE; - } - - if (!GetTokenInformation(hToken, TokenGroups, lpGroups, dwSize, &dwSize)) - { - MyFree(lpGroups); - CloseHandle(hToken); - return FALSE; - } - - CloseHandle(hToken); - - if (!AllocateAndInitializeSid(&Authority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, - &lpSid)) - { - MyFree(lpGroups); - return FALSE; - } - - for (i = 0; i < lpGroups->GroupCount; i++) - { - if (EqualSid(lpSid, lpGroups->Groups[i].Sid)) - { - bResult = TRUE; - break; - } - } - - FreeSid(lpSid); - MyFree(lpGroups); - - return bResult; + return IsUserAnAdmin(); } diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 9d4808f..b50890b 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -251,7 +251,7 @@ 654 stdcall @(long long) shell32_654 # ReadCabinetState@8 660 stdcall -noname FileIconInit(long) - 680 stdcall -noname IsUserAdmin() + 680 stdcall -noname IsUserAnAdmin() 704 stdcall -noname GUIDFromStringW(wstr ptr) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 5eb4507..2fef940 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1279,13 +1279,79 @@ BOOL WINAPI FileIconInit(BOOL bFullInit) { FIXME("(%s)\n", bFullInit ? "true" : "false"); return 0; } + /************************************************************************* - * IsUserAdmin [SHELL32.680] NT 4.0 + * IsUserAnAdmin [SHELL32.680] NT 4.0 + * + * Checks whether the current user is a member of the Administrators group. * + * PARAMS + * None + * + * RETURNS + * Success: TRUE + * Failure: FALSE */ -HRESULT WINAPI IsUserAdmin(void) -{ FIXME("stub\n"); - return TRUE; +BOOL WINAPI IsUserAnAdmin(VOID) +{ + SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY}; + HANDLE hToken; + DWORD dwSize; + PTOKEN_GROUPS lpGroups; + PSID lpSid; + DWORD i; + BOOL bResult = FALSE; + + TRACE("\n"); + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + { + return FALSE; + } + + if (!GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + CloseHandle(hToken); + return FALSE; + } + } + + lpGroups = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (lpGroups == NULL) + { + CloseHandle(hToken); + return FALSE; + } + + if (!GetTokenInformation(hToken, TokenGroups, lpGroups, dwSize, &dwSize)) + { + HeapFree(GetProcessHeap(), 0, lpGroups); + CloseHandle(hToken); + return FALSE; + } + + CloseHandle(hToken); + if (!AllocateAndInitializeSid(&Authority, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, + &lpSid)) + { + HeapFree(GetProcessHeap(), 0, lpGroups); + return FALSE; + } + + for (i = 0; i < lpGroups->GroupCount; i++) + { + if (EqualSid(lpSid, lpGroups->Groups[i].Sid)) + { + bResult = TRUE; + break; + } + } + + FreeSid(lpSid); + HeapFree(GetProcessHeap(), 0, lpGroups); + return bResult; } /************************************************************************* diff --git a/include/shlobj.h b/include/shlobj.h index a608a7e..01f8368 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -77,6 +77,7 @@ VOID WINAPI SHUpdateImageW(LPCWSTR,INT,UINT,INT); #define SHUpdateImage WINELIB_NAME_AW(SHUpdateImage) int WINAPI RestartDialog(HWND,LPCWSTR,DWORD); int WINAPI RestartDialogEx(HWND,LPCWSTR,DWORD,DWORD); +BOOL WINAPI IsUserAnAdmin(void); #define SHFMT_ERROR 0xFFFFFFFFL /* Error on last format, drive may be formattable */ #define SHFMT_CANCEL 0xFFFFFFFEL /* Last format was cancelled */

1 0

Anders Jonsson : ntoskrnl.exe: Stub for PsTerminateSystemThread.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: fb98499063689fa95303151d4072643c28f520af URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb98499063689fa95303151d4… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sun Jun 14 14:19:45 2009 +0200 ntoskrnl.exe: Stub for PsTerminateSystemThread. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a0e3ed7..236b3fa 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1205,6 +1205,16 @@ NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine( PCREATE_THREAD_NOTIFY_ROUTINE No /*********************************************************************** + * PsTerminateSystemThread (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS ExitStatus) +{ + FIXME( "stub: %u\n", ExitStatus ); + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * MmGetSystemRoutineAddress (NTOSKRNL.EXE.@) */ PVOID WINAPI MmGetSystemRoutineAddress(PUNICODE_STRING SystemRoutineName) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index bdf4f74..8b7de2d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -919,7 +919,7 @@ @ stub PsSetProcessWindowStation @ stub PsSetThreadHardErrorsAreDisabled @ stub PsSetThreadWin32Thread -@ stub PsTerminateSystemThread +@ stdcall PsTerminateSystemThread(long) @ stub PsThreadType @ stub READ_REGISTER_BUFFER_UCHAR @ stub READ_REGISTER_BUFFER_ULONG

1 0

Anders Jonsson : ntoskrnl.exe: Stub for ExInitializeZone.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: fc07a521485ed1df27fc33cb2f59af6f62c35e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc07a521485ed1df27fc33cb2… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sun Jun 14 14:16:49 2009 +0200 ntoskrnl.exe: Stub for ExInitializeZone. --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 8fe1975..a0e3ed7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -909,6 +909,19 @@ NTSTATUS WINAPI ExInitializeResourceLite(PERESOURCE Resource) /*********************************************************************** + * ExInitializeZone (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ExInitializeZone(PZONE_HEADER Zone, + ULONG BlockSize, + PVOID InitialSegment, + ULONG InitialSegmentSize) +{ + FIXME( "stub: %p, %u, %p, %u\n", Zone, BlockSize, InitialSegment, InitialSegmentSize ); + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * KeInitializeEvent (NTOSKRNL.EXE.@) */ void WINAPI KeInitializeEvent( PRKEVENT Event, EVENT_TYPE Type, BOOLEAN State ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d46ff8f..bdf4f74 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -142,7 +142,7 @@ @ stub ExInitializeNPagedLookasideList @ stub ExInitializePagedLookasideList @ stdcall ExInitializeResourceLite(ptr) -@ stub ExInitializeZone +@ stdcall ExInitializeZone(ptr long ptr long) @ stub ExInterlockedAddLargeInteger @ stub ExInterlockedAddUlong @ stub ExInterlockedDecrementLong diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 7a227fd..9ba76de 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -133,6 +133,7 @@ typedef struct _ERESOURCE *PERESOURCE; typedef struct _IO_WORKITEM *PIO_WORKITEM; typedef struct _OBJECT_TYPE *POBJECT_TYPE; typedef struct _OBJECT_HANDLE_INFORMATION *POBJECT_HANDLE_INFORMATION; +typedef struct _ZONE_HEADER *PZONE_HEADER; typedef struct _FAST_MUTEX {

1 0

Anders Jonsson : ntoskrnl.exe: Stub for ExInitializeResourceLite.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: afff5f9da515c4053a175f5e114282c3ed00d4cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=afff5f9da515c4053a175f5e1… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sun Jun 14 14:11:44 2009 +0200 ntoskrnl.exe: Stub for ExInitializeResourceLite. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 60f8537..8fe1975 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -899,6 +899,16 @@ void WINAPI ExFreePoolWithTag( void *ptr, ULONG tag ) /*********************************************************************** + * ExInitializeResourceLite (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ExInitializeResourceLite(PERESOURCE Resource) +{ + FIXME( "stub: %p\n", Resource ); + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * KeInitializeEvent (NTOSKRNL.EXE.@) */ void WINAPI KeInitializeEvent( PRKEVENT Event, EVENT_TYPE Type, BOOLEAN State ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 847bb2d..d46ff8f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -141,7 +141,7 @@ @ stub ExGetSharedWaiterCount @ stub ExInitializeNPagedLookasideList @ stub ExInitializePagedLookasideList -@ stub ExInitializeResourceLite +@ stdcall ExInitializeResourceLite(ptr) @ stub ExInitializeZone @ stub ExInterlockedAddLargeInteger @ stub ExInterlockedAddUlong diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index dda5ccb..7a227fd 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -129,6 +129,7 @@ typedef struct _IO_TIMER_ROUTINE *PIO_TIMER_ROUTINE; typedef struct _ETHREAD *PETHREAD; typedef struct _KTHREAD *PKTHREAD; typedef struct _EPROCESS *PEPROCESS; +typedef struct _ERESOURCE *PERESOURCE; typedef struct _IO_WORKITEM *PIO_WORKITEM; typedef struct _OBJECT_TYPE *POBJECT_TYPE; typedef struct _OBJECT_HANDLE_INFORMATION *POBJECT_HANDLE_INFORMATION;

1 0

Anders Jonsson : ntoskrnl.exe: Stub for IoStartTimer.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 34e6ad32220b6f125a462cf2b14461430b8a326d URL: http://source.winehq.org/git/wine.git/?a=commit;h=34e6ad32220b6f125a462cf2b… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sun Jun 14 14:05:54 2009 +0200 ntoskrnl.exe: Stub for IoStartTimer. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a74a839..60f8537 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -332,6 +332,15 @@ NTSTATUS WINAPI IoInitializeTimer(PDEVICE_OBJECT DeviceObject, /*********************************************************************** + * IoStartTimer (NTOSKRNL.EXE.@) + */ +void WINAPI IoStartTimer(PDEVICE_OBJECT DeviceObject) +{ + FIXME( "stub: %p\n", DeviceObject ); +} + + +/*********************************************************************** * IoAllocateIrp (NTOSKRNL.EXE.@) */ PIRP WINAPI IoAllocateIrp( CCHAR stack_size, BOOLEAN charge_quota ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a79ad16..847bb2d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -461,7 +461,7 @@ @ stub IoStartNextPacket @ stub IoStartNextPacketByKey @ stub IoStartPacket -@ stub IoStartTimer +@ stdcall IoStartTimer(ptr) @ stub IoStatisticsLock @ stub IoStopTimer @ stub IoSynchronousInvalidateDeviceRelations

1 0

Anders Jonsson : ntoskrnl.exe: Stub for IoInitializeTimer.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 15dd9e8d35e1208b02e58647b8a63a02a34295b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15dd9e8d35e1208b02e58647b… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sun Jun 14 14:01:38 2009 +0200 ntoskrnl.exe: Stub for IoInitializeTimer. --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d60a0df..a74a839 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -320,6 +320,18 @@ void WINAPI IoInitializeIrp( IRP *irp, USHORT size, CCHAR stack_size ) /*********************************************************************** + * IoInitializeTimer (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoInitializeTimer(PDEVICE_OBJECT DeviceObject, + PIO_TIMER_ROUTINE TimerRoutine, + PVOID Context) +{ + FIXME( "stub: %p, %p, %p\n", DeviceObject, TimerRoutine, Context ); + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * IoAllocateIrp (NTOSKRNL.EXE.@) */ PIRP WINAPI IoAllocateIrp( CCHAR stack_size, BOOLEAN charge_quota ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 867678c..a79ad16 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -399,7 +399,7 @@ @ stub IoGetTopLevelIrp @ stdcall IoInitializeIrp(ptr long long) @ stub IoInitializeRemoveLockEx -@ stub IoInitializeTimer +@ stdcall IoInitializeTimer(ptr ptr ptr) @ stub IoInvalidateDeviceRelations @ stub IoInvalidateDeviceState @ stub IoIsFileOriginRemote diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 3169153..dda5ccb 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -125,6 +125,7 @@ typedef enum _KWAIT_REASON } KWAIT_REASON; typedef struct _IO_TIMER *PIO_TIMER; +typedef struct _IO_TIMER_ROUTINE *PIO_TIMER_ROUTINE; typedef struct _ETHREAD *PETHREAD; typedef struct _KTHREAD *PKTHREAD; typedef struct _EPROCESS *PEPROCESS;

1 0

Anders Jonsson : ntoskrnl.exe: Stub for KeWaitForSingleObject.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 80450122fe49eee35e36a86676a138c5dbf3add2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80450122fe49eee35e36a8667… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sun Jun 14 13:49:17 2009 +0200 ntoskrnl.exe: Stub for KeWaitForSingleObject. --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 50d7b03..d60a0df 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -987,6 +987,20 @@ ULONG WINAPI KeQueryTimeIncrement(void) /*********************************************************************** + * KeWaitForSingleObject (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI KeWaitForSingleObject(PVOID Object, + KWAIT_REASON WaitReason, + KPROCESSOR_MODE WaitMode, + BOOLEAN Alertable, + PLARGE_INTEGER Timeout) +{ + FIXME( "stub: %p, %d, %d, %d, %p\n", Object, WaitReason, WaitMode, Alertable, Timeout ); + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * MmAllocateNonCachedMemory (NTOSKRNL.EXE.@) */ PVOID WINAPI MmAllocateNonCachedMemory( SIZE_T size ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 9f440ed..867678c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -629,7 +629,7 @@ @ stub KeUserModeCallback @ stub KeWaitForMultipleObjects @ stub KeWaitForMutexObject -@ stub KeWaitForSingleObject +@ stdcall KeWaitForSingleObject(ptr long long long ptr) @ stub KiBugCheckData @ stub KiCoprocessorError @ stub KiDeliverApc

1 0

Anders Jonsson : ntoskrnl.exe: Stub for KeInitializeMutex.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: b79a4740332974ad9f99137f84b71d0b7827b438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b79a4740332974ad9f99137f8… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sun Jun 14 13:25:19 2009 +0200 ntoskrnl.exe: Stub for KeInitializeMutex. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 714164e..50d7b03 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -886,6 +886,15 @@ void WINAPI KeInitializeEvent( PRKEVENT Event, EVENT_TYPE Type, BOOLEAN State ) } + /*********************************************************************** + * KeInitializeMutex (NTOSKRNL.EXE.@) + */ +void WINAPI KeInitializeMutex(PRKMUTEX Mutex, ULONG Level) +{ + FIXME( "stub: %p, %u\n", Mutex, Level ); +} + + /*********************************************************************** * KeInitializeSpinLock (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 849dd51..9f440ed 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -549,7 +549,7 @@ @ stdcall KeInitializeEvent(ptr long long) @ stub KeInitializeInterrupt @ stub KeInitializeMutant -@ stub KeInitializeMutex +@ stdcall KeInitializeMutex(ptr long) @ stub KeInitializeQueue @ stub KeInitializeSemaphore @ stdcall KeInitializeSpinLock(ptr)

1 0

Paul Vriens : gdi32/tests: Fix several test failures on Win9x/WinME/NT4.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: cf43e2cac7bf4cf2c2c397e4f16af2df06f82404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf43e2cac7bf4cf2c2c397e4f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jun 15 11:52:51 2009 +0200 gdi32/tests: Fix several test failures on Win9x/WinME/NT4. --- dlls/gdi32/tests/metafile.c | 42 +++++++++++++++++++++++++++++------------- 1 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 077977e..6f91403 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1302,15 +1302,22 @@ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits, BOOL ignore_scaling) { unsigned char buf[MF_BUFSIZE]; - UINT mfsize, offset; + UINT mfsize, offset1, offset2, diff_nt4, diff_9x; const ENHMETAHEADER *emh1, *emh2; mfsize = GetEnhMetaFileBits(mf, MF_BUFSIZE, buf); ok (mfsize > 0, "%s: GetEnhMetaFileBits error %d\n", desc, GetLastError()); + /* ENHMETAHEADER size could differ, depending on platform */ + diff_nt4 = sizeof(SIZEL); + diff_9x = sizeof(SIZEL) + 3 * sizeof(DWORD); + if (mfsize < MF_BUFSIZE) { - ok(mfsize == bsize, "%s: mfsize=%d, bsize=%d\n", desc, mfsize, bsize); + ok(mfsize == bsize || + broken(mfsize == bsize - diff_nt4) || /* NT4 */ + broken(mfsize == bsize - diff_9x), /* Win9x/WinME */ + "%s: mfsize=%d, bsize=%d\n", desc, mfsize, bsize); } else ok(bsize >= MF_BUFSIZE, "%s: mfsize > bufsize (%d bytes), bsize=%d\n", @@ -1325,23 +1332,32 @@ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits, ok(emh1->dSignature == ENHMETA_SIGNATURE, "expected ENHMETA_SIGNATURE, got %u\n", emh1->dSignature); ok(emh1->iType == emh2->iType, "expected EMR_HEADER, got %u\n", emh2->iType); - ok(emh1->nSize == emh2->nSize, "expected nSize %u, got %u\n", emh1->nSize, emh2->nSize); + ok(emh1->nSize == emh2->nSize || + broken(emh1->nSize - diff_nt4 == emh2->nSize) || + broken(emh1->nSize - diff_9x == emh2->nSize), + "expected nSize %u, got %u\n", emh1->nSize, emh2->nSize); ok(emh1->dSignature == emh2->dSignature, "expected dSignature %u, got %u\n", emh1->dSignature, emh2->dSignature); - ok(emh1->nBytes == emh2->nBytes, "expected nBytes %u, got %u\n", emh1->nBytes, emh2->nBytes); - ok(emh1->nRecords == emh2->nRecords, "expected nBytes %u, got %u\n", emh1->nRecords, emh2->nRecords); - - offset = emh1->nSize; - while (offset < emh1->nBytes) + ok(emh1->nBytes == emh2->nBytes || + broken(emh1->nBytes - diff_nt4 == emh2->nBytes) || + broken(emh1->nBytes - diff_9x == emh2->nBytes), + "expected nBytes %u, got %u\n", emh1->nBytes, emh2->nBytes); + ok(emh1->nRecords == emh2->nRecords, "expected nRecords %u, got %u\n", emh1->nRecords, emh2->nRecords); + + offset1 = emh1->nSize; + offset2 = emh2->nSize; /* Needed for Win9x/WinME/NT4 */ + while (offset1 < emh1->nBytes) { - const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset); - const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset); + const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset1); + const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset2); - trace("EMF record %u, size %u/record %u, size %u\n", - emr1->iType, emr1->nSize, emr2->iType, emr2->nSize); + trace("%s: EMF record %u, size %u/record %u, size %u\n", + desc, emr1->iType, emr1->nSize, emr2->iType, emr2->nSize); if (!match_emf_record(emr1, emr2, desc, ignore_scaling)) return -1; - offset += emr1->nSize; + /* We have already bailed out if iType or nSize don't match */ + offset1 += emr1->nSize; + offset2 += emr2->nSize; } return 0; }

1 0

Nikolay Sivov : comctl32/listview: Setting item text to callback stub value already having it raises item-change notifications .
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 7f936a0a6e83538df7929528174846c03e23fba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f936a0a6e83538df79295281… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 15 01:31:45 2009 +0400 comctl32/listview: Setting item text to callback stub value already having it raises item-change notifications. Use same new text comparison rules for both items and subitems. Based on patch by Stefan Stranz. --- dlls/comctl32/listview.c | 13 ++++++------- dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 60d5d63..fd377ff 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -507,7 +507,7 @@ static inline int textcmpWT(LPCWSTR aw, LPCWSTR bt, BOOL isW) if (!aw) return bt ? -1 : 0; if (!bt) return aw ? 1 : 0; if (aw == LPSTR_TEXTCALLBACKW) - return bt == LPSTR_TEXTCALLBACKW ? 0 : -1; + return bt == LPSTR_TEXTCALLBACKW ? 1 : -1; if (bt != LPSTR_TEXTCALLBACKW) { LPWSTR bw = textdupTtoW(bt, isW); @@ -3727,12 +3727,11 @@ static BOOL set_sub_item(const LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, *bChanged = TRUE; } - if (lpLVItem->mask & LVIF_TEXT) - if (lpSubItem->hdr.pszText != lpLVItem->pszText) - { - textsetptrT(&lpSubItem->hdr.pszText, lpLVItem->pszText, isW); - *bChanged = TRUE; - } + if ((lpLVItem->mask & LVIF_TEXT) && textcmpWT(lpSubItem->hdr.pszText, lpLVItem->pszText, isW)) + { + textsetptrT(&lpSubItem->hdr.pszText, lpLVItem->pszText, isW); + *bChanged = TRUE; + } return TRUE; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 3895bea..d28fc1b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1118,7 +1118,7 @@ static void test_items(void) expect(TRUE, r); ok_sequence(sequences, PARENT_SEQ_INDEX, textcallback_set_again_parent_seq, - "check callback text comparison rule", TRUE); + "check callback text comparison rule", FALSE); DestroyWindow(hwnd); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009