July 2017 - Wine-Commits - list.winehq.org

Hugh McMaster : regedit: Sort treeview children on refresh.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: c866c19090fed0d2c62f9f39b22acebbc49c1dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c866c19090fed0d2c62f9f39b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 9 11:12:14 2017 +0000 regedit: Sort treeview children on refresh. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7073e27fbd61c7d2eeff8e4e3ccf1dfa0eca581b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/regedit/treeview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index f081c16..89afddd 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -486,6 +486,7 @@ BOOL RefreshTreeView(HWND hwndTV) SendMessageW(hwndTV, WM_SETREDRAW, TRUE, 0); InvalidateRect(hwndTV, NULL, FALSE); + SendMessageW(hwndTV, TVM_SORTCHILDREN, TRUE, (LPARAM)hSelectedItem); SetCursor(hcursorOld); /* We reselect the currently selected node, this will prompt a refresh of the listview. */

1 0

Piotr Caban : msvcr110: Add _Lock_shared_ptr_spin_lock implementation.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 2ceee36e0185378f336570371773b198ed267942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ceee36e0185378f336570371… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 28 11:21:12 2017 +0100 msvcr110: Add _Lock_shared_ptr_spin_lock implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 26d30c63154c5fb3258fd6d24959c12052999c7f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcrt/lock.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a73f18d..768bf8b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -854,7 +854,7 @@ @ cdecl _Gettnames() @ extern _HUGE MSVCRT__HUGE @ cdecl _IsExceptionObjectToBeDestroyed(ptr) -@ stub _Lock_shared_ptr_spin_lock +@ cdecl _Lock_shared_ptr_spin_lock() @ stub -arch=i386 _NLG_Dispatch2 @ stub -arch=arm,win64 __NLG_Dispatch2 @ stub -arch=i386 _NLG_Return @@ -863,7 +863,7 @@ @ stub -arch=win64 _SetImageBase @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) -@ stub _Unlock_shared_ptr_spin_lock +@ cdecl _Unlock_shared_ptr_spin_lock() @ cdecl _W_Getdays() @ cdecl _W_Getmonths() @ cdecl _W_Gettnames() diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index d81967c..308c6fc 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -912,6 +912,27 @@ MSVCRT_bool __thiscall _ReentrantBlockingLock__TryAcquire(_ReentrantBlockingLock } #endif +#if _MSVCR_VER == 110 +static LONG shared_ptr_lock; + +void __cdecl _Lock_shared_ptr_spin_lock(void) +{ + LONG l = 0; + + while(InterlockedCompareExchange(&shared_ptr_lock, 1, 0) != 0) { + if(l++ == 1000) { + Sleep(0); + l = 0; + } + } +} + +void __cdecl _Unlock_shared_ptr_spin_lock(void) +{ + shared_ptr_lock = 0; +} +#endif + /********************************************************************** * msvcrt_free_locks (internal) *

1 0

