September 2016 - Wine-Commits

Andrey Gusev : api-ms-win-core-realtime-l1-1-0: Add dll.
by Alexandre Julliard Sept. 15, 2016

Sept. 15, 2016

Module: wine Branch: master Commit: e08d5714801a2440cc8ce530790ce9ec6ec6c1c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e08d5714801a2440cc8ce5307… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Sep 15 14:02:09 2016 +0300 api-ms-win-core-realtime-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-realtime-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-realtime-l1-1-0.spec | 5 +++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) diff --git a/configure b/configure index 6727ea5..a588551 100755 --- a/configure +++ b/configure @@ -933,6 +933,7 @@ enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_processthreads_l1_1_2 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_psapi_l1_1_0 +enable_api_ms_win_core_realtime_l1_1_0 enable_api_ms_win_core_registry_l1_1_0 enable_api_ms_win_core_registryuserspecific_l1_1_0 enable_api_ms_win_core_rtlsupport_l1_1_0 @@ -17595,6 +17596,7 @@ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-2 enable_api_ms_win_core_processthreads_l1_1_2 wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-psapi-l1-1-0 enable_api_ms_win_core_psapi_l1_1_0 +wine_fn_config_dll api-ms-win-core-realtime-l1-1-0 enable_api_ms_win_core_realtime_l1_1_0 wine_fn_config_dll api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_registry_l1_1_0 wine_fn_config_dll api-ms-win-core-registryuserspecific-l1-1-0 enable_api_ms_win_core_registryuserspecific_l1_1_0 wine_fn_config_dll api-ms-win-core-rtlsupport-l1-1-0 enable_api_ms_win_core_rtlsupport_l1_1_0 diff --git a/configure.ac b/configure.ac index 35c931a..a395469 100644 --- a/configure.ac +++ b/configure.ac @@ -2709,6 +2709,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-psapi-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-realtime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-registryuserspecific-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0) diff --git a/dlls/api-ms-win-core-realtime-l1-1-0/Makefile.in b/dlls/api-ms-win-core-realtime-l1-1-0/Makefile.in new file mode 100644 index 0000000..3a29de8 --- /dev/null +++ b/dlls/api-ms-win-core-realtime-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-realtime-l1-1-0.dll diff --git a/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec b/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec new file mode 100644 index 0000000..9c70db1 --- /dev/null +++ b/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec @@ -0,0 +1,5 @@ +@ stub QueryIdleProcessorCycleTime +@ stub QueryIdleProcessorCycleTimeEx +@ stub QueryProcessCycleTime +@ stdcall QueryThreadCycleTime(long ptr) kernel32.QueryThreadCycleTime +@ stdcall QueryUnbiasedInterruptTime(ptr) kernel32.QueryUnbiasedInterruptTime diff --git a/tools/make_specfiles b/tools/make_specfiles index eff126c..5f53cbb 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -137,6 +137,7 @@ my @dll_groups = "api-ms-win-core-interlocked-l1-2-0", "api-ms-win-core-misc-l1-1-0", "api-ms-win-core-profile-l1-1-0", + "api-ms-win-core-realtime-l1-1-0", "api-ms-win-core-sidebyside-l1-1-0", "api-ms-win-core-string-l1-1-0", "api-ms-win-core-string-obsolete-l1-1-0",

1 0

Alexandre Julliard : user32/tests: Add some tests for the contents of the clipboard data.
by Alexandre Julliard Sept. 15, 2016

Sept. 15, 2016

