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

Andrey Gusev : api-ms-win-mm-time-l1-1-0: Add dll.
by Alexandre Julliard July 10, 2017

July 10, 2017

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 July 10, 2017

July 10, 2017

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

Nikolay Sivov : wininet: Fix potential use-after-free (Coverity).
by Alexandre Julliard July 10, 2017

July 10, 2017

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 July 10, 2017

July 10, 2017

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 partial support for GdipDrawImagePointsRect on metafile.
by Alexandre Julliard July 10, 2017

July 10, 2017

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

Paul Gofman : d3dx9: Get rid of init_set_constants() function.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 35f82ba444930b770684f0bd623c505d52c7b58f URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f82ba444930b770684f0bd6… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jul 6 14:15:08 2017 +0300 d3dx9: Get rid of init_set_constants() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 58 ++++++++++++++--------------------------------- 1 file changed, 17 insertions(+), 41 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index cabddcd..1aaf59d 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -305,7 +305,8 @@ static unsigned int get_reg_components(unsigned int table) #define PRES_BITMASK_BLOCK_SIZE (sizeof(unsigned int) * 8) -static HRESULT init_set_constants(struct d3dx_const_tab *const_tab, ID3DXConstantTable *ctab); +static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXConstantTable *ctab, + D3DXHANDLE hc, struct d3dx_parameter *param); static HRESULT regstore_alloc_table(struct d3dx_regstore *rs, unsigned int table) { @@ -671,10 +672,24 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab hr = D3DERR_INVALIDCALL; goto err_out; } + continue; } + if (FAILED(hr = init_set_constants_param(out, ctab, hc, inputs_param[i]))) + goto err_out; } out->input_count = desc.Constants; - hr = init_set_constants(out, ctab); + if (out->const_set_count) + { + out->const_set = HeapReAlloc(GetProcessHeap(), 0, out->const_set, + sizeof(*out->const_set) * out->const_set_count); + if (!out->const_set) + { + ERR("Out of memory.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + out->const_set_size = out->const_set_count; + } err_out: ID3DXConstantTable_Release(ctab); return hr; @@ -1452,45 +1467,6 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC return D3D_OK; } -static HRESULT init_set_constants(struct d3dx_const_tab *const_tab, ID3DXConstantTable *ctab) -{ - unsigned int i; - HRESULT hr, ret; - D3DXHANDLE hc; - - ret = D3D_OK; - for (i = 0; i < const_tab->input_count; ++i) - { - if (!const_tab->inputs_param[i] || const_tab->inputs_param[i]->class == D3DXPC_OBJECT) - continue; - hc = ID3DXConstantTable_GetConstant(ctab, NULL, i); - if (hc) - { - hr = init_set_constants_param(const_tab, ctab, hc, const_tab->inputs_param[i]); - } - else - { - FIXME("Could not get constant, index %u.\n", i); - hr = D3DERR_INVALIDCALL; - } - if (FAILED(hr)) - ret = hr; - } - - if (const_tab->const_set_count) - { - const_tab->const_set = HeapReAlloc(GetProcessHeap(), 0, const_tab->const_set, - sizeof(*const_tab->const_set) * const_tab->const_set_count); - if (!const_tab->const_set) - { - ERR("Out of memory.\n"); - return E_OUTOFMEMORY; - } - const_tab->const_set_size = const_tab->const_set_count; - } - return ret; -} - static double exec_get_reg_value(struct d3dx_regstore *rs, enum pres_reg_tables table, unsigned int offset) { if (!regstore_is_val_set_reg(rs, table, get_reg_offset(table, offset)))

1 0