Jacek Caban : msvcrt: Added lldiv implementation.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 03c8736d32f6ad2a820c097933f662d7e10b0bd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c8736d32f6ad2a820c09793… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 20 17:43:32 2017 +0100 msvcrt: Added lldiv implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 60c98caa94465799d0868b69149bce29cf767de4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-utility-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 13 +++++++++++++ dlls/msvcrt/msvcrt.h | 5 +++++ dlls/ucrtbase/tests/misc.c | 17 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec index 12586d8..fe3d04d 100644 --- a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec +++ b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec @@ -22,7 +22,7 @@ @ cdecl labs(long) ucrtbase.labs @ cdecl ldiv(long long) ucrtbase.ldiv @ cdecl -ret64 llabs(int64) ucrtbase.llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) ucrtbase.lldiv @ cdecl qsort(ptr long long ptr) ucrtbase.qsort @ cdecl qsort_s(ptr long long ptr ptr) ucrtbase.qsort_s @ cdecl rand() ucrtbase.rand diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 7f0ad2d..a4c944b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1733,7 +1733,7 @@ @ cdecl ldexp(double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv @ cdecl -ret64 llabs(int64) MSVCRT_llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) MSVCRT_lldiv @ cdecl localeconv() MSVCRT_localeconv @ cdecl log(double) MSVCRT_log @ cdecl -arch=arm,x86_64 logf(float) MSVCRT_logf diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 229bb7a..a73f18d 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2091,7 +2091,7 @@ @ cdecl ldexp(double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv @ cdecl -ret64 llabs(int64) MSVCRT_llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) MSVCRT_lldiv @ cdecl localeconv() MSVCRT_localeconv @ cdecl log(double) MSVCRT_log @ cdecl -arch=arm,x86_64 logf(float) MSVCRT_logf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 30c7479..f98c25b 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2247,7 +2247,7 @@ @ cdecl lgammaf(float) MSVCR120_lgammaf @ cdecl lgammal(double) MSVCR120_lgammal @ cdecl -ret64 llabs(int64) MSVCRT_llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) MSVCRT_lldiv @ cdecl -ret64 llrint(double) MSVCR120_llrint @ cdecl -ret64 llrintf(float) MSVCR120_llrintf @ cdecl -ret64 llrintl(double) MSVCR120_llrintl diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 91a4785..0a7d3e4 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1910,7 +1910,7 @@ @ cdecl lgammaf(float) msvcr120.lgammaf @ cdecl lgammal(double) msvcr120.lgammal @ cdecl -ret64 llabs(int64) msvcr120.llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) msvcr120.lldiv @ cdecl -ret64 llrint(double) msvcr120.llrint @ cdecl -ret64 llrintf(float) msvcr120.llrintf @ cdecl -ret64 llrintl(double) msvcr120.llrintl diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 437aa15..323ed2c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1863,6 +1863,19 @@ MSVCRT_ldiv_t CDECL MSVCRT_ldiv(MSVCRT_long num, MSVCRT_long denom) } #endif /* ifdef __i386__ */ +/********************************************************************* + * lldiv (MSVCRT.@) + */ +MSVCRT_lldiv_t CDECL MSVCRT_lldiv(MSVCRT_longlong num, MSVCRT_longlong denom) +{ + MSVCRT_lldiv_t ret; + + ret.quot = num / denom; + ret.rem = num % denom; + + return ret; +} + #ifdef __i386__ /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 058f999..3caa43c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -448,6 +448,11 @@ typedef struct MSVCRT__ldiv_t { MSVCRT_long rem; /* remainder */ } MSVCRT_ldiv_t; +typedef struct MSVCRT__lldiv_t { + MSVCRT_longlong quot; /* quotient */ + MSVCRT_longlong rem; /* remainder */ +} MSVCRT_lldiv_t; + struct MSVCRT__heapinfo { int* _pentry; MSVCRT_size_t _size; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index cc82022..dcc11a4 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -67,6 +67,11 @@ typedef struct MSVCRT__onexit_table_t MSVCRT__onexit_t *_end; } MSVCRT__onexit_table_t; +typedef struct MSVCRT__lldiv_t { + LONGLONG quot; /* quotient */ + LONGLONG rem; /* remainder */ +} MSVCRT_lldiv_t; + static int (CDECL *p_initialize_onexit_table)(MSVCRT__onexit_table_t *table); static int (CDECL *p_register_onexit_function)(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func); static int (CDECL *p_execute_onexit_table)(MSVCRT__onexit_table_t *table); @@ -80,6 +85,7 @@ static int (CDECL *p__ltoa_s)(LONG, char*, size_t, int); static char* (CDECL *p__get_narrow_winmain_command_line)(void); static int (CDECL *p_sopen_dispatch)(const char *, int, int, int, int *, int); static int (CDECL *p_sopen_s)(int *, const char *, int, int, int); +static MSVCRT_lldiv_t (CDECL *p_lldiv)(LONGLONG,LONGLONG); static void test__initialize_onexit_table(void) { @@ -373,6 +379,7 @@ static BOOL init(void) p__get_narrow_winmain_command_line = (void*)GetProcAddress(GetModuleHandleA("ucrtbase.dll"), "_get_narrow_winmain_command_line"); p_sopen_dispatch = (void*)GetProcAddress(module, "_sopen_dispatch"); p_sopen_s = (void*)GetProcAddress(module, "_sopen_s"); + p_lldiv = (void*)GetProcAddress(module, "lldiv"); return TRUE; } @@ -448,6 +455,15 @@ todo_wine { free(tempf); } +static void test_lldiv(void) +{ + MSVCRT_lldiv_t r; + + r = p_lldiv((LONGLONG)0x111 << 32 | 0x222, (LONGLONG)1 << 32); + ok(r.quot == 0x111, "quot = %x%08x\n", (INT32)(r.quot >> 32), (UINT32)r.quot); + ok(r.rem == 0x222, "rem = %x%08x\n", (INT32)(r.rem >> 32), (UINT32)r.rem); +} + START_TEST(misc) { int arg_c; @@ -470,4 +486,5 @@ START_TEST(misc) test__get_narrow_winmain_command_line(arg_v[0]); test__sopen_dispatch(); test__sopen_s(); + test_lldiv(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2239f03..5da253b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2381,7 +2381,7 @@ @ cdecl lgammaf(float) MSVCR120_lgammaf @ cdecl lgammal(double) MSVCR120_lgammal @ cdecl -ret64 llabs(int64) MSVCRT_llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) MSVCRT_lldiv @ cdecl -ret64 llrint(double) MSVCR120_llrint @ cdecl -ret64 llrintf(float) MSVCR120_llrintf @ cdecl -ret64 llrintl(double) MSVCR120_llrintl