Module: wine Branch: master Commit: 08aa64e38ea06d95f6997ac9ab66e6abb276fc57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08aa64e38ea06d95f6997ac9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 16:39:52 2016 +0900 user32/tests: Add some tests for the contents of the clipboard data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 107 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 61b0d2c..9f54818 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1600,7 +1600,7 @@ static BOOL is_freed( HANDLE handle ) static UINT format_id; static HBITMAP bitmap, bitmap2; static HPALETTE palette; -static const LOGPALETTE logpalette = { 0x300, 1 }; +static const LOGPALETTE logpalette = { 0x300, 1, {{ 0x12, 0x34, 0x56, 0x78 }}}; static void test_handles( HWND hwnd ) { @@ -1609,6 +1609,7 @@ static void test_handles( HWND hwnd ) UINT format_id2 = RegisterClipboardFormatA( "another format" ); BOOL r; HANDLE data; + HBITMAP bitmap_temp; DWORD process; BOOL is_owner = (GetWindowThreadProcessId( hwnd, &process ) && process == GetCurrentProcessId()); @@ -1648,9 +1649,14 @@ static void test_handles( HWND hwnd ) h = SetClipboardData( format_id, htext2 ); ok( h == htext2, "got %p\n", h ); ok( is_moveable( h ), "expected moveable mem %p\n", h ); + bitmap_temp = CreateBitmap( 10, 10, 1, 1, NULL ); + h = SetClipboardData( CF_BITMAP, bitmap_temp ); + ok( h == bitmap_temp, "got %p\n", h ); + ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); h = SetClipboardData( CF_BITMAP, bitmap ); ok( h == bitmap, "got %p\n", h ); ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); + ok( !GetObjectType( bitmap_temp ), "expected free object %p\n", bitmap_temp ); h = SetClipboardData( CF_DSPBITMAP, bitmap2 ); ok( h == bitmap2, "got %p\n", h ); ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); @@ -1923,6 +1929,9 @@ static void test_handles_process( const char *str ) BOOL r; HANDLE h; char *ptr; + BITMAP bm; + PALETTEENTRY entry; + BYTE buffer[1024]; format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); r = OpenClipboard( 0 ); @@ -1951,13 +1960,44 @@ static void test_handles_process( const char *str ) trace( "private %p\n", h ); h = GetClipboardData( CF_BITMAP ); todo_wine ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); + todo_wine ok( GetObjectW( h, sizeof(bm), &bm ) == sizeof(bm), "GetObject %p failed\n", h ); + todo_wine ok( bm.bmWidth == 13 && bm.bmHeight == 17, "wrong bitmap %ux%u\n", bm.bmWidth, bm.bmHeight ); trace( "bitmap %p\n", h ); h = GetClipboardData( CF_DSPBITMAP ); ok( !GetObjectType( h ), "expected invalid object %p\n", h ); trace( "bitmap2 %p\n", h ); h = GetClipboardData( CF_PALETTE ); todo_wine ok( GetObjectType( h ) == OBJ_PAL, "expected palette %p\n", h ); + todo_wine ok( GetPaletteEntries( h, 0, 1, &entry ) == 1, "GetPaletteEntries %p failed\n", h ); + todo_wine ok( entry.peRed == 0x12 && entry.peGreen == 0x34 && entry.peBlue == 0x56, + "wrong color %02x,%02x,%02x\n", entry.peRed, entry.peGreen, entry.peBlue ); trace( "palette %p\n", h ); + h = GetClipboardData( CF_METAFILEPICT ); + todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); + if (h) + ok( GetObjectType( ((METAFILEPICT *)h)->hMF ) == OBJ_METAFILE, + "wrong object %p\n", ((METAFILEPICT *)h)->hMF ); + trace( "metafile %p\n", h ); + h = GetClipboardData( CF_DSPMETAFILEPICT ); + todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); + if (h) + ok( GetObjectType( ((METAFILEPICT *)h)->hMF ) == OBJ_METAFILE, + "wrong object %p\n", ((METAFILEPICT *)h)->hMF ); + trace( "metafile2 %p\n", h ); + h = GetClipboardData( CF_ENHMETAFILE ); + todo_wine ok( GetObjectType( h ) == OBJ_ENHMETAFILE, "expected enhmetafile %p\n", h ); + todo_wine ok( GetEnhMetaFileBits( h, sizeof(buffer), buffer ) > sizeof(ENHMETAHEADER), + "GetEnhMetaFileBits failed on %p\n", h ); + todo_wine ok( ((ENHMETAHEADER *)buffer)->nRecords == 3, + "wrong records %u\n", ((ENHMETAHEADER *)buffer)->nRecords ); + trace( "enhmetafile %p\n", h ); + h = GetClipboardData( CF_DSPENHMETAFILE ); + todo_wine ok( GetObjectType( h ) == OBJ_ENHMETAFILE, "expected enhmetafile %p\n", h ); + todo_wine ok( GetEnhMetaFileBits( h, sizeof(buffer), buffer ) > sizeof(ENHMETAHEADER), + "GetEnhMetaFileBits failed on %p\n", h ); + todo_wine ok( ((ENHMETAHEADER *)buffer)->nRecords == 3, + "wrong records %u\n", ((ENHMETAHEADER *)buffer)->nRecords ); + trace( "enhmetafile2 %p\n", h ); h = GetClipboardData( CF_DIB ); todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); h = GetClipboardData( CF_DIBV5 ); @@ -1980,12 +2020,28 @@ static void test_handles_process_open( const char *str ) ok( is_moveable( h ), "expected moveable mem %p\n", h ); } +static void test_handles_process_dib( const char *str ) +{ + BOOL r; + HANDLE h; + + r = OpenClipboard( 0 ); + ok( r, "gle %d\n", GetLastError() ); + h = GetClipboardData( CF_BITMAP ); + ok( !GetObjectType( h ), "expected invalid object %p\n", h ); + trace( "dibsection %p\n", h ); + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); +} + static void test_data_handles(void) { BOOL r; char *ptr; HANDLE h, text; HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); + BITMAPINFO bmi; + void *bits; ok( hwnd != 0, "window creation failed\n" ); format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); @@ -1994,7 +2050,7 @@ static void test_data_handles(void) test_handles( hwnd ); run_thread( test_handles_thread, hwnd, __LINE__ ); - bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + bitmap = CreateBitmap( 13, 17, 1, 1, NULL ); bitmap2 = CreateBitmap( 10, 10, 1, 1, NULL ); palette = CreatePalette( &logpalette ); @@ -2012,6 +2068,18 @@ static void test_data_handles(void) ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); h = SetClipboardData( CF_PALETTE, palette ); ok( GetObjectType( h ) == OBJ_PAL, "expected palette %p\n", h ); + h = SetClipboardData( CF_METAFILEPICT, create_metafile() ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + trace( "metafile %p\n", h ); + h = SetClipboardData( CF_DSPMETAFILEPICT, create_metafile() ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + trace( "metafile2 %p\n", h ); + h = SetClipboardData( CF_ENHMETAFILE, create_emf() ); + ok( GetObjectType( h ) == OBJ_ENHMETAFILE, "expected enhmetafile %p\n", h ); + trace( "enhmetafile %p\n", h ); + h = SetClipboardData( CF_DSPENHMETAFILE, create_emf() ); + ok( GetObjectType( h ) == OBJ_ENHMETAFILE, "expected enhmetafile %p\n", h ); + trace( "enhmetafile2 %p\n", h ); h = SetClipboardData( CF_GDIOBJFIRST + 3, create_textA() ); ok( is_moveable( h ), "expected moveable mem %p\n", h ); h = SetClipboardData( CF_PRIVATEFIRST + 7, create_textA() ); @@ -2057,6 +2125,36 @@ static void test_data_handles(void) r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); + /* test CF_BITMAP with a DIB section */ + memset( &bmi, 0, sizeof(bmi) ); + bmi.bmiHeader.biSize = sizeof( bmi.bmiHeader ); + bmi.bmiHeader.biWidth = 29; + bmi.bmiHeader.biHeight = 13; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 32; + bitmap = CreateDIBSection( 0, &bmi, DIB_RGB_COLORS, &bits, 0, 0 ); + + r = OpenClipboard( hwnd ); + ok( r, "gle %d\n", GetLastError() ); + r = EmptyClipboard(); + ok( r, "gle %d\n", GetLastError() ); + h = SetClipboardData( CF_BITMAP, bitmap ); + ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); + trace( "dibsection %p\n", h ); + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); + + run_process( "handles_dib dummy" ); + + r = OpenClipboard( hwnd ); + ok( r, "gle %d\n", GetLastError() ); + ok( GetObjectType( bitmap ) == OBJ_BITMAP, "expected bitmap %p\n", bitmap ); + r = EmptyClipboard(); + ok( r, "gle %d\n", GetLastError() ); + ok( !GetObjectType( bitmap ), "expected deleted %p\n", bitmap ); + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); + DestroyWindow( hwnd ); } @@ -2202,6 +2300,11 @@ START_TEST(clipboard) test_handles_process_open( argv[3] ); return; } + if (argc == 4 && !strcmp( argv[2], "handles_dib" )) + { + test_handles_process_dib( argv[3] ); + return; + } test_RegisterClipboardFormatA(); test_ClipboardOwner();

