November 2009 - Wine-Commits

Dan Kegel : ntdll: Implement RtlGetNtGlobalFlags(), add related defines to winternl.h.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 0f556bf8032add24d1bf5940bf477544366ea66e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f556bf8032add24d1bf5940b… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Nov 23 17:24:23 2009 -0800 ntdll: Implement RtlGetNtGlobalFlags(), add related defines to winternl.h. --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/process.c | 9 ++++++++ dlls/ntdll/thread.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 5 ++++ 4 files changed, 65 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 382feb3..e7f298d 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -632,7 +632,7 @@ @ stdcall RtlGetLongestNtPathLength() # @ stub RtlGetNativeSystemInformation # @ stub RtlGetNextRange -@ stub RtlGetNtGlobalFlags +@ stdcall RtlGetNtGlobalFlags() @ stdcall RtlGetNtProductType(ptr) @ stdcall RtlGetNtVersionNumbers(ptr ptr ptr) @ stdcall RtlGetOwnerSecurityDescriptor(ptr ptr ptr) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index ba51df5..aaf8315 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -73,6 +73,15 @@ PEB * WINAPI RtlGetCurrentPeb(void) return NtCurrentTeb()->Peb; } +/****************************************************************************** + * RtlGetNtGlobalFlags [NTDLL.@] + * + */ +ULONG WINAPI RtlGetNtGlobalFlags(void) +{ + return NtCurrentTeb()->Peb->NtGlobalFlag; +} + /*********************************************************************** * __wine_make_process_system (NTDLL.@) * diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index b9529bd..c370651 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -216,6 +216,53 @@ done: return status; } +/*********************************************************************** + * get_global_flag + * + * This is called before the process heap is created, + * but after the connection to the server is established. + * No windows heap allocation is permitted. + */ +static DWORD get_global_flag(void) +{ + static const WCHAR sessionman_keyW[] = {'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r',0}; + static const WCHAR global_flagW[] = {'G','l','o','b','a','l','F','l','a','g',0}; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW, valueW; + HANDLE hkey; + char tmp[32]; + DWORD count; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)tmp; + NTSTATUS status; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, sessionman_keyW ); + + status = NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ); + if (status != STATUS_SUCCESS) + return 0; + + RtlInitUnicodeString( &valueW, global_flagW ); + status = NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, tmp, sizeof(tmp)-1, &count ); + if (status != STATUS_SUCCESS) + return 0; + + /* Some documents say this can be a string, so handle either type */ + if (info->Type == REG_DWORD) + return *(DWORD *)info->Data; + if (info->Type == REG_SZ) + return strtol((char *)info->Data, NULL, 16); + return 0; +} /*********************************************************************** * thread_init @@ -297,6 +344,9 @@ HANDLE thread_init(void) server_init_process(); info_size = server_init_thread( peb ); + /* retrieve the global flags settings from the registry */ + peb->NtGlobalFlag = get_global_flag(); + /* create the process heap */ if (!(peb->ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL ))) { diff --git a/include/winternl.h b/include/winternl.h index 6f21ad0..9625d88 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1732,6 +1732,10 @@ typedef void (NTAPI *RTL_WAITORTIMERCALLBACKFUNC)(PVOID,BOOLEAN); /* FIXME: not #define SE_CREATE_GLOBAL_PRIVILEGE 30L #define SE_MAX_WELL_KNOWN_PRIVILEGE SE_CREATE_GLOBAL_PRIVILEGE +/* NtGlobalFlag bits */ +#define FLG_HEAP_ENABLE_TAIL_CHECK 0x00000010 +#define FLG_HEAP_ENABLE_FREE_CHECK 0x00000020 +#define FLG_HEAP_DISABLE_COALESCING 0x00200000 /* Rtl*Registry* functions structs and defines */ #define RTL_REGISTRY_ABSOLUTE 0 @@ -2404,6 +2408,7 @@ NTSYSAPI NTSTATUS WINAPI RtlGetGroupSecurityDescriptor(PSECURITY_DESCRIPTOR,PSI NTSYSAPI NTSTATUS WINAPI RtlGetLastNtStatus(void); NTSYSAPI DWORD WINAPI RtlGetLastWin32Error(void); NTSYSAPI DWORD WINAPI RtlGetLongestNtPathLength(void); +NTSYSAPI ULONG WINAPI RtlGetNtGlobalFlags(void); NTSYSAPI BOOLEAN WINAPI RtlGetNtProductType(LPDWORD); NTSYSAPI NTSTATUS WINAPI RtlGetOwnerSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID *,PBOOLEAN); NTSYSAPI ULONG WINAPI RtlGetProcessHeaps(ULONG,HANDLE*);

1 0