1 0

Alistair Leslie-Hughes : include: Add mfreadwrite.idl.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: e3f35a674bd38995448a3daf5893ce8b120dc0ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3f35a674bd38995448a3daf5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 23 00:17:23 2017 -0700 include: Add mfreadwrite.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f45f088d865c6fd341a6648742566098a36fb95d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/Makefile.in | 1 + include/mfreadwrite.idl | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 9f615cd..0b5e6ad 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -88,6 +88,7 @@ IDL_SRCS = \ mediaobj.idl \ metahost.idl \ mfobjects.idl \ + mfreadwrite.idl \ mimeinfo.idl \ mimeole.idl \ mlang.idl \ diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl new file mode 100644 index 0000000..3f53ff9 --- /dev/null +++ b/include/mfreadwrite.idl @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +import "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; +import "mfobjects.idl"; + +interface IMFMediaSource; + +[ + object, + uuid(70ae66f2-c809-4e4f-8915-bdcb406b7993), + local +] +interface IMFSourceReader : IUnknown +{ + HRESULT GetStreamSelection([in] DWORD index, [out] BOOL *selected); + HRESULT SetStreamSelection([in] DWORD index, [in] BOOL selected); + HRESULT GetNativeMediaType([in] DWORD index, [in] DWORD typeindex, [out] IMFMediaType **type); + HRESULT GetCurrentMediaType([in] DWORD index, [out] IMFMediaType **type); + HRESULT SetCurrentMediaType([in] DWORD index, [in, out] DWORD *reserved, [in] IMFMediaType *type); + HRESULT SetCurrentPosition([in] REFGUID format, [in] REFPROPVARIANT position); + HRESULT ReadSample([in] DWORD index, [in] DWORD flags, [out] DWORD *actualindex, [out] DWORD *sampleflags, + [out] LONGLONG *timestamp, [out] IMFSample **sample); + HRESULT Flush([in] DWORD index); + HRESULT GetServiceForStream([in] DWORD index, [in] REFGUID service, [in] REFIID riid, [out] void **object); + HRESULT GetPresentationAttribute([in] DWORD index, [in] REFGUID guid, [out] PROPVARIANT *attr); +}; + +cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes," ) +cpp_quote( " IMFSourceReader **reader);" )

1 0