1 0

Andrey Gusev : api-ms-win-core-localization-l2-1-0: Add dll.
by Alexandre Julliard Sept. 15, 2016

Sept. 15, 2016

Module: wine Branch: master Commit: 57832666e3183df8a920db6347a775f67aa86c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=57832666e3183df8a920db634… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Sep 15 15:00:04 2016 +0300 api-ms-win-core-localization-l2-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-localization-l2-1-0/Makefile.in | 1 + .../api-ms-win-core-localization-l2-1-0.spec | 12 ++++++++++++ tools/make_specfiles | 1 + 5 files changed, 17 insertions(+) diff --git a/configure b/configure index a588551..930a0e2 100755 --- a/configure +++ b/configure @@ -913,6 +913,7 @@ enable_api_ms_win_core_libraryloader_l1_2_0 enable_api_ms_win_core_localization_l1_1_0 enable_api_ms_win_core_localization_l1_2_0 enable_api_ms_win_core_localization_l1_2_1 +enable_api_ms_win_core_localization_l2_1_0 enable_api_ms_win_core_localization_obsolete_l1_1_0 enable_api_ms_win_core_localization_obsolete_l1_2_0 enable_api_ms_win_core_localregistry_l1_1_0 @@ -17576,6 +17577,7 @@ wine_fn_config_dll api-ms-win-core-libraryloader-l1-2-0 enable_api_ms_win_core_l wine_fn_config_dll api-ms-win-core-localization-l1-1-0 enable_api_ms_win_core_localization_l1_1_0 wine_fn_config_dll api-ms-win-core-localization-l1-2-0 enable_api_ms_win_core_localization_l1_2_0 wine_fn_config_dll api-ms-win-core-localization-l1-2-1 enable_api_ms_win_core_localization_l1_2_1 +wine_fn_config_dll api-ms-win-core-localization-l2-1-0 enable_api_ms_win_core_localization_l2_1_0 wine_fn_config_dll api-ms-win-core-localization-obsolete-l1-1-0 enable_api_ms_win_core_localization_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-localization-obsolete-l1-2-0 enable_api_ms_win_core_localization_obsolete_l1_2_0 wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 diff --git a/configure.ac b/configure.ac index a395469..6411f22 100644 --- a/configure.ac +++ b/configure.ac @@ -2689,6 +2689,7 @@ WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-localization-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-1) +WINE_CONFIG_DLL(api-ms-win-core-localization-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) diff --git a/dlls/api-ms-win-core-localization-l2-1-0/Makefile.in b/dlls/api-ms-win-core-localization-l2-1-0/Makefile.in new file mode 100644 index 0000000..6cc8960 --- /dev/null +++ b/dlls/api-ms-win-core-localization-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-localization-l2-1-0.dll diff --git a/dlls/api-ms-win-core-localization-l2-1-0/api-ms-win-core-localization-l2-1-0.spec b/dlls/api-ms-win-core-localization-l2-1-0/api-ms-win-core-localization-l2-1-0.spec new file mode 100644 index 0000000..d5c5ef0 --- /dev/null +++ b/dlls/api-ms-win-core-localization-l2-1-0/api-ms-win-core-localization-l2-1-0.spec @@ -0,0 +1,12 @@ +@ stdcall EnumCalendarInfoExEx(ptr wstr long wstr long long) kernel32.EnumCalendarInfoExEx +@ stdcall EnumCalendarInfoExW(ptr long long long) kernel32.EnumCalendarInfoExW +@ stdcall EnumCalendarInfoW(ptr long long long) kernel32.EnumCalendarInfoW +@ stdcall EnumDateFormatsExEx(ptr wstr long long) kernel32.EnumDateFormatsExEx +@ stdcall EnumDateFormatsExW(ptr long long) kernel32.EnumDateFormatsExW +@ stdcall EnumDateFormatsW(ptr long long) kernel32.EnumDateFormatsW +@ stdcall EnumSystemCodePagesW(ptr long) kernel32.EnumSystemCodePagesW +@ stdcall EnumTimeFormatsEx(ptr wstr long long) kernel32.EnumTimeFormatsEx +@ stdcall EnumTimeFormatsW(ptr long long) kernel32.EnumTimeFormatsW +@ stub GetCurrencyFormatEx +@ stdcall GetCurrencyFormatW(long long str ptr str long) kernel32.GetCurrencyFormatW +@ stdcall GetNumberFormatEx(wstr long wstr ptr ptr long) kernel32.GetNumberFormatEx diff --git a/tools/make_specfiles b/tools/make_specfiles index 5f53cbb..5fee758 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -165,6 +165,7 @@ my @dll_groups = "api-ms-win-core-kernel32-private-l1-1-1", "api-ms-win-core-localization-l1-1-0", "api-ms-win-core-localization-l1-2-0", + "api-ms-win-core-localization-l2-1-0", "api-ms-win-core-localization-obsolete-l1-1-0", "api-ms-win-core-localization-obsolete-l1-2-0", "api-ms-win-core-memory-l1-1-0",

