wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Andrey Gusev : api-ms-win-mm-time-l1-1-0: Add dll.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 478462ef0b3a09e7ff26b405893b76151d2be3fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=478462ef0b3a09e7ff26b4058… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jul 10 13:31:05 2017 +0300 api-ms-win-mm-time-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-mm-time-l1-1-0/Makefile.in | 1 + dlls/api-ms-win-mm-time-l1-1-0/api-ms-win-mm-time-l1-1-0.spec | 5 +++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) diff --git a/configure b/configure index 92199ea..b4c2ad7 100755 --- a/configure +++ b/configure @@ -1027,6 +1027,7 @@ enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_eventlog_legacy_l1_1_0 enable_api_ms_win_mm_misc_l1_1_1 enable_api_ms_win_mm_mme_l1_1_0 +enable_api_ms_win_mm_time_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 @@ -18036,6 +18037,7 @@ wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventin wine_fn_config_dll api-ms-win-eventlog-legacy-l1-1-0 enable_api_ms_win_eventlog_legacy_l1_1_0 wine_fn_config_dll api-ms-win-mm-misc-l1-1-1 enable_api_ms_win_mm_misc_l1_1_1 wine_fn_config_dll api-ms-win-mm-mme-l1-1-0 enable_api_ms_win_mm_mme_l1_1_0 +wine_fn_config_dll api-ms-win-mm-time-l1-1-0 enable_api_ms_win_mm_time_l1_1_0 wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_dll api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_dll api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 diff --git a/configure.ac b/configure.ac index 6c4316a..1fcf957 100644 --- a/configure.ac +++ b/configure.ac @@ -2863,6 +2863,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-mm-misc-l1-1-1) WINE_CONFIG_DLL(api-ms-win-mm-mme-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-mm-time-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0) diff --git a/dlls/api-ms-win-mm-time-l1-1-0/Makefile.in b/dlls/api-ms-win-mm-time-l1-1-0/Makefile.in new file mode 100644 index 0000000..b77d360 --- /dev/null +++ b/dlls/api-ms-win-mm-time-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-mm-time-l1-1-0.dll diff --git a/dlls/api-ms-win-mm-time-l1-1-0/api-ms-win-mm-time-l1-1-0.spec b/dlls/api-ms-win-mm-time-l1-1-0/api-ms-win-mm-time-l1-1-0.spec new file mode 100644 index 0000000..0d46016 --- /dev/null +++ b/dlls/api-ms-win-mm-time-l1-1-0/api-ms-win-mm-time-l1-1-0.spec @@ -0,0 +1,5 @@ +@ stdcall timeBeginPeriod(long) winmm.timeBeginPeriod +@ stdcall timeEndPeriod(long) winmm.timeEndPeriod +@ stdcall timeGetDevCaps(ptr long) winmm.timeGetDevCaps +@ stdcall timeGetSystemTime(ptr long) winmm.timeGetSystemTime +@ stdcall timeGetTime() winmm.timeGetTime diff --git a/tools/make_specfiles b/tools/make_specfiles index c8ac40f..82f4c82 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -338,6 +338,7 @@ my @dll_groups = "winmm", "api-ms-win-mm-misc-l1-1-1", "api-ms-win-mm-mme-l1-1-0", + "api-ms-win-mm-time-l1-1-0", ], [ "msvcrt",

1 0

Andrey Gusev : api-ms-win-core-psapi-ansi-l1-1-0: Add dll.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 68bcb8e6759da45a41cbe483b6eb4f45b7855760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68bcb8e6759da45a41cbe483b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jul 10 13:30:38 2017 +0300 api-ms-win-core-psapi-ansi-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-psapi-ansi-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-psapi-ansi-l1-1-0.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 11 insertions(+) diff --git a/configure b/configure index c421baf..92199ea 100755 --- a/configure +++ b/configure @@ -949,6 +949,7 @@ enable_api_ms_win_core_processthreads_l1_1_0 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_ansi_l1_1_0 enable_api_ms_win_core_psapi_l1_1_0 enable_api_ms_win_core_psapi_obsolete_l1_1_0 enable_api_ms_win_core_quirks_l1_1_0 @@ -17957,6 +17958,7 @@ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 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-ansi-l1-1-0 enable_api_ms_win_core_psapi_ansi_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-psapi-obsolete-l1-1-0 enable_api_ms_win_core_psapi_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-quirks-l1-1-0 enable_api_ms_win_core_quirks_l1_1_0 diff --git a/configure.ac b/configure.ac index 23937f1..6c4316a 100644 --- a/configure.ac +++ b/configure.ac @@ -2785,6 +2785,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) 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-ansi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-psapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-psapi-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-quirks-l1-1-0) diff --git a/dlls/api-ms-win-core-psapi-ansi-l1-1-0/Makefile.in b/dlls/api-ms-win-core-psapi-ansi-l1-1-0/Makefile.in new file mode 100644 index 0000000..26836cc --- /dev/null +++ b/dlls/api-ms-win-core-psapi-ansi-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-psapi-ansi-l1-1-0.dll diff --git a/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec b/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec new file mode 100644 index 0000000..e4f7585 --- /dev/null +++ b/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec @@ -0,0 +1,6 @@ +@ stdcall K32EnumPageFilesA(ptr ptr) kernel32.K32EnumPageFilesA +@ stdcall K32GetDeviceDriverBaseNameA(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameA +@ stdcall K32GetDeviceDriverFileNameA(ptr ptr long) kernel32.K32GetDeviceDriverFileNameA +@ stdcall K32GetMappedFileNameA(long ptr ptr long) kernel32.K32GetMappedFileNameA +@ stdcall K32GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA +@ stdcall QueryFullProcessImageNameA(ptr long ptr ptr) kernel32.QueryFullProcessImageNameA diff --git a/tools/make_specfiles b/tools/make_specfiles index 85eb1ff..c8ac40f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -233,6 +233,7 @@ my @dll_groups = "api-ms-win-core-processenvironment-l1-1-0", "api-ms-win-core-processenvironment-l1-2-0", "api-ms-win-core-psapi-l1-1-0", + "api-ms-win-core-psapi-ansi-l1-1-0", "api-ms-win-core-psapi-obsolete-l1-1-0", "api-ms-win-core-threadpool-l1-1-0", "api-ms-win-core-threadpool-l1-2-0",

1 0

Hugh McMaster : regedit: Null-terminate REG_EXPAND_SZ and REG_MULTI_SZ hex data during concatenation if we reach EOF.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 7f11a24fee2ffe538b6991b6d57dad618485acee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f11a24fee2ffe538b6991b6d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 10 11:28:17 2017 +0000 regedit: Null-terminate REG_EXPAND_SZ and REG_MULTI_SZ hex data during concatenation if we reach EOF. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 40 +++++++++++++++++++++++----------------- programs/regedit/tests/regedit.c | 4 ++-- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 0a356cb..ea0b6f8 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -504,6 +504,27 @@ static void free_parser_data(struct parser *parser) parser->data_size = 0; } +static void prepare_hex_string_data(struct parser *parser) +{ + if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ) + { + BYTE *data = parser->data; + + if (data[parser->data_size - 1] != 0) + { + data[parser->data_size] = 0; + parser->data_size++; + } + + if (!parser->is_unicode) + { + parser->data = GetWideStringN(parser->data, parser->data_size, &parser->data_size); + parser->data_size *= sizeof(WCHAR); + HeapFree(GetProcessHeap(), 0, data); + } + } +} + enum reg_versions { REG_VERSION_31, REG_VERSION_40, @@ -852,23 +873,7 @@ static WCHAR *hex_data_state(struct parser *parser, WCHAR *pos) return line; } - if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ) - { - BYTE *data = parser->data; - - if (data[parser->data_size - 1] != 0x00) - { - data[parser->data_size] = 0x00; - parser->data_size++; - } - - if (!parser->is_unicode) - { - parser->data = GetWideStringN(parser->data, parser->data_size, &parser->data_size); - parser->data_size *= sizeof(WCHAR); - HeapFree(GetProcessHeap(), 0, data); - } - } + prepare_hex_string_data(parser); set_state(parser, SET_VALUE); return line; @@ -903,6 +908,7 @@ static WCHAR *hex_multiline_state(struct parser *parser, WCHAR *pos) if (!(line = get_line(parser->file))) { + prepare_hex_string_data(parser); set_state(parser, SET_VALUE); return pos; } diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index b3f6e76..2839a11 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -500,7 +500,7 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine17b\"=hex(2):25,50,41,54,48,25,\\"); - verify_reg(hkey, "Wine17b", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE | TODO_REG_DATA); + verify_reg(hkey, "Wine17b", REG_EXPAND_SZ, "%PATH%", 7, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -510,7 +510,7 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine17d\"=hex(7):4c,69,6e,65,\\"); - verify_reg(hkey, "Wine17d", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE | TODO_REG_DATA); + verify_reg(hkey, "Wine17d", REG_MULTI_SZ, "Line", 5, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Jacek Caban : server: Don' t allow APCs on objects associated with completion port.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 82e6713b75d223ee1ac68812a394626aa2884c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82e6713b75d223ee1ac68812a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 10 12:51:05 2017 +0200 server: Don't allow APCs on objects associated with completion port. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 2 -- dlls/ws2_32/tests/sock.c | 1 - server/async.c | 11 +++++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 71b37e4..ff27d98 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1045,7 +1045,6 @@ static void test_iocp_fileio(HANDLE h) /* using APCs on handle with associated completion port is not allowed */ res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); - todo_wine ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res); } @@ -1094,7 +1093,6 @@ static void test_iocp_fileio(HANDLE h) /* using APCs on handle with associated completion port is not allowed */ res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); - todo_wine ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res); } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2790fea..efe10b3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6824,7 +6824,6 @@ static void test_WSARecv(void) memset(&ov, 0, sizeof(ov)); completion_called = 0; iret = WSARecv(dest, bufs, 1, NULL, &flags, &ov, io_completion); - todo_wine ok(iret == SOCKET_ERROR && GetLastError() == WSAEINVAL, "WSARecv failed - %d error %d\n", iret, GetLastError()); ok(!completion_called, "completion called\n"); diff --git a/server/async.c b/server/async.c index 0205807..1cb020f 100644 --- a/server/async.c +++ b/server/async.c @@ -192,7 +192,7 @@ void free_async_queue( struct async_queue *queue ) LIST_FOR_EACH_ENTRY_SAFE( async, next, &queue->queue, struct async, queue_entry ) { - async->completion = fd_get_completion( async->fd, &async->comp_key ); + if (!async->completion) async->completion = fd_get_completion( async->fd, &async->comp_key ); async->fd = NULL; async_terminate( async, STATUS_HANDLES_CLOSED ); async->queue = NULL; @@ -236,7 +236,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->signaled = 0; async->wait_handle = 0; async->direct_result = 0; - async->completion = NULL; + async->completion = fd_get_completion( fd, &async->comp_key ); if (iosb) async->iosb = (struct iosb *)grab_object( iosb ); else async->iosb = NULL; @@ -244,6 +244,13 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da list_add_head( &thread->process->asyncs, &async->process_entry ); if (event) reset_event( event ); + if (async->completion && data->apc) + { + release_object( async ); + set_error( STATUS_INVALID_PARAMETER ); + return NULL; + } + return async; }