Sebastian Lackner : ntdll: Do not cast unaligned pointer to M128A in set_context_reg.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 86b4c74aa63bce8824c64326f79b0b3f498c6c78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b4c74aa63bce8824c64326f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 5 14:50:48 2017 +0200 ntdll: Do not cast unaligned pointer to M128A in set_context_reg. GCC 7.x will assume 'val' is properly aligned when using a cast. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d2ec61105d47543ae5bddf393d384b5165795ab5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 48 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index f33fe4c..6bd51ea 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1154,30 +1154,30 @@ static void set_context_reg( CONTEXT *context, ULONG_PTR dw_reg, void *val ) case 14: context->R14 = *(ULONG64 *)val; break; case 15: context->R15 = *(ULONG64 *)val; break; case 16: context->Rip = *(ULONG64 *)val; break; - case 17: context->u.s.Xmm0 = *(M128A *)val; break; - case 18: context->u.s.Xmm1 = *(M128A *)val; break; - case 19: context->u.s.Xmm2 = *(M128A *)val; break; - case 20: context->u.s.Xmm3 = *(M128A *)val; break; - case 21: context->u.s.Xmm4 = *(M128A *)val; break; - case 22: context->u.s.Xmm5 = *(M128A *)val; break; - case 23: context->u.s.Xmm6 = *(M128A *)val; break; - case 24: context->u.s.Xmm7 = *(M128A *)val; break; - case 25: context->u.s.Xmm8 = *(M128A *)val; break; - case 26: context->u.s.Xmm9 = *(M128A *)val; break; - case 27: context->u.s.Xmm10 = *(M128A *)val; break; - case 28: context->u.s.Xmm11 = *(M128A *)val; break; - case 29: context->u.s.Xmm12 = *(M128A *)val; break; - case 30: context->u.s.Xmm13 = *(M128A *)val; break; - case 31: context->u.s.Xmm14 = *(M128A *)val; break; - case 32: context->u.s.Xmm15 = *(M128A *)val; break; - case 33: context->u.s.Legacy[0] = *(M128A *)val; break; - case 34: context->u.s.Legacy[1] = *(M128A *)val; break; - case 35: context->u.s.Legacy[2] = *(M128A *)val; break; - case 36: context->u.s.Legacy[3] = *(M128A *)val; break; - case 37: context->u.s.Legacy[4] = *(M128A *)val; break; - case 38: context->u.s.Legacy[5] = *(M128A *)val; break; - case 39: context->u.s.Legacy[6] = *(M128A *)val; break; - case 40: context->u.s.Legacy[7] = *(M128A *)val; break; + case 17: memcpy( &context->u.s.Xmm0, val, sizeof(M128A) ); break; + case 18: memcpy( &context->u.s.Xmm1, val, sizeof(M128A) ); break; + case 19: memcpy( &context->u.s.Xmm2, val, sizeof(M128A) ); break; + case 20: memcpy( &context->u.s.Xmm3, val, sizeof(M128A) ); break; + case 21: memcpy( &context->u.s.Xmm4, val, sizeof(M128A) ); break; + case 22: memcpy( &context->u.s.Xmm5, val, sizeof(M128A) ); break; + case 23: memcpy( &context->u.s.Xmm6, val, sizeof(M128A) ); break; + case 24: memcpy( &context->u.s.Xmm7, val, sizeof(M128A) ); break; + case 25: memcpy( &context->u.s.Xmm8, val, sizeof(M128A) ); break; + case 26: memcpy( &context->u.s.Xmm9, val, sizeof(M128A) ); break; + case 27: memcpy( &context->u.s.Xmm10, val, sizeof(M128A) ); break; + case 28: memcpy( &context->u.s.Xmm11, val, sizeof(M128A) ); break; + case 29: memcpy( &context->u.s.Xmm12, val, sizeof(M128A) ); break; + case 30: memcpy( &context->u.s.Xmm13, val, sizeof(M128A) ); break; + case 31: memcpy( &context->u.s.Xmm14, val, sizeof(M128A) ); break; + case 32: memcpy( &context->u.s.Xmm15, val, sizeof(M128A) ); break; + case 33: memcpy( &context->u.s.Legacy[0], val, sizeof(M128A) ); break; + case 34: memcpy( &context->u.s.Legacy[1], val, sizeof(M128A) ); break; + case 35: memcpy( &context->u.s.Legacy[2], val, sizeof(M128A) ); break; + case 36: memcpy( &context->u.s.Legacy[3], val, sizeof(M128A) ); break; + case 37: memcpy( &context->u.s.Legacy[4], val, sizeof(M128A) ); break; + case 38: memcpy( &context->u.s.Legacy[5], val, sizeof(M128A) ); break; + case 39: memcpy( &context->u.s.Legacy[6], val, sizeof(M128A) ); break; + case 40: memcpy( &context->u.s.Legacy[7], val, sizeof(M128A) ); break; } }

1 0