1 0

Dmitry Timoshkov : gdiplus: Implement GdipGetMetafileHeaderFromStream.
by Alexandre Julliard Sept. 15, 2016

Sept. 15, 2016

Module: wine Branch: master Commit: 368b4c47bbbc525f7479bdf8a861d84c3284711e URL: http://source.winehq.org/git/wine.git/?a=commit;h=368b4c47bbbc525f7479bdf8a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 14 14:57:01 2016 -0500 gdiplus: Implement GdipGetMetafileHeaderFromStream. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 88717e4..adad4f9 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1817,19 +1817,21 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromFile(GDIPCONST WCHAR *filename, GpStatus WINGDIPAPI GdipGetMetafileHeaderFromStream(IStream *stream, MetafileHeader *header) { - static int calls; + GpStatus status; + GpMetafile *metafile; TRACE("(%p,%p)\n", stream, header); - if(!stream || !header) + if (!stream || !header) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); - - memset(header, 0, sizeof(MetafileHeader)); - - return Ok; + status = GdipCreateMetafileFromStream(stream, &metafile); + if (status == Ok) + { + status = GdipGetMetafileHeaderFromMetafile(metafile, header); + GdipDisposeImage(&metafile->image); + } + return status; } GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete,

1 0

Dmitry Timoshkov : gdiplus: Implement GdipGetMetafileHeaderFromWmf.
by Alexandre Julliard Sept. 15, 2016

Sept. 15, 2016

