March 2022 - Wine-Commits - list.winehq.org

Bernhard Kölbl : windows.media.speech: Add IVectorView<HSTRING>.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: 016b0a1b04b5247e7ec7fe0363631b84015bf3fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=016b0a1b04b5247e7ec7fe03… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 29 19:30:45 2022 +0200 windows.media.speech: Add IVectorView<HSTRING>. And make it obtainable from IVector<HSTRING>_GetView. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/vector.c | 186 ++++++++++++++++++++++++++++++++++++- 1 file changed, 184 insertions(+), 2 deletions(-) diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c index 13a36499a46..c4112f10a3e 100644 --- a/dlls/windows.media.speech/vector.c +++ b/dlls/windows.media.speech/vector.c @@ -23,6 +23,169 @@ WINE_DEFAULT_DEBUG_CHANNEL(speech); +/* + * + * IVectorView<HSTRING> + * + */ + +struct vector_view_hstring +{ + IVectorView_HSTRING IVectorView_HSTRING_iface; + LONG ref; + + UINT32 size; + HSTRING elements[]; +}; + +static inline struct vector_view_hstring *impl_from_IVectorView_HSTRING( IVectorView_HSTRING *iface ) +{ + return CONTAINING_RECORD(iface, struct vector_view_hstring, IVectorView_HSTRING_iface); +} + +static HRESULT WINAPI vector_view_hstring_QueryInterface( IVectorView_HSTRING *iface, REFIID iid, void **out ) +{ + struct vector_view_hstring *impl = impl_from_IVectorView_HSTRING(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IVectorView_HSTRING)) + { + IInspectable_AddRef((*out = &impl->IVectorView_HSTRING_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI vector_view_hstring_AddRef( IVectorView_HSTRING *iface ) +{ + struct vector_view_hstring *impl = impl_from_IVectorView_HSTRING(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p increasing refcount to %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI vector_view_hstring_Release( IVectorView_HSTRING *iface ) +{ + struct vector_view_hstring *impl = impl_from_IVectorView_HSTRING(iface); + ULONG i, ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p decreasing refcount to %lu.\n", iface, ref); + + if (!ref) + { + for (i = 0; i < impl->size; ++i) WindowsDeleteString(impl->elements[i]); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI vector_view_hstring_GetIids( IVectorView_HSTRING *iface, ULONG *iid_count, IID **iids ) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_view_hstring_GetRuntimeClassName( IVectorView_HSTRING *iface, HSTRING *class_name ) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_view_hstring_GetTrustLevel( IVectorView_HSTRING *iface, TrustLevel *trust_level ) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_view_hstring_GetAt( IVectorView_HSTRING *iface, UINT32 index, HSTRING *value ) +{ + struct vector_view_hstring *impl = impl_from_IVectorView_HSTRING(iface); + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + *value = NULL; + if (index >= impl->size) return E_BOUNDS; + + return WindowsDuplicateString(impl->elements[index], value); +} + +static HRESULT WINAPI vector_view_hstring_get_Size( IVectorView_HSTRING *iface, UINT32 *value ) +{ + struct vector_view_hstring *impl = impl_from_IVectorView_HSTRING(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_view_hstring_IndexOf( IVectorView_HSTRING *iface, HSTRING element, + UINT32 *index, BOOLEAN *found ) +{ + struct vector_view_hstring *impl = impl_from_IVectorView_HSTRING(iface); + ULONG i; + + TRACE("iface %p, element %p, index %p, found %p.\n", iface, element, index, found); + + for (i = 0; i < impl->size; ++i) if (impl->elements[i] == element) break; + if ((*found = (i < impl->size))) *index = i; + else *index = 0; + + return S_OK; +} + +static HRESULT WINAPI vector_view_hstring_GetMany( IVectorView_HSTRING *iface, UINT32 start_index, + UINT32 items_size, HSTRING *items, UINT *count ) +{ + struct vector_view_hstring *impl = impl_from_IVectorView_HSTRING(iface); + HRESULT hr; + UINT32 i; + + TRACE( "iface %p, start_index %u, items_size %u, items %p, count %p.\n", + iface, start_index, items_size, items, count ); + + if (start_index >= impl->size) return E_BOUNDS; + + for (i = start_index; i < impl->size; ++i) + { + if (i - start_index >= items_size) break; + if (FAILED(hr = WindowsDuplicateString(impl->elements[i], &items[i - start_index]))) goto error; + } + *count = i - start_index; + + return S_OK; + +error: + *count = 0; + while (i-- > start_index) WindowsDeleteString(items[i-start_index]); + return hr; +} + +static const struct IVectorView_HSTRINGVtbl vector_view_hstring_vtbl = +{ + /* IUnknown methods */ + vector_view_hstring_QueryInterface, + vector_view_hstring_AddRef, + vector_view_hstring_Release, + /* IInspectable methods */ + vector_view_hstring_GetIids, + vector_view_hstring_GetRuntimeClassName, + vector_view_hstring_GetTrustLevel, + /* IVectorView<HSTRING> methods */ + vector_view_hstring_GetAt, + vector_view_hstring_get_Size, + vector_view_hstring_IndexOf, + vector_view_hstring_GetMany, +}; + /* * * IVector<HSTRING> @@ -128,8 +291,27 @@ static HRESULT WINAPI vector_hstring_get_Size( IVector_HSTRING *iface, UINT32 *v static HRESULT WINAPI vector_hstring_GetView( IVector_HSTRING *iface, IVectorView_HSTRING **value ) { - FIXME("iface %p, value %p stub!\n", iface, value); - return E_NOTIMPL; + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + struct vector_view_hstring *view; + HRESULT hr; + ULONG i; + + TRACE("iface %p, value %p.\n", iface, value); + + if (!(view = calloc(1, offsetof(struct vector_view_hstring, elements[impl->size])))) return E_OUTOFMEMORY; + view->IVectorView_HSTRING_iface.lpVtbl = &vector_view_hstring_vtbl; + view->ref = 1; + + for (i = 0; i < impl->size; ++i) + if (FAILED(hr = WindowsDuplicateString(impl->elements[i], &view->elements[view->size++]))) goto error; + + *value = &view->IVectorView_HSTRING_iface; + return S_OK; + +error: + while (i-- > 0) WindowsDeleteString(view->elements[i]); + free(view); + return hr; } static HRESULT WINAPI vector_hstring_IndexOf( IVector_HSTRING *iface, HSTRING element, UINT32 *index, BOOLEAN *found )

1 0

Rémi Bernon : kernelbase: Fix indentation of LocalReAlloc.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: 424e38f3f8bdeb5bb6b45ea88d8c66070ec49b34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=424e38f3f8bdeb5bb6b45ea8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 29 15:24:38 2022 +0200 kernelbase: Fix indentation of LocalReAlloc. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/memory.c | 183 +++++++++++++++++++++++------------------------ 1 file changed, 91 insertions(+), 92 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 42ffd1bcdd9..8c818f33ca6 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -791,98 +791,97 @@ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL hmem ) */ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL hmem, SIZE_T size, UINT flags ) { - struct local_header *header; - void *ptr; - HLOCAL ret = 0; - DWORD heap_flags = (flags & LMEM_ZEROINIT) ? HEAP_ZERO_MEMORY : 0; - - RtlLockHeap( GetProcessHeap() ); - if (flags & LMEM_MODIFY) /* modify flags */ - { - if (is_pointer( hmem ) && (flags & LMEM_MOVEABLE)) - { - /* make a fixed block moveable - * actually only NT is able to do this. But it's soo simple - */ - if (hmem == 0) - { - WARN( "null handle\n"); - SetLastError( ERROR_NOACCESS ); - } - else - { - size = RtlSizeHeap( GetProcessHeap(), 0, hmem ); - ret = LocalAlloc( flags, size ); - ptr = LocalLock( ret ); - memcpy( ptr, hmem, size ); - LocalUnlock( ret ); - LocalFree( hmem ); - } - } - else if (!is_pointer( hmem ) && (flags & LMEM_DISCARDABLE)) - { - /* change the flags to make our block "discardable" */ - header = get_header( hmem ); - header->flags |= LMEM_DISCARDABLE >> 8; - ret = hmem; - } - else SetLastError( ERROR_INVALID_PARAMETER ); - } - else - { - if (is_pointer( hmem )) - { - /* reallocate fixed memory */ - if (!(flags & LMEM_MOVEABLE)) heap_flags |= HEAP_REALLOC_IN_PLACE_ONLY; - ret = HeapReAlloc( GetProcessHeap(), heap_flags, hmem, size ); - } - else - { - /* reallocate a moveable block */ - header = get_header( hmem ); - if (size != 0) - { - if (size <= INT_MAX - HLOCAL_STORAGE) - { - if (header->ptr) - { - if ((ptr = HeapReAlloc( GetProcessHeap(), heap_flags, - (char *)header->ptr - HLOCAL_STORAGE, - size + HLOCAL_STORAGE ))) - { - header->ptr = (char *)ptr + HLOCAL_STORAGE; - ret = hmem; - } - } - else - { - if ((ptr = HeapAlloc( GetProcessHeap(), heap_flags, size + HLOCAL_STORAGE ))) - { - *(HLOCAL *)ptr = hmem; - header->ptr = (char *)ptr + HLOCAL_STORAGE; - ret = hmem; - } - } - } - else SetLastError( ERROR_OUTOFMEMORY ); - } - else - { - if (header->lock == 0) - { - if (header->ptr) - { - HeapFree( GetProcessHeap(), 0, (char *)header->ptr - HLOCAL_STORAGE ); - header->ptr = NULL; - } - ret = hmem; - } - else WARN( "not freeing memory associated with locked handle\n" ); - } - } - } - RtlUnlockHeap( GetProcessHeap() ); - return ret; + struct local_header *header; + void *ptr; + HLOCAL ret = 0; + DWORD heap_flags = (flags & LMEM_ZEROINIT) ? HEAP_ZERO_MEMORY : 0; + + RtlLockHeap( GetProcessHeap() ); + if (flags & LMEM_MODIFY) /* modify flags */ + { + if (is_pointer( hmem ) && (flags & LMEM_MOVEABLE)) + { + /* make a fixed block moveable + * actually only NT is able to do this. But it's soo simple + */ + if (hmem == 0) + { + WARN( "null handle\n" ); + SetLastError( ERROR_NOACCESS ); + } + else + { + size = RtlSizeHeap( GetProcessHeap(), 0, hmem ); + ret = LocalAlloc( flags, size ); + ptr = LocalLock( ret ); + memcpy( ptr, hmem, size ); + LocalUnlock( ret ); + LocalFree( hmem ); + } + } + else if (!is_pointer( hmem ) && (flags & LMEM_DISCARDABLE)) + { + /* change the flags to make our block "discardable" */ + header = get_header( hmem ); + header->flags |= LMEM_DISCARDABLE >> 8; + ret = hmem; + } + else SetLastError( ERROR_INVALID_PARAMETER ); + } + else + { + if (is_pointer( hmem )) + { + /* reallocate fixed memory */ + if (!(flags & LMEM_MOVEABLE)) heap_flags |= HEAP_REALLOC_IN_PLACE_ONLY; + ret = HeapReAlloc( GetProcessHeap(), heap_flags, hmem, size ); + } + else + { + /* reallocate a moveable block */ + header = get_header( hmem ); + if (size != 0) + { + if (size <= INT_MAX - HLOCAL_STORAGE) + { + if (header->ptr) + { + if ((ptr = HeapReAlloc( GetProcessHeap(), heap_flags, (char *)header->ptr - HLOCAL_STORAGE, + size + HLOCAL_STORAGE ))) + { + header->ptr = (char *)ptr + HLOCAL_STORAGE; + ret = hmem; + } + } + else + { + if ((ptr = HeapAlloc( GetProcessHeap(), heap_flags, size + HLOCAL_STORAGE ))) + { + *(HLOCAL *)ptr = hmem; + header->ptr = (char *)ptr + HLOCAL_STORAGE; + ret = hmem; + } + } + } + else SetLastError( ERROR_OUTOFMEMORY ); + } + else + { + if (header->lock == 0) + { + if (header->ptr) + { + HeapFree( GetProcessHeap(), 0, (char *)header->ptr - HLOCAL_STORAGE ); + header->ptr = NULL; + } + ret = hmem; + } + else WARN( "not freeing memory associated with locked handle\n" ); + } + } + } + RtlUnlockHeap( GetProcessHeap() ); + return ret; }

1 0

Rémi Bernon : kernel32: Make Global* traces and identifiers more consistent.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: fc12f812c3f7a234e12c1fde455f452aa6fe26c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc12f812c3f7a234e12c1fde… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 29 15:24:37 2022 +0200 kernel32: Make Global* traces and identifiers more consistent. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 111 +++++++++++++++++++++++++++------------------------ 1 file changed, 58 insertions(+), 53 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 7e366eb991e..fefb88d6857 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -183,7 +183,7 @@ typedef struct __GLOBAL32_INTERN * Lock a global memory object and return a pointer to first byte of the memory * * PARAMS - * hmem [I] Handle of the global memory object + * handle [I] Handle of the global memory object * * RETURNS * Success: Pointer to first byte of the memory block @@ -193,9 +193,9 @@ typedef struct __GLOBAL32_INTERN * When the handle is invalid, last error is set to ERROR_INVALID_HANDLE * */ -LPVOID WINAPI GlobalLock(HGLOBAL hmem) +void *WINAPI GlobalLock( HGLOBAL handle ) { - return LocalLock( hmem ); + return LocalLock( handle ); } @@ -205,7 +205,7 @@ LPVOID WINAPI GlobalLock(HGLOBAL hmem) * Unlock a global memory object. * * PARAMS - * hmem [I] Handle of the global memory object + * handle [I] Handle of the global memory object * * RETURNS * Success: Object is still locked @@ -215,10 +215,10 @@ LPVOID WINAPI GlobalLock(HGLOBAL hmem) * When the handle is invalid, last error is set to ERROR_INVALID_HANDLE * */ -BOOL WINAPI GlobalUnlock(HGLOBAL hmem) +BOOL WINAPI GlobalUnlock( HGLOBAL handle ) { - if (ISPOINTER( hmem )) return TRUE; - return LocalUnlock( hmem ); + if (ISPOINTER( handle )) return TRUE; + return LocalUnlock( handle ); } @@ -231,13 +231,15 @@ BOOL WINAPI GlobalUnlock(HGLOBAL hmem) * Handle: Success * NULL: Failure */ -HGLOBAL WINAPI GlobalHandle( LPCVOID pmem ) +HGLOBAL WINAPI GlobalHandle( const void *ptr ) { + PGLOBAL32_INTERN mem; HGLOBAL handle; - PGLOBAL32_INTERN maybe_intern; LPCVOID test; - if (!pmem) + TRACE_(globalmem)( "ptr %p\n", ptr ); + + if (!ptr) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; @@ -248,27 +250,27 @@ HGLOBAL WINAPI GlobalHandle( LPCVOID pmem ) { handle = 0; - /* note that if pmem is a pointer to a block allocated by */ + /* note that if ptr is a pointer to a block allocated by */ /* GlobalAlloc with GMEM_MOVEABLE then magic test in HeapValidate */ /* will fail. */ - if (ISPOINTER( pmem )) + if (ISPOINTER( ptr )) { - if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, pmem )) + if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, ptr )) { - handle = (HGLOBAL)pmem; /* valid fixed block */ + handle = (HGLOBAL)ptr; /* valid fixed block */ break; } - handle = POINTER_TO_HANDLE( pmem ); + handle = POINTER_TO_HANDLE( ptr ); } - else handle = (HGLOBAL)pmem; + else handle = (HGLOBAL)ptr; /* Now test handle either passed in or retrieved from pointer */ - maybe_intern = HANDLE_TO_INTERN( handle ); - if (maybe_intern->Magic == MAGIC_GLOBAL_USED) + mem = HANDLE_TO_INTERN( handle ); + if (mem->Magic == MAGIC_GLOBAL_USED) { - test = maybe_intern->Pointer; + test = mem->Pointer; if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, (const char *)test - HGLOBAL_STORAGE ) && /* obj(-handle) valid arena? */ - HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, maybe_intern )) /* intern valid arena? */ + HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, mem )) /* intern valid arena? */ break; /* valid moveable block */ } handle = 0; @@ -294,9 +296,9 @@ HGLOBAL WINAPI GlobalHandle( LPCVOID pmem ) * Handle: Success * NULL: Failure */ -HGLOBAL WINAPI GlobalReAlloc( HGLOBAL hmem, SIZE_T size, UINT flags ) +HGLOBAL WINAPI GlobalReAlloc( HGLOBAL handle, SIZE_T size, UINT flags ) { - return LocalReAlloc( hmem, size, flags ); + return LocalReAlloc( handle, size, flags ); } @@ -306,7 +308,7 @@ HGLOBAL WINAPI GlobalReAlloc( HGLOBAL hmem, SIZE_T size, UINT flags ) * Get the size of a global memory object. * * PARAMS - * hmem [I] Handle of the global memory object + * handle [I] Handle of the global memory object * * RETURNS * Failure: 0 @@ -316,44 +318,45 @@ HGLOBAL WINAPI GlobalReAlloc( HGLOBAL hmem, SIZE_T size, UINT flags ) * When the handle is invalid, last error is set to ERROR_INVALID_HANDLE * */ -SIZE_T WINAPI GlobalSize(HGLOBAL hmem) +SIZE_T WINAPI GlobalSize( HGLOBAL handle ) { + PGLOBAL32_INTERN mem; SIZE_T retval; - PGLOBAL32_INTERN pintern; - if (!((ULONG_PTR)hmem >> 16)) + TRACE_(globalmem)( "handle %p\n", handle ); + + if (!((ULONG_PTR)handle >> 16)) { SetLastError( ERROR_INVALID_HANDLE ); return 0; } - if (ISPOINTER( hmem )) + if (ISPOINTER( handle )) { - retval = HeapSize( GetProcessHeap(), 0, hmem ); + retval = HeapSize( GetProcessHeap(), 0, handle ); if (retval == ~(SIZE_T)0) /* It might be a GMEM_MOVEABLE data pointer */ { - retval = HeapSize( GetProcessHeap(), 0, (char *)hmem - HGLOBAL_STORAGE ); + retval = HeapSize( GetProcessHeap(), 0, (char *)handle - HGLOBAL_STORAGE ); if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; } } else { RtlLockHeap( GetProcessHeap() ); - pintern = HANDLE_TO_INTERN( hmem ); - - if (pintern->Magic == MAGIC_GLOBAL_USED) + mem = HANDLE_TO_INTERN( handle ); + if (mem->Magic == MAGIC_GLOBAL_USED) { - if (!pintern->Pointer) /* handle case of GlobalAlloc( ??,0) */ + if (!mem->Pointer) /* handle case of GlobalAlloc( ??,0) */ retval = 0; else { - retval = HeapSize( GetProcessHeap(), 0, (char *)pintern->Pointer - HGLOBAL_STORAGE ); + retval = HeapSize( GetProcessHeap(), 0, (char *)mem->Pointer - HGLOBAL_STORAGE ); if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; } } else { - WARN( "invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic ); + WARN_(globalmem)( "invalid handle %p\n", handle ); SetLastError( ERROR_INVALID_HANDLE ); retval = 0; } @@ -367,36 +370,36 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) /*********************************************************************** * GlobalWire (KERNEL32.@) */ -LPVOID WINAPI GlobalWire(HGLOBAL hmem) +void *WINAPI GlobalWire( HGLOBAL handle ) { - return GlobalLock( hmem ); + return GlobalLock( handle ); } /*********************************************************************** * GlobalUnWire (KERNEL32.@) */ -BOOL WINAPI GlobalUnWire(HGLOBAL hmem) +BOOL WINAPI GlobalUnWire( HGLOBAL handle ) { - return GlobalUnlock( hmem); + return GlobalUnlock( handle ); } /*********************************************************************** * GlobalFix (KERNEL32.@) */ -VOID WINAPI GlobalFix(HGLOBAL hmem) +VOID WINAPI GlobalFix( HGLOBAL handle ) { - GlobalLock( hmem ); + GlobalLock( handle ); } /*********************************************************************** * GlobalUnfix (KERNEL32.@) */ -VOID WINAPI GlobalUnfix(HGLOBAL hmem) +VOID WINAPI GlobalUnfix( HGLOBAL handle ) { - GlobalUnlock( hmem); + GlobalUnlock( handle ); } @@ -406,34 +409,36 @@ VOID WINAPI GlobalUnfix(HGLOBAL hmem) * Get information about a global memory object. * * PARAMS - * hmem [I] Handle of the global memory object + * handle [I] Handle of the global memory object * * RETURNS - * Failure: GMEM_INVALID_HANDLE, when the provided handle is invalid + * Failure: GMEM_INVALID_HANDLE, when the provided handle is invalid * Success: Value specifying allocation flags and lock count * */ -UINT WINAPI GlobalFlags(HGLOBAL hmem) +UINT WINAPI GlobalFlags( HGLOBAL handle ) { + PGLOBAL32_INTERN mem; DWORD retval; - PGLOBAL32_INTERN pintern; - if (ISPOINTER( hmem )) + TRACE_(globalmem)( "handle %p\n", handle ); + + if (ISPOINTER( handle )) { retval = 0; } else { RtlLockHeap( GetProcessHeap() ); - pintern = HANDLE_TO_INTERN( hmem ); - if (pintern->Magic == MAGIC_GLOBAL_USED) + mem = HANDLE_TO_INTERN( handle ); + if (mem->Magic == MAGIC_GLOBAL_USED) { - retval = pintern->LockCount + (pintern->Flags << 8); - if (pintern->Pointer == 0) retval |= GMEM_DISCARDED; + retval = mem->LockCount + (mem->Flags << 8); + if (mem->Pointer == 0) retval |= GMEM_DISCARDED; } else { - WARN( "invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic ); + WARN_(globalmem)( "invalid handle %p\n", handle ); SetLastError( ERROR_INVALID_HANDLE ); retval = GMEM_INVALID_HANDLE; }

1 0

Dmitry Timoshkov : sc: Don't silently fail when something doesn't work as expected in a few more places.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: bc54bcf878717adae9b3205349556ab2c6df5353 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc54bcf878717adae9b32053… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 22 17:22:40 2022 +0300 sc: Don't silently fail when something doesn't work as expected in a few more places. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/sc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 3b029f33c78..43148ab99d6 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -295,7 +295,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (parse_failure_params( argc - 3, argv + 3, &sfa )) { ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_FAILURE_ACTIONS, &sfa ); - if (!ret) WINE_TRACE("failed to set service failure actions %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to set service failure actions %lu\n", GetLastError()); HeapFree( GetProcessHeap(), 0, sfa.lpsaActions ); } else @@ -310,7 +310,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (service) { ret = DeleteService( service ); - if (!ret) WINE_TRACE("failed to delete service %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to delete service %lu\n", GetLastError()); CloseServiceHandle( service ); } else WINE_ERR("failed to open service %lu\n", GetLastError()); @@ -321,7 +321,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (service) { ret = StartServiceW( service, argc - 3, argv + 3 ); - if (!ret) WINE_TRACE("failed to start service %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to start service %lu\n", GetLastError()); else query_service( manager, argv[2] ); CloseServiceHandle( service ); } @@ -333,7 +333,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (service) { ret = ControlService( service, SERVICE_CONTROL_STOP, &status ); - if (!ret) WINE_TRACE("failed to stop service %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to stop service %lu\n", GetLastError()); else query_service( manager, argv[2] ); CloseServiceHandle( service ); }

1 0

Bernhard Kölbl : windows.media.speech: Store speech commands in listconstraint.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: 743d77b2f5c21b71162284b72d46845f2f7be786 URL: https://source.winehq.org/git/wine.git/?a=commit;h=743d77b2f5c21b71162284b7… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 29 19:30:48 2022 +0200 windows.media.speech: Store speech commands in listconstraint. And make them obtainable with ISpeechRecognitionListConstraint_get_Commands. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/listconstraint.c | 31 +++++++++++++++------ dlls/windows.media.speech/private.h | 1 + dlls/windows.media.speech/tests/speech.c | 25 ++++++++++------- dlls/windows.media.speech/vector.c | 44 ++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 19 deletions(-) diff --git a/dlls/windows.media.speech/listconstraint.c b/dlls/windows.media.speech/listconstraint.c index 0c486a415a7..ef0dff0e4d5 100644 --- a/dlls/windows.media.speech/listconstraint.c +++ b/dlls/windows.media.speech/listconstraint.c @@ -120,8 +120,19 @@ static HRESULT WINAPI list_constraint_GetTrustLevel( ISpeechRecognitionListConst static HRESULT WINAPI list_constraint_get_Commands( ISpeechRecognitionListConstraint *iface, IVector_HSTRING **value ) { - FIXME("iface %p, value %p stub!\n", iface, value); - return E_NOTIMPL; + struct list_constraint *impl = impl_from_ISpeechRecognitionListConstraint(iface); + IIterable_HSTRING *iterable; + HRESULT hr; + + TRACE("iface %p, value %p.\n", iface, value); + + hr = IVector_HSTRING_QueryInterface(impl->commands, &IID_IIterable_HSTRING, (void **)&iterable); + if (FAILED(hr)) return hr; + + hr = vector_hstring_create_copy(iterable, value); + IIterable_HSTRING_Release(iterable); + + return hr; } static const struct ISpeechRecognitionListConstraintVtbl speech_recognition_list_constraint_vtbl = @@ -135,7 +146,7 @@ static const struct ISpeechRecognitionListConstraintVtbl speech_recognition_list list_constraint_GetRuntimeClassName, list_constraint_GetTrustLevel, /* ISpeechRecognitionListConstraint methods */ - list_constraint_get_Commands + list_constraint_get_Commands, }; /* @@ -209,7 +220,7 @@ static const struct ISpeechRecognitionConstraintVtbl speech_recognition_constrai constraint_put_Tag, constraint_get_Type, constraint_get_Probability, - constraint_put_Probability + constraint_put_Probability, }; /* @@ -338,6 +349,7 @@ static HRESULT WINAPI constraint_factory_CreateWithTag( ISpeechRecognitionListCo ISpeechRecognitionListConstraint** listconstraint ) { struct list_constraint *impl; + HRESULT hr; TRACE("iface %p, commands %p, tag %p, listconstraint %p.\n", iface, commands, tag, listconstraint); @@ -347,11 +359,7 @@ static HRESULT WINAPI constraint_factory_CreateWithTag( ISpeechRecognitionListCo return E_POINTER; if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; - if (FAILED(vector_hstring_create(&impl->commands))) - { - free(impl); - return E_OUTOFMEMORY; - } + if (FAILED(hr = vector_hstring_create_copy(commands, &impl->commands))) goto error; impl->ISpeechRecognitionListConstraint_iface.lpVtbl = &speech_recognition_list_constraint_vtbl; impl->ISpeechRecognitionConstraint_iface.lpVtbl = &speech_recognition_constraint_vtbl; @@ -361,6 +369,11 @@ static HRESULT WINAPI constraint_factory_CreateWithTag( ISpeechRecognitionListCo *listconstraint = &impl->ISpeechRecognitionListConstraint_iface; return S_OK; + +error: + if (impl->commands) IVector_HSTRING_Release(impl->commands); + if (impl) free(impl); + return hr; } static const struct ISpeechRecognitionListConstraintFactoryVtbl speech_recognition_list_constraint_factory_vtbl = diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index a09b5f5ef7e..3c8371ccdbe 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -67,6 +67,7 @@ HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, II HRESULT typed_event_handlers_clear( struct list* list ); HRESULT vector_hstring_create( IVector_HSTRING **out ); +HRESULT vector_hstring_create_copy( IIterable_HSTRING *iterable, IVector_HSTRING **out ); #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index e88cfc25d54..ea160eec9da 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -106,6 +106,7 @@ static inline struct completed_event_handler *impl_from_IHandler_RecognitionComp HRESULT WINAPI completed_event_handler_QueryInterface( IHandler_RecognitionCompleted *iface, REFIID iid, void **out ) { if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IAgileObject) || IsEqualGUID(iid, &IID_IHandler_RecognitionCompleted)) { IUnknown_AddRef(iface); @@ -172,6 +173,7 @@ static inline struct recognition_result_handler *impl_from_IHandler_RecognitionR HRESULT WINAPI recognition_result_handler_QueryInterface( IHandler_RecognitionResult *iface, REFIID iid, void **out ) { if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IAgileObject) || IsEqualGUID(iid, &IID_IHandler_RecognitionResult)) { IUnknown_AddRef(iface); @@ -417,9 +419,11 @@ static HRESULT WINAPI iterable_hstring_GetTrustLevel( IIterable_HSTRING *iface, static HRESULT WINAPI iterable_hstring_First( IIterable_HSTRING *iface, IIterator_HSTRING **value ) { struct iterable_hstring *impl = impl_from_Iterable_HSTRING(iface); + struct iterator_hstring *impl_iter = impl_from_IIterator_HSTRING(impl->iterator); trace("iface %p, value %p.\n", iface, value); + impl_iter->index = 0; IIterator_HSTRING_AddRef((*value = impl->iterator)); return S_OK; } @@ -956,33 +960,34 @@ static void test_SpeechRecognitionListConstraint(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ISpeechRecognitionListConstraint_get_Commands(listconstraint, &hstring_vector); - todo_wine ok(hr == S_OK, "ISpeechRecognitionListConstraint_Commands failed, hr %#lx.\n", hr); - - if (!SUCCEEDED(hr)) - goto skip_tests; + ok(hr == S_OK, "ISpeechRecognitionListConstraint_Commands failed, hr %#lx.\n", hr); hr = IVector_HSTRING_get_Size(hstring_vector, &vector_size); - todo_wine ok(hr == S_OK, "IVector_HSTRING_get_Size failed, hr %#lx.\n", hr); - todo_wine ok(vector_size == ARRAY_SIZE(commands), "Got unexpected vector_size %u.\n", vector_size); + ok(hr == S_OK, "IVector_HSTRING_get_Size failed, hr %#lx.\n", hr); + ok(vector_size == ARRAY_SIZE(commands), "Got unexpected vector_size %u.\n", vector_size); for (i = 0; i < vector_size; i++) { HSTRING str; hr = IVector_HSTRING_GetAt(hstring_vector, i, &str); - todo_wine ok(hr == S_OK, "IVector_HSTRING_GetAt failed, hr %#lx.\n", hr); + ok(hr == S_OK, "IVector_HSTRING_GetAt failed, hr %#lx.\n", hr); hr = WindowsCompareStringOrdinal(commands[i], str, &str_cmp); - todo_wine ok(hr == S_OK, "WindowsCompareStringOrdinal failed, hr %#lx.\n", hr); - todo_wine ok(!str_cmp, "Strings not equal.\n"); + ok(hr == S_OK, "WindowsCompareStringOrdinal failed, hr %#lx.\n", hr); + ok(!str_cmp, "Strings not equal.\n"); WindowsDeleteString(str); } ref = IVector_HSTRING_Release(hstring_vector); - todo_wine ok(ref == 0, "Got unexpected ref %lu.\n", ref); + ok(ref == 0, "Got unexpected ref %lu.\n", ref); hr = ISpeechRecognitionConstraint_get_Tag(constraint, &tag_out); todo_wine ok(hr == S_OK, "ISpeechRecognitionConstraint_get_Tag failed, hr %#lx.\n", hr); + + if (FAILED(hr)) + goto skip_tests; + hr = WindowsCompareStringOrdinal(tag, tag_out, &str_cmp); todo_wine ok(hr == S_OK, "WindowsCompareStringOrdinal failed, hr %#lx.\n", hr); todo_wine ok(!str_cmp, "Strings not equal.\n"); diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c index c399e91593f..fcb7f483e03 100644 --- a/dlls/windows.media.speech/vector.c +++ b/dlls/windows.media.speech/vector.c @@ -727,3 +727,47 @@ HRESULT vector_hstring_create( IVector_HSTRING **out ) TRACE("created %p\n", *out); return S_OK; } + +HRESULT vector_hstring_create_copy( IIterable_HSTRING *iterable, IVector_HSTRING **out ) +{ + struct vector_hstring *impl; + IIterator_HSTRING *iterator; + UINT32 capacity = 0; + BOOL available; + HRESULT hr; + + TRACE("iterable %p, out %p.\n", iterable, out); + + if (FAILED(hr = vector_hstring_create(out))) return hr; + if (FAILED(hr = IIterable_HSTRING_First(iterable, &iterator))) goto error; + + for (IIterator_HSTRING_get_HasCurrent(iterator, &available); available; IIterator_HSTRING_MoveNext(iterator, &available)) + capacity++; + + IIterator_HSTRING_Release(iterator); + + impl = impl_from_IVector_HSTRING(*out); + impl->size = 0; + impl->capacity = capacity; + if (!(impl->elements = realloc(impl->elements, impl->capacity * sizeof(*impl->elements)))) goto error; + + if (FAILED(hr = IIterable_HSTRING_First(iterable, &iterator))) goto error; + + for (IIterator_HSTRING_get_HasCurrent(iterator, &available); available; IIterator_HSTRING_MoveNext(iterator, &available)) + { + HSTRING str; + if (FAILED(hr = IIterator_HSTRING_get_Current(iterator, &str))) goto error; + if (FAILED(hr = WindowsDuplicateString(str, &impl->elements[impl->size]))) goto error; + WindowsDeleteString(str); + impl->size++; + } + + IIterator_HSTRING_Release(iterator); + + TRACE("created %p\n", *out); + return S_OK; + +error: + IVector_HSTRING_Release(*out); + return hr; +}

1 0

Dmitry Timoshkov : sc: Add support for the 'query' command.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: 921c86a35d95279a1d2c00faeef8db8e4732f85d URL: https://source.winehq.org/git/wine.git/?a=commit;h=921c86a35d95279a1d2c00fa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 22 17:22:35 2022 +0300 sc: Add support for the 'query' command. Output is modelled on behaviour observed under the Windows 10. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/sc.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 4e642874237..9e8bfb61f42 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -175,6 +175,58 @@ static void usage( void ) exit( 1 ); } +static const WCHAR *service_type_string( DWORD type ) +{ + switch (type) + { + case SERVICE_WIN32_OWN_PROCESS: return L"WIN32_OWN_PROCESS"; + case SERVICE_WIN32_SHARE_PROCESS: return L"WIN32_SHARE_PROCESS"; + case SERVICE_WIN32: return L"WIN32"; + default: return L""; + } +} + +static const WCHAR *service_state_string( DWORD state ) +{ + static const WCHAR * const state_str[] = { L"", L"STOPPED", L"START_PENDING", + L"STOP_PENDING", L"RUNNING", L"CONTINUE_PENDING", L"PAUSE_PENDING", L"PAUSED" }; + + if (state < ARRAY_SIZE( state_str )) return state_str[ state ]; + return L""; +} + +static BOOL query_service( SC_HANDLE manager, const WCHAR *name ) +{ + SC_HANDLE service; + SERVICE_STATUS status; + BOOL ret = FALSE; + + service = OpenServiceW( manager, name, SERVICE_QUERY_STATUS ); + if (service) + { + ret = QueryServiceStatus( service, &status ); + if (!ret) + WINE_ERR("failed to query service status %lu\n", GetLastError()); + else + printf( "SERVICE_NAME: %ls\n" + " TYPE : %lx %ls\n" + " STATE : %lx %ls\n" + " WIN32_EXIT_CODE : %lu (0x%lx)\n" + " SERVICE_EXIT_CODE : %lu (0x%lx)\n" + " CHECKPOINT : 0x%lx\n" + " WAIT_HINT : 0x%lx\n", + name, status.dwServiceType, service_type_string( status.dwServiceType ), + status.dwCurrentState, service_state_string( status.dwCurrentState ), + status.dwWin32ExitCode, status.dwWin32ExitCode, + status.dwServiceSpecificExitCode, status.dwServiceSpecificExitCode, + status.dwCheckPoint, status.dwWaitHint ); + CloseServiceHandle( service ); + } + else WINE_ERR("failed to open service %lu\n", GetLastError()); + + return ret; +} + int __cdecl wmain( int argc, const WCHAR *argv[] ) { SC_HANDLE manager, service; @@ -285,6 +337,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_ERR("failed to open service %lu\n", GetLastError()); } + else if (!wcsicmp( argv[1], L"query" )) + { + ret = query_service( manager, argv[2] ); + } else if (!wcsicmp( argv[1], L"sdset" )) { WINE_FIXME("SdSet command not supported, faking success\n");

1 0

Bernhard Kölbl : windows.media.speech: Add IVector<HSTRING>.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: d8c9e6705947fd04d3d73b6d1020c86486808caf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8c9e6705947fd04d3d73b6d… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 29 19:30:44 2022 +0200 windows.media.speech: Add IVector<HSTRING>. And use it in listconstraint. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/Makefile.in | 3 +- dlls/windows.media.speech/listconstraint.c | 11 +- dlls/windows.media.speech/private.h | 2 + dlls/windows.media.speech/vector.c | 313 +++++++++++++++++++++++++++++ 4 files changed, 326 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8c9e6705947fd04d3d7…

1 0

Rémi Bernon : kernelbase: Make (Global|Local)* traces and identifiers more consistent.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: 4ba774d85ea1596b9573c38bab234a5515b7eab7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ba774d85ea1596b9573c38b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 29 15:24:39 2022 +0200 kernelbase: Make (Global|Local)* traces and identifiers more consistent. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/memory.c | 185 +++++++++++++++++++++++++---------------------- 1 file changed, 97 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ba774d85ea1596b9573…

1 0

Nikolay Sivov : wer: Use CRT memory allocation functions.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: 56c57f8ae220e403ff02051c5b11f6ae8db379b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56c57f8ae220e403ff02051c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 15:11:49 2022 +0300 wer: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wer/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index 44c6718f310..b0f18b0568d 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -18,12 +18,12 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" #include "winreg.h" #include "werapi.h" -#include "wine/heap.h" #include "wine/list.h" #include "wine/debug.h" @@ -219,7 +219,7 @@ HRESULT WINAPI WerReportCloseHandle(HREPORT hreport) if (!found) return E_INVALIDARG; - heap_free(report); + free(report); return S_OK; } @@ -259,7 +259,7 @@ HRESULT WINAPI WerReportCreate(PCWSTR eventtype, WER_REPORT_TYPE reporttype, PWE return E_INVALIDARG; } - report = heap_alloc_zero(FIELD_OFFSET(report_t, eventtype[lstrlenW(eventtype) + 1])); + report = calloc(1, FIELD_OFFSET(report_t, eventtype[lstrlenW(eventtype) + 1])); if (!report) return __HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY);

1 0

Alexandre Julliard : kernelbase: Reimplement calendar options in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 29, 2022

March 29, 2022

Module: wine Branch: master Commit: 00fd05d4478317fa9c0395288a72b74fb760fd6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=00fd05d4478317fa9c039528… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 08:37:18 2022 +0200 kernelbase: Reimplement calendar options in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 529cc663cd5..3095234bd9b 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1276,19 +1276,19 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->snativecurrname, type, buffer, len ); case LOCALE_ICALENDARTYPE: - return -1; + return locale_return_number( locale_strings[locale->scalendartype + 1], type, buffer, len ); case LOCALE_IPAPERSIZE: return -1; case LOCALE_IOPTIONALCALENDAR: - return -1; + return locale_return_number( locale_strings[locale->scalendartype + 2], type, buffer, len ); case LOCALE_IFIRSTDAYOFWEEK: - return -1; + return locale_return_number( (locale->ifirstdayofweek + 6) % 7, type, buffer, len ); case LOCALE_IFIRSTWEEKOFYEAR: - return -1; + return locale_return_number( locale->ifirstweekofyear, type, buffer, len ); case LOCALE_SMONTHNAME13: return locale_return_strarray( ((type & LOCALE_RETURN_GENITIVE_NAMES) && locale->sgenitivemonth) ?

1 0