1 0

Nikolay Sivov : wininet: Fix potential use-after-free (Coverity).
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: f55a116101836a19f017ba42a1a99fc17a5f08c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55a116101836a19f017ba42a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 9 17:00:39 2017 +0300 wininet: Fix potential use-after-free (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ef9f144..078a5cb 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4133,12 +4133,12 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, WCHAR *url) request->path = heap_alloc(needed*sizeof(WCHAR)); rc = UrlEscapeW(path, request->path, &needed, URL_ESCAPE_SPACES_ONLY); - heap_free(path); if (rc != S_OK) { ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); strcpyW(request->path, path); } + heap_free(path); } /* Remove custom content-type/length headers on redirects. */

1 0

Piotr Caban : gdiplus: Add support for ImageAttributes when drawing image to metafile.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 689268d2f2f6121c40bf2014baf8a958fd2948f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=689268d2f2f6121c40bf2014b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 10 11:30:40 2017 +0200 gdiplus: Add support for ImageAttributes when drawing image to metafile. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 99 ++++++++++++++++++++++++++++++++++++++++--- dlls/gdiplus/tests/metafile.c | 20 ++++++++- 2 files changed, 112 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index a3f94a1..1aafdf7 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -198,6 +198,24 @@ typedef struct EmfPlusImage } ImageData; } EmfPlusImage; +typedef struct EmfPlusARGB +{ + BYTE Blue; + BYTE Green; + BYTE Red; + BYTE Alpha; +} EmfPlusARGB; + +typedef struct EmfPlusImageAttributes +{ + DWORD Version; + DWORD Reserved1; + DWORD WrapMode; + EmfPlusARGB ClampColor; + DWORD ObjectClamp; + DWORD Reserved2; +} EmfPlusImageAttributes; + typedef enum ObjectType { ObjectTypeInvalid, @@ -218,6 +236,7 @@ typedef struct EmfPlusObject union { EmfPlusImage image; + EmfPlusImageAttributes image_attributes; } ObjectData; } EmfPlusObject; @@ -2414,13 +2433,48 @@ static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image, DW } } +static GpStatus METAFILE_AddImageAttributesObject(GpMetafile *metafile, const GpImageAttributes *attrs, DWORD *id) +{ + EmfPlusObject *object_record; + EmfPlusImageAttributes *attrs_record; + GpStatus stat; + + *id = -1; + + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) + return Ok; + + if (!attrs) + return Ok; + + stat = METAFILE_AllocateRecord(metafile, + FIELD_OFFSET(EmfPlusObject, ObjectData.image_attributes) + sizeof(EmfPlusImageAttributes), + (void**)&object_record); + if (stat != Ok) return stat; + + *id = METAFILE_AddObjectId(metafile); + object_record->Header.Type = EmfPlusRecordTypeObject; + object_record->Header.Flags = *id | (ObjectTypeImageAttributes << 8); + attrs_record = &object_record->ObjectData.image_attributes; + attrs_record->Version = 0xDBC01002; + attrs_record->Reserved1 = 0; + attrs_record->WrapMode = attrs->wrap; + attrs_record->ClampColor.Blue = attrs->outside_color & 0xff; + attrs_record->ClampColor.Green = (attrs->outside_color >> 8) & 0xff; + attrs_record->ClampColor.Red = (attrs->outside_color >> 16) & 0xff; + attrs_record->ClampColor.Alpha = attrs->outside_color >> 24; + attrs_record->ObjectClamp = attrs->clamp; + attrs_record->Reserved2 = 0; + return Ok; +} + GpStatus METAFILE_DrawImagePointsRect(GpMetafile *metafile, GpImage *image, GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, DrawImageAbort callback, VOID *callbackData) { EmfPlusDrawImagePoints *draw_image_record; - DWORD image_id; + DWORD image_id, attributes_id; GpStatus stat; if (count != 3) return InvalidParameter; @@ -2433,20 +2487,55 @@ GpStatus METAFILE_DrawImagePointsRect(GpMetafile *metafile, GpImage *image, else FIXME("semi-stub\n"); - if (imageAttributes) + if (!imageAttributes) { - FIXME("ImageAttributes != NULL not supported\n"); + stat = METAFILE_AddImageObject(metafile, image, &image_id); + } + else if (image->type == ImageTypeBitmap) + { + INT width = ((GpBitmap*)image)->width; + INT height = ((GpBitmap*)image)->height; + GpGraphics *graphics; + GpBitmap *bitmap; + + stat = GdipCreateBitmapFromScan0(width, height, + 0, PixelFormat32bppARGB, NULL, &bitmap); + if (stat != Ok) return stat; + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + if (stat != Ok) + { + GdipDisposeImage((GpImage*)bitmap); + return stat; + } + + stat = GdipDrawImageRectRectI(graphics, image, 0, 0, width, height, + 0, 0, width, height, UnitPixel, imageAttributes, NULL, NULL); + GdipDeleteGraphics(graphics); + if (stat != Ok) + { + GdipDisposeImage((GpImage*)bitmap); + return stat; + } + + stat = METAFILE_AddImageObject(metafile, (GpImage*)bitmap, &image_id); + GdipDisposeImage((GpImage*)bitmap); + } + else + { + FIXME("imageAttributes not supported (image type %d)\n", image->type); return NotImplemented; } + if (stat != Ok) return stat; - stat = METAFILE_AddImageObject(metafile, image, &image_id); + stat = METAFILE_AddImageAttributesObject(metafile, imageAttributes, &attributes_id); if (stat != Ok) return stat; stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusDrawImagePoints), (void**)&draw_image_record); if (stat != Ok) return stat; draw_image_record->Header.Type = EmfPlusRecordTypeDrawImagePoints; draw_image_record->Header.Flags = image_id; - draw_image_record->ImageAttributesID = -1; + draw_image_record->ImageAttributesID = attributes_id; draw_image_record->SrcUnit = UnitPixel; draw_image_record->SrcRect.X = units_to_pixels(srcx, srcUnit, metafile->image.xres); draw_image_record->SrcRect.Y = units_to_pixels(srcy, srcUnit, metafile->image.yres); diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 9048619..cbf63a6 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2326,6 +2326,7 @@ static const emfplus_record draw_image_records[] = { {0, EMR_HEADER}, {0, EmfPlusRecordTypeHeader}, {0, EmfPlusRecordTypeObject}, + {0, EmfPlusRecordTypeObject}, {0, EmfPlusRecordTypeDrawImagePoints}, {1, EMR_SAVEDC}, {1, EMR_SETICMMODE}, @@ -2341,7 +2342,14 @@ static void test_drawimage(void) static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; static const GpPointF dst_points[3] = {{10.0,10.0},{25.0,15.0},{10.0,20.0}}; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; - + const ColorMatrix double_red = {{ + {2.0,0.0,0.0,0.0,0.0}, + {0.0,1.0,0.0,0.0,0.0}, + {0.0,0.0,1.0,0.0,0.0}, + {0.0,0.0,0.0,1.0,0.0}, + {0.0,0.0,0.0,0.0,1.0}}}; + + GpImageAttributes *imageattr; GpMetafile *metafile; GpGraphics *graphics; HENHMETAFILE hemf; @@ -2370,8 +2378,16 @@ static void test_drawimage(void) stat = GdipCreateBitmapFromGdiDib(&info, buff, &bm); expect(Ok, stat); + stat = GdipCreateImageAttributes(&imageattr); + expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &double_red, NULL, ColorMatrixFlagsDefault); + expect(Ok, stat); + stat = GdipDrawImagePointsRect(graphics, (GpImage*)bm, dst_points, 3, - 0.0, 0.0, 10.0, 10.0, UnitPixel, NULL, NULL, NULL); + 0.0, 0.0, 10.0, 10.0, UnitPixel, imageattr, NULL, NULL); + GdipDisposeImageAttributes(imageattr); expect(Ok, stat); GdipDisposeImage((GpImage*)bm);