Module: wine Branch: master Commit: 8c1ded6164ca6d98a0d7010f154cc01e9fc76371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c1ded6164ca6d98a0d7010f1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 14 14:57:00 2016 -0500 gdiplus: Implement GdipGetMetafileHeaderFromWmf. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/metafile.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c163ef9..db0a49a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -303,7 +303,7 @@ 303 stdcall GdipGetMetafileHeaderFromFile(wstr ptr) 304 stdcall GdipGetMetafileHeaderFromMetafile(ptr ptr) 305 stdcall GdipGetMetafileHeaderFromStream(ptr ptr) -306 stub GdipGetMetafileHeaderFromWmf +306 stdcall GdipGetMetafileHeaderFromWmf(ptr ptr ptr) 307 stdcall GdipGetNearestColor(ptr ptr) 308 stdcall GdipGetPageScale(ptr ptr) 309 stdcall GdipGetPageUnit(ptr ptr) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 6d58170..88717e4 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1779,6 +1779,23 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE hemf, return Ok; } +GpStatus WINGDIPAPI GdipGetMetafileHeaderFromWmf(HMETAFILE hwmf, + GDIPCONST WmfPlaceableFileHeader *placeable, MetafileHeader *header) +{ + GpStatus status; + GpMetafile *metafile; + + TRACE("(%p,%p,%p)\n", hwmf, placeable, header); + + status = GdipCreateMetafileFromWmf(hwmf, FALSE, placeable, &metafile); + if (status == Ok) + { + status = GdipGetMetafileHeaderFromMetafile(metafile, header); + GdipDisposeImage(&metafile->image); + } + return status; +} + GpStatus WINGDIPAPI GdipGetMetafileHeaderFromFile(GDIPCONST WCHAR *filename, MetafileHeader *header) {

1 0

Andrey Gusev : api-ms-win-core-kernel32-private-l1-1-1: Add dll.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: d2e0fa8b85e8ff67d1465b60b88f902ebf2beb1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e0fa8b85e8ff67d1465b60b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Sep 14 12:05:23 2016 +0300 api-ms-win-core-kernel32-private-l1-1-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-kernel32-private-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-kernel32-private-l1-1-1.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index b8133ae..e815d8b 100755 --- a/configure +++ b/configure @@ -905,6 +905,7 @@ enable_api_ms_win_core_job_l1_1_0 enable_api_ms_win_core_job_l2_1_0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 enable_api_ms_win_core_kernel32_legacy_l1_1_1 +enable_api_ms_win_core_kernel32_private_l1_1_1 enable_api_ms_win_core_libraryloader_l1_1_0 enable_api_ms_win_core_libraryloader_l1_1_1 enable_api_ms_win_core_libraryloader_l1_2_0 @@ -17564,6 +17565,7 @@ wine_fn_config_dll api-ms-win-core-job-l1-1-0 enable_api_ms_win_core_job_l1_1_0 wine_fn_config_dll api-ms-win-core-job-l2-1-0 enable_api_ms_win_core_job_l2_1_0 wine_fn_config_dll api-ms-win-core-kernel32-legacy-l1-1-0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-kernel32-legacy-l1-1-1 enable_api_ms_win_core_kernel32_legacy_l1_1_1 +wine_fn_config_dll api-ms-win-core-kernel32-private-l1-1-1 enable_api_ms_win_core_kernel32_private_l1_1_1 wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-0 enable_api_ms_win_core_libraryloader_l1_1_0 wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-1 enable_api_ms_win_core_libraryloader_l1_1_1 wine_fn_config_dll api-ms-win-core-libraryloader-l1-2-0 enable_api_ms_win_core_libraryloader_l1_2_0 diff --git a/configure.ac b/configure.ac index ac75845..5ef439e 100644 --- a/configure.ac +++ b/configure.ac @@ -2681,6 +2681,7 @@ WINE_CONFIG_DLL(api-ms-win-core-job-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-job-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-kernel32-private-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-2-0) diff --git a/dlls/api-ms-win-core-kernel32-private-l1-1-1/Makefile.in b/dlls/api-ms-win-core-kernel32-private-l1-1-1/Makefile.in new file mode 100644 index 0000000..b8cec6b --- /dev/null +++ b/dlls/api-ms-win-core-kernel32-private-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-kernel32-private-l1-1-1.dll diff --git a/dlls/api-ms-win-core-kernel32-private-l1-1-1/api-ms-win-core-kernel32-private-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-private-l1-1-1/api-ms-win-core-kernel32-private-l1-1-1.spec new file mode 100644 index 0000000..277b59a --- /dev/null +++ b/dlls/api-ms-win-core-kernel32-private-l1-1-1/api-ms-win-core-kernel32-private-l1-1-1.spec @@ -0,0 +1 @@ +@ stub PrivCopyFileExW diff --git a/tools/make_specfiles b/tools/make_specfiles index d8ea7c5..b5a072c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -161,6 +161,7 @@ my @dll_groups = "api-ms-win-core-job-l2-1-0", "api-ms-win-core-kernel32-legacy-l1-1-0", "api-ms-win-core-kernel32-legacy-l1-1-1", + "api-ms-win-core-kernel32-private-l1-1-1", "api-ms-win-core-localization-l1-1-0", "api-ms-win-core-localization-l1-2-0", "api-ms-win-core-localization-obsolete-l1-1-0",

1 0

Piotr Caban : user32: Fix DefWindowProc(WM_NCRBUTTONDOWN) tests on Win 8 and 10.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: 80a222a8cdb127aa9d292ff636ce2ad5f0b2989e URL: http://source.winehq.org/git/wine.git/?a=commit;h=80a222a8cdb127aa9d292ff63… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 14 12:19:47 2016 +0200 user32: Fix DefWindowProc(WM_NCRBUTTONDOWN) tests on Win 8 and 10. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 72614eb..b088d1c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13909,6 +13909,25 @@ static const struct message NCRBUTTONDOWNSeq[] = { 0 } }; +struct rbuttonup_thread_data +{ + HWND hwnd; + HANDLE wndproc_finished; +}; + +static DWORD CALLBACK post_rbuttonup_msg( void *arg ) +{ + struct rbuttonup_thread_data *data = arg; + DWORD ret; + + ret = WaitForSingleObject( data->wndproc_finished, 500 ); + todo_wine ok( ret == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", ret ); + if( ret == WAIT_OBJECT_0 ) return 0; + + PostMessageA( data->hwnd, WM_RBUTTONUP, 0, 0 ); + return 0; +} + static void test_defwinproc(void) { HWND hwnd; @@ -13918,6 +13937,8 @@ static void test_defwinproc(void) RECT rect; INT x, y; LRESULT res; + struct rbuttonup_thread_data data; + HANDLE thread; hwnd = CreateWindowExA(0, "TestWindowClass", "test_defwndproc", WS_VISIBLE | WS_CAPTION | WS_OVERLAPPEDWINDOW, 0,0,500,100,0,0,0, NULL); @@ -13933,11 +13954,25 @@ static void test_defwinproc(void) res = DefWindowProcA( hwnd, WM_NCHITTEST, 0, MAKELPARAM(x, y)); ok(res == HTCAPTION, "WM_NCHITTEST returned %ld\n", res); + mouse_event( MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0 ); + mouse_event( MOUSEEVENTF_LEFTUP, 0, 0, 0, 0 ); + flush_events(); + flush_sequence(); - PostMessageA( hwnd, WM_RBUTTONUP, 0, 0); + mouse_event( MOUSEEVENTF_RIGHTUP, 0, 0, 0, 0 ); + /* workaround for missing support for clicking on window frame */ + data.hwnd = hwnd; + data.wndproc_finished = CreateEventA( NULL, FALSE, FALSE, NULL ); + thread = CreateThread( NULL, 0, post_rbuttonup_msg, (void*)&data, 0, NULL ); + DefWindowProcA( hwnd, WM_NCRBUTTONDOWN, HTCAPTION, MAKELPARAM(x, y)); ok_sequence(NCRBUTTONDOWNSeq, "WM_NCRBUTTONDOWN on caption", FALSE); + SetEvent( data.wndproc_finished ); + WaitForSingleObject( thread, 1000 ); + CloseHandle( data.wndproc_finished ); + CloseHandle( thread ); + SetCursorPos(pos.x, pos.y); DefWindowProcA( hwnd, WM_ENDSESSION, 1, 0);

1 0

Hans Leidekker : qmgr: Job error codes are HRESULT values.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: ec6a17fa9c4dd816bbfe0a21a68d4fbdb734d9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec6a17fa9c4dd816bbfe0a21a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 14 10:06:11 2016 +0200 qmgr: Job error codes are HRESULT values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/file.c | 12 ++++++------ dlls/qmgr/job.c | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index cdea329..3673ede 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -201,7 +201,7 @@ HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, return S_OK; } -static HRESULT error_from_http_response(DWORD code) +static HRESULT hresult_from_http_response(DWORD code) { switch (code) { @@ -239,7 +239,7 @@ static void CALLBACK progress_callback_http(HINTERNET handle, DWORD_PTR context, if (WinHttpQueryHeaders(handle, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &code, &size, NULL)) { - if ((job->error.code = error_from_http_response(code))) + if ((job->error.code = hresult_from_http_response(code))) { EnterCriticalSection(&job->cs); @@ -281,7 +281,7 @@ static void CALLBACK progress_callback_http(HINTERNET handle, DWORD_PTR context, case WINHTTP_CALLBACK_STATUS_REQUEST_ERROR: { WINHTTP_ASYNC_RESULT *result = (WINHTTP_ASYNC_RESULT *)buf; - job->error.code = result->dwError; + job->error.code = HRESULT_FROM_WIN32(result->dwError); transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_ERROR); break; } @@ -386,10 +386,10 @@ static BOOL transfer_file_http(BackgroundCopyFileImpl *file, URL_COMPONENTSW *uc if (!set_request_credentials(req, job)) goto done; if (!(WinHttpSendRequest(req, job->http_options.headers, ~0u, NULL, 0, 0, (DWORD_PTR)file))) goto done; - if (wait_for_completion(job) || job->error.code) goto done; + if (wait_for_completion(job) || FAILED(job->error.code)) goto done; if (!(WinHttpReceiveResponse(req, NULL))) goto done; - if (wait_for_completion(job) || job->error.code) goto done; + if (wait_for_completion(job) || FAILED(job->error.code)) goto done; transitionJobState(job, BG_JOB_STATE_CONNECTING, BG_JOB_STATE_TRANSFERRING); @@ -400,7 +400,7 @@ static BOOL transfer_file_http(BackgroundCopyFileImpl *file, URL_COMPONENTSW *uc { file->read_size = 0; if (!(ret = WinHttpReadData(req, buf, sizeof(buf), NULL))) break; - if (wait_for_completion(job) || job->error.code) + if (wait_for_completion(job) || FAILED(job->error.code)) { ret = FALSE; break; diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 33e3bd2..a12e511 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -371,7 +371,8 @@ static HRESULT WINAPI BackgroundCopyJob_Resume( && This->state != BG_JOB_STATE_TRANSFERRING) { This->state = BG_JOB_STATE_QUEUED; - This->error.context = This->error.code = 0; + This->error.context = 0; + This->error.code = S_OK; if (This->error.file) { IBackgroundCopyFile2_Release(This->error.file); @@ -1245,7 +1246,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID This->callback2 = FALSE; This->error.context = 0; - This->error.code = 0; + This->error.code = S_OK; This->error.file = NULL; memset(&This->http_options, 0, sizeof(This->http_options));

1 0

Hans Leidekker : msi: Use proper return types in msi_table_apply_transform.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: b0b2a1a4deee25474beb32573ce2fa770ff89cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0b2a1a4deee25474beb32573… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 14 10:06:10 2016 +0200 msi: Use proper return types in msi_table_apply_transform. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 9c31992..2b36091 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2738,7 +2738,7 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg ) IEnumSTATSTG *stgenum = NULL; TRANSFORMDATA *transform; TRANSFORMDATA *tables = NULL, *columns = NULL; - HRESULT r; + HRESULT hr; STATSTG stat; string_table *strings; UINT ret = ERROR_FUNCTION_FAILED; @@ -2751,8 +2751,8 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg ) if( !strings ) goto end; - r = IStorage_EnumElements( stg, 0, NULL, 0, &stgenum ); - if( FAILED( r ) ) + hr = IStorage_EnumElements( stg, 0, NULL, 0, &stgenum ); + if (FAILED( hr )) goto end; list_init(&transforms); @@ -2763,8 +2763,8 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg ) WCHAR name[0x40]; ULONG count = 0; - r = IEnumSTATSTG_Next( stgenum, 1, &stat, &count ); - if ( FAILED( r ) || !count ) + hr = IEnumSTATSTG_Next( stgenum, 1, &stat, &count ); + if (FAILED( hr ) || !count) break; decode_streamname( stat.pwcsName, name ); @@ -2794,12 +2794,10 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg ) TRACE("transform contains stream %s\n", debugstr_w(name)); /* load the table */ - r = TABLE_CreateView( db, transform->name, (MSIVIEW**) &tv ); - if( r != ERROR_SUCCESS ) + if (TABLE_CreateView( db, transform->name, (MSIVIEW**) &tv ) != ERROR_SUCCESS) continue; - r = tv->view.ops->execute( &tv->view, NULL ); - if( r != ERROR_SUCCESS ) + if (tv->view.ops->execute( &tv->view, NULL ) != ERROR_SUCCESS) { tv->view.ops->delete( &tv->view ); continue;

1 0

Piotr Caban : ucrtbase: Add __std_type_info_hash implementation.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: 4931e6f92bc7e0c229a057ebf2e000f8f5aa1edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4931e6f92bc7e0c229a057ebf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 14 15:34:02 2016 +0200 ucrtbase: Add __std_type_info_hash implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcrt/cpp.c | 19 ++++++++++++++ dlls/ucrtbase/tests/cpp.c | 30 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 5 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index a007823..e52b904 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -46,7 +46,7 @@ @ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ cdecl __std_type_info_destroy_list(ptr) ucrtbase.__std_type_info_destroy_list -@ stub __std_type_info_hash +@ cdecl __std_type_info_hash(ptr) ucrtbase.__std_type_info_hash @ cdecl __std_type_info_name(ptr ptr) ucrtbase.__std_type_info_name @ cdecl __unDName(ptr str long ptr ptr long) ucrtbase.__unDName @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) ucrtbase.__unDNameEx diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 3621f12..0ffe61e 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1588,4 +1588,23 @@ void CDECL MSVCRT_type_info_destroy_list(SLIST_HEADER *header) MSVCRT_free(cur); } } + +/****************************************************************** + * __std_type_info_hash (UCRTBASE.@) + * + * TODO: 64-bit version of the function uses different constants + */ +MSVCRT_size_t CDECL MSVCRT_type_info_hash(const type_info140 *ti) +{ + MSVCRT_size_t hash = 0x811c9dc5; + const char *p; + + TRACE("(%p)->%s\n", ti, ti->mangled); + + for(p = ti->mangled+1; *p; p++) { + hash ^= *p; + hash *= 0x1000193; + } + return hash; +} #endif diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c index 168cd21..1a01fea 100644 --- a/dlls/ucrtbase/tests/cpp.c +++ b/dlls/ucrtbase/tests/cpp.c @@ -51,6 +51,7 @@ static void (CDECL *p___std_exception_destroy)(__std_exception_data*); static int (CDECL *p___std_type_info_compare)(const type_info140*, const type_info140*); static const char* (CDECL *p___std_type_info_name)(type_info140*, SLIST_HEADER*); static void (CDECL *p___std_type_info_destroy_list)(SLIST_HEADER*); +static size_t (CDECL *p___std_type_info_hash)(type_info140*); static BOOL init(void) @@ -70,6 +71,7 @@ static BOOL init(void) p___std_type_info_compare = (void*)GetProcAddress(module, "__std_type_info_compare"); p___std_type_info_name = (void*)GetProcAddress(module, "__std_type_info_name"); p___std_type_info_destroy_list = (void*)GetProcAddress(module, "__std_type_info_destroy_list"); + p___std_type_info_hash = (void*)GetProcAddress(module, "__std_type_info_hash"); return TRUE; } @@ -125,6 +127,7 @@ static void test___std_type_info(void) SLIST_HEADER header; type_info_list *elem; const char *ret; + size_t hash1, hash2; int eq; @@ -154,6 +157,33 @@ static void test___std_type_info(void) eq = p___std_type_info_compare(&ti1, &ti3); ok(eq == 0, "__std_type_info_compare(&ti1, &ti3) = %d\n", eq); + + ti1.mangled[0] = 0; + ti1.mangled[1] = 0; + ti1.mangled[2] = 0; + hash1 = p___std_type_info_hash(&ti1); +#ifdef _WIN64 + todo_wine ok(hash1 == 0xcbf29ce44fd0bfc1, "hash = %p\n", (void*)hash1); +#else + ok(hash1 == 0x811c9dc5, "hash = %p\n", (void*)hash1); +#endif + + ti1.mangled[0] = 1; + hash2 = p___std_type_info_hash(&ti1); + ok(hash1 == hash2, "hash1 != hash2 (first char not ignorred)\n"); + + ti1.mangled[1] = 1; + hash1 = p___std_type_info_hash(&ti1); + if(sizeof(void*) == sizeof(int)) + ok(hash1 == 0x40c5b8c, "hash = %p\n", (void*)hash1); + ok(hash1 != hash2, "hash1 == hash2 for different strings\n"); + + ti1.mangled[1] = 2; + hash2 = p___std_type_info_hash(&ti1); + ok(hash1 != hash2, "hash1 == hash2 for different strings\n"); + + hash1 = p___std_type_info_hash(&ti2); + ok(hash1 != hash2, "hash1 == hash2 for different strings\n"); } START_TEST(cpp) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 07eb7e1..f0598ce 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -144,7 +144,7 @@ @ cdecl __std_exception_destroy(ptr) MSVCRT___std_exception_destroy @ cdecl __std_type_info_compare(ptr ptr) MSVCRT_type_info_compare @ cdecl __std_type_info_destroy_list(ptr) MSVCRT_type_info_destroy_list -@ stub __std_type_info_hash +@ cdecl __std_type_info_hash(ptr) MSVCRT_type_info_hash @ cdecl __std_type_info_name(ptr ptr) MSVCRT_type_info_name_list @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf @ stub __stdio_common_vfprintf_p diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 8d6c060..ca9368c 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -41,7 +41,7 @@ @ stub __std_terminate @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ cdecl __std_type_info_destroy_list(ptr) ucrtbase.__std_type_info_destroy_list -@ stub __std_type_info_hash +@ cdecl __std_type_info_hash(ptr) ucrtbase.__std_type_info_hash @ cdecl __std_type_info_name(ptr ptr) ucrtbase.__std_type_info_name @ cdecl __telemetry_main_invoke_trigger(ptr) @ cdecl __telemetry_main_return_trigger(ptr)

1 0