February 2020 - wine-devel

[PATCH 3/3] vbscript: Silence QueryInterface FIXME.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 2/3] vbscript: Add SetScriptState(SCRIPTSTATE_CLOSED) implementation.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/vbscript.c | 71 ++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.c | 5 ++- 2 files changed, 75 insertions(+), 1 deletion(-)

1 0

[PATCH 1/3] vbscript: Don't convert hex literals ending with '&' to short in parse_hex_literal.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 6 +++--- dlls/vbscript/lex.c | 8 +++++--- dlls/vbscript/tests/lang.vbs | 7 ++++++- 3 files changed, 14 insertions(+), 7 deletions(-)

1 0

[PATCH] oleaut32: Use GetFinalPathNameByHandle to canonicalize file path.
by Jacek Caban 03 Feb '20

03 Feb '20

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Current canonicalization code assumes that the drive does not change, which may not be the case when, for example, z: path is used for paths inside drive_c, . dlls/oleaut32/typelib.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-)

1 0

[PATCH v2] msvcrt/tests: Be more explicit about sscanf() with %d/%hd/%hhd.
by Serge Gautherie 03 Feb '20

03 Feb '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Removed comments, added a cast. --- dlls/msvcrt/tests/scanf.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 57d9cc0..60e1f6c 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -207,9 +207,14 @@ static void test_sscanf( void ) result = 0xdeadbeef; strcpy(buffer,"12345678"); - ret = p_sscanf(buffer, "%hd", &result); + ret = p_sscanf(buffer, "%d", &result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); - ok(result == 0xdead614e, "Wrong number read (%x)\n", result); + ok(result == 0x00bc614e, "Wrong number read (%08x)\n", result); + + result = 0xdeadbeef; + ret = p_sscanf(buffer, "%hd", (short *)&result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 0xdead614e, "Wrong number read (%08x)\n", result); result = 0xdeadbeef; strcpy(buffer,"12345678"); @@ -238,7 +243,7 @@ static void test_sscanf( void ) result = 0xdeadbeef; ret = p_sscanf(buffer, "%hhd", &result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); - ok(result == 0xbc614e, "Wrong number read (%x)\n", result); + ok(result == 0x00bc614e, "Wrong number read (%08x)\n", result); strcpy(buffer,"12345678901234"); ret = p_sscanf(buffer, "%lld", &result64); -- 2.10.0.windows.1

2 1

[PATCH 3/3] msvcrt: Set return value on all paths in wcstombs_s_l.
by Daniel Lehman 03 Feb '20

03 Feb '20

1 0

[PATCH 2/3] msvcrt: Don't set error in wcstombs_s_l if no characters to convert.
by Daniel Lehman 03 Feb '20

03 Feb '20

1 0

[PATCH 1/3] msvcrt/tests: Add some wcstombs_s_l tests.
by Daniel Lehman 03 Feb '20

03 Feb '20

1 0

[PATCH resend 1/2] kernel32/path: Allow renaming a file/directory to a different capitalization of itself.
by Gabriel Ivăncescu 03 Feb '20

03 Feb '20

Renaming a file or directory from e.g. foobar to FooBar (or any other caps-only change) should work and capitalize it, like on Windows, instead of being a no-op. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- There's been some interest in this fix during the code freeze, affecting other apps' experience as well, so I sent it again now that it's over. dlls/kernel32/path.c | 66 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 61 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index c50b631..b4756bf 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -274,6 +274,16 @@ static BOOL is_same_file(HANDLE h1, HANDLE h2) return ret; } +static ULONG get_handle_attr(HANDLE handle) +{ + FILE_BASIC_INFORMATION info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryInformationFile(handle, &io, &info, sizeof(info), FileBasicInformation); + return status != STATUS_SUCCESS ? 0 : info.FileAttributes; +} + /************************************************************************** * CopyFileW (KERNEL32.@) */ @@ -455,6 +465,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, NTSTATUS status; HANDLE source_handle = 0, dest_handle = 0; ANSI_STRING source_unix, dest_unix; + BOOL same_file = FALSE; DWORD options; TRACE("(%s,%s,%p,%p,%04x)\n", @@ -507,18 +518,22 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_PATH_NOT_FOUND ); goto error; } - options = FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT; + options = FILE_SYNCHRONOUS_IO_NONALERT; if (flag & MOVEFILE_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, options ); if (status == STATUS_SUCCESS) /* destination exists */ { - if (!(flag & MOVEFILE_REPLACE_EXISTING)) + ULONG attrib = 0; + + if (!(flag & MOVEFILE_REPLACE_EXISTING) || + ((attrib = get_handle_attr(dest_handle)) & FILE_ATTRIBUTE_DIRECTORY)) { - if (!is_same_file( source_handle, dest_handle )) + if (!(same_file = is_same_file( source_handle, dest_handle ))) { - SetLastError( ERROR_ALREADY_EXISTS ); + SetLastError( (attrib & FILE_ATTRIBUTE_DIRECTORY) + ? ERROR_ACCESS_DENIED : ERROR_ALREADY_EXISTS ); RtlFreeUnicodeString( &nt_name ); goto error; } @@ -528,6 +543,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_ACCESS_DENIED ); goto error; } + else same_file = is_same_file( source_handle, dest_handle ); NtClose( dest_handle ); dest_handle = NULL; @@ -540,13 +556,53 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } status = wine_nt_to_unix_file_name( &nt_name, &dest_unix, FILE_OPEN_IF, FALSE ); - RtlFreeUnicodeString( &nt_name ); if (status != STATUS_SUCCESS && status != STATUS_NO_SUCH_FILE) { + RtlFreeUnicodeString( &nt_name ); SetLastError( RtlNtStatusToDosError(status) ); goto error; } + /* When it's renaming to the same file, preserve the case sensitivity of the last + component, so that renaming a\b\c\foobar to a\b\c\Foobar works correctly like + on Windows, but note that due to hard links the paths must be exactly identical */ + if (same_file && source_unix.Length == dest_unix.Length && + !memcmp(source_unix.Buffer, dest_unix.Buffer, dest_unix.Length)) + { + size_t nt_filename_len, pathlen; + const WCHAR *nt_filename; + BOOL used_default; + char *tmp; + INT num; + + nt_filename = memrchrW(nt_name.Buffer, '\\', nt_name.Length / sizeof(WCHAR)) + 1; + nt_filename_len = nt_name.Buffer + nt_name.Length / sizeof(WCHAR) - nt_filename; + + /* Build it from path + filename (the latter converted from nt_name) */ + num = WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + NULL, 0, NULL, &used_default); + if (num > 0 && !used_default) + { + for (pathlen = dest_unix.Length; --pathlen > 0;) + if (dest_unix.Buffer[pathlen] == '/') { pathlen++; break; } + + tmp = dest_unix.Buffer; + if (dest_unix.MaximumLength < pathlen + num + 1) + tmp = RtlReAllocateHeap(GetProcessHeap(), 0, tmp, pathlen + num + 1); + if (tmp) + { + dest_unix.Buffer = tmp; + dest_unix.Length = pathlen + num; + dest_unix.MaximumLength = dest_unix.Length + 1; + dest_unix.Buffer[dest_unix.Length] = '\0'; + + WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + dest_unix.Buffer + pathlen, num, NULL, NULL); + } + } + } + RtlFreeUnicodeString( &nt_name ); + /* now perform the rename */ if (rename( source_unix.Buffer, dest_unix.Buffer ) == -1) -- 2.21.0

2 4

[v2 PATCH 1/2] dwrite: Do not create intermediate object to return face reference from family.
by Nikolay Sivov 03 Feb '20