Austin English : ntoskrnl.exe: Add IoReportResourceForDetection stub.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 4056837b71d60197f4734c38bee8800eed9fb157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4056837b71d60197f4734c38b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 20 18:26:14 2017 +0200 ntoskrnl.exe: Add IoReportResourceForDetection stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 18c94886d7ca3f5c9df71e0b6268b3114ada25e6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index b3db46c..c2d3127 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1453,6 +1453,20 @@ VOID WINAPI IoUnregisterShutdownNotification( PDEVICE_OBJECT obj ) /*********************************************************************** + * IoReportResourceForDetection (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoReportResourceForDetection( DRIVER_OBJECT *drv_obj, CM_RESOURCE_LIST *drv_list, ULONG drv_size, + DEVICE_OBJECT *dev_obj, CM_RESOURCE_LIST *dev_list, ULONG dev_size, + BOOLEAN *conflict ) +{ + FIXME( "(%p, %p, %u, %p, %p, %u, %p): stub\n", drv_obj, drv_list, drv_size, + dev_obj, dev_list, dev_size, conflict ); + + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * IoReportResourceUsage (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoReportResourceUsage(PUNICODE_STRING name, PDRIVER_OBJECT drv_obj, PCM_RESOURCE_LIST drv_list, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7416740..cb92d80 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -440,7 +440,7 @@ @ stub IoRemoveShareAccess @ stub IoReportDetectedDevice @ stub IoReportHalResourceUsage -@ stub IoReportResourceForDetection +@ stdcall IoReportResourceForDetection(ptr ptr long ptr ptr long ptr) @ stdcall IoReportResourceUsage(ptr ptr ptr long ptr ptr long long ptr) @ stub IoReportTargetDeviceChange @ stub IoReportTargetDeviceChangeAsynchronous

1 0

Hans Leidekker : msi: Properly handle DWORD registry values in MsiGetPatchInfoEx.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 324760af5901b57b0fd744dc8c8ce6ea254cbfd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=324760af5901b57b0fd744dc8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 19 11:26:48 2017 +0200 msi: Properly handle DWORD registry values in MsiGetPatchInfoEx. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f3adb4a17a1428b9f9a14c924865dc3bd45ea508) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/msi.c | 48 ++++++++++++++++++++++++------------------------ dlls/msi/tests/msi.c | 17 ++++++++++++++++- 2 files changed, 40 insertions(+), 25 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 972eec6..f6b6151 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1075,26 +1075,26 @@ done: return rc; } -static LPWSTR msi_reg_get_value(HKEY hkey, LPCWSTR name, DWORD *type) +static WCHAR *reg_get_value( HKEY hkey, const WCHAR *name, DWORD *type ) { - DWORD dval; LONG res; - WCHAR temp[20]; - static const WCHAR format[] = {'%','d',0}; + if ((res = RegQueryValueExW( hkey, name, NULL, type, NULL, NULL )) != ERROR_SUCCESS) return NULL; - res = RegQueryValueExW(hkey, name, NULL, type, NULL, NULL); - if (res != ERROR_SUCCESS) - return NULL; - - if (*type == REG_SZ) - return msi_reg_get_val_str(hkey, name); + if (*type == REG_SZ) return msi_reg_get_val_str( hkey, name ); + if (*type == REG_DWORD) + { + static const WCHAR fmt[] = {'%','u',0}; + WCHAR temp[11]; + DWORD val; - if (!msi_reg_get_val_dword(hkey, name, &dval)) - return NULL; + if (!msi_reg_get_val_dword( hkey, name, &val )) return NULL; + sprintfW( temp, fmt, val ); + return strdupW( temp ); + } - sprintfW(temp, format, dval); - return strdupW(temp); + ERR( "unhandled value type %u\n", *type ); + return NULL; } static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, @@ -1168,7 +1168,7 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, else if (!strcmpW( szAttribute, INSTALLPROPERTY_VERSIONSTRINGW )) szAttribute = display_version; - val = msi_reg_get_value(userdata, szAttribute, &type); + val = reg_get_value(userdata, szAttribute, &type); if (!val) val = empty; RegCloseKey(userdata); @@ -1202,7 +1202,7 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, goto done; } - val = msi_reg_get_value(source, szAttribute, &type); + val = reg_get_value(source, szAttribute, &type); if (!val) val = empty; @@ -1210,7 +1210,7 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, } else { - val = msi_reg_get_value(prodkey, szAttribute, &type); + val = reg_get_value(prodkey, szAttribute, &type); if (!val) val = empty; } @@ -1492,7 +1492,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, !strcmpW( szProperty, INSTALLPROPERTY_REGOWNERW ) || !strcmpW( szProperty, INSTALLPROPERTY_INSTANCETYPEW )) { - val = msi_reg_get_value(props, package, &type); + val = reg_get_value(props, package, &type); if (!val) { if (prod || classes) @@ -1508,7 +1508,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, else if (!strcmpW( szProperty, INSTALLPROPERTY_VERSIONSTRINGW )) szProperty = displayversion; - val = msi_reg_get_value(props, szProperty, &type); + val = reg_get_value(props, szProperty, &type); if (!val) val = strdupW(szEmpty); @@ -1533,7 +1533,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, else if (dwContext == MSIINSTALLCONTEXT_MACHINE) hkey = classes; - val = msi_reg_get_value(hkey, szProperty, &type); + val = reg_get_value(hkey, szProperty, &type); if (!val) val = strdupW(szEmpty); @@ -1545,7 +1545,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, { if (props) { - val = msi_reg_get_value(props, package, &type); + val = reg_get_value(props, package, &type); if (!val) goto done; @@ -1558,7 +1558,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, r = msi_copy_outval(val, szValue, pcchValue); goto done; } - else if (props && (val = msi_reg_get_value(props, package, &type))) + else if (props && (val = reg_get_value(props, package, &type))) { msi_free(val); val = strdupW(five); @@ -1674,7 +1674,7 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, HKEY udpatch = 0, datakey = 0; HKEY prodpatches = 0; UINT r = ERROR_UNKNOWN_PRODUCT; - DWORD len; + DWORD len, type; LONG res; TRACE("(%s, %s, %s, %d, %s, %p, %p)\n", debugstr_w(szPatchCode), @@ -1766,7 +1766,7 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, } } - val = msi_reg_get_val_str(datakey, szProperty); + val = reg_get_value(datakey, szProperty, &type); if (!val) val = strdupW(szEmpty); diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 46d0b73..909aa1d 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -12675,7 +12675,22 @@ static void test_MsiGetPatchInfoEx(void) MSIINSTALLCONTEXT_USERMANAGED, INSTALLPROPERTY_PATCHSTATEA, val, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmpA(val, "1"), "Expected \"1\", got \"%s\"\n", val); + ok(!lstrcmpA(val, "1"), "Expected \"1\", got \"%s\"\n", val); + ok(size == 1, "Expected 1, got %d\n", size); + + size = 1; + res = RegSetValueExA(hpatch, "Uninstallable", 0, REG_DWORD, + (const BYTE *)&size, sizeof(DWORD)); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* Uninstallable value exists */ + size = MAX_PATH; + lstrcpyA(val, "apple"); + r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid, + MSIINSTALLCONTEXT_USERMANAGED, + INSTALLPROPERTY_UNINSTALLABLEA, val, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(val, "1"), "Expected \"1\", got \"%s\"\n", val); ok(size == 1, "Expected 1, got %d\n", size); res = RegSetValueExA(hpatch, "DisplayName", 0, REG_SZ,

1 0

Nikolay Sivov : dwrite: Make CreateFontFaceFromHdc() properly fail on unsupported font format.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 9f0cb9c2cfb40e3d39d2fd19a1f4b2e72a62add2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f0cb9c2cfb40e3d39d2fd19a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 15:15:29 2017 +0300 dwrite: Make CreateFontFaceFromHdc() properly fail on unsupported font format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0344c19692396dca80a98f02fa7f713cee12b344) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 13 +++++++------ dlls/dwrite/tests/font.c | 24 +++++++++++++++++++++++- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 67fc4a0..5353810d 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -746,14 +746,15 @@ static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop1 *iface is_supported = FALSE; hr = IDWriteFontFile_Analyze(file, &is_supported, &filetype, &facetype, &facenum); - if (FAILED(hr) || !is_supported) { - IDWriteFontFile_Release(file); - return hr; + if (SUCCEEDED(hr)) { + if (is_supported) + /* Simulations flags values match DWRITE_FONT_SIMULATIONS */ + hr = IDWriteFactory4_CreateFontFace(This->factory, facetype, 1, &file, info.face_index, + info.simulations, fontface); + else + hr = DWRITE_E_FILEFORMAT; } - /* Simulations flags values match DWRITE_FONT_SIMULATIONS */ - hr = IDWriteFactory4_CreateFontFace(This->factory, facetype, 1, &file, info.face_index, info.simulations, - fontface); IDWriteFontFile_Release(file); return hr; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ba9866a..b5cb9b5 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1,7 +1,7 @@ /* * Font related tests * - * Copyright 2012, 2014-2016 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2017 Nikolay Sivov for CodeWeavers * Copyright 2014 Aric Stewart for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -3344,6 +3344,7 @@ static void test_CreateFontFaceFromHdc(void) IDWriteFactory *factory; HFONT hfont, oldhfont; LOGFONTW logfont; + LOGFONTA lf; HRESULT hr; HDC hdc; @@ -3353,11 +3354,17 @@ static void test_CreateFontFaceFromHdc(void) hr = IDWriteFactory_GetGdiInterop(factory, &interop); ok(hr == S_OK, "got 0x%08x\n", hr); + /* Invalid HDC. */ fontface = (void*)0xdeadbeef; hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, NULL, &fontface); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(fontface == NULL, "got %p\n", fontface); + fontface = (void *)0xdeadbeef; + hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, (HDC)0xdeadbeef, &fontface); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(fontface == NULL, "got %p\n", fontface); + memset(&logfont, 0, sizeof(logfont)); logfont.lfHeight = 12; logfont.lfWidth = 12; @@ -3374,6 +3381,21 @@ static void test_CreateFontFaceFromHdc(void) ok(hr == S_OK, "got 0x%08x\n", hr); IDWriteFontFace_Release(fontface); DeleteObject(SelectObject(hdc, oldhfont)); + + /* Select bitmap font MS Sans Serif, format that's not supported by DirectWrite. */ + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -12; + strcpy(lf.lfFaceName, "MS Sans Serif"); + + hfont = CreateFontIndirectA(&lf); + oldhfont = SelectObject(hdc, hfont); + + fontface = (void *)0xdeadbeef; + hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, hdc, &fontface); + ok(hr == DWRITE_E_FILEFORMAT || broken(hr == E_FAIL) /* Vista */, "got 0x%08x\n", hr); + ok(fontface == NULL, "got %p\n", fontface); + + DeleteObject(SelectObject(hdc, oldhfont)); DeleteDC(hdc); IDWriteGdiInterop_Release(interop);