Michael Stefaniuc : d3dx9/tests: Use string concatenation for a multiline string.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 041a0ff1c048084539a9d936985661c9ae9e7c9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=041a0ff1c048084539a9d9369… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 6 15:23:38 2017 +0200 d3dx9/tests: Use string concatenation for a multiline string. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index bbebfc3..55f48e9 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4338,8 +4338,8 @@ static void test_effect_preshader_compare_vconsts_(unsigned int line, IDirect3DD & (1u << (i % TEST_EFFECT_BITMASK_BLOCK_SIZE))) { ok_(__FILE__, line)(!memcmp(&fdata[i], &test_effect_preshader_fvect_v[i], sizeof(fdata[i])), - "Vertex shader float constants do not match, expected (%g, %g, %g, %g), \ -got (%g, %g, %g, %g), parameter %s.\n", + "Vertex shader float constants do not match, expected (%g, %g, %g, %g), " + "got (%g, %g, %g, %g), parameter %s.\n", test_effect_preshader_fvect_v[i].x, test_effect_preshader_fvect_v[i].y, test_effect_preshader_fvect_v[i].z, test_effect_preshader_fvect_v[i].w, fdata[i].x, fdata[i].y, fdata[i].z, fdata[i].w, updated_param);

1 0

Andrey Gusev : api-ms-win-security-provider-l1-1-0: Add dll.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: e80b6b64ba0b42edc841e8e4f75228f7a1c7e595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e80b6b64ba0b42edc841e8e4f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jul 10 13:31:25 2017 +0300 api-ms-win-security-provider-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-security-provider-l1-1-0/Makefile.in | 1 + .../api-ms-win-security-provider-l1-1-0.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 11 insertions(+) diff --git a/configure b/configure index b4c2ad7..f6053f1 100755 --- a/configure +++ b/configure @@ -1043,6 +1043,7 @@ enable_api_ms_win_security_lsalookup_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_1 enable_api_ms_win_security_lsalookup_l2_1_1 enable_api_ms_win_security_lsapolicy_l1_1_0 +enable_api_ms_win_security_provider_l1_1_0 enable_api_ms_win_security_sddl_l1_1_0 enable_api_ms_win_security_systemfunctions_l1_1_0 enable_api_ms_win_service_core_l1_1_0 @@ -18053,6 +18054,7 @@ wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_securi wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-1 enable_api_ms_win_security_lsalookup_l1_1_1 wine_fn_config_dll api-ms-win-security-lsalookup-l2-1-1 enable_api_ms_win_security_lsalookup_l2_1_1 wine_fn_config_dll api-ms-win-security-lsapolicy-l1-1-0 enable_api_ms_win_security_lsapolicy_l1_1_0 +wine_fn_config_dll api-ms-win-security-provider-l1-1-0 enable_api_ms_win_security_provider_l1_1_0 wine_fn_config_dll api-ms-win-security-sddl-l1-1-0 enable_api_ms_win_security_sddl_l1_1_0 wine_fn_config_dll api-ms-win-security-systemfunctions-l1-1-0 enable_api_ms_win_security_systemfunctions_l1_1_0 wine_fn_config_dll api-ms-win-service-core-l1-1-0 enable_api_ms_win_service_core_l1_1_0 diff --git a/configure.ac b/configure.ac index 1fcf957..d557df8 100644 --- a/configure.ac +++ b/configure.ac @@ -2879,6 +2879,7 @@ WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l2-1-1) WINE_CONFIG_DLL(api-ms-win-security-lsapolicy-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-security-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-systemfunctions-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-0) diff --git a/dlls/api-ms-win-security-provider-l1-1-0/Makefile.in b/dlls/api-ms-win-security-provider-l1-1-0/Makefile.in new file mode 100644 index 0000000..fb5047c --- /dev/null +++ b/dlls/api-ms-win-security-provider-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-provider-l1-1-0.dll diff --git a/dlls/api-ms-win-security-provider-l1-1-0/api-ms-win-security-provider-l1-1-0.spec b/dlls/api-ms-win-security-provider-l1-1-0/api-ms-win-security-provider-l1-1-0.spec new file mode 100644 index 0000000..b244ad8 --- /dev/null +++ b/dlls/api-ms-win-security-provider-l1-1-0/api-ms-win-security-provider-l1-1-0.spec @@ -0,0 +1,6 @@ +@ stdcall GetExplicitEntriesFromAclW(ptr ptr ptr) advapi32.GetExplicitEntriesFromAclW +@ stdcall GetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr ptr) advapi32.GetNamedSecurityInfoW +@ stdcall GetSecurityInfo(long long long ptr ptr ptr ptr ptr) advapi32.GetSecurityInfo +@ stdcall SetEntriesInAclW(long ptr ptr ptr) advapi32.SetEntriesInAclW +@ stdcall SetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr) advapi32.SetNamedSecurityInfoW +@ stdcall SetSecurityInfo(long long long ptr ptr ptr ptr) advapi32.SetSecurityInfo diff --git a/tools/make_specfiles b/tools/make_specfiles index 82f4c82..58207ad 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -129,6 +129,7 @@ my @dll_groups = "api-ms-win-security-lsalookup-l1-1-1", "api-ms-win-security-lsalookup-l2-1-1", "api-ms-win-security-lsapolicy-l1-1-0", + "api-ms-win-security-provider-l1-1-0", "api-ms-win-security-sddl-l1-1-0", "api-ms-win-security-systemfunctions-l1-1-0", "api-ms-win-service-core-l1-1-0",

1 0

Francois Gouget : windowscodecs/tests: A spelling fix in an ok() message.
by Alexandre Julliard July 10, 2017

July 10, 2017

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

Piotr Caban : gdiplus: Add function for managing metafile objects id.
by Alexandre Julliard July 10, 2017

July 10, 2017

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