Maarten Lankhorst : dsound: Fix destruction in duplex.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 9aa5aa3364cc78429f5c260592d5f9b1117afe5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa5aa3364cc78429f5c26059… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 24 14:12:58 2009 +0100 dsound: Fix destruction in duplex. --- dlls/dsound/duplex.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index 8fbf1d6..7ef83f9 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -109,7 +109,7 @@ static ULONG WINAPI IDirectSoundFullDuplex_IUnknown_Release( ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); if (!ref) { - IDirectSound_Release(This->pdsfd->pUnknown); + This->pdsfd->pUnknown = NULL; HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); } @@ -185,7 +185,7 @@ static ULONG WINAPI IDirectSoundFullDuplex_IDirectSound_Release( ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); if (!ref) { - IDirectSound_Release(This->pdsfd->pDS); + This->pdsfd->pDS = NULL; HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); } @@ -350,7 +350,7 @@ static ULONG WINAPI IDirectSoundFullDuplex_IDirectSound8_Release( ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); if (!ref) { - IDirectSound_Release(This->pdsfd->pDS8); + This->pdsfd->pDS8 = NULL; HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); } @@ -515,7 +515,7 @@ static ULONG WINAPI IDirectSoundFullDuplex_IDirectSoundCapture_Release( ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); if (!ref) { - IDirectSoundCapture_Release(This->pdsfd->pDSC); + This->pdsfd->pDSC = NULL; HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); }

1 0

Paul Vriens : include: Add some system parameters.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 50cec6e9892f9cfb22e941ad9c25c6ec57a4f748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50cec6e9892f9cfb22e941ad9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 30 12:30:09 2009 +0100 include: Add some system parameters. --- dlls/user32/sysparams.c | 10 ++++++++++ include/winuser.h | 8 ++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 8d81404..4092221 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2353,6 +2353,16 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, ret = set_user_pref_param( 3, 0x80, PtrToUlong(pvParam), fWinIni ); break; + /* _WIN32_WINNT >= 0x600 */ + WINE_SPI_FIXME(SPI_GETDISABLEOVERLAPPEDCONTENT); + WINE_SPI_FIXME(SPI_SETDISABLEOVERLAPPEDCONTENT); + WINE_SPI_FIXME(SPI_GETCLIENTAREAANIMATION); + WINE_SPI_FIXME(SPI_SETCLIENTAREAANIMATION); + WINE_SPI_FIXME(SPI_GETCLEARTYPE); + WINE_SPI_FIXME(SPI_SETCLEARTYPE); + WINE_SPI_FIXME(SPI_GETSPEECHRECOGNITION); + WINE_SPI_FIXME(SPI_SETSPEECHRECOGNITION); + case SPI_GETFOREGROUNDLOCKTIMEOUT: /* 0x2000 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ ret = get_uint_param( SPI_SETFOREGROUNDLOCKTIMEOUT_IDX, SPI_SETFOREGROUNDLOCKTIMEOUT_REGKEY, diff --git a/include/winuser.h b/include/winuser.h index 9707b2c..e6b4741 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3046,6 +3046,14 @@ typedef struct tagCBTACTIVATESTRUCT #define SPI_SETBLOCKSENDINPUTRESETS 0x1027 #define SPI_GETUIEFFECTS 0x103E #define SPI_SETUIEFFECTS 0x103F +#define SPI_GETDISABLEOVERLAPPEDCONTENT 0x1040 +#define SPI_SETDISABLEOVERLAPPEDCONTENT 0x1041 +#define SPI_GETCLIENTAREAANIMATION 0x1042 +#define SPI_SETCLIENTAREAANIMATION 0x1043 +#define SPI_GETCLEARTYPE 0x1048 +#define SPI_SETCLEARTYPE 0x1049 +#define SPI_GETSPEECHRECOGNITION 0x104A +#define SPI_SETSPEECHRECOGNITION 0x104B #define SPI_GETFOREGROUNDLOCKTIMEOUT 0x2000 #define SPI_SETFOREGROUNDLOCKTIMEOUT 0x2001 #define SPI_GETACTIVEWNDTRKTIMEOUT 0x2002

1 0

Nikolay Sivov : comctl32/header: Avoid uninitialized memory passed to HDM_INSERTITEM, some fields are always copied.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: d2e169fadd90e345fb8b6c1aeed7cda8fb095fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e169fadd90e345fb8b6c1ae… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Nov 28 17:31:52 2009 +0300 comctl32/header: Avoid uninitialized memory passed to HDM_INSERTITEM, some fields are always copied. --- dlls/comctl32/tests/header.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index b7fe8e5..8d6ad1f 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1267,6 +1267,7 @@ static void test_hds_nosizing(HWND hParent) hChild = create_custom_header_control(hParent, FALSE); + memset(&hdItem, 0, sizeof(hdItem)); hdItem.mask = HDI_WIDTH; hdItem.cxy = 80;

1 0

Nikolay Sivov : user32/tests: Free memory after use.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 916e38f969bb5478c2053c812daaa2b782e04a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=916e38f969bb5478c2053c812… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Nov 29 02:18:59 2009 +0300 user32/tests: Free memory after use. --- dlls/user32/tests/dde.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 202bb41..afeef4d 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2067,6 +2067,8 @@ static void test_UnpackDDElParam(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ok(lo == 0, "Expected 0, got %08lx\n", lo); ok(hi == 0xcafebabe, "Expected 0xcafebabe, got %08lx\n", hi); + + GlobalFree(hglobal); } static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV hconv,

1 0

Nikolay Sivov : riched20/tests: Don't leak string in test.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: c6ff530ad60b8df4561e44999a691fbfbd064062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ff530ad60b8df4561e44999… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Nov 28 21:43:14 2009 +0300 riched20/tests: Don't leak string in test. --- dlls/riched20/tests/txtsrv.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index da28945..8da111d 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -667,6 +667,7 @@ static void test_TxSetText(void) ok(memcmp(rettext,settext,SysStringByteLen(rettext)) == 0, "String returned differs\n"); + SysFreeString(rettext); IUnknown_Release(txtserv); CoTaskMemFree(dummyTextHost); }

1 0

Juan Lang : crypt32: Revert 8ed5a777de6c9797a285829e07d7a27b3ed01257.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 90c160c3d823621749c968e49b63ca9a60e86d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90c160c3d823621749c968e49… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Nov 29 15:14:06 2009 -0800 crypt32: Revert 8ed5a777de6c9797a285829e07d7a27b3ed01257. Ordinarily removing tests seems like a bad idea, but in this case it seems the only rational response to the test failures the tests produce. The tests check the state of three bits with a variety of certificate and CRL combinations. One of these bits is apparently not set by any version of Windows for any of the tests. Testing its absence doesn't seem correct, and I'll explain why in more detail in a second. Every permutation of the remaining two bits appears on at least one Windows version, and no Windows version is obviously more correct than the rest, so testing them doesn't seem worthwhile. The one bit that doesn't appear to be set is the bit saying that a certificate is revoked. I created CRLs that do in fact revoke some of the tested certificates, so it appears to me that the bit should be set. It's possible that Windows doesn't bother checking the revocation status of a certificate whose anchor isn't trusted, but it's impossible to test this in an automated regression test suite, because adding a trusted certificate requires clicking OK (or its equivalent) in a dialog. The dialog is invoked by the system process, so I can't use a dialog hook to suppress it. I can test this hypothesis manually, but it isn't possible to do so in an automated way. --- dlls/crypt32/tests/chain.c | 344 -------------------------------------------- 1 files changed, 0 insertions(+), 344 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90c160c3d823621749c96…

1 0

Nikolay Sivov : comctl32/listview: Get rid of duplicated helper in tests.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 1e1c1310f5cbef72ef5ea7ade6041814f872dc22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e1c1310f5cbef72ef5ea7ade… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Nov 28 12:04:58 2009 +0300 comctl32/listview: Get rid of duplicated helper in tests. --- dlls/comctl32/tests/listview.c | 162 +++++++++++++++++----------------------- 1 files changed, 70 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e1c1310f5cbef72ef5ea…

1 0

Juan Lang : crypt32: Don' t copy past end of buffer when removing a string from a multi string.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: f2040b772544ebc434fa82a27713aa3a248c1b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2040b772544ebc434fa82a27… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Nov 29 11:42:57 2009 -0800 crypt32: Don't copy past end of buffer when removing a string from a multi string. --- dlls/crypt32/oid.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 0a3889d..68a4852 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -881,9 +881,11 @@ static BOOL CRYPT_RemoveStringFromMultiString(LPWSTR multi, LPCWSTR toRemove) } else { + LPCWSTR nextStr = spotToRemove + lstrlenW(toRemove) + 1; + /* Copy remainder of string "left" */ - memmove(spotToRemove, spotToRemove + lstrlenW(toRemove) + 1, - (len - (spotToRemove - multi)) * sizeof(WCHAR)); + memmove(spotToRemove, nextStr, + (len - (nextStr - multi)) * sizeof(WCHAR)); } ret = TRUE; }