1 0

Piotr Caban : gdiplus: Add function for managing metafile objects id.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: ac231b14b946276615519198256968fe339956d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac231b14b9462766155191982… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 10 11:30:24 2017 +0200 gdiplus: Add function for managing metafile objects id. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/metafile.c | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 9da720b..6fd0968 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -370,6 +370,7 @@ struct GpMetafile{ IStream *record_stream; BOOL auto_frame; /* If true, determine the frame automatically */ GpPointF auto_frame_min, auto_frame_max; + DWORD next_object_id; /* playback */ GpGraphics *playback_graphics; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index f3bef73..a3f94a1 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -250,6 +250,11 @@ typedef struct EmfPlusDrawImagePoints } PointData[3]; } EmfPlusDrawImagePoints; +static DWORD METAFILE_AddObjectId(GpMetafile *metafile) +{ + return (metafile->next_object_id++) % 64; +} + static GpStatus METAFILE_AllocateRecord(GpMetafile *metafile, DWORD size, void **result) { DWORD size_needed; @@ -2363,8 +2368,10 @@ static GpStatus METAFILE_FillEmfPlusBitmap(EmfPlusBitmap *record, IStream *strea return Ok; } -static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image) +static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image, DWORD *id) { + *id = -1; + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) return Ok; @@ -2389,8 +2396,9 @@ static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image) } memset(object_record->ObjectData.image.ImageData.bitmap.BitmapData + size, 0, aligned_size - size); + *id = METAFILE_AddObjectId(metafile); object_record->Header.Type = EmfPlusRecordTypeObject; - object_record->Header.Flags = ObjectTypeImage << 8; + object_record->Header.Flags = *id | ObjectTypeImage << 8; object_record->ObjectData.image.Version = 0xDBC01002; object_record->ObjectData.image.Type = ImageDataTypeBitmap; @@ -2412,6 +2420,7 @@ GpStatus METAFILE_DrawImagePointsRect(GpMetafile *metafile, GpImage *image, DrawImageAbort callback, VOID *callbackData) { EmfPlusDrawImagePoints *draw_image_record; + DWORD image_id; GpStatus stat; if (count != 3) return InvalidParameter; @@ -2430,13 +2439,13 @@ GpStatus METAFILE_DrawImagePointsRect(GpMetafile *metafile, GpImage *image, return NotImplemented; } - stat = METAFILE_AddImageObject(metafile, image); + stat = METAFILE_AddImageObject(metafile, image, &image_id); if (stat != Ok) return stat; stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusDrawImagePoints), (void**)&draw_image_record); if (stat != Ok) return stat; draw_image_record->Header.Type = EmfPlusRecordTypeDrawImagePoints; - draw_image_record->Header.Flags = 0; + draw_image_record->Header.Flags = image_id; draw_image_record->ImageAttributesID = -1; draw_image_record->SrcUnit = UnitPixel; draw_image_record->SrcRect.X = units_to_pixels(srcx, srcUnit, metafile->image.xres);