1 0

Jakub Bartmiński : regedit: Fall back to tree root on invalid path.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 0d8afd40a5391204c312513baee38a6d60145499 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8afd40a5391204c312513ba… Author: Jakub Bartmiński <jakub.bartm(a)gmail.com> Date: Mon Apr 3 21:39:46 2017 +0200 regedit: Fall back to tree root on invalid path. Signed-off-by: Jakub Bartmiński <jakub.bartm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9e35dd15454be28c487b0f1bebefbbe530b2aca4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/regedit/treeview.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 07e9b41..f081c16 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -132,13 +132,16 @@ static LPWSTR get_path_component(LPCWSTR *lplpKeyName) { HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName) { TVITEMEXW tvi; WCHAR buf[261]; /* tree view has 260 character limitation on item name */ - HTREEITEM hItem, hOldItem; + HTREEITEM hRoot, hItem, hOldItem; + BOOL valid_path; buf[260] = '\0'; - hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_ROOT, 0); + hRoot = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_ROOT, 0); + hItem = hRoot; SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)hItem); hOldItem = hItem; + valid_path = FALSE; while(1) { LPWSTR lpItemName = get_path_component(&lpKeyName); @@ -150,6 +153,7 @@ HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName) { tvi.cchTextMax = 260; SendMessageW(hwndTV, TVM_GETITEMW, 0, (LPARAM) &tvi); if (!lstrcmpiW(tvi.pszText, lpItemName)) { + valid_path = TRUE; SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); if (!lpKeyName) { @@ -164,10 +168,10 @@ HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName) { } HeapFree(GetProcessHeap(), 0, lpItemName); if (!hItem) - return hOldItem; + return valid_path ? hOldItem : hRoot; } else - return hItem; + return valid_path ? hItem : hRoot; } }