1 0

Nikolay Sivov : comctl32/listview: New hover value should be passed using LPARAM.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 78e7b3cf9c9b03544e8ac367bf247306b7469052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78e7b3cf9c9b03544e8ac367b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Nov 28 11:50:30 2009 +0300 comctl32/listview: New hover value should be passed using LPARAM. --- dlls/comctl32/listview.c | 2 +- dlls/comctl32/tests/listview.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 97bf05a..8f6db54 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11134,7 +11134,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_SetHotItem(infoPtr, (INT)wParam); case LVM_SETHOVERTIME: - return LISTVIEW_SetHoverTime(infoPtr, (DWORD)wParam); + return LISTVIEW_SetHoverTime(infoPtr, (DWORD)lParam); case LVM_SETICONSPACING: return LISTVIEW_SetIconSpacing(infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam)); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0b55a23..8e2d9d5 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4277,6 +4277,11 @@ static void test_hover(void) ok_sequence(sequences, PARENT_SEQ_INDEX, hover_parent, "NM_HOVER block test", TRUE); g_block_hover = FALSE; + r = SendMessage(hwnd, LVM_SETHOVERTIME, 0, 500); + expect(HOVER_DEFAULT, r); + r = SendMessage(hwnd, LVM_GETHOVERTIME, 0, 0); + expect(500, r); + DestroyWindow(hwnd); }

1 0