September 2016 - Wine-commits

Alexandre Julliard : user32/tests: Add some tests for the contents of the clipboard data.
by Alexandre Julliard 15 Sep '16

15 Sep '16

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

Alexandre Julliard : user32: Use GetDIBits to retrieve the bitmap header when synthesizing a DIB.
by Alexandre Julliard 15 Sep '16

15 Sep '16

Module: wine Branch: master Commit: fe04dd2a4b5313f74f9e6c01d62d9e133576f2c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe04dd2a4b5313f74f9e6c01d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 21:01:57 2016 +0900 user32: Use GetDIBits to retrieve the bitmap header when synthesizing a DIB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index dc94794..1693aae 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -290,33 +290,33 @@ static HANDLE render_synthesized_dib( HANDLE data, UINT format, UINT from ) if (from == CF_BITMAP) { - BITMAP bmp; + BITMAPV5HEADER header; - if (!GetObjectW( data, sizeof(bmp), &bmp )) goto done; + memset( &header, 0, sizeof(header) ); + header.bV5Size = (format == CF_DIBV5) ? sizeof(BITMAPV5HEADER) : sizeof(BITMAPINFOHEADER); + if (!GetDIBits( hdc, data, 0, 0, NULL, (BITMAPINFO *)&header, DIB_RGB_COLORS )) goto done; - bits_size = abs( bmp.bmHeight ) * (((bmp.bmWidth * bmp.bmBitsPixel + 31) / 8) & ~3); - if (bmp.bmBitsPixel <= 8) - header_size = offsetof( BITMAPINFO, bmiColors[1 << bmp.bmBitsPixel] ); - else - header_size = (format == CF_DIBV5) ? sizeof(BITMAPV5HEADER) : sizeof(BITMAPINFOHEADER); - - if (!(ret = GlobalAlloc( GMEM_FIXED, header_size + bits_size ))) goto done; + header_size = bitmap_info_size( (BITMAPINFO *)&header, DIB_RGB_COLORS ); + if (!(ret = GlobalAlloc( GMEM_FIXED, header_size + header.bV5SizeImage ))) goto done; bmi = (BITMAPINFO *)ret; memset( bmi, 0, header_size ); - bmi->bmiHeader.biSize = header_size; - bmi->bmiHeader.biWidth = bmp.bmWidth; - bmi->bmiHeader.biHeight = bmp.bmHeight; - bmi->bmiHeader.biPlanes = 1; - bmi->bmiHeader.biBitCount = bmp.bmBitsPixel; - bmi->bmiHeader.biCompression = BI_RGB; - GetDIBits( hdc, data, 0, bmp.bmHeight, (char *)bmi + header_size, bmi, DIB_RGB_COLORS ); + memcpy( bmi, &header, header.bV5Size ); + GetDIBits( hdc, data, 0, abs(header.bV5Height), (char *)bmi + header_size, bmi, DIB_RGB_COLORS ); } else { + SIZE_T size = GlobalSize( data ); + + if (size < sizeof(*bmi)) goto done; if (!(src = GlobalLock( data ))) goto done; src_size = bitmap_info_size( src, DIB_RGB_COLORS ); - bits_size = GlobalSize( data ) - src_size; + if (size <= src_size) + { + GlobalUnlock( data ); + goto done; + } + bits_size = size - src_size; header_size = (format == CF_DIBV5) ? sizeof(BITMAPV5HEADER) : offsetof( BITMAPINFO, bmiColors[src->bmiHeader.biCompression == BI_BITFIELDS ? 3 : 0] );

1 0

Andrey Gusev : api-ms-win-core-realtime-l1-1-0: Add dll.
by Alexandre Julliard 15 Sep '16

15 Sep '16

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

Andrey Gusev : api-ms-win-core-localization-l2-1-0: Add dll.
by Alexandre Julliard 15 Sep '16

15 Sep '16

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

Andrey Gusev : api-ms-win-shell-shellcom-l1-1-0: Add dll.
by Alexandre Julliard 15 Sep '16

15 Sep '16

Module: wine Branch: master Commit: 1938d389b293930c5ac2f2970c6241e09517cf49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1938d389b293930c5ac2f2970… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Sep 15 15:35:57 2016 +0300 api-ms-win-shell-shellcom-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-shell-shellcom-l1-1-0/Makefile.in | 1 + .../api-ms-win-shell-shellcom-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index 930a0e2..2fa877d 100755 --- a/configure +++ b/configure @@ -1003,6 +1003,7 @@ enable_api_ms_win_security_sddl_l1_1_0 enable_api_ms_win_service_core_l1_1_1 enable_api_ms_win_service_management_l1_1_0 enable_api_ms_win_service_winsvc_l1_2_0 +enable_api_ms_win_shell_shellcom_l1_1_0 enable_api_ms_win_shell_shellfolders_l1_1_0 enable_apphelp enable_appwiz_cpl @@ -17667,6 +17668,7 @@ wine_fn_config_dll api-ms-win-security-sddl-l1-1-0 enable_api_ms_win_security_sd wine_fn_config_dll api-ms-win-service-core-l1-1-1 enable_api_ms_win_service_core_l1_1_1 wine_fn_config_dll api-ms-win-service-management-l1-1-0 enable_api_ms_win_service_management_l1_1_0 wine_fn_config_dll api-ms-win-service-winsvc-l1-2-0 enable_api_ms_win_service_winsvc_l1_2_0 +wine_fn_config_dll api-ms-win-shell-shellcom-l1-1-0 enable_api_ms_win_shell_shellcom_l1_1_0 wine_fn_config_dll api-ms-win-shell-shellfolders-l1-1-0 enable_api_ms_win_shell_shellfolders_l1_1_0 wine_fn_config_dll apphelp enable_apphelp wine_fn_config_test dlls/apphelp/tests apphelp_test diff --git a/configure.ac b/configure.ac index 6411f22..f6b9039 100644 --- a/configure.ac +++ b/configure.ac @@ -2779,6 +2779,7 @@ WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-shell-shellcom-l1-1-0) WINE_CONFIG_DLL(api-ms-win-shell-shellfolders-l1-1-0) WINE_CONFIG_DLL(apphelp) WINE_CONFIG_TEST(dlls/apphelp/tests) diff --git a/dlls/api-ms-win-shell-shellcom-l1-1-0/Makefile.in b/dlls/api-ms-win-shell-shellcom-l1-1-0/Makefile.in new file mode 100644 index 0000000..939a124 --- /dev/null +++ b/dlls/api-ms-win-shell-shellcom-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-shell-shellcom-l1-1-0.dll diff --git a/dlls/api-ms-win-shell-shellcom-l1-1-0/api-ms-win-shell-shellcom-l1-1-0.spec b/dlls/api-ms-win-shell-shellcom-l1-1-0/api-ms-win-shell-shellcom-l1-1-0.spec new file mode 100644 index 0000000..bf9f656 --- /dev/null +++ b/dlls/api-ms-win-shell-shellcom-l1-1-0/api-ms-win-shell-shellcom-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall SHCoCreateInstance(wstr ptr long ptr ptr) shell32.SHCoCreateInstance diff --git a/tools/make_specfiles b/tools/make_specfiles index 5fee758..7c1cd1f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -224,6 +224,7 @@ my @dll_groups = [ "shell32", "api-ms-win-downlevel-shell32-l1-1-0", + "api-ms-win-shell-shellcom-l1-1-0", "api-ms-win-shell-shellfolders-l1-1-0", ], [

1 0

Sebastian Lackner : msi: Do not return ERROR_* constant in HRESULT function.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: feb986ac5b9d8f59f4cc61e6bb8ab5192bf77e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb986ac5b9d8f59f4cc61e6b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 17:53:20 2016 +0200 msi: Do not return ERROR_* constant in HRESULT function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index ecc3e94..e812ebb 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2543,7 +2543,7 @@ HRESULT WINAPI MsiGetFileSignatureInformationA( LPCSTR path, DWORD flags, PCCERT TRACE("%s %08x %p %p %p\n", debugstr_a(path), flags, cert, hash, hashlen); - if (path && !(pathW = strdupAtoW( path ))) return ERROR_OUTOFMEMORY; + if (path && !(pathW = strdupAtoW( path ))) return E_OUTOFMEMORY; r = MsiGetFileSignatureInformationW( pathW, flags, cert, hash, hashlen ); msi_free( pathW ); return r;

1 0

Nikolay Sivov : mshtml: Use proper constants as HRESULT return values.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: 7846f0947a1df69ee6417af0030bfcfa5620e0c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7846f0947a1df69ee6417af00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 13 21:54:20 2016 +0300 mshtml: Use proper constants as HRESULT return values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmlnode.c | 4 ++-- dlls/mshtml/htmlstyle.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/ifacewrap.c | 4 ++-- dlls/mshtml/main.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 3f37840..76d5c2e 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -291,7 +291,7 @@ static HRESULT WINAPI HTMLImgElement_put_src(IHTMLImgElement *iface, BSTR v) if(NS_FAILED(nsres)) ERR("SetSrc failed: %08x\n", nsres); - return NS_OK; + return S_OK; } static HRESULT WINAPI HTMLImgElement_get_src(IHTMLImgElement *iface, BSTR *p) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 80964c9..1ba477e 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1167,10 +1167,10 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDOMNode2_iface; }else if(IsEqualGUID(&IID_nsXPCOMCycleCollectionParticipant, riid)) { *ppv = &node_ccp; - return NS_OK; + return S_OK; }else if(IsEqualGUID(&IID_nsCycleCollectionISupports, riid)) { *ppv = &This->IHTMLDOMNode_iface; - return NS_OK; + return S_OK; }else if(dispex_query_interface(&This->event_target.dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 0ee848f..7a4ebe3 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -494,7 +494,7 @@ static HRESULT get_nsstyle_attr_nsval(nsIDOMCSSStyleDeclaration *nsstyle, stylei nsAString_Finish(&str_name); - return NS_OK; + return S_OK; } static HRESULT nsstyle_to_bstr(const WCHAR *val, DWORD flags, BSTR *p) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 14246a6..da1af2c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -458,7 +458,7 @@ HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, BOOL deep, H return hres; *ret = window; - return NS_OK; + return S_OK; } static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, VARIANT *pvarResult) diff --git a/dlls/mshtml/ifacewrap.c b/dlls/mshtml/ifacewrap.c index a22a008..f31bb4a 100644 --- a/dlls/mshtml/ifacewrap.c +++ b/dlls/mshtml/ifacewrap.c @@ -59,7 +59,7 @@ static HRESULT WINAPI wrapper_QueryInterface(IUnknown *iface, REFIID riid, void return IUnknown_QueryInterface(This->ref_unk, riid, ppv); } -static HRESULT WINAPI wrapper_AddRef(IUnknown *iface) +static ULONG WINAPI wrapper_AddRef(IUnknown *iface) { iface_wrapper_t *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); @@ -69,7 +69,7 @@ static HRESULT WINAPI wrapper_AddRef(IUnknown *iface) return ref; } -static HRESULT WINAPI wrapper_Release(IUnknown *iface) +static ULONG WINAPI wrapper_Release(IUnknown *iface) { iface_wrapper_t *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 8a366bd..2a00aee 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -382,7 +382,7 @@ HRESULT WINAPI RunHTMLApplication( HINSTANCE hinst, HINSTANCE hPrevInst, LPSTR szCmdLine, INT nCmdShow ) { FIXME("%p %p %s %d\n", hinst, hPrevInst, debugstr_a(szCmdLine), nCmdShow ); - return 0; + return S_OK; } /***********************************************************************

1 0

Hans Leidekker : msi: Use proper return types in msi_table_apply_transform.
by Alexandre Julliard 14 Sep '16

14 Sep '16

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

Hans Leidekker : msi: Use proper return types in MSI_RecordSetStreamFromFileW.
by Alexandre Julliard 14 Sep '16

14 Sep '16

Module: wine Branch: master Commit: 13af267e75fae8be2da63c2f5a4a739c8e4ea252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13af267e75fae8be2da63c2f5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 14 10:06:09 2016 +0200 msi: Use proper return types in MSI_RecordSetStreamFromFileW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/record.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 88d94a9..51e7a23 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -727,7 +727,8 @@ UINT MSI_RecordSetStream(MSIRECORD *rec, UINT iField, IStream *stream) UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, LPCWSTR szFilename) { IStream *stm = NULL; - HRESULT r; + HRESULT hr; + UINT ret; if( (iField == 0) || (iField > rec->count) ) return ERROR_INVALID_PARAMETER; @@ -746,16 +747,16 @@ UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, LPCWSTR szFilenam return ERROR_INVALID_FIELD; ofs.QuadPart = 0; - r = IStream_Seek( stm, ofs, STREAM_SEEK_SET, &cur ); - if( FAILED( r ) ) + hr = IStream_Seek( stm, ofs, STREAM_SEEK_SET, &cur ); + if (FAILED( hr )) return ERROR_FUNCTION_FAILED; } else { /* read the file into a stream and save the stream in the record */ - r = RECORD_StreamFromFile(szFilename, &stm); - if( r != ERROR_SUCCESS ) - return r; + ret = RECORD_StreamFromFile(szFilename, &stm); + if (ret != ERROR_SUCCESS) + return ret; /* if all's good, store it in the record */ MSI_RecordSetStream(rec, iField, stm);

1 0

Hans Leidekker : qmgr: Job error codes are HRESULT values.
by Alexandre Julliard 14 Sep '16

14 Sep '16

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