1 0

Piotr Caban : msvcrt: Fix wide characters handling in wscanf functions.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: a97aa62ee7530eb2bd18e6a4460225fc18f2b5fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a97aa62ee7530eb2bd18e6a44… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 3 12:45:58 2017 +0200 msvcrt: Fix wide characters handling in wscanf functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e7f9b562b9da5aa1fbe369f9e57fe63d08cbb743) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/scanf.h | 16 ++++++++-------- dlls/msvcrt/tests/scanf.c | 12 +++++++++++- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 0fa1e6f..2920b9b 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -68,11 +68,11 @@ #undef _EOF_ #define _EOF_ 0 #ifdef STRING_LEN -#ifdef WIDE_CHAR +#ifdef WIDE_SCANF #define _GETC_(file) (consumed==length ? '\0' : (consumed++, *file++)) -#else /* WIDE_CHAR */ +#else /* WIDE_SCANF */ #define _GETC_(file) (consumed==length ? '\0' : (consumed++, (unsigned char)*file++)) -#endif /* WIDE_CHAR */ +#endif /* WIDE_SCANF */ #define _UNGETC_(nch, file) do { file--; consumed--; } while(0) #define _LOCK_FILE_(file) do {} while(0) #define _UNLOCK_FILE_(file) do {} while(0) @@ -90,11 +90,11 @@ #endif /* SECURE */ #endif /* WIDE_SCANF */ #else /* STRING_LEN */ -#ifdef WIDE_CHAR +#ifdef WIDE_SCANF #define _GETC_(file) (consumed++, *file++) -#else /* WIDE_CHAR */ +#else /* WIDE_SCANF */ #define _GETC_(file) (consumed++, (unsigned char)*file++) -#endif /* WIDE_CHAR */ +#endif /* WIDE_SCANF */ #define _UNGETC_(nch, file) do { file--; consumed--; } while(0) #define _LOCK_FILE_(file) do {} while(0) #define _UNLOCK_FILE_(file) do {} while(0) @@ -685,7 +685,7 @@ _FUNCTION_ { * use %%." */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); - if (nch==*format) { + if ((_CHAR_)nch == *format) { suppress = 1; /* whoops no field to be read */ st = 1; /* but we got what we expected */ nch = _GETC_(file); @@ -699,7 +699,7 @@ _FUNCTION_ { * a matching non-white-space character. */ else { /* check for character match */ - if (nch == (unsigned char)*format) { + if ((_CHAR_)nch == *format) { nch = _GETC_(file); } else break; } diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index ecb270b..1d1f28e 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -252,7 +252,7 @@ static void test_sscanf( void ) ok(!strcmp(buffer, "test"), "buf %s\n", buffer); ok(!strcmp(buffer1, "value\xda"), "buf %s\n", buffer1); - ret = sscanf("\x81test", "\x81%s", buffer); + ret = sscanf("\x81\x82test", "\x81%\x82%s", buffer); ok(ret == 1, "got %d\n", ret); ok(!strcmp(buffer, "test"), "buf = %s\n", buffer); } @@ -303,6 +303,8 @@ static void test_swscanf( void ) wchar_t buffer[100]; int result, ret; static const WCHAR formatd[] = {'%','d',0}; + const WCHAR format2[] = {'a',0x1234,'%',0x1234,'%','c',0}; + WCHAR c; /* check WEOF */ /* WEOF is an unsigned short -1 but swscanf returns int @@ -312,6 +314,14 @@ static void test_swscanf( void ) /* msvcrt returns 0 but should return -1 (later versions do) */ ok( ret == (short)WEOF || broken(ret == 0), "swscanf returns %x instead of %x\n", ret, WEOF ); + + buffer[0] = 'a'; + buffer[1] = 0x1234; + buffer[2] = 0x1234; + buffer[3] = 'b'; + ret = swscanf(buffer, format2, &c); + ok(ret == 1, "swscanf returned %d\n", ret); + ok(c == 'b', "c = %x\n", c); } START_TEST(scanf)

1 0