03 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 507099b24e..a3d36a5206 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2429,21 +2429,19 @@ static HRESULT WINAPI dwritefontfamily1_GetFont(IDWriteFontFamily2 *iface, UINT3 static HRESULT WINAPI dwritefontfamily1_GetFontFaceReference(IDWriteFontFamily2 *iface, UINT32 index, IDWriteFontFaceReference **reference) { - IDWriteFont3 *font; - HRESULT hr; + struct dwrite_fontfamily *family = impl_from_IDWriteFontFamily2(iface); + const struct dwrite_font_data *font; TRACE("%p, %u, %p.\n", iface, index, reference); *reference = NULL; - hr = IDWriteFontFamily2_GetFont(iface, index, &font); - if (FAILED(hr)) - return hr; - - hr = IDWriteFont3_GetFontFaceReference(font, reference); - IDWriteFont3_Release(font); + if (index >= family->data->count) + return E_FAIL; - return hr; + font = family->data->fonts[index]; + return IDWriteFactory5_CreateFontFaceReference_((IDWriteFactory5 *)family->collection->factory, + font->file, font->face_index, font->simulations, reference); } static HRESULT WINAPI dwritefontfamily2_GetMatchingFonts(IDWriteFontFamily2 *iface, -- 2.24.1

1 1

[PATCH 2/2 v2] dsound: Use an SRW lock for the buffer lock.
by Andrew Eikum 03 Feb '20

03 Feb '20

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Better match surrounding indent styles. dlls/dsound/buffer.c | 65 +++++++++++++----------------------- dlls/dsound/capture.c | 1 - dlls/dsound/dsound.c | 1 - dlls/dsound/dsound_convert.c | 1 - dlls/dsound/dsound_main.c | 1 - dlls/dsound/dsound_private.h | 2 +- dlls/dsound/duplex.c | 1 - dlls/dsound/mixer.c | 5 ++- dlls/dsound/primary.c | 5 ++- dlls/dsound/propset.c | 1 - dlls/dsound/sound3d.c | 1 - 11 files changed, 29 insertions(+), 55 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index d585a7605ef..8d4a3b92fa6 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -27,7 +27,6 @@ #include "winbase.h" #include "winuser.h" #include "mmsystem.h" -#include "winternl.h" #include "vfwmsgs.h" #include "wine/debug.h" #include "dsound.h" @@ -200,8 +199,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetVolume(IDirectSoundBuffer8 *ifac return DSERR_INVALIDPARAM; } - /* **** */ - RtlAcquireResourceExclusive(&This->lock, TRUE); + AcquireSRWLockExclusive(&This->lock); if (This->dsbd.dwFlags & DSBCAPS_CTRL3D) { oldVol = This->ds3db_lVolume; @@ -216,8 +214,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetVolume(IDirectSoundBuffer8 *ifac DSOUND_RecalcVolPan(&(This->volpan)); } - RtlReleaseResource(&This->lock); - /* **** */ + ReleaseSRWLockExclusive(&This->lock); return hres; } @@ -268,8 +265,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency(IDirectSoundBuffer8 *i return DSERR_INVALIDPARAM; } - /* **** */ - RtlAcquireResourceExclusive(&This->lock, TRUE); + AcquireSRWLockExclusive(&This->lock); oldFreq = This->freq; This->freq = freq; @@ -280,8 +276,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency(IDirectSoundBuffer8 *i DSOUND_RecalcFormat(This); } - RtlReleaseResource(&This->lock); - /* **** */ + ReleaseSRWLockExclusive(&This->lock); return DS_OK; } @@ -295,8 +290,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Play(IDirectSoundBuffer8 *iface, DW TRACE("(%p,%08x,%08x,%08x)\n",This,reserved1,reserved2,flags); - /* **** */ - RtlAcquireResourceExclusive(&This->lock, TRUE); + AcquireSRWLockExclusive(&This->lock); This->playflags = flags; if (This->state == STATE_STOPPED) { @@ -309,8 +303,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Play(IDirectSoundBuffer8 *iface, DW IMediaObject_Discontinuity(This->filters[i].obj, 0); } - RtlReleaseResource(&This->lock); - /* **** */ + ReleaseSRWLockExclusive(&This->lock); return hres; } @@ -322,8 +315,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Stop(IDirectSoundBuffer8 *iface) TRACE("(%p)\n",This); - /* **** */ - RtlAcquireResourceExclusive(&This->lock, TRUE); + AcquireSRWLockExclusive(&This->lock); if (This->state == STATE_PLAYING) This->state = STATE_STOPPING; @@ -333,8 +325,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Stop(IDirectSoundBuffer8 *iface) DSOUND_CheckEvent(This, 0, 0); } - RtlReleaseResource(&This->lock); - /* **** */ + ReleaseSRWLockExclusive(&This->lock); return hres; } @@ -382,7 +373,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetCurrentPosition(IDirectSoundBuff TRACE("(%p,%p,%p)\n",This,playpos,writepos); - RtlAcquireResourceShared(&This->lock, TRUE); + AcquireSRWLockShared(&This->lock); pos = This->sec_mixpos; @@ -403,7 +394,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetCurrentPosition(IDirectSoundBuff *writepos %= This->buflen; } - RtlReleaseResource(&This->lock); + ReleaseSRWLockShared(&This->lock); TRACE("playpos = %d, writepos = %d, buflen=%d (%p, time=%d)\n", playpos?*playpos:-1, writepos?*writepos:-1, This->buflen, This, GetTickCount()); @@ -423,13 +414,13 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetStatus(IDirectSoundBuffer8 *ifac } *status = 0; - RtlAcquireResourceShared(&This->lock, TRUE); + AcquireSRWLockShared(&This->lock); if ((This->state == STATE_STARTING) || (This->state == STATE_PLAYING)) { *status |= DSBSTATUS_PLAYING; if (This->playflags & DSBPLAY_LOOPING) *status |= DSBSTATUS_LOOPING; } - RtlReleaseResource(&This->lock); + ReleaseSRWLockShared(&This->lock); TRACE("status=%x\n", *status); return DS_OK; @@ -509,8 +500,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW return DSERR_INVALIDPARAM; } - /* **** */ - RtlAcquireResourceShared(&This->lock, TRUE); + AcquireSRWLockShared(&This->lock); if (writecursor+writebytes <= This->buflen) { *(LPBYTE*)lplpaudioptr1 = This->buffer->memory+writecursor; @@ -543,8 +533,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW TRACE("Locked %p(%i bytes) and %p(%i bytes) writecursor=%d\n", *(LPBYTE*)lplpaudioptr1, *audiobytes1, lplpaudioptr2 ? *(LPBYTE*)lplpaudioptr2 : NULL, audiobytes2 ? *audiobytes2: 0, writecursor); } - RtlReleaseResource(&This->lock); - /* **** */ + ReleaseSRWLockShared(&This->lock); return DS_OK; } @@ -557,8 +546,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetCurrentPosition(IDirectSoundBuff TRACE("(%p,%d)\n",This,newpos); - /* **** */ - RtlAcquireResourceExclusive(&This->lock, TRUE); + AcquireSRWLockExclusive(&This->lock); /* start mixing from this new location instead */ newpos %= This->buflen; @@ -568,8 +556,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetCurrentPosition(IDirectSoundBuff /* at this point, do not attempt to reset buffers, mess with primary mix position, or anything like that to reduce latency. The data already prebuffered cannot be changed */ - RtlReleaseResource(&This->lock); - /* **** */ + ReleaseSRWLockExclusive(&This->lock); return hres; } @@ -591,16 +578,14 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetPan(IDirectSoundBuffer8 *iface, return DSERR_CONTROLUNAVAIL; } - /* **** */ - RtlAcquireResourceExclusive(&This->lock, TRUE); + AcquireSRWLockExclusive(&This->lock); if (This->volpan.lPan != pan) { This->volpan.lPan = pan; DSOUND_RecalcVolPan(&(This->volpan)); } - RtlReleaseResource(&This->lock); - /* **** */ + ReleaseSRWLockExclusive(&This->lock); return hres; } @@ -646,7 +631,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, AcquireSRWLockShared(&This->device->buffer_list_lock); LIST_FOR_EACH_ENTRY(iter, &This->buffer->buffers, IDirectSoundBufferImpl, entry ) { - RtlAcquireResourceShared(&iter->lock, TRUE); + AcquireSRWLockShared(&iter->lock); if (x1) { if(x1 + (DWORD_PTR)p1 - (DWORD_PTR)iter->buffer->memory > iter->buflen) @@ -662,7 +647,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, else iter->buffer->lockedbytes -= x2; } - RtlReleaseResource(&iter->lock); + ReleaseSRWLockShared(&iter->lock); } ReleaseSRWLockShared(&This->device->buffer_list_lock); } @@ -1125,7 +1110,7 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds } else DSOUND_RecalcVolPan(&(dsb->volpan)); - RtlInitializeResource(&dsb->lock); + InitializeSRWLock(&dsb->lock); /* register buffer */ err = DirectSoundDevice_AddBuffer(device, dsb); @@ -1148,7 +1133,6 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) This->device->drvcaps.dwFreeHwMixingAllBuffers++; DirectSoundDevice_RemoveBuffer(This->device, This); - RtlDeleteResource(&This->lock); This->buffer->ref--; list_remove(&This->entry); @@ -1190,13 +1174,13 @@ HRESULT IDirectSoundBufferImpl_Duplicate( return DSERR_OUTOFMEMORY; } - RtlAcquireResourceShared(&pdsb->lock, TRUE); + AcquireSRWLockShared(&pdsb->lock); CopyMemory(dsb, pdsb, sizeof(*dsb)); dsb->pwfx = DSOUND_CopyFormat(pdsb->pwfx); - RtlReleaseResource(&pdsb->lock); + ReleaseSRWLockShared(&pdsb->lock); if (dsb->pwfx == NULL) { HeapFree(GetProcessHeap(),0,dsb); @@ -1218,12 +1202,11 @@ HRESULT IDirectSoundBufferImpl_Duplicate( dsb->device = device; DSOUND_RecalcFormat(dsb); - RtlInitializeResource(&dsb->lock); + InitializeSRWLock(&dsb->lock); /* register buffer */ hres = DirectSoundDevice_AddBuffer(device, dsb); if (hres != DS_OK) { - RtlDeleteResource(&dsb->lock); list_remove(&dsb->entry); dsb->buffer->ref--; HeapFree(GetProcessHeap(),0,dsb->pwfx); diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 8fc27499998..10690f7df0d 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -34,7 +34,6 @@ #include "winuser.h" #include "mmsystem.h" #include "mmddk.h" -#include "winternl.h" #include "winnls.h" #include "wine/debug.h" #include "dsound.h" diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index e7ab7922bb7..3085d86e5b5 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -30,7 +30,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winternl.h" #include "mmddk.h" #include "wingdi.h" #include "mmreg.h" diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 6181f04be73..4735178a9a8 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -41,7 +41,6 @@ #include "windef.h" #include "winbase.h" #include "mmsystem.h" -#include "winternl.h" #include "wine/debug.h" #include "dsound.h" #include "dsound_private.h" diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 4e752be6bae..3acee554ad9 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -43,7 +43,6 @@ #include "winnls.h" #include "winreg.h" #include "mmsystem.h" -#include "winternl.h" #include "mmddk.h" #include "wine/debug.h" #include "dsound.h" diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 5605bded905..bdb9ebee544 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -136,7 +136,7 @@ struct IDirectSoundBufferImpl LONG ref, refn, ref3D, refiks; /* IDirectSoundBufferImpl fields */ DirectSoundDevice* device; - RTL_RWLOCK lock; + SRWLOCK lock; PWAVEFORMATEX pwfx; BufferMemory* buffer; DWORD playflags,state,leadin; diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index 4a88dd89b96..cccfeba0f06 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -28,7 +28,6 @@ #include "winuser.h" #include "mmsystem.h" #include "mmddk.h" -#include "winternl.h" #include "wine/debug.h" #include "dsound.h" #include "dsound_private.h" diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index c1bd3273f58..a6402b09eff 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -33,7 +33,6 @@ #include "mmsystem.h" #include "wingdi.h" #include "mmreg.h" -#include "winternl.h" #include "wine/debug.h" #include "dsound.h" #include "ks.h" @@ -593,7 +592,7 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buff if (dsb->buflen && dsb->state) { TRACE("Checking %p, frames=%d\n", dsb, frames); - RtlAcquireResourceShared(&dsb->lock, TRUE); + AcquireSRWLockShared(&dsb->lock); /* if buffer is stopping it is stopped now */ if (dsb->state == STATE_STOPPING) { dsb->state = STATE_STOPPED; @@ -609,7 +608,7 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buff *all_stopped = FALSE; } - RtlReleaseResource(&dsb->lock); + ReleaseSRWLockShared(&dsb->lock); } } } diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 8d42fe0ed90..655f730b375 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -32,7 +32,6 @@ #include "winbase.h" #include "winuser.h" #include "mmsystem.h" -#include "winternl.h" #include "mmddk.h" #include "wine/debug.h" #include "dsound.h" @@ -274,9 +273,9 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device, WAVEFORMATEX *wfx, device->playpos = 0; for (i = 0; i < device->nrofbuffers; i++) { - RtlAcquireResourceExclusive(&dsb[i]->lock, TRUE); + AcquireSRWLockExclusive(&dsb[i]->lock); DSOUND_RecalcFormat(dsb[i]); - RtlReleaseResource(&dsb[i]->lock); + ReleaseSRWLockExclusive(&dsb[i]->lock); } return DS_OK; diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 92aae8fe0ad..dcb2b871783 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -28,7 +28,6 @@ #include "winbase.h" #include "winuser.h" #include "mmsystem.h" -#include "winternl.h" #include "winnls.h" #include "vfwmsgs.h" #include "mmddk.h" diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 27fc416676f..06dbf58ca0b 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -44,7 +44,6 @@ #include "winbase.h" #include "winuser.h" #include "mmsystem.h" -#include "winternl.h" #include "mmddk.h" #include "wine/debug.h" #include "dsound.h" -- 2.25.0

1 0

[PATCH 1/2 v2] dsound: Use an SRW lock for buffer_list_lock.
by Andrew Eikum 03 Feb '20

03 Feb '20

From: Zebediah Figura <z.figura12(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48408 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: No changes. dlls/dsound/buffer.c | 4 ++-- dlls/dsound/dsound.c | 15 +++++++-------- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 4 ++-- dlls/dsound/primary.c | 4 ++-- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index f6006529141..d585a7605ef 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -643,7 +643,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, if (x1 || x2) { - RtlAcquireResourceShared(&This->device->buffer_list_lock, TRUE); + AcquireSRWLockShared(&This->device->buffer_list_lock); LIST_FOR_EACH_ENTRY(iter, &This->buffer->buffers, IDirectSoundBufferImpl, entry ) { RtlAcquireResourceShared(&iter->lock, TRUE); @@ -664,7 +664,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, } RtlReleaseResource(&iter->lock); } - RtlReleaseResource(&This->device->buffer_list_lock); + ReleaseSRWLockShared(&This->device->buffer_list_lock); } return hres; diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 8e2b839fe89..e7ab7922bb7 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -181,7 +181,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) InitializeCriticalSection(&(device->mixlock)); device->mixlock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": DirectSoundDevice.mixlock"); - RtlInitializeResource(&(device->buffer_list_lock)); + InitializeSRWLock(&device->buffer_list_lock); *ppDevice = device; @@ -238,7 +238,6 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) HeapFree(GetProcessHeap(), 0, device->tmp_buffer); HeapFree(GetProcessHeap(), 0, device->cp_buffer); HeapFree(GetProcessHeap(), 0, device->buffer); - RtlDeleteResource(&device->buffer_list_lock); device->mixlock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&device->mixlock); HeapFree(GetProcessHeap(),0,device); @@ -612,7 +611,7 @@ HRESULT DirectSoundDevice_AddBuffer( TRACE("(%p, %p)\n", device, pDSB); - RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); + AcquireSRWLockExclusive(&device->buffer_list_lock); if (device->buffers) newbuffers = HeapReAlloc(GetProcessHeap(),0,device->buffers,sizeof(IDirectSoundBufferImpl*)*(device->nrofbuffers+1)); @@ -629,7 +628,7 @@ HRESULT DirectSoundDevice_AddBuffer( hr = DSERR_OUTOFMEMORY; } - RtlReleaseResource(&(device->buffer_list_lock)); + ReleaseSRWLockExclusive(&device->buffer_list_lock); return hr; } @@ -644,7 +643,7 @@ void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBuff TRACE("(%p, %p)\n", device, pDSB); - RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); + AcquireSRWLockExclusive(&device->buffer_list_lock); if (device->nrofbuffers == 1) { assert(device->buffers[0] == pDSB); @@ -662,7 +661,7 @@ void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBuff device->nrofbuffers--; TRACE("buffer count is now %d\n", device->nrofbuffers); - RtlReleaseResource(&(device->buffer_list_lock)); + ReleaseSRWLockExclusive(&device->buffer_list_lock); } /******************************************************************************* @@ -869,14 +868,14 @@ static HRESULT WINAPI IDirectSound8Impl_SetCooperativeLevel(IDirectSound8 *iface level==DSSCL_PRIORITY ? "DSSCL_PRIORITY" : "DSSCL_EXCLUSIVE"); } - RtlAcquireResourceExclusive(&device->buffer_list_lock, TRUE); + AcquireSRWLockExclusive(&device->buffer_list_lock); EnterCriticalSection(&device->mixlock); if ((level == DSSCL_WRITEPRIMARY) != (device->priolevel == DSSCL_WRITEPRIMARY)) hr = DSOUND_ReopenDevice(device, level == DSSCL_WRITEPRIMARY); if (SUCCEEDED(hr)) device->priolevel = level; LeaveCriticalSection(&device->mixlock); - RtlReleaseResource(&device->buffer_list_lock); + ReleaseSRWLockExclusive(&device->buffer_list_lock); return hr; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 930c3e92ec8..5605bded905 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -80,7 +80,7 @@ struct DirectSoundDevice DWORD writelead, buflen, ac_frames, frag_frames, playpos, pad, stopped; int nrofbuffers; IDirectSoundBufferImpl** buffers; - RTL_RWLOCK buffer_list_lock; + SRWLOCK buffer_list_lock; CRITICAL_SECTION mixlock; IDirectSoundBufferImpl *primary; DWORD speaker_config; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 05ca99b5df4..c1bd3273f58 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -767,9 +767,9 @@ DWORD CALLBACK DSOUND_mixthread(void *p) if (!dev->ref) break; - RtlAcquireResourceShared(&(dev->buffer_list_lock), TRUE); + AcquireSRWLockShared(&dev->buffer_list_lock); DSOUND_PerformMix(dev); - RtlReleaseResource(&(dev->buffer_list_lock)); + ReleaseSRWLockShared(&dev->buffer_list_lock); } return 0; } diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 852ec51b7ff..8d42fe0ed90 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -472,7 +472,7 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe } /* **** */ - RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); + AcquireSRWLockExclusive(&device->buffer_list_lock); EnterCriticalSection(&(device->mixlock)); if (device->priolevel == DSSCL_WRITEPRIMARY) { @@ -508,7 +508,7 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe out: LeaveCriticalSection(&(device->mixlock)); - RtlReleaseResource(&(device->buffer_list_lock)); + ReleaseSRWLockExclusive(&device->buffer_list_lock); /* **** */ return err; -- 2.25.0

1 0

[PATCH] mshtml: use ARRAY_SIZE instead of sizeof in MultiByteToWideChar
by Marcus Meissner 03 Feb '20

03 Feb '20

Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/mshtml/tests/dom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1c4a54cf63..2b0a5cde95 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6370,7 +6370,7 @@ static void test_navigator(IHTMLDocument2 *doc) hres = ObtainUserAgentString(0, bufa, &size); ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); - MultiByteToWideChar(CP_ACP, 0, bufa, size, buf, sizeof(buf)); + MultiByteToWideChar(CP_ACP, 0, bufa, size, buf, ARRAY_SIZE(buf)); bstr = NULL; hres = IOmNavigator_get_userAgent(navigator, &bstr); @@ -6390,7 +6390,7 @@ static void test_navigator(IHTMLDocument2 *doc) hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, ua, sizeof(ua), 0); ok(hres == S_OK, "UrlMkSetSessionOption failed: %08x\n", hres); - MultiByteToWideChar(CP_ACP, 0, ua, -1, buf, sizeof(buf)); + MultiByteToWideChar(CP_ACP, 0, ua, -1, buf, ARRAY_SIZE(buf)); hres = IOmNavigator_get_appVersion(navigator, &bstr); ok(hres == S_OK, "get_appVersion failed: %08x\n", hres); -- 2.25.0

2 1

[PATCH 1/2] dwrite: Do not create intermediate object to return face reference from family.
by Nikolay Sivov 03 Feb '20

03 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 507099b24e..a3d36a5206 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2429,21 +2429,19 @@ static HRESULT WINAPI dwritefontfamily1_GetFont(IDWriteFontFamily2 *iface, UINT3 static HRESULT WINAPI dwritefontfamily1_GetFontFaceReference(IDWriteFontFamily2 *iface, UINT32 index, IDWriteFontFaceReference **reference) { - IDWriteFont3 *font; - HRESULT hr; + struct dwrite_fontfamily *family = impl_from_IDWriteFontFamily2(iface); + const struct dwrite_font_data *font; TRACE("%p, %u, %p.\n", iface, index, reference); *reference = NULL; - hr = IDWriteFontFamily2_GetFont(iface, index, &font); - if (FAILED(hr)) - return hr; - - hr = IDWriteFont3_GetFontFaceReference(font, reference); - IDWriteFont3_Release(font); + if (index >= family->data->count) + return E_FAIL; - return hr; + font = family->data->fonts[index]; + return IDWriteFactory5_CreateFontFaceReference_((IDWriteFactory5 *)family->collection->factory, + font->file, font->face_index, font->simulations, reference); } static HRESULT WINAPI dwritefontfamily2_GetMatchingFonts(IDWriteFontFamily2 *iface, -- 2.24.1

2 2

[PATCH 8/8] jscript: Add GetSourcePosition implementation.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jscript.c | 25 +++++++++++++++++++++---- dlls/jscript/tests/run.c | 3 --- 2 files changed, 21 insertions(+), 7 deletions(-)

1 0

[PATCH 7/8] jscript: Return error source and description from GetExceptionInfo.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jscript.c | 4 ++++ dlls/jscript/tests/run.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[PATCH 6/8] jscript: Propagate compiler error location.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH 5/8] jscript: Propagate parser error location.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 2 +- dlls/jscript/parser.h | 4 +++- dlls/jscript/parser.y | 29 ++++++++++++++++++----------- 3 files changed, 22 insertions(+), 13 deletions(-)

1 0

[PATCH 4/8] jscript: Delay error object creation for builtin errors with message string until it's needed.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 12 ++++++------ dlls/jscript/engine.c | 10 ++++------ dlls/jscript/error.c | 41 ++++++++--------------------------------- dlls/jscript/jscript.h | 2 +- 4 files changed, 19 insertions(+), 46 deletions(-)

1 0

[PATCH 3/8] jscript: Support propagating error message.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 2 ++ dlls/jscript/engine.c | 14 ++++++++++++-- dlls/jscript/engine.h | 1 + dlls/jscript/error.c | 4 +++- dlls/jscript/jscript.c | 4 ++++ 5 files changed, 22 insertions(+), 3 deletions(-)

1 0

[PATCH 2/8] jscript: Store error location in jsexcept_t.
by Jacek Caban 03 Feb '20

03 Feb '20

1 0

[PATCH 1/8] jscript: Propagate Invoke error code using jsexcept_t.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH] dwrite/tests: Add traces to allow debugging font failures.
by Francois Gouget 03 Feb '20

03 Feb '20