1 0

Piotr Caban : gdiplus: Add partial support for GdipDrawImagePointsRect on metafile.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: e1e4dd202321318d821b5e93044f136f37fa7791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1e4dd202321318d821b5e930… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 10 11:30:08 2017 +0200 gdiplus: Add partial support for GdipDrawImagePointsRect on metafile. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 5 + dlls/gdiplus/graphics.c | 7 ++ dlls/gdiplus/image.c | 2 +- dlls/gdiplus/metafile.c | 244 +++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 5 +- 5 files changed, 260 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1e4dd202321318d821b5…

1 0

Piotr Caban : gdiplus: Remove unused clsid parameter from encode_image_func helpers.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 1a75f763db60876c6b71dd3d25f5fa547d86157f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a75f763db60876c6b71dd3d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 10 11:29:56 2017 +0200 gdiplus: Remove unused clsid parameter from encode_image_func helpers. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 720f8f2..eb705d1 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4140,7 +4140,7 @@ static GpStatus decode_image_emf(IStream *stream, GpImage **image) } typedef GpStatus (*encode_image_func)(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params); + GDIPCONST EncoderParameters* params); typedef GpStatus (*decode_image_func)(IStream *stream, GpImage **image); @@ -4516,31 +4516,31 @@ static GpStatus encode_image_wic(GpImage *image, IStream* stream, } static GpStatus encode_image_BMP(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) + GDIPCONST EncoderParameters* params) { return encode_image_wic(image, stream, &GUID_ContainerFormatBmp, params); } static GpStatus encode_image_tiff(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) + GDIPCONST EncoderParameters* params) { return encode_image_wic(image, stream, &GUID_ContainerFormatTiff, params); } static GpStatus encode_image_png(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) + GDIPCONST EncoderParameters* params) { return encode_image_wic(image, stream, &GUID_ContainerFormatPng, params); } static GpStatus encode_image_jpeg(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) + GDIPCONST EncoderParameters* params) { return encode_image_wic(image, stream, &GUID_ContainerFormatJpeg, params); } static GpStatus encode_image_gif(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) + GDIPCONST EncoderParameters* params) { return encode_image_wic(image, stream, &CLSID_WICGifEncoder, params); } @@ -4570,7 +4570,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, if (encode_image == NULL) return UnknownImageFormat; - stat = encode_image(image, stream, clsid, params); + stat = encode_image(image, stream, params); return stat; }

1 0

Francois Gouget : windowscodecs/tests: A spelling fix in an ok() message.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 5d8a1cf378524871081cbe66d4a4d590f6d6f4cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d8a1cf378524871081cbe66d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 6 12:22:16 2017 +0200 windowscodecs/tests: A spelling fix in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/metadata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 704a679..f0cfc09 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -2606,7 +2606,7 @@ static HRESULT WINAPI mdr_GetValue(IWICMetadataReader *iface, const PROPVARIANT ok(current_metadata_block != NULL, "current_metadata_block can't be NULL\n"); if (!current_metadata_block) return E_POINTER; - ok(schema != NULL && id != NULL && value != NULL, "%p, %p, %p shoud not be NULL\n", schema, id, value); + ok(schema != NULL && id != NULL && value != NULL, "%p, %p, %p should not be NULL\n", schema, id, value); for (i = 0; i < current_metadata_block->count; i++) {

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2017