Always trace the iteration counters so one can identify which iteration is failing. Also trace the family and font name so one can know which font is causing the failure. But only do so if extra debugging information is requested since there can be quite a lot of fonts. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dwrite/tests/font.c | 52 ++++++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index cdc41ec5a1d..a401ca910f8 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7903,7 +7903,20 @@ todo_wine UINT32 font_count, j; hr = IDWriteFontCollection1_GetFontFamily(collection, i, &family); - ok(hr == S_OK, "Failed to get family, hr %#x.\n", hr); + ok(hr == S_OK, "%u Failed to get family, hr %#x.\n", i, hr); + + if (winetest_debug > 1) + { + IDWriteLocalizedStrings *names; + WCHAR familynameW[64]; + + hr = IDWriteFontFamily1_GetFamilyNames(family, &names); + ok(hr == S_OK, "%u got 0x%08x\n", i, hr); + + get_enus_string(names, familynameW, ARRAY_SIZE(familynameW)); + IDWriteLocalizedStrings_Release(names); + trace("%u family=%s\n", i, wine_dbgstr_w(familynameW)); + } font_count = IDWriteFontFamily1_GetFontCount(family); @@ -7912,17 +7925,30 @@ todo_wine IDWriteFontFaceReference1 *ref2; hr = IDWriteFontFamily1_GetFont(family, j, &font3); - ok(hr == S_OK, "Failed to get font, hr %#x.\n", hr); + ok(hr == S_OK, "%u.%u Failed to get font, hr %#x.\n", i, j, hr); + + if (winetest_debug > 1) + { + IDWriteLocalizedStrings *names; + WCHAR facenameW[64]; + + hr = IDWriteFont3_GetFaceNames(font3, &names); + ok(hr == S_OK, "%u.%u got 0x%08x\n", i, j, hr); + + get_enus_string(names, facenameW, ARRAY_SIZE(facenameW)); + IDWriteLocalizedStrings_Release(names); + trace("%u.%u facename=%s\n", i, j, wine_dbgstr_w(facenameW)); + } hr = IDWriteFont3_GetFontFaceReference(font3, &ref); - ok(hr == S_OK, "Failed to get reference object, hr %#x.\n", hr); + ok(hr == S_OK, "%u.%u Failed to get reference object, hr %#x.\n", i, j, hr); hr = IDWriteFont3_GetFontFaceReference(font3, &ref1); - ok(hr == S_OK, "Failed to get reference object, hr %#x.\n", hr); - ok(ref != ref1, "Unexpected reference object %p, %p.\n", ref1, ref); + ok(hr == S_OK, "%u.%u Failed to get reference object, hr %#x.\n", i, j, hr); + ok(ref != ref1, "%u.%u Unexpected reference object %p, %p.\n", i, j, ref1, ref); hr = IDWriteFont3_CreateFontFace(font3, &fontface); - ok(hr == S_OK, "Failed to create a fontface, hr %#x.\n", hr); + ok(hr == S_OK, "%u.%u Failed to create a fontface, hr %#x.\n", i, j, hr); /* Fonts present regular properties as axis values, for non-variable fonts too. Normally it would include weight/width/slant/italic, but could also contain optical size axis. */ @@ -7931,7 +7957,7 @@ todo_wine { UINT32 axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); todo_wine - ok(axis_count > 0, "Unexpected axis value count.\n"); + ok(axis_count > 0, "%u.%u Unexpected axis value count %d.\n", i, j, axis_count); IDWriteFontFaceReference1_Release(ref2); } @@ -7940,25 +7966,25 @@ todo_wine hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref); todo_wine - ok(hr == S_OK, "Failed to get a reference, hr %#x.\n", hr); + ok(hr == S_OK, "%u.%u Failed to get a reference, hr %#x.\n", i, j, hr); hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref1); todo_wine - ok(hr == S_OK, "Failed to get a reference, hr %#x.\n", hr); + ok(hr == S_OK, "%u.%u Failed to get a reference, hr %#x.\n", i, j, hr); if (hr == S_OK) - ok(ref == ref1, "Unexpected reference %p, %p.\n", ref1, ref); + ok(ref == ref1, "%u.%u Unexpected reference %p, %p.\n", i, j, ref1, ref); if (hr == S_OK) { hr = IDWriteFontFaceReference_CreateFontFace(ref, &fontface1); - ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); - ok(fontface1 == fontface, "Unexpected fontface %p, %p.\n", fontface1, fontface); + ok(hr == S_OK, "%u.%u Failed to create fontface, hr %#x.\n", i, j, hr); + ok(fontface1 == fontface, "%u.%u Unexpected fontface %p, %p.\n", i, j, fontface1, fontface); IDWriteFontFace3_Release(fontface1); if (SUCCEEDED(hr = IDWriteFontFaceReference_QueryInterface(ref, &IID_IDWriteFontFaceReference1, (void **)&ref2))) { UINT32 axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); - ok(!axis_count, "Unexpected axis value count.\n"); + ok(!axis_count, "%u.%u Unexpected axis value count %u.\n", i, j, axis_count); IDWriteFontFaceReference1_Release(ref2); } -- 2.20.1

2 3

[PATCH] bcrypt: Make format_gnutls_signature() static.
by Francois Gouget 03 Feb '20

03 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/bcrypt/gnutls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 868f898bbbb..1d78b9f4d1f 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1141,8 +1141,8 @@ static unsigned int get_signature_length( enum alg_id id ) } } -NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signature, UCHAR *output, - ULONG output_len, ULONG *ret_len ) +static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signature, + UCHAR *output, ULONG output_len, ULONG *ret_len ) { switch (type) { -- 2.20.1

1 0

Almost unused functions in mountmgr.sys
by Francois Gouget 03 Feb '20

03 Feb '20

So I have a script telling me that, in mountmgr.sys, create_scsi_entry() and set_scsi_device_name() are not used. Looking into this it turns out that they are only used on macOS and on Linux distributions that still have libhal, which I expect most distributions have dropped in favor of libdbus-1. So are we missing code to use these on modern Linux machines that have libdbus-1 but not libhal? Or is there something else at play? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Un western sans indien c'est comme une police sans serif. -- John Wayne

1 0

RFC How to deal with tests that spam the report
by Francois Gouget 03 Feb '20

03 Feb '20

Some tests loop on system resources like fonts and issue todos, skips or even traces on every iteration. Depending on the machine configuration this can result in a lot of lines and push WineTest reports above the 1.5 MB limit. For instance the new Debian Testing VM has some extra fonts (though I did not manually add any extra font packages), resulting in some todo messages being repeated 772 times and dwrite:font generating 160 KB of traces. Same for gdi32:font. So of course the report exceeds the 1.5 MB. https://testbot.winehq.org/JobDetails.pl?Key=64300 It would be possible to uninstall some font packages to reduce this but that would mean accepting that test.winehq.org forces us to artificially limit the test coverage. Plus uninstalling fonts would not help with kernel32:virtual (90 KB), shell32:ebrowser (17 KB), etc. So when WINETEST_DEBUG=1 this patch automatically mutes the lines that generate more than 50 such messages. When it happens a message is issued so the developer knows what happened, and a count of silenced lines is given at the end. And setting WINETEST_DEBUG >= 2 disables this filtering. The rationale here is that after the first few repetitions additional lines don't really bring any new information: sure GetFontFaceReference() is unimplemented, there's no point saying so 772 times! In contrast other todo lines still bring new information. This is why this patch mutes individual lines rather than limiting the total number of non-essential lines in a test unit. The drawback is that some tests like ieframe:webbrowser have 10 lines that each generate between 15 and 26 lines of output. So they all fly under the 50 repeats threshold but still generate 14 KB all together. One option would be to lower the threshold from 50 to... 20, 15, 10? Or we could have each test unit count the non-essential lines and silence all of them after some threshold. But then any todo, skip or trace that comes after a spammer would be lost :-( Here are some commands to get a sense of things: wget -O wtbdebiant_win32.report \ 'https://testbot.winehq.org/GetTaskFile.pl?Job=64300&Step=1&Task=1&File=win3…' # Non-essential lines repeat counts egrep '^[a-z0-9]*\.c:[0-9]*: ' wtbdebiant_win32.report | \ egrep -v ': Test (failed|succeeded inside todo block):' | \ sed -e 's/^$[a-z0-9]*\.c:[0-9]*: Test[^:]*$:.*$/\1/' -e t \ -e 's/^$[a-z0-9]*\.c:[0-9]*:$.*$/\1 Trace/' | \ sort | uniq -c | sort -b -n -r | head -n 10 772 font.c:7947: Test marked todo 772 font.c:7943: Test marked todo 772 font.c:7934: Test marked todo 522 virtual.c:4056: Test marked todo 256 ebrowser.c:1659: Test marked todo 189 font.c:3238: Tests skipped 184 virtual.c:4015: Test marked todo 151 font.c:3940: Test marked todo 135 istream.c:274: Test marked todo 128 sock.c:1252: Test marked todo # Per test unit non-essential line counts egrep '^[a-z0-9]*\.c:[0-9]*: ' wtbdebiant_win32.report | \ egrep -v ': Test (failed|succeeded inside todo block):' | \ sed -e 's/^$[a-z0-9]*\.c$:[0-9]*:.*$/\1/' | \ sort | uniq -c | sort -b -n -r | head -n10 2988 font.c (yep, this mixes dwrite:font, gdi32:font and gdiplus:font) 916 virtual.c 485 msg.c 437 webbrowser.c 412 metafile.c 399 info.c 372 sock.c 351 security.c 327 graphics.c 316 file.c include/wine/test.h | 77 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 14 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index a919ce81d68..9f308b4c4ab 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -62,6 +62,9 @@ extern int winetest_interactive; /* report successful tests (BOOL) */ extern int winetest_report_success; +/* silence todos and skips above this threshold */ +extern int winetest_mute_threshold; + /* current platform */ extern const char *winetest_platform; @@ -211,6 +214,9 @@ const char *winetest_platform = "windows"; /* report successful tests (BOOL) */ int winetest_report_success = 0; +/* silence todos and skips above this threshold */ +int winetest_mute_threshold = 50; + /* passing arguments around */ static int winetest_argc; static char** winetest_argv; @@ -222,6 +228,12 @@ static LONG failures; /* number of failures */ static LONG skipped; /* number of skipped test chunks */ static LONG todo_successes; /* number of successful tests inside todo block */ static LONG todo_failures; /* number of failures inside todo block */ +static LONG muted_traces; /* number of silenced traces */ +static LONG muted_skipped; /* same as skipped but silent */ +static LONG muted_todo_successes; /* same as todo_successes but silent */ + +/* counts how many times a given line printed a message */ +static LONG line_counters[16384]; /* The following data must be kept track of on a per-thread basis */ struct tls_data @@ -284,6 +296,25 @@ int broken( int condition ) return (strcmp(winetest_platform, "windows") == 0) && condition; } +static LONG winetest_add_line( void ) +{ + struct tls_data *data; + int index, count; + + if (winetest_debug > 1) + return 0; + + data = get_tls_data(); + index = data->current_line % ARRAY_SIZE(line_counters); + count = InterlockedIncrement(line_counters + index) - 1; + if (count == winetest_mute_threshold) + printf( "%s:%d Line has been silenced after %d occurences\n", + data->current_file, data->current_line, + winetest_mute_threshold); + + return count; +} + /* * Checks condition. * Parameters: @@ -310,13 +341,19 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) } else { - if (winetest_debug > 0) + if (!winetest_debug || + winetest_add_line() < winetest_mute_threshold) { - printf( "%s:%d: Test marked todo: ", - data->current_file, data->current_line ); - vprintf(msg, args); + if (winetest_debug > 0) + { + printf( "%s:%d Test marked todo: ", + data->current_file, data->current_line ); + vprintf(msg, args); + } + InterlockedIncrement(&todo_successes); } - InterlockedIncrement(&todo_successes); + else + InterlockedIncrement(&muted_todo_successes); return 1; } } @@ -353,24 +390,32 @@ void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) void __winetest_cdecl winetest_trace( const char *msg, ... ) { __winetest_va_list valist; - struct tls_data *data = get_tls_data(); - if (winetest_debug > 0) + if (!winetest_debug) + return; + if (winetest_add_line() < winetest_mute_threshold) { - printf( "%s:%d: ", data->current_file, data->current_line ); + struct tls_data *data = get_tls_data(); + printf( "%s:%d ", data->current_file, data->current_line ); __winetest_va_start(valist, msg); vprintf(msg, valist); __winetest_va_end(valist); } + else + InterlockedIncrement(&muted_traces); } void winetest_vskip( const char *msg, __winetest_va_list args ) { - struct tls_data *data = get_tls_data(); - - printf( "%s:%d: Tests skipped: ", data->current_file, data->current_line ); - vprintf(msg, args); - skipped++; + if (winetest_add_line() < winetest_mute_threshold) + { + struct tls_data *data = get_tls_data(); + printf( "%s:%d Tests skipped: ", data->current_file, data->current_line ); + vprintf(msg, args); + InterlockedIncrement(&skipped); + } + else + InterlockedIncrement(&muted_skipped); } void __winetest_cdecl winetest_skip( const char *msg, ... ) @@ -505,7 +550,11 @@ static int run_test( const char *name ) if (winetest_debug) { - printf( "%04x:%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + if (muted_todo_successes || muted_skipped || muted_traces) + printf( "%04x:%s Silenced %d todos, %d skips and %d traces.\n", + GetCurrentProcessId(), test->name, + muted_todo_successes, muted_skipped, muted_traces); + printf( "%04x:%s %d tests executed (%d marked as todo, %d %s), %d skipped.\n", GetCurrentProcessId(), test->name, successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, -- 2.20.1

1 1

[PATCH] winex11.drv: Use raw value for raw motion event.
by Ziqing Hui 03 Feb '20

03 Feb '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH] dwrite: Fix potential strings object leak (Coverity).
by Nikolay Sivov 03 Feb '20

03 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/opentype.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 0aa1b10460..9813676ab0 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2166,10 +2166,6 @@ static HRESULT opentype_get_font_strings_from_meta(const struct file_stream_desc *ret = NULL; - hr = create_localizedstrings(&strings); - if (FAILED(hr)) - return hr; - switch (id) { case DWRITE_INFORMATIONAL_STRING_DESIGN_SCRIPT_LANGUAGE_TAG: @@ -2183,6 +2179,9 @@ static HRESULT opentype_get_font_strings_from_meta(const struct file_stream_desc return S_OK; } + if (FAILED(hr = create_localizedstrings(&strings))) + return hr; + opentype_get_font_table(stream_desc, MS_META_TAG, &meta); if (meta.data) -- 2.24.1

1 0

[PATCH 1/2] ole32/tests: Add some tests for MonikerCommonPrefixWith().
by Nikolay Sivov 03 Feb '20

03 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 117 +++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index d485360215..4c8d013e42 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -92,6 +92,24 @@ todo_wine_if(todo) ok_(__FILE__, line)(type2 == type, "Unexpected moniker type %d.\n", type2); } +#define TEST_DISPLAY_NAME(m,name) _test_moniker_name(m, name, __LINE__) +static void _test_moniker_name(IMoniker *moniker, const WCHAR *name, int line) +{ + WCHAR *display_name; + IBindCtx *pbc; + HRESULT hr; + + hr = CreateBindCtx(0, &pbc); + ok_(__FILE__, line)(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); + + hr = IMoniker_GetDisplayName(moniker, pbc, NULL, &display_name); + ok_(__FILE__, line)(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); + ok_(__FILE__, line)(!lstrcmpW(display_name, name), "Unexpected display name %s.\n", wine_dbgstr_w(display_name)); + + CoTaskMemFree(display_name); + IBindCtx_Release(pbc); +} + static IMoniker *create_antimoniker(DWORD level) { LARGE_INTEGER pos; @@ -3221,6 +3239,104 @@ static void test_save_load_filemoniker(void) IStream_Release(pStm); } +static void test_MonikerCommonPrefixWith(void) +{ + IMoniker *moniker, *item, *file1, *file2, *composite, *composite2; + HRESULT hr; + + moniker = (void *)0xdeadbeef; + hr = MonikerCommonPrefixWith(NULL, NULL, &moniker); +todo_wine { + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + ok(!moniker, "Unexpected pointer.\n"); +} + if (hr == E_NOTIMPL) + return; + + hr = CreateItemMoniker(L"!", L"Item", &item); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(item, NULL, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(NULL, item, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(item, item, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = CreateFileMoniker(L"C:\\test.txt", &file1); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(file1, NULL, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(NULL, file1, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + /* F x F */ + hr = MonikerCommonPrefixWith(file1, file1, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = CreateFileMoniker(L"C:\\a\\test.txt", &file2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + /* F1 x F2 */ + hr = MonikerCommonPrefixWith(file1, file2, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = CreateGenericComposite(file1, item, &composite); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = CreateGenericComposite(file2, item, &composite2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + /* F x (F,I) -> F */ + hr = MonikerCommonPrefixWith(file1, composite, &moniker); + ok(hr == MK_S_ME, "Unexpected hr %#x.\n", hr); + ok(moniker == file1, "Unexpected pointer.\n"); + IMoniker_Release(moniker); + + /* F1 x (F2,I) -> F */ + hr = MonikerCommonPrefixWith(file1, composite2, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker, MKSYS_FILEMONIKER); + TEST_DISPLAY_NAME(moniker, L"C:\\"); + IMoniker_Release(moniker); + + /* (F2,I) x F1 -> F */ + hr = MonikerCommonPrefixWith(composite2, file1, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker, MKSYS_FILEMONIKER); + TEST_DISPLAY_NAME(moniker, L"C:\\"); + IMoniker_Release(moniker); + + /* (F,I) x (F) -> F */ + hr = MonikerCommonPrefixWith(composite, file1, &moniker); + ok(hr == MK_S_HIM, "Unexpected hr %#x.\n", hr); + ok(moniker == file1, "Unexpected pointer.\n"); + IMoniker_Release(moniker); + + /* (F,I) x (F,I) -> (F,I) */ + hr = MonikerCommonPrefixWith(composite, composite, &moniker); + ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker, MKSYS_GENERICCOMPOSITE); + TEST_DISPLAY_NAME(moniker, L"C:\\test.txt!Item"); + ok(moniker != composite, "Unexpected pointer.\n"); + IMoniker_Release(moniker); + + /* (F1,I) x (F2,I) -> () */ + hr = MonikerCommonPrefixWith(composite, composite2, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!moniker, "Unexpected pointer %p.\n", moniker); + + IMoniker_Release(composite2); + IMoniker_Release(composite); + IMoniker_Release(file2); + IMoniker_Release(file1); + IMoniker_Release(item); +} + START_TEST(moniker) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -3235,6 +3351,7 @@ START_TEST(moniker) test_generic_composite_moniker(); test_pointer_moniker(); test_save_load_filemoniker(); + test_MonikerCommonPrefixWith(); /* FIXME: test moniker creation funcs and parsing other moniker formats */ -- 2.24.1

1 1

[PATCH] include: Add some newer Edit messages.
by Nikolay Sivov 03 Feb '20

03 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/commctrl.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 700b335fbb..b503f9ef24 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5346,6 +5346,24 @@ typedef struct _tagEDITBALLOONTIP #define EM_GETHILITE (ECM_FIRST + 6) #define EM_NOSETFOCUS (ECM_FIRST + 7) #define EM_TAKEFOCUS (ECM_FIRST + 8) +#define EM_SETEXTENDEDSTYLE (ECM_FIRST + 10) +#define EM_GETEXTENDEDSTYLE (ECM_FIRST + 11) +#define EM_SETENDOFLINE (ECM_FIRST + 12) +#define EM_GETENDOFLINE (ECM_FIRST + 13) +#define EM_ENABLESEARCHWEB (ECM_FIRST + 14) +#define EM_SEARCHWEB (ECM_FIRST + 15) +#define EM_SETCARETINDEX (ECM_FIRST + 17) +#define EM_GETCARETINDEX (ECM_FIRST + 18) +#define EM_FILELINEFROMCHAR (ECM_FIRST + 19) +#define EM_FILELINEINDEX (ECM_FIRST + 20) +#define EM_FILELINELENGTH (ECM_FIRST + 21) +#define EM_GETFILELINE (ECM_FIRST + 22) +#define EM_GETFILELINECOUNT (ECM_FIRST + 23) + +#define EM_GETZOOM (WM_USER + 224) +#define EM_SETZOOM (WM_USER + 225) + +#define EN_SEARCHWEB (EN_FIRST) #define Edit_SetCueBannerText(hwnd, text) \ (BOOL)SNDMSG((hwnd), EM_SETCUEBANNER, 0, (LPARAM)(text)) -- 2.24.1

1 0

[PATCH 1/5] shdocvw: Forward WhichPlatform() to shlwapi.
by Nikolay Sivov 03 Feb '20

03 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 11 ----------- include/shlwapi.h | 8 +++++++- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 485d1608db..aa1b5e0c96 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -2,7 +2,7 @@ 101 stdcall -noname IEWinMain(str long) 102 stub -noname CreateShortcutInDirA 103 stub -noname CreateShortcutInDirW -104 stdcall -noname WhichPlatformFORWARD() +104 stdcall -noname WhichPlatform() shlwapi.WhichPlatform 105 stub -noname CreateShortcutInDirEx 106 stub HlinkFindFrame 107 stub SetShellOfflineState diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 98d0d2cde2..ac3913dd23 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -283,17 +283,6 @@ static void* fetch_shlwapi_ordinal(UINT_PTR ord) return (void*)GetProcAddress(h, (const char*)ord); } -/****************************************************************** - * WhichPlatformFORWARD (SHDOCVW.@) - */ -DWORD WINAPI WhichPlatformFORWARD(void) -{ - static DWORD (WINAPI *p)(void); - - if (p || (p = fetch_shlwapi_ordinal(276))) return p(); - return 1; /* not integrated, see shlwapi.WhichPlatform */ -} - /****************************************************************** * StopWatchModeFORWARD (SHDOCVW.@) */ diff --git a/include/shlwapi.h b/include/shlwapi.h index 8d6801a94d..2bfca0bc90 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1135,7 +1135,6 @@ BOOL WINAPI IsOS(DWORD); #define FDTF_RTLDATE 0x00000200 #define FDTF_NOAUTOREADINGORDER 0x00000400 - typedef struct { const IID *piid; @@ -1144,6 +1143,13 @@ typedef struct HRESULT WINAPI QISearch(void* base, const QITAB *pqit, REFIID riid, void **ppv); +#define PLATFORM_UNKNOWN 0 +#define PLATFORM_IE3 1 +#define PLATFORM_BROWSERONLY 1 +#define PLATFORM_INTEGRATED 2 + +UINT WINAPI WhichPlatform(void); + #include <poppack.h> #ifdef __cplusplus -- 2.24.1

1 4

[PATCH] d3dx9_36: Implement D3DXCreateKeyframedAnimationSet
by Alistair Leslie-Hughes 03 Feb '20

03 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45481 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3dx9_36/animation.c | 388 ++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/mesh.c | 27 +++ 2 files changed, 412 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/animation.c b/dlls/d3dx9_36/animation.c index de6d69d383..c916be976b 100644 --- a/dlls/d3dx9_36/animation.c +++ b/dlls/d3dx9_36/animation.c @@ -468,14 +468,396 @@ HRESULT WINAPI D3DXCreateAnimationController(UINT max_outputs, UINT max_sets, return D3D_OK; } +struct d3dx9_animation_frame_set +{ + ID3DXKeyframedAnimationSet ID3DXKeyframedAnimationSet_iface; + LONG ref; + + char *name; + double ticks_per_second; + D3DXPLAYBACK_TYPE playback_type; + UINT animation_count; + UINT callback_key_count; + const D3DXKEY_CALLBACK *callback_keys; +}; + +static inline struct d3dx9_animation_frame_set *impl_from_ID3DXKeyframedAnimationSet(ID3DXKeyframedAnimationSet *iface) +{ + return CONTAINING_RECORD(iface, struct d3dx9_animation_frame_set, ID3DXKeyframedAnimationSet_iface); +} + +static HRESULT WINAPI d3dx9_animation_framed_QueryInterface(ID3DXKeyframedAnimationSet *iface, REFIID riid, void **obj) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_ID3DXAnimationSet) || + IsEqualGUID(riid, &IID_ID3DXKeyframedAnimationSet)) + { + iface->lpVtbl->AddRef(iface); + *obj = iface; + return D3D_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI d3dx9_animation_framed_AddRef(ID3DXKeyframedAnimationSet *iface) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + ULONG refcount = InterlockedIncrement(&framed->ref); + + TRACE("%p increasing refcount to %u.\n", framed, refcount); + + return refcount; +} + +static ULONG WINAPI d3dx9_animation_framed_Release(ID3DXKeyframedAnimationSet *iface) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + ULONG refcount = InterlockedDecrement(&framed->ref); + + TRACE("%p decreasing refcount to %u.\n", framed, refcount); + + if (!refcount) + { + heap_free(framed->name); + HeapFree(GetProcessHeap(), 0, framed); + } + + return refcount; +} + +static const char * WINAPI d3dx9_animation_framed_GetName(ID3DXKeyframedAnimationSet *iface) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + TRACE("framed %p.\n", framed); + return framed->name; +} + +static DOUBLE WINAPI d3dx9_animation_framed_GetPeriod(ID3DXKeyframedAnimationSet *iface) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p stub.\n", framed); + return 0.0f; +} + +static DOUBLE WINAPI d3dx9_animation_framed_GetPeriodicPosition(ID3DXKeyframedAnimationSet *iface, DOUBLE position) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p stub.\n", framed); + return 0.0f; +} + +static UINT WINAPI d3dx9_animation_framed_GetNumAnimations(ID3DXKeyframedAnimationSet *iface) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p stub.\n", framed); + return 0; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetAnimationNameByIndex(ID3DXKeyframedAnimationSet *iface, UINT index, + const char **name) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, name %p stub.\n", framed, name); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetAnimationIndexByName(ID3DXKeyframedAnimationSet *iface, + const char *name, UINT *index) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, name %s, index %p stub.\n", framed, debugstr_a(name), index); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetSRT(ID3DXKeyframedAnimationSet *iface, DOUBLE periodic_position, + UINT animation, D3DXVECTOR3 *scale, + D3DXQUATERNION *rotation, D3DXVECTOR3 *translation) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, periodic_position %f, animation %u, scale %p rotation %p translation %p stub.\n", + framed, periodic_position, animation, scale, rotation, translation); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetCallback(ID3DXKeyframedAnimationSet *iface, double position, + DWORD flags, double *callback_position, void **callback_data) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, position %f, flags 0x%08x, callback_position %p, callback_data %p stub.\n", + framed, position, flags, callback_position, callback_data); + return E_NOTIMPL; +} + +static D3DXPLAYBACK_TYPE WINAPI d3dx9_animation_framed_GetPlaybackType(ID3DXKeyframedAnimationSet *iface) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + TRACE("framed %p.\n", framed); + return framed->playback_type; +} + +static DOUBLE WINAPI d3dx9_animation_framed_GetSourceTicksPerSecond(ID3DXKeyframedAnimationSet *iface) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + TRACE("framed %p.\n", framed); + return framed->ticks_per_second; +} + +static UINT WINAPI d3dx9_animation_framed_GetNumScaleKeys(ID3DXKeyframedAnimationSet *iface, UINT keys) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, keys %u stub.\n", framed, keys); + return 0; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetScaleKeys(ID3DXKeyframedAnimationSet *iface, UINT animation, + D3DXKEY_VECTOR3 *scale_keys) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, scale_keys %p stub.\n", framed, animation, scale_keys); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetScaleKey(ID3DXKeyframedAnimationSet *iface, UINT animation, + UINT key, D3DXKEY_VECTOR3 *scale_key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, key %u, scale_key %p stub.\n", framed, animation, key, scale_key); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_SetScaleKey(ID3DXKeyframedAnimationSet *iface, UINT animation, + UINT key, D3DXKEY_VECTOR3 *scale_key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, key %u, scale_key %p stub.\n", framed, animation, key, scale_key); + return E_NOTIMPL; +} + +static UINT WINAPI d3dx9_animation_framed_GetNumRotationKeys(ID3DXKeyframedAnimationSet *iface, UINT animation) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u stub.\n", framed, animation); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetRotationKeys(ID3DXKeyframedAnimationSet *iface, UINT animation, + D3DXKEY_QUATERNION *rotation_keys) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, rotation_keys %p stub.\n", framed, animation, rotation_keys); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetRotationKey(ID3DXKeyframedAnimationSet *iface, UINT animation, UINT key, + D3DXKEY_QUATERNION *rotation_key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, key %u, rotation_key %p stub.\n", framed, animation, key, rotation_key); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_SetRotationKey(ID3DXKeyframedAnimationSet *iface, UINT animation, UINT key, + D3DXKEY_QUATERNION *rotation_key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, key %u, rotation_key %p stub.\n", framed, animation, key, rotation_key); + return E_NOTIMPL; +} + +static UINT WINAPI d3dx9_animation_framed_GetNumTranslationKeys(ID3DXKeyframedAnimationSet *iface, UINT animation) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u stub.\n", framed, animation); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetTranslationKeys(ID3DXKeyframedAnimationSet *iface, UINT animation, + D3DXKEY_VECTOR3 *translation_keys) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, rotation_key %p stub.\n", framed, animation, translation_keys); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetTranslationKey(ID3DXKeyframedAnimationSet *iface, UINT animation, + UINT key, D3DXKEY_VECTOR3 *translation_key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, key %u, translation_key %p stub.\n", framed, animation, key, translation_key); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_SetTranslationKey(ID3DXKeyframedAnimationSet *iface, UINT animation, + UINT key, D3DXKEY_VECTOR3 *translation_key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, key %u, translation_key %p stub.\n", framed, animation, key, translation_key); + return E_NOTIMPL; +} + +static UINT WINAPI d3dx9_animation_framed_GetNumCallbackKeys(ID3DXKeyframedAnimationSet *iface) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p stub.\n", framed); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetCallbackKeys(ID3DXKeyframedAnimationSet *iface, + D3DXKEY_CALLBACK *callback_keys) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, callback_keys %p stub.\n", framed, callback_keys); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetCallbackKey(ID3DXKeyframedAnimationSet *iface, UINT key, + D3DXKEY_CALLBACK *callback_key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, key %u, callback_key %p stub.\n", framed, key, callback_key); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_SetCallbackKey(ID3DXKeyframedAnimationSet *iface, UINT key, + D3DXKEY_CALLBACK *callback_key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, key %u, callback_key %p stub.\n", framed, key, callback_key); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_UnregisterScaleKey(ID3DXKeyframedAnimationSet *iface, + UINT animation, UINT key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, key %u stub.\n", framed, animation, key); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_UnregisterRotationKey(ID3DXKeyframedAnimationSet *iface, + UINT animation, UINT key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, key %u stub.\n", framed, animation, key); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_UnregisterTranslationKey(ID3DXKeyframedAnimationSet *iface, + UINT animation, UINT key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, key %u stub.\n", framed, animation, key); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_RegisterAnimationSRTKeys(ID3DXKeyframedAnimationSet *iface, + const char *name, UINT num_scale_keys, UINT num_rotation_keys, UINT num_translation_keys, + const D3DXKEY_VECTOR3 *scale_keys, const D3DXKEY_QUATERNION *rotation_keys, + const D3DXKEY_VECTOR3 *translation_keys, DWORD *animation_index) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, name %s, num_scale_keys %u, num_rotation_keys %u, rotation_keys %p, num_translation_keys %u, " + " scale_keys %p, rotation_keys %p, translation_keys %p, animation_index %p stub.\n", + framed, debugstr_a(name), num_scale_keys, num_rotation_keys, rotation_keys, num_translation_keys, scale_keys, + rotation_keys, translation_keys, animation_index); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_Compress(ID3DXKeyframedAnimationSet *iface, DWORD flags, float lossiness, + D3DXFRAME *hierarchy, ID3DXBuffer **compressed_data) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, flags 0x%08x, lossiness %f, hierarchy %p, compressed_data %p stub.\n", framed, flags, lossiness, + hierarchy, compressed_data); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_UnregisterAnimation(ID3DXKeyframedAnimationSet *iface, UINT index) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, index %u stub.\n", framed, index); + return E_NOTIMPL; +} + +static const struct ID3DXKeyframedAnimationSetVtbl d3dx9_animation_framed_vtbl = +{ + d3dx9_animation_framed_QueryInterface, + d3dx9_animation_framed_AddRef, + d3dx9_animation_framed_Release, + d3dx9_animation_framed_GetName, + d3dx9_animation_framed_GetPeriod, + d3dx9_animation_framed_GetPeriodicPosition, + d3dx9_animation_framed_GetNumAnimations, + d3dx9_animation_framed_GetAnimationNameByIndex, + d3dx9_animation_framed_GetAnimationIndexByName, + d3dx9_animation_framed_GetSRT, + d3dx9_animation_framed_GetCallback, + d3dx9_animation_framed_GetPlaybackType, + d3dx9_animation_framed_GetSourceTicksPerSecond, + d3dx9_animation_framed_GetNumScaleKeys, + d3dx9_animation_framed_GetScaleKeys, + d3dx9_animation_framed_GetScaleKey, + d3dx9_animation_framed_SetScaleKey, + d3dx9_animation_framed_GetNumRotationKeys, + d3dx9_animation_framed_GetRotationKeys, + d3dx9_animation_framed_GetRotationKey, + d3dx9_animation_framed_SetRotationKey, + d3dx9_animation_framed_GetNumTranslationKeys, + d3dx9_animation_framed_GetTranslationKeys, + d3dx9_animation_framed_GetTranslationKey, + d3dx9_animation_framed_SetTranslationKey, + d3dx9_animation_framed_GetNumCallbackKeys, + d3dx9_animation_framed_GetCallbackKeys, + d3dx9_animation_framed_GetCallbackKey, + d3dx9_animation_framed_SetCallbackKey, + d3dx9_animation_framed_UnregisterScaleKey, + d3dx9_animation_framed_UnregisterRotationKey, + d3dx9_animation_framed_UnregisterTranslationKey, + d3dx9_animation_framed_RegisterAnimationSRTKeys, + d3dx9_animation_framed_Compress, + d3dx9_animation_framed_UnregisterAnimation +}; + HRESULT WINAPI D3DXCreateKeyframedAnimationSet(const char *name, double ticks_per_second, D3DXPLAYBACK_TYPE playback_type, UINT animation_count, UINT callback_key_count, const D3DXKEY_CALLBACK *callback_keys, ID3DXKeyframedAnimationSet **animation_set) { - FIXME("name %s, ticks_per_second %.16e, playback_type %u, animation_count %u, " - "callback_key_count %u, callback_keys %p, animation_set %p stub.\n", + struct d3dx9_animation_frame_set *object; + + TRACE("name %s, ticks_per_second %.16e, playback_type %u, animation_count %u, " + "callback_key_count %u, callback_keys %p, animation_set %p.\n", debugstr_a(name), ticks_per_second, playback_type, animation_count, callback_key_count, callback_keys, animation_set); - return E_NOTIMPL; + if(!animation_count) + return D3DERR_INVALIDCALL; + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->ID3DXKeyframedAnimationSet_iface.lpVtbl = &d3dx9_animation_framed_vtbl; + object->ref = 1; + object->name = heap_alloc( strlen(name)+1 ); + if(!object->name) + { + heap_free(object); + return E_OUTOFMEMORY; + } + strcpy(object->name, name); + object->ticks_per_second = ticks_per_second; + object->playback_type = playback_type; + object->animation_count = animation_count; + object->callback_key_count = callback_key_count; + object->callback_keys = callback_keys; + + *animation_set = &object->ID3DXKeyframedAnimationSet_iface; + + return D3D_OK; } diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 3882bb404a..fc07ac1228 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -11119,6 +11119,32 @@ static void D3DXCreateAnimationControllerTest(void) animation->lpVtbl->Release(animation); } +static void D3DXCreateKeyframedAnimationSetTest(void) +{ + ID3DXKeyframedAnimationSet *framed; + HRESULT hr; + const char *name; + D3DXPLAYBACK_TYPE playtype; + UINT count; + + hr = D3DXCreateKeyframedAnimationSet("wine_bottle", 5.0, D3DXPLAY_LOOP, 0, 0, NULL, &framed); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr returned %#x.\n", hr); + + hr = D3DXCreateKeyframedAnimationSet("wine_bottle", 5.0, D3DXPLAY_LOOP, 10, 0, NULL, &framed); + ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); + + name = framed->lpVtbl->GetName(framed); + ok(!strcmp(name, "wine_bottle"), "unexpected name (%s)\n", name); + + playtype = framed->lpVtbl->GetPlaybackType(framed); + ok(playtype == D3DXPLAY_LOOP, "unexpected value, got %d\n", playtype); + + count = framed->lpVtbl->GetNumAnimations(framed); + ok(count == 0, "unexpected value, got %d\n", count); + + framed->lpVtbl->Release(framed); +} + static void test_D3DXFrameFind(void) { static char n1[] = "name1"; @@ -11387,6 +11413,7 @@ START_TEST(mesh) D3DXCreateTextTest(); D3DXCreateTorusTest(); D3DXCreateAnimationControllerTest(); + D3DXCreateKeyframedAnimationSetTest(); test_get_decl_length(); test_get_decl_vertex_size(); test_fvf_decl_conversion(); -- 2.17.1

1 0

[PATCH] oledb32: DataLink Dialog - Add page for ODBC Connections.
by Alistair Leslie-Hughes 03 Feb '20

03 Feb '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/dslocator.c | 113 ++++++++++++++++++++++++++++++++++++--- dlls/oledb32/resource.h | 20 +++++++ dlls/oledb32/version.rc | 26 +++++++++ 3 files changed, 151 insertions(+), 8 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 26ee12de53..556390fdf8 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -289,11 +289,102 @@ static LRESULT CALLBACK data_link_properties_dlg_proc(HWND hwnd, UINT msg, WPARA return 0; } +static void connection_fill_odbc_list(HWND parent) +{ + LONG res; + HKEY key; + DWORD index = 0; + WCHAR name[MAX_PATH]; + DWORD nameLen; + + HWND combo = GetDlgItem(parent, IDC_CBO_NAMES); + if (!combo) + return; + + res = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\ODBC\\ODBC.INI\\ODBC Data Sources", 0, KEY_READ, &key); + if (res == ERROR_FILE_NOT_FOUND) + return; + + SendMessageW (combo, CB_RESETCONTENT, 0, 0); + + for(;; index++) + { + nameLen = MAX_PATH; + if (RegEnumValueW(key, index, name, &nameLen, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + break; + + SendMessageW(combo, CB_ADDSTRING, 0, (LPARAM)name); + } + + RegCloseKey(key); +} + +static void connection_initialize_controls(HWND parent) +{ + HWND hwnd = GetDlgItem(parent, IDC_RDO_SRC_NAME); + if (hwnd) + SendMessageA(hwnd, BM_SETCHECK, BST_CHECKED, 0); +} + +static void connection_toggle_controls(HWND parent) +{ + BOOL checked = TRUE; + HWND hwnd = GetDlgItem(parent, IDC_RDO_SRC_NAME); + if (hwnd) + checked = SendMessageA(hwnd, BM_GETCHECK, 0, 0); + + EnableWindow(GetDlgItem(parent, IDC_CBO_NAMES), checked); + EnableWindow(GetDlgItem(parent, IDC_BTN_REFRESH), checked); + + EnableWindow(GetDlgItem(parent, IDC_LBL_CONNECTION), !checked); + EnableWindow(GetDlgItem(parent, IDC_EDT_CONNECTION), !checked); + EnableWindow(GetDlgItem(parent, IDC_BTN_BUILD), !checked); +} + +static LRESULT CALLBACK data_link_connection_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); + + switch (msg) + { + case WM_INITDIALOG: + { + connection_initialize_controls(hwnd); + connection_fill_odbc_list(hwnd); + connection_toggle_controls(hwnd); + break; + } + case WM_COMMAND: + { + switch LOWORD(wp) + { + case IDC_RDO_SRC_NAME: + case IDC_BTN_CONNECTION: + connection_toggle_controls(hwnd); + break; + case IDC_BTN_REFRESH: + connection_fill_odbc_list(hwnd); + break; + case IDC_BTN_BUILD: + case IDC_BTN_TEST: + /* TODO: Implement dialogs */ + MessageBoxA(hwnd, "Not implemented yet.", "Error", MB_OK | MB_ICONEXCLAMATION); + break; + } + + break; + } + default: + break; + } + return 0; +} + static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch **connection) { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); PROPSHEETHEADERW hdr; - PROPSHEETPAGEW page; + PROPSHEETPAGEW pages[2]; INT_PTR ret; FIXME("(%p, %p) Semi-stub\n", iface, connection); @@ -303,11 +394,17 @@ static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch * *connection = NULL; - memset(&page, 0, sizeof(PROPSHEETPAGEW)); - page.dwSize = sizeof(page); - page.hInstance = instance; - page.u.pszTemplate = MAKEINTRESOURCEW(IDD_PROVIDER); - page.pfnDlgProc = data_link_properties_dlg_proc; + memset(&pages, 0, sizeof(pages)); + + pages[0].dwSize = sizeof(PROPSHEETPAGEW); + pages[0].hInstance = instance; + pages[0].u.pszTemplate = MAKEINTRESOURCEW(IDD_PROVIDER); + pages[0].pfnDlgProc = data_link_properties_dlg_proc; + + pages[1].dwSize = sizeof(PROPSHEETPAGEW); + pages[1].hInstance = instance; + pages[1].u.pszTemplate = MAKEINTRESOURCEW(IDD_CONNECTION); + pages[1].pfnDlgProc = data_link_connection_dlg_proc; memset(&hdr, 0, sizeof(hdr)); hdr.dwSize = sizeof(hdr); @@ -315,8 +412,8 @@ static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch * hdr.dwFlags = PSH_NOAPPLYNOW | PSH_PROPSHEETPAGE; hdr.hInstance = instance; hdr.pszCaption = MAKEINTRESOURCEW(IDS_PROPSHEET_TITLE); - hdr.u3.ppsp = &page; - hdr.nPages = 1; + hdr.u3.ppsp = pages; + hdr.nPages = ARRAY_SIZE(pages); ret = PropertySheetW(&hdr); return ret ? S_OK : S_FALSE; diff --git a/dlls/oledb32/resource.h b/dlls/oledb32/resource.h index df88a10829..7944e42cc4 100644 --- a/dlls/oledb32/resource.h +++ b/dlls/oledb32/resource.h @@ -22,3 +22,23 @@ #define IDS_PROPSHEET_TITLE 2000 #define IDS_COL_PROVIDER 2001 + +#define IDD_CONNECTION 3000 +#define IDC_BTN_EDIT 3001 +#define IDC_RDO_SRC_NAME 3002 +#define IDC_CBO_NAMES 3003 +#define IDC_BTN_REFRESH 3004 +#define IDC_BTN_CONNECTION 3005 +#define IDC_EDT_CONNECTION 3006 +#define IDC_BTN_BUILD 3007 +#define IDC_EDT_NAME 3008 +#define IDC_EDT_PASSWORD 3009 +#define IDC_CHK_BLANK 3010 +#define IDC_CHK_SAVE_PASS 3011 +#define IDC_CBO_INITIAL 3012 +#define IDC_BTN_TEST 3013 +#define IDC_LBL_SOURCE 3014 +#define IDC_LBL_LOGIN 3015 +#define IDC_LBL_INITIAL 3016 +#define IDC_LBL_CONNECTION 3017 + diff --git a/dlls/oledb32/version.rc b/dlls/oledb32/version.rc index 3a200d1cd6..63d1d6c002 100644 --- a/dlls/oledb32/version.rc +++ b/dlls/oledb32/version.rc @@ -46,3 +46,29 @@ BEGIN CONTROL "",IDC_LST_CONNECTIONS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,14,20,206,162 PUSHBUTTON "&Next >",IDC_BTN_NEXT,170,194,50,14 END + +IDD_CONNECTION DIALOG 0, 0, 227, 225 +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Connection" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the following to connect to ODBC data:",-1,7,7,213,8 + LTEXT "1. Specify the source of data:",IDC_LBL_SOURCE,14,18,206,8 + CONTROL "Use &data source name",IDC_RDO_SRC_NAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,29,29,192,10 + COMBOBOX IDC_CBO_NAMES,36,40,150,128,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Refresh",IDC_BTN_REFRESH,189,39,31,14 + CONTROL "Use c&onnection string",IDC_BTN_CONNECTION,"Button",BS_AUTORADIOBUTTON,29,57,192,10 + LTEXT "&Connection string:",IDC_LBL_CONNECTION,36,68,182,8 + EDITTEXT IDC_EDT_CONNECTION,36,78,148,12,ES_AUTOHSCROLL + PUSHBUTTON "B&uild...",IDC_BTN_BUILD,189,77,31,14 + LTEXT "2. Enter information to log on to the server",IDC_LBL_LOGIN,14,98,206,8 + LTEXT "User &name:",-1,29,110,38,8 + EDITTEXT IDC_EDT_NAME,67,108,153,12,ES_AUTOHSCROLL + LTEXT "&Password:",-1,29,126,34,8 + EDITTEXT IDC_EDT_PASSWORD,67,124,153,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "&Blank password",IDC_CHK_BLANK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,29,140,69,10 + CONTROL "Allow &saving password",IDC_CHK_SAVE_PASS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,103,140,103,10 + LTEXT "3. Enter the &initial catalog to use:",IDC_LBL_INITIAL,14,159,206,8 + COMBOBOX IDC_CBO_INITIAL,29,170,191,64,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Test Connection",IDC_BTN_TEST,140,194,81,14,WS_GROUP +END -- 2.17.1

1 0

[PATCH] configure: Fix a typo in a comment.
by Francois Gouget 03 Feb '20

03 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 36f65378a44..f9ca95ce496 100644 --- a/configure.ac +++ b/configure.ac @@ -1686,7 +1686,7 @@ fi WINE_NOTICE_WITH(udev,[test "x$UDEV_LIBS" = "x"], [libudev ${notice_platform}development files not found, plug and play won't be supported.]) -dnl **** Check for libuwind **** +dnl **** Check for libunwind **** if test "x$with_unwind" != xno then WINE_PACKAGE_FLAGS(UNWIND,[libunwind],[-lunwind],,, -- 2.20.1

1 0

[PATCH v2 resend 1/8] msvcr90/tests: Test _get_current_locale()/setlocale() interaction.
by Chip Davis 03 Feb '20

03 Feb '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v2: Bail if setlocale() fails. Mark a result as broken(). --- dlls/msvcr90/tests/msvcr90.c | 466 +++++++++++++++++++++++++++++++++++ 1 file changed, 466 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index c8a49f25492d..c81f4410d60b 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -139,6 +139,22 @@ static int (__cdecl *p_swscanf)(const wchar_t *str, const wchar_t* format, ...); static int (__cdecl *p____mb_cur_max_l_func)(_locale_t locale); static _locale_t (__cdecl *p__create_locale)(int, const char*); static void (__cdecl *p__free_locale)(_locale_t); +static _locale_t (__cdecl *p__get_current_locale)(void); + +struct __lc_time_data { + const char *short_wday[7]; + const char *wday[7]; + const char *short_mon[12]; + const char *mon[12]; + const char *am; + const char *pm; + const char *short_date; + const char *date; + const char *time; + LCID lcid; + int unk; + int refcount; +}; /* make sure we use the correct errno */ #undef errno @@ -408,6 +424,7 @@ static BOOL init(void) SET(p____mb_cur_max_l_func, "___mb_cur_max_l_func"); SET(p__create_locale, "_create_locale"); SET(p__free_locale, "_free_locale"); + SET(p__get_current_locale, "_get_current_locale"); if (sizeof(void *) == 8) { @@ -1961,6 +1978,454 @@ static void test____mb_cur_max_l_func(void) p__free_locale(l); } +static void test__get_current_locale(void) +{ + _locale_t l = p__get_current_locale(), l2 = p__get_current_locale(); + int i; +#define lc_str(lc, s) \ + ok(!strcmp(l->locinfo->lc_category[lc].locale, s), #lc " = \"%s\"\n", \ + l->locinfo->lc_category[lc].locale) + lc_str(LC_COLLATE, "C"); + lc_str(LC_CTYPE, "C"); + lc_str(LC_MONETARY, "C"); + lc_str(LC_NUMERIC, "C"); + lc_str(LC_TIME, "C"); + + ok(l->locinfo->refcount == 3, "refcount = %d\n", l->locinfo->refcount); + + if(!p_setlocale(LC_ALL, "english")) { + win_skip("English locale not available\n"); + p__free_locale(l); + p__free_locale(l2); + return; + } + + todo_wine { + lc_str(LC_COLLATE, "C"); + lc_str(LC_CTYPE, "C"); + lc_str(LC_MONETARY, "C"); + lc_str(LC_NUMERIC, "C"); + lc_str(LC_TIME, "C"); + } +#undef lc_str + + todo_wine ok(l->locinfo->refcount == 2, "refcount = %d\n", l->locinfo->refcount); + ok(l->locinfo == l2->locinfo, "different locinfo pointers\n"); + ok(l->mbcinfo == l2->mbcinfo, "different mbcinfo pointers\n"); + + p__free_locale(l); + p__free_locale(l2); + + l = p__get_current_locale(); + p_setlocale(LC_COLLATE, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + todo_wine { + ok(l->locinfo->lc_category[LC_COLLATE].locale != l2->locinfo->lc_category[LC_COLLATE].locale, + "same locale name pointers for LC_COLLATE\n"); + ok(l->locinfo->lc_category[LC_COLLATE].refcount != l2->locinfo->lc_category[LC_COLLATE].refcount, + "same refcount pointers for LC_COLLATE\n"); + ok(l->locinfo->lc_category[LC_COLLATE].refcount, "null refcount pointer for LC_COLLATE\n"); + if(l->locinfo->lc_category[LC_COLLATE].refcount) + ok(*l->locinfo->lc_category[LC_COLLATE].refcount == 1, "refcount = %d\n", + *l->locinfo->lc_category[LC_COLLATE].refcount); + ok(l2->locinfo->lc_category[LC_COLLATE].refcount, "null refcount pointer for LC_COLLATE\n"); + if(l2->locinfo->lc_category[LC_COLLATE].refcount) + ok(*l2->locinfo->lc_category[LC_COLLATE].refcount == 2, "refcount = %d\n", + *l2->locinfo->lc_category[LC_COLLATE].refcount); + } + for(i = LC_CTYPE; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale == l2->locinfo->lc_category[i].locale, + "different locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount == l2->locinfo->lc_category[i].refcount, + "different refcount pointers for category %d\n", i); + todo_wine ok(*l->locinfo->lc_category[i].refcount == 3, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + } + + todo_wine ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage == l2->locinfo->lc_codepage, "different lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike == l2->locinfo->lc_clike, "different lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + /* The meaning of this member seems to be reversed--go figure */ + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + ok(l->locinfo->ctype1 == l2->locinfo->ctype1, "different ctype1 pointers\n"); + ok(l->locinfo->pclmap == l2->locinfo->pclmap, "different clmap pointers\n"); + ok(l->locinfo->pcumap == l2->locinfo->pcumap, "different cumap pointers\n"); + ok(l->locinfo->ctype1_refcount == l2->locinfo->ctype1_refcount, "different ctype1_refcount pointers\n"); + todo_wine ok(*l->locinfo->ctype1_refcount == 3, "refcount = %d\n", *l->locinfo->ctype1_refcount); + + ok(l->locinfo->lconv == l2->locinfo->lconv, "different lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount == l2->locinfo->lconv_intl_refcount, "different lconv_intl_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + todo_wine ok(*l->locinfo->lconv_intl_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + + ok(l->locinfo->lconv->decimal_point == l2->locinfo->lconv->decimal_point, "different LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount == l2->locinfo->lconv_num_refcount, "different lconv_num_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + todo_wine ok(*l->locinfo->lconv_num_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + + ok(l->locinfo->lconv->currency_symbol == l2->locinfo->lconv->currency_symbol, "different LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount == l2->locinfo->lconv_mon_refcount, "different lconv_mon_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + todo_wine ok(*l->locinfo->lconv_mon_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_CTYPE, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + for(i = LC_COLLATE; i < LC_MONETARY; i++) { + todo_wine { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + for(i = LC_MONETARY; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale == l2->locinfo->lc_category[i].locale, + "different locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount == l2->locinfo->lc_category[i].refcount, + "different refcount pointers for category %d\n", i); + todo_wine ok(*l->locinfo->lc_category[i].refcount == 3, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + } + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + ok(l->locinfo->lconv == l2->locinfo->lconv, "different lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount == l2->locinfo->lconv_intl_refcount, "different lconv_intl_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + todo_wine ok(*l->locinfo->lconv_intl_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + + ok(l->locinfo->lconv->decimal_point == l2->locinfo->lconv->decimal_point, "different LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount == l2->locinfo->lconv_num_refcount, "different lconv_num_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + todo_wine ok(*l->locinfo->lconv_num_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + + ok(l->locinfo->lconv->currency_symbol == l2->locinfo->lconv->currency_symbol, "different LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount == l2->locinfo->lconv_mon_refcount, "different lconv_mon_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + todo_wine ok(*l->locinfo->lconv_mon_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_MONETARY, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + for(i = LC_COLLATE; i <= LC_MONETARY; i++) { + todo_wine { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + for(i = LC_NUMERIC; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale == l2->locinfo->lc_category[i].locale, + "different locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount == l2->locinfo->lc_category[i].refcount, + "different refcount pointers for category %d\n", i); + todo_wine ok(*l->locinfo->lc_category[i].refcount == 3, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + } + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv != l2->locinfo->lconv, "same lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount != l2->locinfo->lconv_intl_refcount, "same lconv_intl_refcount pointers\n"); + ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + ok(*l->locinfo->lconv_intl_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + ok(l2->locinfo->lconv_intl_refcount, "null refcount pointer for C locale\n"); + if(l2->locinfo->lconv_intl_refcount) + ok(*l2->locinfo->lconv_intl_refcount == 2, "refcount = %d\n", *l2->locinfo->lconv_intl_refcount); + } + + ok(l->locinfo->lconv->decimal_point == l2->locinfo->lconv->decimal_point, "different LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount == l2->locinfo->lconv_num_refcount, "different lconv_num_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + todo_wine ok(*l->locinfo->lconv_num_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + + todo_wine { + ok(l->locinfo->lconv->currency_symbol != l2->locinfo->lconv->currency_symbol, "same LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount != l2->locinfo->lconv_mon_refcount, "same lconv_mon_refcount pointers\n"); + ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + ok(*l->locinfo->lconv_mon_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + } + ok(!l2->locinfo->lconv_mon_refcount, "nonnull refcount pointer for C locale\n"); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_NUMERIC, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + for(i = LC_COLLATE; i <= LC_NUMERIC; i++) { + todo_wine { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + ok(l->locinfo->lc_category[LC_TIME].locale == l2->locinfo->lc_category[LC_TIME].locale, + "different locale name pointers for LC_TIME\n"); + ok(l->locinfo->lc_category[LC_TIME].refcount == l2->locinfo->lc_category[LC_TIME].refcount, + "different refcount pointers for LC_TIME\n"); + todo_wine ok(*l->locinfo->lc_category[LC_TIME].refcount == 3, "refcount = %d\n", + *l->locinfo->lc_category[LC_TIME].refcount); + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv != l2->locinfo->lconv, "same lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount != l2->locinfo->lconv_intl_refcount, "same lconv_intl_refcount pointers\n"); + ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + ok(*l->locinfo->lconv_intl_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + } + ok(!l2->locinfo->lconv_intl_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->decimal_point != l2->locinfo->lconv->decimal_point, "same LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount != l2->locinfo->lconv_num_refcount, "same lconv_num_refcount pointers\n"); + ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + ok(*l->locinfo->lconv_num_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + } + ok(!l2->locinfo->lconv_num_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->currency_symbol != l2->locinfo->lconv->currency_symbol, "same LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount != l2->locinfo->lconv_mon_refcount, "same lconv_mon_refcount pointers\n"); + ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + ok(*l->locinfo->lconv_mon_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + } + ok(!l2->locinfo->lconv_mon_refcount, "nonnull refcount pointer for C locale\n"); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_TIME, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + todo_wine { + for(i = LC_MIN+1; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv != l2->locinfo->lconv, "same lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount != l2->locinfo->lconv_intl_refcount, "same lconv_intl_refcount pointers\n"); + ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + ok(*l->locinfo->lconv_intl_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + } + ok(!l2->locinfo->lconv_intl_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->decimal_point != l2->locinfo->lconv->decimal_point, "same LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount != l2->locinfo->lconv_num_refcount, "same lconv_num_refcount pointers\n"); + ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + ok(*l->locinfo->lconv_num_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + } + ok(!l2->locinfo->lconv_num_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->currency_symbol != l2->locinfo->lconv->currency_symbol, "same LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount != l2->locinfo->lconv_mon_refcount, "same lconv_mon_refcount pointers\n"); + ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + ok(*l->locinfo->lconv_mon_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + } + ok(!l2->locinfo->lconv_mon_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine ok(l->locinfo->lc_time_curr != l2->locinfo->lc_time_curr, "same lc_time_curr pointers\n"); + ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 1, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + ok(l2->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l2->locinfo->lc_time_curr->unk); + todo_wine ok(l2->locinfo->lc_time_curr->refcount == 3 || broken(l2->locinfo->lc_time_curr->refcount == 2), + "refcount = %d\n", l2->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p__free_locale(l); + p_setlocale(LC_ALL, "C"); +} + START_TEST(msvcr90) { if(!init()) @@ -2001,4 +2466,5 @@ START_TEST(msvcr90) test___strncnt(); test_swscanf(); test____mb_cur_max_l_func(); + test__get_current_locale(); } -- 2.24.0

1 7

[PATCH] tests: Don't initialize static variables to 0.
by Francois Gouget 03 Feb '20

03 Feb '20

Static variables are initialized to 0 by default anyway. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- I don't really mind initializing them but with the current code not all of them are initialized : skipped is missing. The inconsistency makes this a bit confusing so I propose to standardize on using the fact that the compiler will automatically initialize those to 0. include/wine/test.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index 9f308b4c4ab..827d1cba226 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -543,7 +543,6 @@ static int run_test( const char *name ) printf( "Fatal: test '%s' does not exist.\n", name ); exit_process(1); } - successes = failures = todo_successes = todo_failures = 0; tls_index=TlsAlloc(); current_test = test; test->func(); -- 2.20.1

1 0

[PATCH v2 1/5] quartz/filtergraph: Get rid of tracing for outer IUnknown methods.
by Zebediah Figura 02 Feb '20

02 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 207 ++++++++++++-------------------------- 1 file changed, 63 insertions(+), 144 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 161b0e9f900..c29bb3e95d8 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -527,31 +527,22 @@ static inline IFilterGraphImpl *impl_from_IFilterGraph2(IFilterGraph2 *iface) return CONTAINING_RECORD(iface, IFilterGraphImpl, IFilterGraph2_iface); } -static HRESULT WINAPI FilterGraph2_QueryInterface(IFilterGraph2 *iface, REFIID riid, void **ppvObj) +static HRESULT WINAPI FilterGraph2_QueryInterface(IFilterGraph2 *iface, REFIID iid, void **out) { - IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); } static ULONG WINAPI FilterGraph2_AddRef(IFilterGraph2 *iface) { - IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface); + return IUnknown_AddRef(graph->outer_unk); } static ULONG WINAPI FilterGraph2_Release(IFilterGraph2 *iface) { - IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface); + return IUnknown_Release(graph->outer_unk); } static IBaseFilter *find_filter_by_name(IFilterGraphImpl *graph, const WCHAR *name) @@ -2005,31 +1996,22 @@ static inline IFilterGraphImpl *impl_from_IMediaControl(IMediaControl *iface) return CONTAINING_RECORD(iface, IFilterGraphImpl, IMediaControl_iface); } -static HRESULT WINAPI MediaControl_QueryInterface(IMediaControl *iface, REFIID riid, void **ppvObj) +static HRESULT WINAPI MediaControl_QueryInterface(IMediaControl *iface, REFIID iid, void **out) { - IFilterGraphImpl *This = impl_from_IMediaControl(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + IFilterGraphImpl *graph = impl_from_IMediaControl(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); } static ULONG WINAPI MediaControl_AddRef(IMediaControl *iface) { - IFilterGraphImpl *This = impl_from_IMediaControl(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IMediaControl(iface); + return IUnknown_AddRef(graph->outer_unk); } static ULONG WINAPI MediaControl_Release(IMediaControl *iface) { - IFilterGraphImpl *This = impl_from_IMediaControl(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IMediaControl(iface); + return IUnknown_Release(graph->outer_unk); } @@ -2178,31 +2160,22 @@ static inline IFilterGraphImpl *impl_from_IMediaSeeking(IMediaSeeking *iface) return CONTAINING_RECORD(iface, IFilterGraphImpl, IMediaSeeking_iface); } -static HRESULT WINAPI MediaSeeking_QueryInterface(IMediaSeeking *iface, REFIID riid, void **ppvObj) +static HRESULT WINAPI MediaSeeking_QueryInterface(IMediaSeeking *iface, REFIID iid, void **out) { - IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + IFilterGraphImpl *graph = impl_from_IMediaSeeking(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); } static ULONG WINAPI MediaSeeking_AddRef(IMediaSeeking *iface) { - IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IMediaSeeking(iface); + return IUnknown_AddRef(graph->outer_unk); } static ULONG WINAPI MediaSeeking_Release(IMediaSeeking *iface) { - IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IMediaSeeking(iface); + return IUnknown_Release(graph->outer_unk); } typedef HRESULT (WINAPI *fnFoundSeek)(IFilterGraphImpl *This, IMediaSeeking*, DWORD_PTR arg); @@ -2660,31 +2633,22 @@ static inline IFilterGraphImpl *impl_from_IMediaPosition(IMediaPosition *iface) } /*** IUnknown methods ***/ -static HRESULT WINAPI MediaPosition_QueryInterface(IMediaPosition* iface, REFIID riid, void** ppvObj) +static HRESULT WINAPI MediaPosition_QueryInterface(IMediaPosition *iface, REFIID iid, void **out) { - IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + IFilterGraphImpl *graph = impl_from_IMediaPosition(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); } static ULONG WINAPI MediaPosition_AddRef(IMediaPosition *iface) { - IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IMediaPosition(iface); + return IUnknown_AddRef(graph->outer_unk); } static ULONG WINAPI MediaPosition_Release(IMediaPosition *iface) { - IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IMediaPosition(iface); + return IUnknown_Release(graph->outer_unk); } /*** IDispatch methods ***/ @@ -2872,31 +2836,22 @@ static inline IFilterGraphImpl *impl_from_IObjectWithSite(IObjectWithSite *iface } /*** IUnknown methods ***/ -static HRESULT WINAPI ObjectWithSite_QueryInterface(IObjectWithSite* iface, REFIID riid, void** ppvObj) +static HRESULT WINAPI ObjectWithSite_QueryInterface(IObjectWithSite *iface, REFIID iid, void **out) { - IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + IFilterGraphImpl *graph = impl_from_IObjectWithSite(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); } static ULONG WINAPI ObjectWithSite_AddRef(IObjectWithSite *iface) { - IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IObjectWithSite(iface); + return IUnknown_AddRef(graph->outer_unk); } static ULONG WINAPI ObjectWithSite_Release(IObjectWithSite *iface) { - IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IObjectWithSite(iface); + return IUnknown_Release(graph->outer_unk); } /*** IObjectWithSite methods ***/ @@ -2984,31 +2939,22 @@ static inline IFilterGraphImpl *impl_from_IBasicAudio(IBasicAudio *iface) return CONTAINING_RECORD(iface, IFilterGraphImpl, IBasicAudio_iface); } -static HRESULT WINAPI BasicAudio_QueryInterface(IBasicAudio *iface, REFIID riid, void **ppvObj) +static HRESULT WINAPI BasicAudio_QueryInterface(IBasicAudio *iface, REFIID iid, void **out) { - IFilterGraphImpl *This = impl_from_IBasicAudio(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + IFilterGraphImpl *graph = impl_from_IBasicAudio(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); } static ULONG WINAPI BasicAudio_AddRef(IBasicAudio *iface) { - IFilterGraphImpl *This = impl_from_IBasicAudio(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IBasicAudio(iface); + return IUnknown_AddRef(graph->outer_unk); } static ULONG WINAPI BasicAudio_Release(IBasicAudio *iface) { - IFilterGraphImpl *This = impl_from_IBasicAudio(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IBasicAudio(iface); + return IUnknown_Release(graph->outer_unk); } static HRESULT WINAPI BasicAudio_GetTypeInfoCount(IBasicAudio *iface, UINT *count) @@ -3160,31 +3106,22 @@ static inline IFilterGraphImpl *impl_from_IBasicVideo2(IBasicVideo2 *iface) return CONTAINING_RECORD(iface, IFilterGraphImpl, IBasicVideo2_iface); } -static HRESULT WINAPI BasicVideo_QueryInterface(IBasicVideo2 *iface, REFIID riid, void **ppvObj) +static HRESULT WINAPI BasicVideo_QueryInterface(IBasicVideo2 *iface, REFIID iid, void **out) { - IFilterGraphImpl *This = impl_from_IBasicVideo2(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + IFilterGraphImpl *graph = impl_from_IBasicVideo2(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); } static ULONG WINAPI BasicVideo_AddRef(IBasicVideo2 *iface) { - IFilterGraphImpl *This = impl_from_IBasicVideo2(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IBasicVideo2(iface); + return IUnknown_AddRef(graph->outer_unk); } static ULONG WINAPI BasicVideo_Release(IBasicVideo2 *iface) { - IFilterGraphImpl *This = impl_from_IBasicVideo2(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IBasicVideo2(iface); + return IUnknown_Release(graph->outer_unk); } static HRESULT WINAPI BasicVideo_GetTypeInfoCount(IBasicVideo2 *iface, UINT *count) @@ -3953,31 +3890,22 @@ static inline IFilterGraphImpl *impl_from_IVideoWindow(IVideoWindow *iface) return CONTAINING_RECORD(iface, IFilterGraphImpl, IVideoWindow_iface); } -static HRESULT WINAPI VideoWindow_QueryInterface(IVideoWindow *iface, REFIID riid, void **ppvObj) +static HRESULT WINAPI VideoWindow_QueryInterface(IVideoWindow *iface, REFIID iid, void **out) { - IFilterGraphImpl *This = impl_from_IVideoWindow(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + IFilterGraphImpl *graph = impl_from_IVideoWindow(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); } static ULONG WINAPI VideoWindow_AddRef(IVideoWindow *iface) { - IFilterGraphImpl *This = impl_from_IVideoWindow(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IVideoWindow(iface); + return IUnknown_AddRef(graph->outer_unk); } static ULONG WINAPI VideoWindow_Release(IVideoWindow *iface) { - IFilterGraphImpl *This = impl_from_IVideoWindow(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IVideoWindow(iface); + return IUnknown_Release(graph->outer_unk); } HRESULT WINAPI VideoWindow_GetTypeInfoCount(IVideoWindow *iface, UINT *count) @@ -4872,31 +4800,22 @@ static inline IFilterGraphImpl *impl_from_IMediaEventEx(IMediaEventEx *iface) return CONTAINING_RECORD(iface, IFilterGraphImpl, IMediaEventEx_iface); } -static HRESULT WINAPI MediaEvent_QueryInterface(IMediaEventEx *iface, REFIID riid, void **ppvObj) +static HRESULT WINAPI MediaEvent_QueryInterface(IMediaEventEx *iface, REFIID iid, void **out) { - IFilterGraphImpl *This = impl_from_IMediaEventEx(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + IFilterGraphImpl *graph = impl_from_IMediaEventEx(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); } static ULONG WINAPI MediaEvent_AddRef(IMediaEventEx *iface) { - IFilterGraphImpl *This = impl_from_IMediaEventEx(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IMediaEventEx(iface); + return IUnknown_AddRef(graph->outer_unk); } static ULONG WINAPI MediaEvent_Release(IMediaEventEx *iface) { - IFilterGraphImpl *This = impl_from_IMediaEventEx(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IMediaEventEx(iface); + return IUnknown_Release(graph->outer_unk); } /*** IDispatch methods ***/ -- 2.25.0

1 5

[PATCH 1/5] quartz/tests: Add tests for IFilterGraph::Reconnect().
by Zebediah Figura 02 Feb '20

02 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 110693185fd..decea5d94cb 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2915,6 +2915,37 @@ todo_wine ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); ok(source_pin.mt == &mt, "Got mt %p.\n", source_pin.mt); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test Reconnect[Ex](). */ + + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + sink_pin.peer = &source_pin.IPin_iface; + IPin_AddRef(sink_pin.peer); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); /* ConnectDirect() protects against cyclical connections. */ hr = IFilterGraph2_AddFilter(graph, &parser1.IBaseFilter_iface, NULL); @@ -2953,6 +2984,8 @@ todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Both pins are disconnected when a filter is removed. */ + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); sink_pin.peer = &source_pin.IPin_iface; IPin_AddRef(sink_pin.peer); hr = IFilterGraph2_RemoveFilter(graph, &source.IBaseFilter_iface); -- 2.25.0

2 9

Wine staging 5.1 release
by Alistair Leslie-Hughes 02 Feb '20

02 Feb '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.1 (860 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * include: Add directmanipulation.idl * include: Add DCompManipulationCompositor coclass and supporting interfaces. * include: Add IDirectManipulationViewport2 interface. * include: Add IDirectManipulationPrimaryContent interface. * include/winternl.h: Add Vista+ PEB_LDR_DATA structure fields. * gdiplus: GdipCreateBitmapFromHBITMAP should use palette from the GDI bitmap. * gdiplus: Reimplement GdipCreateBitmapFromGdiDib by using GdipCreateBitmapFromHBITMAP. * gdiplus/tests: Add more tests for GdipCreateBitmapFromHBITMAP and palette images. * kernelbase: Implement ReOpenFile(). * advapi32: Fallback to Sid string when LookupAccountSid fails. * advapi32: Fix name and use of DOMAIN_GROUP_RID_USERS. * gdiplus: Use refcounting for GpFontFamily instead of cloning. Added: * None Updated: * dxva2-Video_Decoder * oleaut32-CreateTypeLib * ntdll-RtlIpv4StringToAddress * d3dx9_36-D3DXCreateKeyframedAnimationSet * wined3d-SWVP-shaders Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] wldap32: Remove unused debug channel.
by Gerald Pfeifer 02 Feb '20

02 Feb '20

This led to the definition of a static variable which then was not used, so wasting space and/or triggering a compiler warning. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/wldap32/add.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wldap32/add.c b/dlls/wldap32/add.c index 0a24d95f32..d28ad961e1 100644 --- a/dlls/wldap32/add.c +++ b/dlls/wldap32/add.c @@ -34,8 +34,6 @@ #include "wldap32.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); - #ifdef HAVE_LDAP static LDAPMod *nullattrs[] = { NULL }; #endif -- 2.25.0

3 3

Call for WineConf Hosts
by Ulrich Czekalla 02 Feb '20

02 Feb '20

Hi All, During the last WineConf it was decided that we needed a more formal process for choosing the next WineConf host. It was also decided that we need to help current and future hosts by by putting together a support WineConf committee along with a checklist to help guide the host. To that end, we have started a Organising WineConf [1] wiki page. It's by no means complete so I encourage all past hosts to review and edit the page to make it more helpful to potential hosts. Thanks to Henri for providing most of the current content. This is also a call for proposals to host the next WineConf sometime this year. Ideally proposals would present; Proposed dates Proposed city Information on potential venues and travel We'll need to choose a host relatively quickly as it does take time to plan and book the event. I'm hoping we can settle on a host by the end of February but ultimately that decision goes to the Wine Committee. Questions, comments, concerns can be posted on the mailing list. Thanks, -Ulrich 1. http://wiki.winehq.org/Organising_WineConf

1 0

[PATCH v2] iphlpapi: Consolidate append_*_row functions
by Alex Henrie 01 Feb '20

01 Feb '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Minor whitespace fix --- dlls/iphlpapi/ipstats.c | 151 +++++++++------------------------------- 1 file changed, 32 insertions(+), 119 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index dd6a57015f..83259f4743 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1326,24 +1326,24 @@ DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS stats) return GetUdpStatisticsEx(stats, WS_AF_INET); } -static MIB_IPFORWARDTABLE *append_ipforward_row( HANDLE heap, DWORD flags, MIB_IPFORWARDTABLE *table, - DWORD *count, const MIB_IPFORWARDROW *row ) +static void *append_table_row( HANDLE heap, DWORD flags, void *table, DWORD *table_size, DWORD *table_capacity, + const void *row, DWORD row_size ) { - if (table->dwNumEntries >= *count) + DWORD *num_entries = table; /* this must be the first field */ + if (*num_entries == *table_capacity) { - MIB_IPFORWARDTABLE *new_table; - DWORD new_count = table->dwNumEntries * 2; - - if (!(new_table = HeapReAlloc( heap, flags, table, - FIELD_OFFSET(MIB_IPFORWARDTABLE, table[new_count] )))) + void *new_table; + *table_size += *table_capacity * row_size; + if (!(new_table = HeapReAlloc( heap, flags, table, *table_size ))) { HeapFree( heap, 0, table ); return NULL; } - *count = new_count; - table = new_table; + num_entries = table = new_table; + *table_capacity *= 2; } - memcpy( &table->table[table->dwNumEntries++], row, sizeof(*row) ); + memcpy( (char *)table + *table_size - (*table_capacity - *num_entries) * row_size, row, row_size ); + (*num_entries)++; return table; } @@ -1381,13 +1381,13 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw { MIB_IPFORWARDTABLE *table; MIB_IPFORWARDROW row; - DWORD ret = NO_ERROR, count = 16; + DWORD ret = NO_ERROR, count = 16, table_size = FIELD_OFFSET( MIB_IPFORWARDTABLE, table[count] ); TRACE("table %p, bOrder %d, heap %p, flags 0x%08x\n", ppIpForwardTable, bOrder, heap, flags); if (!ppIpForwardTable) return ERROR_INVALID_PARAMETER; - if (!(table = HeapAlloc( heap, flags, FIELD_OFFSET(MIB_IPFORWARDTABLE, table[count] )))) + if (!(table = HeapAlloc( heap, flags, table_size ))) return ERROR_OUTOFMEMORY; table->dwNumEntries = 0; @@ -1428,7 +1428,7 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw * route is typically set with MIB_IPPROTO_NETMGMT instead */ row.u2.ForwardProto = MIB_IPPROTO_LOCAL; - if (!(table = append_ipforward_row( heap, flags, table, &count, &row ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) break; } fclose(fp); @@ -1465,7 +1465,8 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw memcpy( name, entry->ipRouteIfIndex.o_bytes, namelen ); name[namelen] = 0; getInterfaceIndexByName( name, &row.dwForwardIfIndex ); - if (!(table = append_ipforward_row( heap, flags, table, &count, &row ))) break; + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) + break; } HeapFree( GetProcessHeap(), 0, data ); } @@ -1573,7 +1574,7 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw } } - if (!(table = append_ipforward_row( heap, flags, table, &count, &row ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) break; } done: @@ -1596,27 +1597,6 @@ done: return ret; } -static MIB_IPNETTABLE *append_ipnet_row( HANDLE heap, DWORD flags, MIB_IPNETTABLE *table, - DWORD *count, const MIB_IPNETROW *row ) -{ - if (table->dwNumEntries >= *count) - { - MIB_IPNETTABLE *new_table; - DWORD new_count = table->dwNumEntries * 2; - - if (!(new_table = HeapReAlloc( heap, flags, table, - FIELD_OFFSET(MIB_IPNETTABLE, table[new_count] )))) - { - HeapFree( heap, 0, table ); - return NULL; - } - *count = new_count; - table = new_table; - } - memcpy( &table->table[table->dwNumEntries++], row, sizeof(*row) ); - return table; -} - static int compare_ipnet_rows(const void *a, const void *b) { const MIB_IPNETROW *rowA = a; @@ -1648,13 +1628,13 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO { MIB_IPNETTABLE *table; MIB_IPNETROW row; - DWORD ret = NO_ERROR, count = 16; + DWORD ret = NO_ERROR, count = 16, table_size = FIELD_OFFSET( MIB_IPNETTABLE, table[count] ); TRACE("table %p, bOrder %d, heap %p, flags 0x%08x\n", ppIpNetTable, bOrder, heap, flags); if (!ppIpNetTable) return ERROR_INVALID_PARAMETER; - if (!(table = HeapAlloc( heap, flags, FIELD_OFFSET(MIB_IPNETTABLE, table[count] )))) + if (!(table = HeapAlloc( heap, flags, table_size ))) return ERROR_OUTOFMEMORY; table->dwNumEntries = 0; @@ -1700,7 +1680,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO while (*ptr && isspace(*ptr)) ptr++; getInterfaceIndexByName(ptr, &row.dwIndex); - if (!(table = append_ipnet_row( heap, flags, table, &count, &row ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) break; } fclose(fp); @@ -1728,7 +1708,8 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO memcpy( name, entry->ipNetToMediaIfIndex.o_bytes, namelen ); name[namelen] = 0; getInterfaceIndexByName( name, &row.dwIndex ); - if (!(table = append_ipnet_row( heap, flags, table, &count, &row ))) break; + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) + break; } HeapFree( GetProcessHeap(), 0, data ); } @@ -1784,7 +1765,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO else if(rtm->rtm_rmx.rmx_expire != 0) row.u.Type = MIB_IPNET_TYPE_DYNAMIC; else row.u.Type = MIB_IPNET_TYPE_INVALID; - if (!(table = append_ipnet_row( heap, flags, table, &count, &row ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) break; } next += rtm->rtm_msglen; @@ -1846,30 +1827,6 @@ static DWORD get_tcp_table_sizes( TCP_TABLE_CLASS class, DWORD row_count, DWORD return table_size; } -static MIB_TCPTABLE *append_tcp_row( TCP_TABLE_CLASS class, HANDLE heap, DWORD flags, - MIB_TCPTABLE *table, DWORD *count, - const MIB_TCPROW_OWNER_MODULE *row, DWORD row_size ) -{ - if (table->dwNumEntries >= *count) - { - MIB_TCPTABLE *new_table; - DWORD new_count = table->dwNumEntries * 2, new_table_size; - - new_table_size = get_tcp_table_sizes( class, new_count, NULL ); - if (!(new_table = HeapReAlloc( heap, flags, table, new_table_size ))) - { - HeapFree( heap, 0, table ); - return NULL; - } - *count = new_count; - table = new_table; - } - memcpy( (char *)table->table + (table->dwNumEntries * row_size), row, row_size ); - table->dwNumEntries++; - return table; -} - - /* Why not a lookup table? Because the TCPS_* constants are different on different platforms */ static inline MIB_TCP_STATE TCPStateToMIBState (int state) @@ -2156,7 +2113,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.liCreateTimestamp.QuadPart = 0; /* FIXME */ memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_tcp_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } HeapFree( GetProcessHeap(), 0, map ); @@ -2182,7 +2139,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.dwRemotePort = htons( entry->tcpConnRemPort ); row.dwState = entry->tcpConnState; if (!match_class( class, row.dwState )) continue; - if (!(table = append_tcp_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } HeapFree( GetProcessHeap(), 0, data ); @@ -2276,7 +2233,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.liCreateTimestamp.QuadPart = 0; /* FIXME */ memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_tcp_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } @@ -2395,29 +2352,6 @@ static DWORD get_udp_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD return table_size; } -static MIB_UDPTABLE *append_udp_row( UDP_TABLE_CLASS class, HANDLE heap, DWORD flags, - MIB_UDPTABLE *table, DWORD *count, - const MIB_UDPROW_OWNER_MODULE *row, DWORD row_size ) -{ - if (table->dwNumEntries >= *count) - { - MIB_UDPTABLE *new_table; - DWORD new_count = table->dwNumEntries * 2, new_table_size; - - new_table_size = get_udp_table_sizes( class, new_count, NULL ); - if (!(new_table = HeapReAlloc( heap, flags, table, new_table_size ))) - { - HeapFree( heap, 0, table ); - return NULL; - } - *count = new_count; - table = new_table; - } - memcpy( (char *)table->table + (table->dwNumEntries * row_size), row, row_size ); - table->dwNumEntries++; - return table; -} - static int compare_udp_rows(const void *a, const void *b) { const MIB_UDPROW *rowA = a; @@ -2474,7 +2408,7 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.u.dwFlags = 0; memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_udp_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } HeapFree( GetProcessHeap(), 0, map ); @@ -2496,7 +2430,8 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE { row.dwLocalAddr = entry->udpLocalAddress; row.dwLocalPort = htons( entry->udpLocalPort ); - if (!(table = append_udp_row( class, heap, flags, table, &count, &row, row_size ))) break; + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) + break; } HeapFree( GetProcessHeap(), 0, data ); } @@ -2584,7 +2519,8 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.u.SpecificPortBind = !(pINData->inp_flags & INP_ANONPORT); memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_udp_row( class, heap, flags, table, &count, &row, row_size ))) break; + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) + break; } done: @@ -2640,29 +2576,6 @@ static DWORD get_udp6_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD return table_size; } -static MIB_UDP6TABLE *append_udp6_row( UDP_TABLE_CLASS class, HANDLE heap, DWORD flags, - MIB_UDP6TABLE *table, DWORD *count, - const MIB_UDP6ROW_OWNER_MODULE *row, DWORD row_size ) -{ - if (table->dwNumEntries >= *count) - { - MIB_UDP6TABLE *new_table; - DWORD new_count = table->dwNumEntries * 2, new_table_size; - - new_table_size = get_udp6_table_sizes( class, new_count, NULL ); - if (!(new_table = HeapReAlloc( heap, flags, table, new_table_size ))) - { - HeapFree( heap, 0, table ); - return NULL; - } - *count = new_count; - table = new_table; - } - memcpy( (char *)table->table + (table->dwNumEntries * row_size), row, row_size ); - table->dwNumEntries++; - return table; -} - static int compare_udp6_rows(const void *a, const void *b) { const MIB_UDP6ROW *rowA = a; @@ -2824,7 +2737,7 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.u.dwFlags = 0; memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_udp6_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } HeapFree( GetProcessHeap(), 0, map ); -- 2.25.0

1 0

[PATCH] iphlpapi: Consolidate append_*_row functions
by Alex Henrie 01 Feb '20

01 Feb '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/iphlpapi/ipstats.c | 151 +++++++++------------------------------- 1 file changed, 32 insertions(+), 119 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index dd6a57015f..88e338493c 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1326,24 +1326,24 @@ DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS stats) return GetUdpStatisticsEx(stats, WS_AF_INET); } -static MIB_IPFORWARDTABLE *append_ipforward_row( HANDLE heap, DWORD flags, MIB_IPFORWARDTABLE *table, - DWORD *count, const MIB_IPFORWARDROW *row ) +static void *append_table_row( HANDLE heap, DWORD flags, void *table, DWORD *table_size, DWORD *table_capacity, + const void *row, DWORD row_size ) { - if (table->dwNumEntries >= *count) + DWORD *num_entries = table; /* this must be the first field */ + if (*num_entries == *table_capacity) { - MIB_IPFORWARDTABLE *new_table; - DWORD new_count = table->dwNumEntries * 2; - - if (!(new_table = HeapReAlloc( heap, flags, table, - FIELD_OFFSET(MIB_IPFORWARDTABLE, table[new_count] )))) + void *new_table; + *table_size += *table_capacity * row_size; + if (!(new_table = HeapReAlloc( heap, flags, table, *table_size ))) { HeapFree( heap, 0, table ); return NULL; } - *count = new_count; - table = new_table; + num_entries = table = new_table; + *table_capacity *= 2; } - memcpy( &table->table[table->dwNumEntries++], row, sizeof(*row) ); + memcpy( (char *)table + *table_size - (*table_capacity - *num_entries) * row_size, row, row_size ); + (*num_entries)++; return table; } @@ -1381,13 +1381,13 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw { MIB_IPFORWARDTABLE *table; MIB_IPFORWARDROW row; - DWORD ret = NO_ERROR, count = 16; + DWORD ret = NO_ERROR, count = 16, table_size = FIELD_OFFSET( MIB_IPFORWARDTABLE, table[count] ); TRACE("table %p, bOrder %d, heap %p, flags 0x%08x\n", ppIpForwardTable, bOrder, heap, flags); if (!ppIpForwardTable) return ERROR_INVALID_PARAMETER; - if (!(table = HeapAlloc( heap, flags, FIELD_OFFSET(MIB_IPFORWARDTABLE, table[count] )))) + if (!(table = HeapAlloc( heap, flags, table_size))) return ERROR_OUTOFMEMORY; table->dwNumEntries = 0; @@ -1428,7 +1428,7 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw * route is typically set with MIB_IPPROTO_NETMGMT instead */ row.u2.ForwardProto = MIB_IPPROTO_LOCAL; - if (!(table = append_ipforward_row( heap, flags, table, &count, &row ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) break; } fclose(fp); @@ -1465,7 +1465,8 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw memcpy( name, entry->ipRouteIfIndex.o_bytes, namelen ); name[namelen] = 0; getInterfaceIndexByName( name, &row.dwForwardIfIndex ); - if (!(table = append_ipforward_row( heap, flags, table, &count, &row ))) break; + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) + break; } HeapFree( GetProcessHeap(), 0, data ); } @@ -1573,7 +1574,7 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw } } - if (!(table = append_ipforward_row( heap, flags, table, &count, &row ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) break; } done: @@ -1596,27 +1597,6 @@ done: return ret; } -static MIB_IPNETTABLE *append_ipnet_row( HANDLE heap, DWORD flags, MIB_IPNETTABLE *table, - DWORD *count, const MIB_IPNETROW *row ) -{ - if (table->dwNumEntries >= *count) - { - MIB_IPNETTABLE *new_table; - DWORD new_count = table->dwNumEntries * 2; - - if (!(new_table = HeapReAlloc( heap, flags, table, - FIELD_OFFSET(MIB_IPNETTABLE, table[new_count] )))) - { - HeapFree( heap, 0, table ); - return NULL; - } - *count = new_count; - table = new_table; - } - memcpy( &table->table[table->dwNumEntries++], row, sizeof(*row) ); - return table; -} - static int compare_ipnet_rows(const void *a, const void *b) { const MIB_IPNETROW *rowA = a; @@ -1648,13 +1628,13 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO { MIB_IPNETTABLE *table; MIB_IPNETROW row; - DWORD ret = NO_ERROR, count = 16; + DWORD ret = NO_ERROR, count = 16, table_size = FIELD_OFFSET( MIB_IPNETTABLE, table[count] ); TRACE("table %p, bOrder %d, heap %p, flags 0x%08x\n", ppIpNetTable, bOrder, heap, flags); if (!ppIpNetTable) return ERROR_INVALID_PARAMETER; - if (!(table = HeapAlloc( heap, flags, FIELD_OFFSET(MIB_IPNETTABLE, table[count] )))) + if (!(table = HeapAlloc( heap, flags, table_size ))) return ERROR_OUTOFMEMORY; table->dwNumEntries = 0; @@ -1700,7 +1680,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO while (*ptr && isspace(*ptr)) ptr++; getInterfaceIndexByName(ptr, &row.dwIndex); - if (!(table = append_ipnet_row( heap, flags, table, &count, &row ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) break; } fclose(fp); @@ -1728,7 +1708,8 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO memcpy( name, entry->ipNetToMediaIfIndex.o_bytes, namelen ); name[namelen] = 0; getInterfaceIndexByName( name, &row.dwIndex ); - if (!(table = append_ipnet_row( heap, flags, table, &count, &row ))) break; + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) + break; } HeapFree( GetProcessHeap(), 0, data ); } @@ -1784,7 +1765,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO else if(rtm->rtm_rmx.rmx_expire != 0) row.u.Type = MIB_IPNET_TYPE_DYNAMIC; else row.u.Type = MIB_IPNET_TYPE_INVALID; - if (!(table = append_ipnet_row( heap, flags, table, &count, &row ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) break; } next += rtm->rtm_msglen; @@ -1846,30 +1827,6 @@ static DWORD get_tcp_table_sizes( TCP_TABLE_CLASS class, DWORD row_count, DWORD return table_size; } -static MIB_TCPTABLE *append_tcp_row( TCP_TABLE_CLASS class, HANDLE heap, DWORD flags, - MIB_TCPTABLE *table, DWORD *count, - const MIB_TCPROW_OWNER_MODULE *row, DWORD row_size ) -{ - if (table->dwNumEntries >= *count) - { - MIB_TCPTABLE *new_table; - DWORD new_count = table->dwNumEntries * 2, new_table_size; - - new_table_size = get_tcp_table_sizes( class, new_count, NULL ); - if (!(new_table = HeapReAlloc( heap, flags, table, new_table_size ))) - { - HeapFree( heap, 0, table ); - return NULL; - } - *count = new_count; - table = new_table; - } - memcpy( (char *)table->table + (table->dwNumEntries * row_size), row, row_size ); - table->dwNumEntries++; - return table; -} - - /* Why not a lookup table? Because the TCPS_* constants are different on different platforms */ static inline MIB_TCP_STATE TCPStateToMIBState (int state) @@ -2156,7 +2113,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.liCreateTimestamp.QuadPart = 0; /* FIXME */ memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_tcp_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } HeapFree( GetProcessHeap(), 0, map ); @@ -2182,7 +2139,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.dwRemotePort = htons( entry->tcpConnRemPort ); row.dwState = entry->tcpConnState; if (!match_class( class, row.dwState )) continue; - if (!(table = append_tcp_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } HeapFree( GetProcessHeap(), 0, data ); @@ -2276,7 +2233,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.liCreateTimestamp.QuadPart = 0; /* FIXME */ memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_tcp_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } @@ -2395,29 +2352,6 @@ static DWORD get_udp_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD return table_size; } -static MIB_UDPTABLE *append_udp_row( UDP_TABLE_CLASS class, HANDLE heap, DWORD flags, - MIB_UDPTABLE *table, DWORD *count, - const MIB_UDPROW_OWNER_MODULE *row, DWORD row_size ) -{ - if (table->dwNumEntries >= *count) - { - MIB_UDPTABLE *new_table; - DWORD new_count = table->dwNumEntries * 2, new_table_size; - - new_table_size = get_udp_table_sizes( class, new_count, NULL ); - if (!(new_table = HeapReAlloc( heap, flags, table, new_table_size ))) - { - HeapFree( heap, 0, table ); - return NULL; - } - *count = new_count; - table = new_table; - } - memcpy( (char *)table->table + (table->dwNumEntries * row_size), row, row_size ); - table->dwNumEntries++; - return table; -} - static int compare_udp_rows(const void *a, const void *b) { const MIB_UDPROW *rowA = a; @@ -2474,7 +2408,7 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.u.dwFlags = 0; memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_udp_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } HeapFree( GetProcessHeap(), 0, map ); @@ -2496,7 +2430,8 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE { row.dwLocalAddr = entry->udpLocalAddress; row.dwLocalPort = htons( entry->udpLocalPort ); - if (!(table = append_udp_row( class, heap, flags, table, &count, &row, row_size ))) break; + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) + break; } HeapFree( GetProcessHeap(), 0, data ); } @@ -2584,7 +2519,8 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.u.SpecificPortBind = !(pINData->inp_flags & INP_ANONPORT); memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_udp_row( class, heap, flags, table, &count, &row, row_size ))) break; + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) + break; } done: @@ -2640,29 +2576,6 @@ static DWORD get_udp6_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD return table_size; } -static MIB_UDP6TABLE *append_udp6_row( UDP_TABLE_CLASS class, HANDLE heap, DWORD flags, - MIB_UDP6TABLE *table, DWORD *count, - const MIB_UDP6ROW_OWNER_MODULE *row, DWORD row_size ) -{ - if (table->dwNumEntries >= *count) - { - MIB_UDP6TABLE *new_table; - DWORD new_count = table->dwNumEntries * 2, new_table_size; - - new_table_size = get_udp6_table_sizes( class, new_count, NULL ); - if (!(new_table = HeapReAlloc( heap, flags, table, new_table_size ))) - { - HeapFree( heap, 0, table ); - return NULL; - } - *count = new_count; - table = new_table; - } - memcpy( (char *)table->table + (table->dwNumEntries * row_size), row, row_size ); - table->dwNumEntries++; - return table; -} - static int compare_udp6_rows(const void *a, const void *b) { const MIB_UDP6ROW *rowA = a; @@ -2824,7 +2737,7 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.u.dwFlags = 0; memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_udp6_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } HeapFree( GetProcessHeap(), 0, map ); -- 2.25.0

1 0

[PATCH] advapi32: Fix the name and use of DOMAIN_GROUP_RID_USERS.
by Zebediah Figura 01 Feb '20

01 Feb '20

From: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I know of no application that requires this. The patch was originally sent as part of a set in which some patches were labeled as for Cygwin: https://www.winehq.org/pipermail/wine-patches/2015-April/138518.html However, Cygwin is currently too broken in Wine to test. dlls/advapi32/security.c | 5 +++-- dlls/advapi32/tests/security.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a7707f15d39..700ee7d8eae 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -187,7 +187,7 @@ static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m',' static const WCHAR Domain_Computers[] = { 'D','o','m','a','i','n',' ','C','o','m','p','u','t','e','r','s',0 }; static const WCHAR Domain_Controllers[] = { 'D','o','m','a','i','n',' ','C','o','n','t','r','o','l','l','e','r','s',0 }; static const WCHAR Domain_Guests[] = { 'D','o','m','a','i','n',' ','G','u','e','s','t','s',0 }; -static const WCHAR Domain_Users[] = { 'D','o','m','a','i','n',' ','U','s','e','r','s',0 }; +static const WCHAR None[] = { 'N','o','n','e',0 }; static const WCHAR Enterprise_Admins[] = { 'E','n','t','e','r','p','r','i','s','e',' ','A','d','m','i','n','s',0 }; static const WCHAR ENTERPRISE_DOMAIN_CONTROLLERS[] = { 'E','N','T','E','R','P','R','I','S','E',' ','D','O','M','A','I','N',' ','C','O','N','T','R','O','L','L','E','R','S',0 }; static const WCHAR Everyone[] = { 'E','v','e','r','y','o','n','e',0 }; @@ -1185,7 +1185,8 @@ LookupAccountSidW( ac = Domain_Admins; break; case DOMAIN_GROUP_RID_USERS: - ac = Domain_Users; + ac = None; + use = SidTypeGroup; break; case DOMAIN_GROUP_RID_GUESTS: ac = Domain_Guests; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6d73300c1d4..afcdb6328e0 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2928,11 +2928,11 @@ static void test_process_security(void) dom_size = sizeof(domain); ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use ); ok(ret, "LookupAccountSid failed with %d\n", ret); - todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use); + ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use); if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH) skip("Non-English locale (test with hardcoded 'None')\n"); else - todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account); + ok(!strcmp(account, "None"), "expect None, got %s\n", account); res = GetTokenInformation( token, TokenUser, NULL, 0, &size ); ok(!res, "Expected failure, got %d\n", res); -- 2.25.0

1 0

[PATCH 1/2] advapi32/tests: Clean up and expand tests for LsaLookupSids().
by Zebediah Figura 01 Feb '20

01 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/tests/lsa.c | 83 ++++++++++++++++++++++++--------------- 1 file changed, 51 insertions(+), 32 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 451bee92e93..7b8f6b8e849 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -319,74 +319,93 @@ static void test_LsaLookupNames2(void) ok(status == STATUS_SUCCESS, "LsaClose() failed, returned 0x%08x\n", status); } +static void check_unicode_string_(int line, const LSA_UNICODE_STRING *string, const WCHAR *expect) +{ + ok_(__FILE__, line)(string->Length == wcslen(string->Buffer) * sizeof(WCHAR), + "expected %u, got %u\n", wcslen(string->Buffer) * sizeof(WCHAR), string->Length); + ok_(__FILE__, line)(string->MaximumLength == string->Length + sizeof(WCHAR), + "expected %u, got %u\n", string->Length + sizeof(WCHAR), string->MaximumLength); + ok_(__FILE__, line)(!wcsicmp(string->Buffer, expect), "expected %s, got %s\n", + debugstr_w(expect), debugstr_w(string->Buffer)); +} +#define check_unicode_string(a, b) check_unicode_string_(__LINE__, a, b) + static void test_LsaLookupSids(void) { + char user_buffer[64]; + LSA_OBJECT_ATTRIBUTES attrs = {.Length = sizeof(attrs)}; + TOKEN_USER *user = (TOKEN_USER *)user_buffer; + WCHAR computer_name[64], user_name[64]; LSA_REFERENCED_DOMAIN_LIST *list; - LSA_OBJECT_ATTRIBUTES attrs; LSA_TRANSLATED_NAME *names; LSA_HANDLE policy; - TOKEN_USER *user; NTSTATUS status; HANDLE token; DWORD size; BOOL ret; PSID sid; - memset(&attrs, 0, sizeof(attrs)); - attrs.Length = sizeof(attrs); - status = LsaOpenPolicy(NULL, &attrs, POLICY_LOOKUP_NAMES, &policy); ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); ret = OpenProcessToken(GetCurrentProcess(), MAXIMUM_ALLOWED, &token); - ok(ret, "got %d\n", ret); + ok(ret, "OpenProcessToken() failed, error %u\n", GetLastError()); + + ret = GetTokenInformation(token, TokenUser, user, sizeof(user_buffer), &size); + ok(ret, "GetTokenInformation() failed, error %u\n", GetLastError()); - ret = GetTokenInformation(token, TokenUser, NULL, 0, &size); - ok(!ret, "got %d\n", ret); + size = ARRAY_SIZE(computer_name); + ret = GetComputerNameW(computer_name, &size); + ok(ret, "GetComputerName() failed, error %u\n", GetLastError()); - user = HeapAlloc(GetProcessHeap(), 0, size); - ret = GetTokenInformation(token, TokenUser, user, size, &size); - ok(ret, "got %d\n", ret); + size = ARRAY_SIZE(user_name); + ret = GetUserNameW(user_name, &size); + ok(ret, "GetUserName() failed, error %u\n", GetLastError()); status = LsaLookupSids(policy, 1, &user->User.Sid, &list, &names); ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - ok(list->Entries > 0, "got %d\n", list->Entries); - if (list->Entries) - { - ok((char*)list->Domains - (char*)list > 0, "%p, %p\n", list, list->Domains); - ok((char*)list->Domains[0].Sid - (char*)list->Domains > 0, "%p, %p\n", list->Domains, list->Domains[0].Sid); - ok(list->Domains[0].Name.MaximumLength > list->Domains[0].Name.Length, "got %d, %d\n", list->Domains[0].Name.MaximumLength, - list->Domains[0].Name.Length); - } + ok(list->Entries == 1, "got %d\n", list->Entries); + check_unicode_string(&list->Domains[0].Name, computer_name); + + ok(names[0].Use == SidTypeUser, "got type %u\n", names[0].Use); + ok(!names[0].DomainIndex, "got index %u\n", names[0].DomainIndex); + check_unicode_string(&names[0].Name, user_name); LsaFreeMemory(names); LsaFreeMemory(list); - - HeapFree(GetProcessHeap(), 0, user); - CloseHandle(token); ret = ConvertStringSidToSidA("S-1-1-0", &sid); - ok(ret == TRUE, "ConvertStringSidToSidA returned false\n"); + ok(ret, "ConvertStringSidToSidA() failed, error %u\n", GetLastError()); status = LsaLookupSids(policy, 1, &sid, &list, &names); ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - ok(list->Entries > 0, "got %d\n", list->Entries); + ok(list->Entries == 1, "got %d\n", list->Entries); + check_unicode_string(&list->Domains[0].Name, L""); - if (list->Entries) - { - ok((char*)list->Domains - (char*)list > 0, "%p, %p\n", list, list->Domains); - ok((char*)list->Domains[0].Sid - (char*)list->Domains > 0, "%p, %p\n", list->Domains, list->Domains[0].Sid); - ok(list->Domains[0].Name.MaximumLength > list->Domains[0].Name.Length, "got %d, %d\n", list->Domains[0].Name.MaximumLength, - list->Domains[0].Name.Length); - ok(list->Domains[0].Name.Buffer != NULL, "domain[0] name buffer is null\n"); - } + ok(names[0].Use == SidTypeWellKnownGroup, "got type %u\n", names[0].Use); + ok(!names[0].DomainIndex, "got index %u\n", names[0].DomainIndex); + check_unicode_string(&names[0].Name, L"Everyone"); LsaFreeMemory(names); LsaFreeMemory(list); + FreeSid(sid); + + ret = ConvertStringSidToSidA("S-1-1234-5678-1234-5678", &sid); + ok(ret, "ConvertStringSidToSidA() failed, error %u\n", GetLastError()); + status = LsaLookupSids(policy, 1, &sid, &list, &names); + ok(status == STATUS_NONE_MAPPED, "got 0x%08x\n", status); + + ok(!list->Entries, "got %d\n", list->Entries); + + ok(names[0].Use == SidTypeUnknown, "got type %u\n", names[0].Use); + ok(names[0].DomainIndex == -1, "got index %u\n", names[0].DomainIndex); + + LsaFreeMemory(names); + LsaFreeMemory(list); FreeSid(sid); status = LsaClose(policy); -- 2.25.0

1 1

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-devel February 2020